Release 3.0.0 (#91)

* fix: handling x-omitempty property for definition properties (#68) * docs: update CHANGELOG * BREAKING_CHANGE: renamed mustache templates, split client mustache template * Fixed unsafe clone() of Response causing json() hang. (#89) Fixed unsafe clone() of Response causing json() hang * bump: up project version to 3.0.0; chore: refresh generated api modules; docs; update CHANGELOG Co-authored-by: Benjamin Dobell <benjamin.dobell+github@glassechidna.com.au>
acacode · Nov 10, 2020 · 1f6e21b · 1f6e21b
1 parent 9329559
commit 1f6e21b
Show file tree

Hide file tree

Showing 62 changed files with 1,821 additions and 166 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# next release  
+
+
+# 3.0.0  
+
+BREAKING_CHANGES:  
+- Renamed mustache templates:  
+  - `api.mustache` -> `data-contracts.mustache`   
+  - `client.mustache` -> `http.client.mustache` + `api.mustache`  
+- Split the `client.mustache` template into two parts: `http-client.mustache` and `api.mustache`  
+
+Fixes:  
+- Fixed unsafe clone() of Response causing json() hang. (Thanks @Benjamin-Dobell)  
+
 # 2.0.0  
 
 Features:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Create typescript api module from swagger schema",
   "scripts": {
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts",

diff --git a/src/config.js b/src/config.js
@@ -1,6 +1,6 @@
 const config = {
   /** CLI flag */
-  templates: "./templates",
+  templates: "./templates/defaults",
   /** CLI flag */
   generateResponses: false,
   /** CLI flag */

diff --git a/src/filePrefix.js b/src/filePrefix.js
@@ -0,0 +1,14 @@
+module.exports = {
+  filePrefix: `/* tslint:disable */
+/* eslint-disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+`,
+};
diff --git a/src/files.js b/src/files.js
@@ -1,13 +1,14 @@
 const _ = require("lodash");
 const fs = require("fs");
 const { resolve } = require("path");
+const { filePrefix } = require("./filePrefix");
 
 const getFileContent = (path) => fs.readFileSync(path, { encoding: "UTF-8" });
 
 const pathIsExist = (path) => path && fs.existsSync(path);
 
 const createFile = (pathTo, fileName, content) =>
-  fs.writeFileSync(resolve(__dirname, pathTo, `./${fileName}`), content, _.noop);
+  fs.writeFileSync(resolve(__dirname, pathTo, `./${fileName}`), `${filePrefix}${content}`, _.noop);
 
 module.exports = {
   createFile,

diff --git a/src/index.js b/src/index.js
@@ -56,7 +56,12 @@ module.exports = {
       });
       (spec ? convertSwaggerObject(spec) : getSwaggerObject(input, url))
         .then(({ usageSchema, originalSchema }) => {
-          const { apiTemplate, clientTemplate, routeTypesTemplate } = getTemplates();
+          const {
+            dataContractsTemplate,
+            httpClientTemplate,
+            apiTemplate,
+            routeTypesTemplate,
+          } = getTemplates();
 
           console.log("☄️  start generating your typescript api");
 
@@ -90,9 +95,10 @@ module.exports = {
           };
 
           let sourceFileContent = [
-            mustache.render(apiTemplate, configuration),
+            mustache.render(dataContractsTemplate, configuration),
             generateRouteTypes ? mustache.render(routeTypesTemplate, configuration) : "",
-            generateClient ? mustache.render(clientTemplate, configuration) : "",
+            generateClient ? mustache.render(httpClientTemplate, configuration) : "",
+            generateClient ? mustache.render(apiTemplate, configuration) : "",
           ].join("");
 
           if (toJS) {

diff --git a/src/templates.js b/src/templates.js
@@ -2,19 +2,20 @@ const { getFileContent } = require("./files");
 const { config } = require("./config");
 const { resolve } = require("path");
 
+const getTemplate = (templateName) =>
+  getFileContent(resolve(config.templates, `./${templateName}.mustache`));
+
 const getTemplates = () => {
   console.log(`✨ try to read templates from directory "${config.templates}"`);
 
   return {
-    apiTemplate: getTemplate("api"),
-    clientTemplate: config.generateClient ? getTemplate("client") : null,
+    dataContractsTemplate: getTemplate("data-contracts"),
     routeTypesTemplate: config.generateRouteTypes ? getTemplate("route-types") : null,
+    httpClientTemplate: config.generateClient ? getTemplate("http-client") : null,
+    apiTemplate: config.generateClient ? getTemplate("api") : null,
   };
 };
 
-const getTemplate = (templateName) =>
-  getFileContent(resolve(config.templates, `./${templateName}.mustache`));
-
 module.exports = {
   getTemplates,
 };
diff --git a/src/templates/api.mustache b/src/templates/api.mustache
diff --git a/src/templates/defaults/api.mustache b/src/templates/defaults/api.mustache
@@ -0,0 +1,41 @@
+
+{{#apiConfig.hasDescription}}
+/**
+{{#apiConfig.description}}
+ * {{.}}
+{{/apiConfig.description}}
+ */
+{{/apiConfig.hasDescription}}
+export class Api<{{#apiConfig.generic}}{{name}}{{#defaultValue}} = {{.}}{{/defaultValue}},{{/apiConfig.generic}}> extends HttpClient<{{#apiConfig.generic}}{{name}},{{/apiConfig.generic}}>{
+{{#routes}}
+
+  {{#outOfModule}}
+
+
+  /**
+  {{#comments}}
+   * {{.}}
+  {{/comments}}
+   */
+  {{name}} = ({{#routeArgs}}{{name}}{{#optional}}?{{/optional}}: {{type}}, {{/routeArgs}}) =>
+    this.request<{{returnType}}, {{errorReturnType}}>({{requestMethodContent}})
+  {{/outOfModule}}
+
+  {{#combined}}
+  {{moduleName}} = {
+    {{#routes}}
+
+
+    /**
+    {{#comments}}
+     * {{.}}
+    {{/comments}}
+     */
+    {{name}}: ({{#routeArgs}}{{name}}{{#optional}}?{{/optional}}: {{type}}, {{/routeArgs}}) =>
+      this.request<{{returnType}}, {{errorReturnType}}>({{requestMethodContent}}),
+    {{/routes}}
+  }
+  {{/combined}}
+{{/routes}}
+
+}
diff --git a/src/templates/defaults/data-contracts.mustache b/src/templates/defaults/data-contracts.mustache
@@ -0,0 +1,9 @@
+{{#modelTypes}}
+
+{{#description}}
+/**
+ * {{.}}
+ */
+{{/description}}
+export {{typeIdentifier}} {{name}} {{content}}
+{{/modelTypes}}
diff --git a/src/templates/client.mustache → src/templates/defaults/http-client.mustache b/src/templates/client.mustache → src/templates/defaults/http-client.mustache
@@ -96,7 +96,7 @@ class HttpClient<{{#apiConfig.generic}}{{name}},{{/apiConfig.generic}}> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 
@@ -139,44 +139,3 @@ class HttpClient<{{#apiConfig.generic}}{{name}},{{/apiConfig.generic}}> {
     })
   }
 }
-
-{{#apiConfig.hasDescription}}
-/**
-{{#apiConfig.description}}
- * {{.}}
-{{/apiConfig.description}}
- */
-{{/apiConfig.hasDescription}}
-export class Api<{{#apiConfig.generic}}{{name}}{{#defaultValue}} = {{.}}{{/defaultValue}},{{/apiConfig.generic}}> extends HttpClient<{{#apiConfig.generic}}{{name}},{{/apiConfig.generic}}>{
-{{#routes}}
-
-  {{#outOfModule}}
-
-
-  /**
-  {{#comments}}
-   * {{.}}
-  {{/comments}}
-   */
-  {{name}} = ({{#routeArgs}}{{name}}{{#optional}}?{{/optional}}: {{type}}, {{/routeArgs}}) =>
-    this.request<{{returnType}}, {{errorReturnType}}>({{requestMethodContent}})
-  {{/outOfModule}}
-
-  {{#combined}}
-  {{moduleName}} = {
-    {{#routes}}
-
-
-    /**
-    {{#comments}}
-     * {{.}}
-    {{/comments}}
-     */
-    {{name}}: ({{#routeArgs}}{{name}}{{#optional}}?{{/optional}}: {{type}}, {{/routeArgs}}) =>
-      this.request<{{returnType}}, {{errorReturnType}}>({{requestMethodContent}}),
-    {{/routes}}
-  }
-  {{/combined}}
-{{/routes}}
-
-}
diff --git a/src/templates/route-types.mustache → src/templates/defaults/route-types.mustache b/src/templates/route-types.mustache → src/templates/defaults/route-types.mustache
diff --git a/tests/generated/v2.0/adafruit.ts b/tests/generated/v2.0/adafruit.ts
@@ -237,7 +237,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/another-example.ts b/tests/generated/v2.0/another-example.ts
@@ -190,7 +190,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/api-with-examples.ts b/tests/generated/v2.0/api-with-examples.ts
@@ -68,7 +68,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/authentiq.ts b/tests/generated/v2.0/authentiq.ts
@@ -142,7 +142,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/example1.ts b/tests/generated/v2.0/example1.ts
@@ -109,7 +109,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/file-formdata-example.ts b/tests/generated/v2.0/file-formdata-example.ts
@@ -74,7 +74,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/furkot-example.ts b/tests/generated/v2.0/furkot-example.ts
@@ -116,7 +116,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/giphy.ts b/tests/generated/v2.0/giphy.ts
@@ -257,7 +257,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/github-swagger.ts b/tests/generated/v2.0/github-swagger.ts
@@ -1486,7 +1486,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/path-args.ts b/tests/generated/v2.0/path-args.ts
@@ -90,7 +90,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/petstore-expanded.ts b/tests/generated/v2.0/petstore-expanded.ts
@@ -116,7 +116,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/petstore-minimal.ts b/tests/generated/v2.0/petstore-minimal.ts
@@ -75,7 +75,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/petstore-simple.ts b/tests/generated/v2.0/petstore-simple.ts
@@ -112,7 +112,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/petstore-swagger-io.ts b/tests/generated/v2.0/petstore-swagger-io.ts
@@ -147,7 +147,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/petstore-with-external-docs.ts b/tests/generated/v2.0/petstore-with-external-docs.ts
@@ -102,7 +102,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/petstore.ts b/tests/generated/v2.0/petstore.ts
@@ -103,7 +103,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;
 

diff --git a/tests/generated/v2.0/query-path-param.ts b/tests/generated/v2.0/query-path-param.ts
@@ -90,7 +90,7 @@ class HttpClient<SecurityDataType> {
   }
 
   private safeParseResponse = <T = any, E = any>(response: Response): Promise<HttpResponse<T, E>> => {
-    const r = response.clone() as HttpResponse<T, E>;
+    const r = response as HttpResponse<T, E>;
     r.data = null;
     r.error = null;