Merge pull request #26 from EvgenyiFedotov/fix/always-change

fix: cli should know what files should be alway regenerated

Author: EvgenyiFedotov

src/cli/index.js

@@ -12,7 +12,6 @@ const changeCase = require("change-case");
 
 const timeLog = `✨ ${name}`;
 const defaultOutputDir = "./api";
-const changeAlways = ["index.js", "index.d.ts"];
 
 program
   .version(version)
@@ -110,7 +109,10 @@ async function main(config) {
     resolveLocalPresets(omitUndefined(config)),
   );
   const apiResult = await swaggerToJs(compiledConfig);
-  const outputFiles = buildFiles(apiResult, compiledConfig);
+  const { all: outputFiles, source: sourceFilesNames } = buildFiles(
+    apiResult,
+    compiledConfig,
+  );
 
   // Check and create output dir
   const pathOutputDir = path.resolve(process.cwd(), compiledConfig.outputDir);
@@ -120,7 +122,7 @@ async function main(config) {
   }
 
   // Write files
-  writeFilesSync(outputFiles, pathOutputDir);
+  writeFilesSync(outputFiles, sourceFilesNames, pathOutputDir);
 
   console.timeEnd(timeLog);
 }
@@ -183,7 +185,7 @@ function buildFiles({ code, types, swaggerData }, config = {}) {
     );
   }
 
-  return files;
+  return { all: files, source: [nameCode, nameTypes] };
 }
 
 function resolveLocalPresets(config) {
@@ -219,7 +221,11 @@ function exportOneFunction(content) {
   return contentLines.join("\n");
 }
 
-function writeFilesSync(files, outputDir = "") {
+function writeFilesSync(
+  files,
+  changeAlways = ["index.d.ts", "index.js"],
+  outputDir = "",
+) {
   Object.keys(files).forEach((fileName) => {
     const filePath = path.resolve(outputDir, fileName);
 
@@ -229,7 +235,7 @@ function writeFilesSync(files, outputDir = "") {
       writeFileSync(filePath, fileConfig.content);
 
       if (fileConfig.dependencies) {
-        writeFilesSync(fileConfig.dependencies, outputDir);
+        writeFilesSync(fileConfig.dependencies, changeAlways, outputDir);
       }
     }
   });

src/cli/index.test.js

@@ -1,19 +1,31 @@
 const { execSync } = require("child_process");
-const { readFileSync, writeFileSync } = require("fs");
-
-const fs = require("fs");
 const path = require("path");
+const { readFileSync, writeFileSync, readdirSync } = require("fs");
+
 const { sentenceCase } = require("change-case");
 
 afterEach(() => {
   execSync("rm -fr ./TEST_API");
   execSync("rm -fr ./TEST_CONFIG.js");
 });
 
+test("should regenerate nonstandard file names", () => {
+  execSync(
+    `node ./src/cli --output-dir ./TEST_API --file ./src/mocks/petstore-v3-short.json --template-file-name-code random.js`,
+  );
+  const first = readFileSync("./TEST_API/random.js", "utf8");
+
+  execSync(
+    `node ./src/cli --output-dir ./TEST_API --file ./src/mocks/petstore-v3.json --template-file-name-code random.js`,
+  );
+  const second = readFileSync("./TEST_API/random.js", "utf8");
+
+  expect(first).not.toBe(second);
+});
+
 describe("CLI", () => {
   const fixturesDir = path.join(__dirname, "fixtures");
-  const testCases = fs
-    .readdirSync(fixturesDir)
+  const testCases = readdirSync(fixturesDir)
     .filter((file) => file.endsWith(".js"))
     .sort();