bug: fix build on windows

removed shell scripts

fixed manipulation of tsc with tsc-silent, and instead call tsc-silent directly for the generated source

Author: SgtPooki

.aegir.cjs

@@ -32,9 +32,7 @@ module.exports = {
      * @param {MockServerController} controller
      */
     async after (_, controller) {
-      console.log('test after:')
       await controller.shutdown()
-
     }
   }
 }

.gitignore

@@ -12,3 +12,6 @@ package-lock.json
 *.bak
 .swc
 .envrc
+.nyc_output
+generated/fetch/package.json
+generated/fetch/tsconfig.json

README.md

@@ -25,7 +25,7 @@ const client = new PinsApi(config)
   // Get 10 failed Pins
   const pinsGetOptions: PinsGetRequest = {
     limit: 10,
-    status: Status.Failed
+    status: new Set([Status.Failed]) // requires a set, and not an array
   }
   const {count, results}: PinResults = await client.pinsGet(pinsGetOptions)
 

npm-scripts/fix/gen.sh

@@ -131,29 +131,30 @@
     ]
   },
   "scripts": {
+    "clean": "npx rimraf dist generated node_modules",
     "ci:test": "run-s test:*",
     "dep-check": "aegir dep-check src/**/*.ts test/**/*.ts generated/**/*.ts",
     "fix": "run-s fix:*",
-    "fix:gen": "./npm-scripts/fix/gen.sh",
     "fix:lint": "aegir lint --fix",
     "lint": "run-s lint:*",
     "lint:main": "aegir lint",
-    "lint:ts": "aegir ts -p check -- -p tsconfig.json --suppress 6133@generated 6192@generated --stats",
+    "lint:ts": "aegir ts -p check",
     "lint-TODO:project": "check-aegir-project # currently broken due to corrupting the repoUrl",
     "release": "aegir release",
-    "postinstall": "npm run gen && patch-package",
-    "build": "aegir build -- -p tsconfig.json --suppress 6133@generated 6192@generated --stats",
-    "build:main": "aegir build -- -p tsconfig.json --suppress 6133@generated 6192@generated --stats",
+    "postinstall": "run-s gen",
+    "build": "aegir build",
+    "build2": "tsc-silent -p tsconfig.generated.json --suppress 6133@generated 6192@generated --stats",
+    "build:main": "aegir build",
     "build:docs": "aegir ts docs",
-    "build:types": "aegir ts -p types -- -p tsconfig.json --suppress 6133@generated 6192@generated --stats",
+    "build:types": "aegir ts -p types",
     "test": "run-s test:*",
     "test:browser": "aegir test --target browser",
     "test:webworker": "aegir test --target webworker",
     "test:electron": "aegir test --target electron-main",
     "test:node": "aegir test --target node --cov && npx nyc report",
     "pregen": "openapi-generator-cli validate -i https://raw.githubusercontent.com/ipfs/pinning-services-api-spec/v1.0.0/ipfs-pinning-service.yaml",
     "gen": "run-p gen:fetch",
-    "postgen": "run-s fix:gen",
+    "postgen": "tsc-silent -p tsconfig.generated.json --suppress 6133@generated 6192@generated --stats",
     "gen:fetch": "openapi-generator-cli generate --generator-key fetch",
     "gen:node": "openapi-generator-cli generate --generator-key node",
     "gen:ts": "openapi-generator-cli generate --generator-key ts"

npm-scripts/postinstall.sh

@@ -1,7 +1,11 @@
 import fetchPonyfill from 'fetch-ponyfill'
-import { Configuration as GeneratedConfiguration, ConfigurationParameters } from '../generated/fetch/src/index'
+import { Configuration as GeneratedConfiguration } from '../generated/fetch/dist/src'
+import type { ConfigurationParameters } from '../generated/fetch/dist/src'
 
-class Configuration extends GeneratedConfiguration {
+export * from '../generated/fetch/dist/src/apis'
+export * from '../generated/fetch/dist/src/models'
+
+export class Configuration extends GeneratedConfiguration {
   constructor (options: ConfigurationParameters) {
     /**
      * Prevent the need for everyone to have to override the fetch API...
@@ -13,5 +17,19 @@ class Configuration extends GeneratedConfiguration {
   }
 }
 
-export * from '../generated/fetch/src/index'
-export { Configuration }
+export type { ConfigurationParameters }
+export {
+  BASE_PATH,
+  BaseAPI,
+  BlobApiResponse,
+  COLLECTION_FORMATS,
+  // Configuration, // overwritten above
+  JSONApiResponse,
+  RequiredError,
+  TextApiResponse,
+  VoidApiResponse,
+  canConsumeForm,
+  exists,
+  mapValues,
+  querystring
+} from '../generated/fetch/dist/src/runtime'

package.json

@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "sourceRoot": "generated/fetch/src",
+    "outDir": "generated/fetch/dist",
+    "emitDeclarationOnly": false,
+    "module": "ES2020",
+    "target": "ES2020",
+    "typeRoots": [
+      "./types",
+      "./node_modules/@types"
+    ],
+    "declaration": true,
+    "noEmitOnError": true,
+    "esModuleInterop": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "isolatedModules": false,
+    "rootDir": "generated/fetch",
+    "sourceMap": true,
+    "moduleResolution":"Node"
+
+  },
+  "include": [
+    "generated/fetch/src",
+    "types/global.d.ts",
+  ],
+  "exclude": [
+    "./generated/fetch/dist"
+  ]
+}

src/index.ts

@@ -6,17 +6,25 @@
     "module": "ES2020",
     "typeRoots": [
       "./types",
-      "./node_modules/@types"
+      "./node_modules/@types",
+      "./generated/fetch/dist"
     ],
-    "noEmitOnError": true
+    "noEmitOnError": true,
+    "esModuleInterop": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false
   },
   "include": [
     "src",
-    "generated",
+    "test",
     "test/**/*.ts",
-    "generated",
-    "types/**/*.d.ts"
-, "MockServer.ts"  ],
+    "types/**/*.d.ts",
+    "MockServer.ts",
+    "./generated/fetch/dist"
+  ],
+  "exclude": [
+    "generated"
+  ],
   "ts-node": {
     "transpileOnly": true,
     "files": true,

tsconfig.generated.json

@@ -1,6 +1,2 @@
 
 declare type GlobalFetch = WindowOrWorkerGlobalScope
-
-declare module 'mock-ipfs-pinning-service' {
-  export * from 'mock-ipfs-pinning-service/dist/index'
-}