swagger-typescript-api 11.0.0 → 11.0.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # next release  
 
+# 11.0.2  
+
+- fix: problems with --http-client option in `generate-templates` command  
+- fix: rewrite file content in `generate-templates` command (`--rewrite` flag)  
+
 # 11.0.0  
 
 ## Breaking changes  

package/index.js

@@ -290,7 +290,14 @@ const main = async () => {
         break;
       }
       case "generate-templates": {
-        await generateTemplates(options);
+        await generateTemplates({
+          cleanOutput: options.cleanOutput,
+          output: options.output,
+          httpClientType: options.httpClient,
+          modular: options.modular,
+          silent: options.silent,
+          rewrite: options.rewrite,
+        });
         break;
       }
       default: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "11.0.0",
+  "version": "11.0.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",

package/src/commands/generate-templates/templates-gen-process.js

@@ -56,16 +56,40 @@ class TemplatesGenProcess {
       }
 
       templates.forEach((template) => {
-        const templateExist = this.fileSystem.pathIsExist(path.resolve(outputPath, template.name));
-        if (!templateExist || this.config.rewrite) {
+        const templateName = this.fileSystem.cropExtension(template.name);
+        const templateEjsPath = path.resolve(outputPath, `${templateName}.ejs`);
+        const templateEtaPath = path.resolve(outputPath, `${templateName}.eta`);
+        const templateEjsPathExist = this.fileSystem.pathIsExist(templateEjsPath);
+        const templateEtaPathExist = this.fileSystem.pathIsExist(templateEtaPath);
+
+        const templateNotExist = !templateEjsPathExist && !templateEtaPathExist;
+
+        if (templateNotExist) {
           this.fileSystem.createFile({
             path: outputPath,
             fileName: template.name,
             content: template.content,
             withPrefix: false,
           });
+        } else if (this.config.rewrite) {
+          if (templateEjsPathExist) {
+            this.fileSystem.createFile({
+              path: outputPath,
+              fileName: `${templateName}.ejs`,
+              content: template.content,
+              withPrefix: false,
+            });
+          } else if (templateEtaPathExist) {
+            this.fileSystem.createFile({
+              path: outputPath,
+              fileName: `${templateName}.eta`,
+              content: template.content,
+              withPrefix: false,
+            });
+          }
         }
       });
+
       this.logger.success(`source templates has been successfully created in "${outputPath}"`);
     }
 
@@ -83,23 +107,26 @@ class TemplatesGenProcess {
     const apiTemplatesPath = this.config.modular ? this.paths.moduleApiTemplates : this.paths.defaultApiTemplates;
     const apiTemplates = this.getTemplateNamesFromDir(apiTemplatesPath);
 
-    for (const fileName of baseTemplates) {
-      outputFiles.push({
-        name: fileName,
-        content: this.fixTemplateContent(this.getTemplateContent(`${this.paths.baseTemplates}/${fileName}`)),
-      });
-    }
-
     const usingHttpClientTemplate = httpClientTemplates.find((template) =>
       template.startsWith(`${this.config.httpClientType}-`),
     );
 
+    let httpClientTemplateContent = "";
+
     if (usingHttpClientTemplate) {
+      httpClientTemplateContent = this.fixTemplateContent(
+        this.getTemplateContent(`${this.paths.httpClientTemplates}/${usingHttpClientTemplate}`),
+      );
+    }
+
+    for (const fileName of baseTemplates) {
+      const templateContent =
+        (fileName === "http-client.ejs" && httpClientTemplateContent) ||
+        this.fixTemplateContent(this.getTemplateContent(`${this.paths.baseTemplates}/${fileName}`));
+
       outputFiles.push({
-        name: usingHttpClientTemplate,
-        content: this.fixTemplateContent(
-          this.getTemplateContent(`${this.paths.httpClientTemplates}/${usingHttpClientTemplate}`),
-        ),
+        name: fileName,
+        content: templateContent,
       });
     }