swagger-typescript-api 11.0.0--beta-4 → 11.0.0--beta-5

package/cli/operations/display-help.js

@@ -129,7 +129,6 @@ ${outputTest}`);
 };
 
 const displayHelp = (commands, instance, command) => {
-  const rootCommand = commands[root_command];
   if (command.name === root_command) return displayAllHelp(commands, instance);
 
   const { options, maxLength: maxOptionLength } = generateOptionsOutput(command.options);

package/index.js

@@ -230,6 +230,11 @@ program.addCommand({
       description: "clean output folder before generate template. WARNING: May cause data loss",
       default: templateGenBaseConfig.cleanOutput,
     },
+    {
+      flags: "-r, --rewrite",
+      description: "rewrite content in existing templates",
+      default: templateGenBaseConfig.rewrite,
+    },
     {
       flags: "--silent",
       description: "Output only errors to console",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "11.0.0--beta-4",
+  "version": "11.0.0--beta-5",
   "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/configuration.js

@@ -11,6 +11,7 @@ class TemplatesGenConfig {
   modular = false;
   silent = false;
   version = PROJECT_VERSION;
+  rewrite = false;
 
   /**
    * @param config {GenerateTemplatesParams}

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

@@ -39,9 +39,12 @@ class TemplatesGenProcess {
    * @return {Promise<GenerateTemplatesOutput>}
    */
   async start() {
+    this.logger.event('start generating source templates ".ejs" for code generator');
+
     const templates = this.getTemplates();
 
     if (this.config.output) {
+      this.logger.log("preparing output directory for source templates");
       const outputPath = path.resolve(process.cwd(), this.config.output);
 
       if (this.fileSystem.pathIsExist(outputPath)) {
@@ -53,13 +56,16 @@ class TemplatesGenProcess {
       }
 
       templates.forEach((template) => {
-        this.fileSystem.createFile({
-          path: outputPath,
-          fileName: template.name,
-          content: template.content,
-          withPrefix: false,
-        });
+        if (!this.fileSystem.pathIsExist(resolve(outputPath, template.name)) || this.config.rewrite) {
+          this.fileSystem.createFile({
+            path: outputPath,
+            fileName: template.name,
+            content: template.content,
+            withPrefix: false,
+          });
+        }
       });
+      this.logger.event(`source templates has been successfully created in "${outputPath}"`);
     }
 
     return {
@@ -107,14 +113,17 @@ class TemplatesGenProcess {
   };
 
   fixTemplateContent = (content) => {
+    // includeFile("@base/
     const importsRegExp1 = new RegExp(
       `includeFile\\\("(${this.importTemplatePrefixes.map((v) => `(${v})`).join("|")})\/`,
       "g",
     );
+    // includeFile(`@base/
     const importsRegExp2 = new RegExp(
       `includeFile\\\(\`(${this.importTemplatePrefixes.map((v) => `(${v})`).join("|")})\/`,
       "g",
     );
+    // includeFile('@base/
     const importsRegExp3 = new RegExp(
       `includeFile\\\(\'(${this.importTemplatePrefixes.map((v) => `(${v})`).join("|")})\/`,
       "g",