express-fix-any-js 1.26.2 → 1.28.5

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

@@ -1,11 +1,15 @@
 import fs from "fs";
 import path from "path";
+import { fileNamesJson as fromNpm } from "pattern-collector-base-files";
 
-import fileNamesJson from '../fileNames.json' with {type: 'json'};
+// import fileNamesJson from '../fileNames.json' with {type: 'json'};
 
 const startFunc = ({ alterArray, inFileType, inTargetPath, inValue }) => {
 
     try {
+
+        const fileNamesJson = fromNpm();
+
         if (!inFileType in fileNamesJson) {
             return false;
         };

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

@@ -2,15 +2,19 @@ import fs from "fs";
 import path from "path";
 
 import defaultFunc from 'pattern-collector-anyjs-story';
+import { fileNamesJson as fromNpm } from "pattern-collector-base-files";
+
 import insertLine from "../insertLine/index.js";
 
-import fileNamesJson from '../../fileNames.json' with {type: 'json'};
+// import fileNamesJson from '../../fileNames.json' with {type: 'json'};
 
 const startFunc = ({ inParts, inFileType, inTargetPath,
-    presentKey, regexKey, templateKey
+    presentKey, regexKey, templateKey, inConsiderKey
 }) => {
 
     try {
+        const fileNamesJson = fromNpm();
+
         const localJsPath = path.join(inTargetPath, fileNamesJson[inFileType]?.fileName);
 
         const fileContent = fs.readFileSync(localJsPath, 'utf8');
@@ -25,7 +29,7 @@ const startFunc = ({ inParts, inFileType, inTargetPath,
             importRegex: story?.extractRegex?.toInsertIndex?.[inFileType]?.[regexKey],
             filePath: localJsPath,
             inTemplate: story?.reverseTemplates?.[templateKey],
-            inParts
+            inParts, inConsiderKey
         });
 
         return fromInsertLine;

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

@@ -7,10 +7,12 @@ function build(template, parts) {
 };
 
 const startFunc = ({ linesStory, fileContent, filePath, importRegex, onlyIndexesValues,
-    presentKey, inTemplate, inParts }) => {
+    presentKey, inTemplate, inParts, inConsiderKey }) => {
 
     const foundUseLinesStory = linesStory[presentKey].find(element => {
-        return element.part2 === inParts[1];
+        if (inConsiderKey in element) {
+            return element[inConsiderKey] === inParts[1];
+        };
     });
 
     if (foundUseLinesStory) {
@@ -36,15 +38,11 @@ const startFunc = ({ linesStory, fileContent, filePath, importRegex, onlyIndexes
         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"));
-
 };
 
 export default startFunc;

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

@@ -1,22 +1,25 @@
+import { fileNamesJson as fromNpm } from "pattern-collector-base-files";
 import forImportLine from "./forImportLine/index.js";
 
-import fileNamesJson from '../fileNames.json' with {type: 'json'};
-
 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]
+        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"
+        inTargetPath, presentKey: "useLines",
+        inConsiderKey: "part1"
     });
 
     return { fromImportLine, fromUseLine }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-fix-any-js",
-  "version": "1.26.2",
+  "version": "1.28.5",
   "description": "CLI to build for appjs, the endpoints",
   "keywords": [
     "cli",
@@ -10,7 +10,8 @@
     "project-generator"
   ],
   "dependencies": {
-    "pattern-collector-anyjs-story": "^1.23.2",
+    "express-check-any-for-import": "^1.4.7",
+    "pattern-collector-anyjs-story": "^1.24.2",
     "pattern-collector-base-files": "^1.3.1"
   },
   "type": "module",

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"
-    }
-}