Merge branch 'develop' of github.com:psrebniak/swagger-typescript-cli…

…ent-generator
psrebniak · Dec 7, 2020 · e23ba7a · e23ba7a
2 parents 2dd2535 + 0eed669
commit e23ba7a
Show file tree

Hide file tree

Showing 28 changed files with 1,636 additions and 1,348 deletions.
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "swagger-typescript-client-generator",
   "private": true,
   "scripts": {
+    "clean": "lerna exec --stream -- yarn clean",
     "build": "lerna exec --stream -- yarn build",
     "pretest": "yarn build",
     "test": "yarn test:lib && yarn test:petstore",

diff --git a/packages/swagger-typescript-client-generator-runtime/lib/abstractApiClient.js b/packages/swagger-typescript-client-generator-runtime/lib/abstractApiClient.js
diff --git a/packages/swagger-typescript-client-generator-runtime/lib/serialize.js b/packages/swagger-typescript-client-generator-runtime/lib/serialize.js
diff --git a/packages/swagger-typescript-client-generator-runtime/lib/whatwg-fetch.js b/packages/swagger-typescript-client-generator-runtime/lib/whatwg-fetch.js
diff --git a/packages/swagger-typescript-client-generator-runtime/lib/withHeaders.js b/packages/swagger-typescript-client-generator-runtime/lib/withHeaders.js
diff --git a/packages/swagger-typescript-client-generator/lib/commands/bundleCommand.js b/packages/swagger-typescript-client-generator/lib/commands/bundleCommand.js
diff --git a/packages/swagger-typescript-client-generator/lib/commands/clientCommand.js b/packages/swagger-typescript-client-generator/lib/commands/clientCommand.js
diff --git a/packages/swagger-typescript-client-generator/lib/commands/index.js b/packages/swagger-typescript-client-generator/lib/commands/index.js
diff --git a/packages/swagger-typescript-client-generator/lib/commands/modelsCommand.js b/packages/swagger-typescript-client-generator/lib/commands/modelsCommand.js
diff --git a/packages/swagger-typescript-client-generator/lib/fileReader/jsonReader.js b/packages/swagger-typescript-client-generator/lib/fileReader/jsonReader.js
diff --git a/packages/swagger-typescript-client-generator/lib/fileReader/readerFactory.js b/packages/swagger-typescript-client-generator/lib/fileReader/readerFactory.js
diff --git a/packages/swagger-typescript-client-generator/lib/fileReader/yamlReader.js b/packages/swagger-typescript-client-generator/lib/fileReader/yamlReader.js
diff --git a/packages/swagger-typescript-client-generator/lib/index.js b/packages/swagger-typescript-client-generator/lib/index.js
diff --git a/packages/swagger-typescript-client-generator/lib/parameterArrayToSchemaConverter.js b/packages/swagger-typescript-client-generator/lib/parameterArrayToSchemaConverter.js
diff --git a/packages/swagger-typescript-client-generator/lib/parametersJarFactory.js b/packages/swagger-typescript-client-generator/lib/parametersJarFactory.js
diff --git a/packages/swagger-typescript-client-generator/lib/swaggerTypes.js b/packages/swagger-typescript-client-generator/lib/swaggerTypes.js
diff --git a/packages/swagger-typescript-client-generator/lib/typescriptClientGenerator.js b/packages/swagger-typescript-client-generator/lib/typescriptClientGenerator.js
diff --git a/packages/swagger-typescript-client-generator/lib/typescriptConverter.js b/packages/swagger-typescript-client-generator/lib/typescriptConverter.js
diff --git a/packages/swagger-typescript-client-generator/lib/typescriptNameNormalizer.js b/packages/swagger-typescript-client-generator/lib/typescriptNameNormalizer.js
diff --git a/packages/swagger-typescript-client-generator/lib/writer/prettierWriterComposite.d.ts b/packages/swagger-typescript-client-generator/lib/writer/prettierWriterComposite.d.ts
diff --git a/packages/swagger-typescript-client-generator/lib/writer/prettierWriterComposite.js b/packages/swagger-typescript-client-generator/lib/writer/prettierWriterComposite.js
diff --git a/packages/swagger-typescript-client-generator/lib/writer/stdoutWriter.js b/packages/swagger-typescript-client-generator/lib/writer/stdoutWriter.js
diff --git a/packages/swagger-typescript-client-generator/lib/writer/writerFactory.d.ts b/packages/swagger-typescript-client-generator/lib/writer/writerFactory.d.ts
diff --git a/packages/swagger-typescript-client-generator/lib/writer/writerFactory.js b/packages/swagger-typescript-client-generator/lib/writer/writerFactory.js
diff --git a/packages/swagger-typescript-client-generator/package.json b/packages/swagger-typescript-client-generator/package.json
@@ -26,7 +26,7 @@
     "@types/jest": "^25.2.1",
     "@types/js-yaml": "^3.12.1",
     "@types/prettier": "^2.0.0",
-    "@types/swagger-schema-official": "^2.0.15",
+    "@types/swagger-schema-official": "2.0.15",
     "@types/yargs": "^15.0.4",
     "jest": "^25.2.7",
     "rimraf": "^3.0.0",

diff --git a/packages/swagger-typescript-client-generator/src/fileReader/jsonReader.ts b/packages/swagger-typescript-client-generator/src/fileReader/jsonReader.ts
@@ -6,7 +6,7 @@ import { Spec } from "swagger-schema-official"
 export const jsonReader: FileReader = (options: FileReaderOptions): Spec => {
   const content = fs.readFileSync(options.file, {
     encoding: "UTF-8",
-    flag: "r"
+    flag: "r",
   })
-  return JSON.parse(content)
+  return (JSON.parse(content) as unknown) as Spec
 }
diff --git a/packages/swagger-typescript-client-generator/src/fileReader/yamlReader.ts b/packages/swagger-typescript-client-generator/src/fileReader/yamlReader.ts
@@ -7,7 +7,7 @@ import * as yaml from "js-yaml"
 export const yamlReader: FileReader = (options: FileReaderOptions): Spec => {
   const content = fs.readFileSync(options.file, {
     encoding: "UTF-8",
-    flag: "r"
+    flag: "r",
   })
-  return yaml.safeLoad(content)
+  return (yaml.safeLoad(content) as unknown) as Spec
 }