swagger-typescript-api 11.0.0--alpha-5 → 11.0.0--alpha-6

package/package.json

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

@@ -81,23 +81,26 @@ class Templates {
     const customFullPath = this.getTemplateFullPath(templatePaths.custom, fileName);
     let fileContent = customFullPath && this.fileSystem.getFileContent(customFullPath);
 
-    if (!fileContent) {
-      const baseFullPath = this.getTemplateFullPath(templatePaths.base, fileName);
-
-      if (baseFullPath) {
-        fileContent = this.fileSystem.getFileContent(baseFullPath);
-      } else {
-        this.logger.warn(
-          `${_.lowerCase(name)} template not found in ${customFullPath}`,
-          `\nCode generator will use the default template`,
-        );
-      }
-
-      const originalFullPath = this.getTemplateFullPath(templatePaths.original, fileName);
-
-      if (originalFullPath) {
-        fileContent = this.fileSystem.getFileContent(originalFullPath);
-      }
+    if (fileContent) {
+      this.logger.log(`"${_.lowerCase(name)}" template found in "${templatePaths.custom}"`);
+      return fileContent;
+    }
+
+    const baseFullPath = this.getTemplateFullPath(templatePaths.base, fileName);
+
+    if (baseFullPath) {
+      fileContent = this.fileSystem.getFileContent(baseFullPath);
+    } else {
+      this.logger.warn(
+        `"${_.lowerCase(name)}" template not found in "${templatePaths.custom}"`,
+        `\nCode generator will use the default template`,
+      );
+    }
+
+    const originalFullPath = this.getTemplateFullPath(templatePaths.original, fileName);
+
+    if (originalFullPath) {
+      fileContent = this.fileSystem.getFileContent(originalFullPath);
     }
 
     return fileContent;