swagger-typescript-api 11.1.1 → 11.1.2

package/index.js

@@ -308,7 +308,9 @@ const main = async () => {
   } catch (e) {
     console.error(e);
     process.exit(1);
+    return;
   }
+  process.exit(0);
 };
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "11.1.1",
+  "version": "11.1.2",
   "description": "Generate typescript/javascript api from swagger schema",
   "scripts": {
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts",
@@ -38,6 +38,7 @@
     "test:--enum-names-as-values": "node tests/spec/enumNamesAsValues/test.js",
     "test:--default-response": "node tests/spec/defaultResponse/test.js",
     "test:--js": "node tests/spec/js/test.js",
+    "test:jsSingleHttpClientModular": "node tests/spec/jsSingleHttpClientModular/test.js",
     "test:--js--axios": "node tests/spec/jsAxios/test.js",
     "test:--axios": "node tests/spec/axios/test.js",
     "test:--another-array-type": "node tests/spec/another-array-type/test.js",
@@ -46,11 +47,15 @@
     "test:--type-suffix--type-prefix": "node tests/spec/typeSuffixPrefix/test.js",
     "test:--dot-path-params": "node tests/spec/dot-path-params/test.js",
     "test:--primitive-type-constructs": "node tests/spec/primitive-type-constructs/test.js",
-    "test:--cli": "node index.js -p tests/spec/cli/schema.json -o tests/spec/cli -n schema.ts --extract-response-body --extract-response-error --api-class-name MySuperApi --type-prefix Prefix",
+    "test:--cli": "node index.js -p tests/spec/cli/schema.json -o tests/spec/cli -n schema.ts --extract-response-body --extract-response-error --api-class-name MySuperApi --type-prefix Prefix && node tests/spec/cli/test.js",
     "test:partialBaseTemplate": "node tests/spec/partialBaseTemplate/test.js",
     "test:partialDefaultTemplate": "node tests/spec/partialDefaultTemplate/test.js",
     "test:--patch": "node tests/spec/patch/test.js",
-    "test:deprecated": "node tests/spec/deprecated/test.js"
+    "test:deprecated": "node tests/spec/deprecated/test.js",
+    "test:nullableRefTest3.0": "node tests/spec/nullable-3.0/test.js",
+    "test:nullableRefTest2.0": "node tests/spec/nullable-2.0/test.js",
+    "test:additionalProperties2.0": "node tests/spec/additional-properties-2.0/test.js",
+    "test:enums2.0": "node tests/spec/enums-2.0/test.js"
   },
   "author": "acacode",
   "license": "MIT",
@@ -61,6 +66,7 @@
     "@types/node": "^18.11.7",
     "@types/prettier": "^2.7.1",
     "all-contributors-cli": "^6.20.0",
+    "axios": "^1.1.3",
     "cross-env": "^7.0.3",
     "git-diff": "^2.0.6",
     "husky": "^4.3.6",

package/src/schema-parser/schema-parser.js

@@ -149,7 +149,7 @@ class SchemaParser {
       });
     },
     [SCHEMA_TYPES.OBJECT]: (schema, typeName) => {
-      const content = this.getObjectSchemaContent(schema);
+      const contentProperties = this.getObjectSchemaContent(schema);
 
       return this.attachParsedRef(schema, {
         ...(_.isObject(schema) ? schema : {}),
@@ -159,8 +159,8 @@ class SchemaParser {
         typeIdentifier: this.config.Ts.Keyword.Interface,
         name: typeName,
         description: this.schemaFormatters.formatDescription(schema.description),
-        allFieldsAreOptional: !_.some(_.values(content), (part) => part.isRequired),
-        content: content,
+        allFieldsAreOptional: !_.some(_.values(contentProperties), (part) => part.isRequired),
+        content: contentProperties,
       });
     },
     [SCHEMA_TYPES.COMPLEX]: (schema, typeName) => {
@@ -424,7 +424,7 @@ class SchemaParser {
       };
     });
 
-    if (additionalProperties === true) {
+    if (additionalProperties) {
       propertiesContent.push({
         $$raw: { additionalProperties },
         description: "",

package/src/translators/JavaScript.js

@@ -1,49 +1,60 @@
-const ts = require("typescript");
-
-function translate(fileName, content, options) {
-  const output = {};
-  const host = ts.createCompilerHost(options, true);
-  const fileNames = [fileName];
-  const originalSourceFileGet = host.getSourceFile.bind(host);
-  host.getSourceFile = (sourceFileName, languageVersion, onError, shouldCreateNewSourceFile) => {
-    if (sourceFileName !== fileName)
-      return originalSourceFileGet(sourceFileName, languageVersion, onError, shouldCreateNewSourceFile);
-
-    return ts.createSourceFile(sourceFileName, content, languageVersion, true, ts.ScriptKind.External);
-  };
-
-  host.writeFile = (fileName, contents) => {
-    output[fileName] = contents;
-  };
-
-  ts.createProgram(fileNames, options, host).emit();
-
-  return output;
-}
-
-module.exports = {
-  translate: (fileName, sourceTypeScript) => {
-    const translated = translate(fileName, sourceTypeScript, {
-      module: "ESNext",
-      noImplicitReturns: true,
-      alwaysStrict: true,
-      target: ts.ScriptTarget.ESNext,
-      declaration: true,
-      noImplicitAny: false,
-      sourceMap: false,
-      removeComments: false,
-      disableSizeLimit: true,
-      esModuleInterop: true,
-      emitDecoratorMetadata: true,
-      skipLibCheck: true,
-    });
-
-    const sourceFileName = fileName.replace(ts.Extension.Ts, ts.Extension.Js);
-    const declarationFileName = fileName.replace(ts.Extension.Ts, ts.Extension.Dts);
-
-    return {
-      sourceContent: translated[sourceFileName],
-      declarationContent: translated[declarationFileName],
-    };
-  },
-};
+const ts = require("typescript");
+
+function translate(fileName, content, options) {
+  const output = {};
+  const host = ts.createCompilerHost(options, true);
+  const fileNames = [fileName];
+  const originalSourceFileGet = host.getSourceFile.bind(host);
+  host.getSourceFile = (sourceFileName, languageVersion, onError, shouldCreateNewSourceFile) => {
+    if (sourceFileName !== fileName)
+      return originalSourceFileGet(sourceFileName, languageVersion, onError, shouldCreateNewSourceFile);
+
+    return ts.createSourceFile(sourceFileName, content, languageVersion, true, ts.ScriptKind.External);
+  };
+
+  host.writeFile = (fileName, contents) => {
+    output[fileName] = contents;
+  };
+
+  ts.createProgram(fileNames, options, host).emit();
+
+  return output;
+}
+
+module.exports = {
+  translate: (fileName, sourceTypeScript) => {
+    const translated = translate(fileName, sourceTypeScript, {
+      module: "ESNext",
+      noImplicitReturns: true,
+      alwaysStrict: true,
+      target: ts.ScriptTarget.ESNext,
+      declaration: true,
+      noImplicitAny: false,
+      sourceMap: false,
+      removeComments: false,
+      disableSizeLimit: true,
+      esModuleInterop: true,
+      emitDecoratorMetadata: true,
+      skipLibCheck: true,
+    });
+
+    const sourceFileName = fileName.replace(ts.Extension.Ts, ts.Extension.Js);
+    const declarationFileName = fileName.replace(ts.Extension.Ts, ts.Extension.Dts);
+    const sourceContent = translated[sourceFileName];
+    const tsImportRows = sourceTypeScript.split("\n").filter((line) => line.startsWith("import "));
+    const declarationContent = translated[declarationFileName]
+      .split("\n")
+      .map((line) => {
+        if (line.startsWith("import ")) {
+          return tsImportRows.shift();
+        }
+        return line;
+      })
+      .join("\n");
+
+    return {
+      sourceContent: sourceContent,
+      declarationContent: declarationContent,
+    };
+  },
+};