From 6963a35698a4f02763da9e83df2756ff180eb22f Mon Sep 17 00:00:00 2001 From: Adam Snyder Date: Tue, 23 Feb 2021 17:11:06 -0800 Subject: [PATCH 1/2] Do not fail if template file does not exist (#179) This allows overriding specific template files and fallback on the defaults. --- src/templates.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/templates.js b/src/templates.js index 734b3ef2..28213c9b 100644 --- a/src/templates.js +++ b/src/templates.js @@ -1,6 +1,6 @@ const _ = require("lodash"); const Eta = require("eta"); -const { getFileContent } = require("./files"); +const { getFileContent, pathIsExist } = require("./files"); const { resolve } = require("path"); const getTemplates = ({ templates, modular }) => { @@ -27,7 +27,8 @@ const getTemplates = ({ templates, modular }) => { const templatesMap = _.reduce( templatePaths, (acc, pathToTemplate, key) => { - let fileContent = getFileContent(resolve(customTemplatesPath, pathToTemplate)); + const customFullPath = resolve(customTemplatesPath, pathToTemplate) + let fileContent = pathIsExist(customFullPath) && getFileContent(customFullPath); if (!fileContent) { console.log( From bdb605a017f44f7b72d98aaf8f927ca89fab2e06 Mon Sep 17 00:00:00 2001 From: svolkov Date: Wed, 24 Feb 2021 04:29:19 +0300 Subject: [PATCH 2/2] bump: up version to 5.1.7 --- CHANGELOG.md | 6 ++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 665621bf..1984f493 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # next release +# 5.1.7 + +Fixes: +- Do not fail if template file does not exist (issue #166, thanks @armsnyder ) + Caveat: With this fix it will still error if the overridden template uses `includeFile` on a template file that is not overridden + # 5.1.6 Fixes: diff --git a/package-lock.json b/package-lock.json index f3e7b160..d47bd1fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "swagger-typescript-api", - "version": "5.1.6", + "version": "5.1.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3b13c6d8..9e143581 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swagger-typescript-api", - "version": "5.1.6", + "version": "5.1.7", "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 --extract-request-params --enum-names-as-values",