Merge pull request #435 from acacode/next

Next release

Author: js2me

CHANGELOG.md

@@ -1,5 +1,12 @@
 # next release
 
+# 11.1.2  
+
+fix: problems with missing type imports in `.d.ts` files with using option `--js`    
+internal: add extra spec tests  
+fix: additionalProperties management problem in Swagger 2 (#343)  
+fix: hanging cli after execution finished (#436, thanks @Soarc)  
+
 # 11.1.1  
 fix: `--api-class-name` option has no default value (#433)  
 

index.js

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

package-lock.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",
@@ -39,6 +39,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",
@@ -47,11 +48,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",
@@ -62,6 +67,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.json

@@ -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: "",

src/schema-parser/schema-parser.js

@@ -40,10 +40,21 @@ module.exports = {
 
     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: translated[sourceFileName],
-      declarationContent: translated[declarationFileName],
+      sourceContent: sourceContent,
+      declarationContent: declarationContent,
     };
   },
 };