express-fix-any-js 1.26.2 → 1.28.2

package/bin/{v25/alterFile → v28/hookFolder}/insertLine/findInsertIndex.js

@@ -1,38 +1,38 @@
-const startFunc = ({ onlyIndexesValues, importRegex, presentKey }) => {
-    const insertStory = {};
-
-    if (!importRegex) {
-        return insertStory;
-    };
-
-    // Try each preferred location until one exists.
-    for (const preference of importRegex) {
-
-        const [group, property] = preference.split(".");
-
-        // Preference like: importLines.firstLineIndex
-        if (property) {
-            if (onlyIndexesValues[group]?.[property] !== undefined) {
-                insertStory.index = onlyIndexesValues[group][property];
-
-                if (presentKey in onlyIndexesValues && !onlyIndexesValues[presentKey]) {
-                    insertStory.gapBefore = true;
-                }
-
-                break;
-            }
-
-            continue;
-        }
-
-        // Special preference like: first
-        if (preference === "firstLineIndex") {
-            insertStory.index = 0;
-            break;
-        };
-    };
-
-    return insertStory;
-};
-
+const startFunc = ({ onlyIndexesValues, importRegex, presentKey }) => {
+    const insertStory = {};
+
+    if (!importRegex) {
+        return insertStory;
+    };
+
+    // Try each preferred location until one exists.
+    for (const preference of importRegex) {
+
+        const [group, property] = preference.split(".");
+
+        // Preference like: importLines.firstLineIndex
+        if (property) {
+            if (onlyIndexesValues[group]?.[property] !== undefined) {
+                insertStory.index = onlyIndexesValues[group][property];
+
+                if (presentKey in onlyIndexesValues && !onlyIndexesValues[presentKey]) {
+                    insertStory.gapBefore = true;
+                }
+
+                break;
+            }
+
+            continue;
+        }
+
+        // Special preference like: first
+        if (preference === "firstLineIndex") {
+            insertStory.index = 0;
+            break;
+        };
+    };
+
+    return insertStory;
+};
+
 export default startFunc;

package/bin/{v26 → v28}/hookFolder/insertLine/index.js

@@ -1,50 +1,48 @@
-import findInsertIndex from "./findInsertIndex.js";
-import addLines from "./addLines.js";
-import writeToFile from "./writeToFile.js";
-
-function build(template, parts) {
-    return template.replace(/\{(\d+)\}/g, (_, i) => parts[i]);
-};
-
-const startFunc = ({ linesStory, fileContent, filePath, importRegex, onlyIndexesValues,
-    presentKey, inTemplate, inParts }) => {
-
-    const foundUseLinesStory = linesStory[presentKey].find(element => {
-        return element.part2 === inParts[1];
-    });
-
-    if (foundUseLinesStory) {
-        return {
-            KTF: false,
-            KReason: foundUseLinesStory
-        };
-    };
-
-    const newLine = build(inTemplate, inParts);
-
-    const lines = fileContent.split(/\r?\n/);
-
-    const insertStory = findInsertIndex({
-        onlyIndexesValues,
-        importRegex,
-        presentKey
-    });
-
-    addLines({
-        inLines: lines, inInsertAtIndex: insertStory?.index,
-        inNewLine: newLine, inGapBefore: insertStory?.gapBefore,
-        inGapAfter: insertStory?.gapAfter
-    });
-
-    // lines.splice(insertAtIndex, 0, newLine);
-
-    writeToFile({ fileContent, filePath, lines });
-
-    return {
-        newLine, inParts
-    };
-    // fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
-
-};
-
+import findInsertIndex from "./findInsertIndex.js";
+import addLines from "./addLines.js";
+import writeToFile from "./writeToFile.js";
+
+function build(template, parts) {
+    return template.replace(/\{(\d+)\}/g, (_, i) => parts[i]);
+};
+
+const startFunc = ({ linesStory, fileContent, filePath, importRegex, onlyIndexesValues,
+    presentKey, inTemplate, inParts, inConsiderKey }) => {
+
+    const foundUseLinesStory = linesStory[presentKey].find(element => {
+        if (inConsiderKey in element) {
+            return element[inConsiderKey] === inParts[1];
+        };
+    });
+
+    if (foundUseLinesStory) {
+        return {
+            KTF: false,
+            KReason: foundUseLinesStory
+        };
+    };
+
+    const newLine = build(inTemplate, inParts);
+
+    const lines = fileContent.split(/\r?\n/);
+
+    const insertStory = findInsertIndex({
+        onlyIndexesValues,
+        importRegex,
+        presentKey
+    });
+
+    addLines({
+        inLines: lines, inInsertAtIndex: insertStory?.index,
+        inNewLine: newLine, inGapBefore: insertStory?.gapBefore,
+        inGapAfter: insertStory?.gapAfter
+    });
+
+    writeToFile({ fileContent, filePath, lines });
+
+    return {
+        newLine, inParts
+    };
+};
+
 export default startFunc;

package/bin/{v25 → v28}/hookFolder/insertLine/writeToFile.js

@@ -1,8 +1,8 @@
-import fs from 'fs';
-
-const startFunc = ({ fileContent, filePath, lines }) => {
-
-    fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
-};
-
+import fs from 'fs';
+
+const startFunc = ({ fileContent, filePath, lines }) => {
+
+    fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
+};
+
 export default startFunc;

package/bin/{v25 → v28}/hookFolder/start.js

@@ -1,25 +1,28 @@
-import forImportLine from "./forImportLine/index.js";
-
-import fileNamesJson from '../fileNames.json' with {type: 'json'};
-
-const startFunc = ({ inValue, OutValue,
-    inFileType, inTargetPath }) => {
-
-    const fromImportLine = forImportLine({
-        inFileType, regexKey: "import",
-        templateKey: "importRegex",
-        inTargetPath, presentKey: "importLines",
-        inParts: [`${fileNamesJson[inFileType]?.temporaryValue}${inValue}`, inValue]
-    });
-
-    const fromUseLine = forImportLine({
-        inParts: [`${fileNamesJson[inFileType]?.temporaryValue}${inValue}`, OutValue],
-        inFileType, regexKey: "consumption",
-        templateKey: "consumptionRegex",
-        inTargetPath, presentKey: "useLines"
-    });
-
-    return { fromImportLine, fromUseLine }
-};
-
+import { fileNamesJson as fromNpm } from "pattern-collector-base-files";
+import forImportLine from "./forImportLine/index.js";
+
+const startFunc = ({ inValue, OutValue,
+    inFileType, inTargetPath }) => {
+
+    const fileNamesJson = fromNpm();
+
+    const fromImportLine = forImportLine({
+        inFileType, regexKey: "import",
+        templateKey: "importRegex",
+        inTargetPath, presentKey: "importLines",
+        inParts: [`${fileNamesJson[inFileType]?.temporaryValue}${inValue}`, inValue],
+        inConsiderKey: "part2"
+    });
+
+    const fromUseLine = forImportLine({
+        inParts: [`${fileNamesJson[inFileType]?.temporaryValue}${inValue}`, OutValue],
+        inFileType, regexKey: "consumption",
+        templateKey: "consumptionRegex",
+        inTargetPath, presentKey: "useLines",
+        inConsiderKey: "part1"
+    });
+
+    return { fromImportLine, fromUseLine }
+};
+
 export default startFunc;

package/bin/{v26 → v28}/start.js

@@ -1,25 +1,25 @@
-import hookFolder from "./hookFolder/start.js";
-import alterFile from "./alterFile/start.js";
-
-const startFunc = ({ inValue, OutValue,
-    inFileType, jsFilePath, inTargetPath, alterArray }) => {
-
-    let fromInternal;
-    let fromAlterFile;
-
-    if (inValue && OutValue) {
-        fromInternal = hookFolder({
-            inValue, OutValue,
-            inFileType, inTargetPath
-        });
-    };
-
-    fromAlterFile = alterFile({
-        alterArray, inFileType, inValue,
-        inTargetPath
-    });
-
-    return { fromInternal, fromAlterFile };
-};
-
+import hookFolder from "./hookFolder/start.js";
+import alterFile from "./alterFile/start.js";
+
+const startFunc = ({ inValue, OutValue,
+    inFileType, jsFilePath, inTargetPath, alterArray }) => {
+
+    let fromInternal;
+    let fromAlterFile;
+
+    if (inValue && OutValue) {
+        fromInternal = hookFolder({
+            inValue, OutValue,
+            inFileType, inTargetPath
+        });
+    };
+
+    fromAlterFile = alterFile({
+        alterArray, inFileType, inValue,
+        inTargetPath
+    });
+
+    return { fromInternal, fromAlterFile };
+};
+
 export default startFunc;

package/index.js

@@ -1,14 +1,14 @@
-import { createRequire } from "module";
-import getLatestVersion from "./bin/core/getLatestVersion.js";
-
-const require = createRequire(import.meta.url);
-
-const load = (options) => {
-    const v = getLatestVersion();
-
-    const mod = require(`./bin/${v}/start.js`);
-
-    return mod.default(options);
-};
-
+import { createRequire } from "module";
+import getLatestVersion from "./bin/core/getLatestVersion.js";
+
+const require = createRequire(import.meta.url);
+
+const load = (options) => {
+    const v = getLatestVersion();
+
+    const mod = require(`./bin/${v}/start.js`);
+
+    return mod.default(options);
+};
+
 export default load;

package/package.json

@@ -1,37 +1,37 @@
-{
-  "name": "express-fix-any-js",
-  "version": "1.26.2",
-  "description": "CLI to build for appjs, the endpoints",
-  "keywords": [
-    "cli",
-    "scaffold",
-    "templates",
-    "node",
-    "project-generator"
-  ],
-  "dependencies": {
-    "pattern-collector-anyjs-story": "^1.23.2",
-    "pattern-collector-base-files": "^1.3.1"
-  },
-  "type": "module",
-  "exports": {
-    ".": "./index.js"
-  },
-  "bin": {
-    "express-fix-any-js": "./bin/cli.js"
-  },
-  "files": [
-    "bin/",
-    "index.js",
-    "README.md",
-    "LICENSE"
-  ],
-  "homepage": "https://cli.keshavsoft.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/keshavsoft/express-fix-any-js"
-  },
-  "bugs": {
-    "url": "https://github.com/keshavsoft/express-fix-any-js/issues"
-  }
-}
+{
+  "name": "express-fix-any-js",
+  "version": "1.28.2",
+  "description": "CLI to build for appjs, the endpoints",
+  "keywords": [
+    "cli",
+    "scaffold",
+    "templates",
+    "node",
+    "project-generator"
+  ],
+  "dependencies": {
+    "pattern-collector-anyjs-story": "^1.24.1",
+    "pattern-collector-base-files": "^1.3.1"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./index.js"
+  },
+  "bin": {
+    "express-fix-any-js": "./bin/cli.js"
+  },
+  "files": [
+    "bin/",
+    "index.js",
+    "README.md",
+    "LICENSE"
+  ],
+  "homepage": "https://cli.keshavsoft.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/keshavsoft/express-fix-any-js"
+  },
+  "bugs": {
+    "url": "https://github.com/keshavsoft/express-fix-any-js/issues"
+  }
+}

package/bin/v26/fileNames.json

@@ -1,35 +0,0 @@
-{
-    "version": "25.2",
-    "fromAppJs": {
-        "fileName": "app.js",
-        "temporaryValue": "routerFrom"
-    },
-    "fromRoutesJs": {
-        "fileName": "routes.js",
-        "temporaryValue": "routerFrom"
-    },
-    "fromRoutesJsEnd": {
-        "fileName": "routes.js",
-        "temporaryValue": "routerFrom",
-        "hookTo": "fromEndPointsJs"
-    },
-    "fromEndPointsJs": {
-        "fileName": "end-points.js",
-        "temporaryValue": "funcFrom",
-        "hookTo": "fromControllerJs"
-    },
-    "tableGetShowAll": {
-        "fileName": "end-points.js",
-        "temporaryValue": "funcFrom",
-        "hookTo": "fromControllerJs"
-    },
-    "tableGetFind": {
-        "fileName": "end-points.js",
-        "temporaryValue": "funcFrom",
-        "hookTo": "fromControllerJs"
-    },
-    "fromControllerJs": {
-        "fileName": "controller.js",
-        "temporaryValue": "controllerFrom"
-    }
-}