express-fix-any-js 1.15.3 → 1.16.3

package/bin/v15/forImportLine/index.js

@@ -4,25 +4,31 @@ import defaultFunc from 'pattern-collector-anyjs-story';
 import insertImportLine from "./insertImportLine.js";
 
 const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
-    const folderNameToInsert = inFolderNameToInsert;
-    const localJsPath = inJsPath;
+    try {
 
-    const fileContent = fs.readFileSync(localJsPath, 'utf8');
+        const folderNameToInsert = inFolderNameToInsert;
+        const localJsPath = inJsPath;
 
-    const story = defaultFunc({
-        fileContent,
-        fileType: inFileType
-    });
+        const fileContent = fs.readFileSync(localJsPath, 'utf8');
 
-    insertImportLine({
-        inStory: story,
-        fileContent, extractRegex: story?.extractRegex,
-        filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
-        inTemplate1: story.regexForPullLinesStory.importRegex.reverseTemplate,
-        inTemplate: story.reverseTemplates.importRegex,
-        inParts: [`${story.variablesConnection}${folderNameToInsert}`, folderNameToInsert]
-    });
+        const story = defaultFunc({
+            fileContent,
+            fileType: inFileType
+        });
 
+        insertImportLine({
+            inStory: story,
+            fileContent, extractRegex: story?.extractRegex,
+            filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
+            inTemplate1: story.regexForPullLinesStory.importRegex.reverseTemplate,
+            inTemplate: story.reverseTemplates.importRegex,
+            inParts: [`${story.variablesConnection}${folderNameToInsert}`, folderNameToInsert]
+        });
+
+    } catch (error) {
+        console.log("error : ", error);
+
+    };
 };
 
 export default startFunc;

package/bin/v16/addLines.js

@@ -0,0 +1,16 @@
+const startFunc = ({
+    inLines,
+    inNewLine,
+    inInsertAtIndex,
+    inGapBefore = false,
+    inGapAfter = false
+}) => {
+    let line = inNewLine;
+
+    if (inGapBefore) line = "\n" + line;
+    if (inGapAfter) line = line + "\n";
+
+    inLines.splice(inInsertAtIndex, 0, line);
+};
+
+export default startFunc;

package/bin/v16/findInsertIndex.js

@@ -0,0 +1,79 @@
+const startFunc1 = ({ onlyIndexesValues, extractRegex, presentKey }) => {
+    let insertStory = {};
+
+    mainLoop: for (const element of extractRegex?.toInsertIndex?.import) {
+        const splitValues = element.split(".");
+        const firstValue = splitValues[0];
+        const secondValue = splitValues[1];
+
+        if (splitValues.length > 1) {
+            if (firstValue in onlyIndexesValues) {
+                if (onlyIndexesValues[firstValue]) {
+                    if (secondValue in onlyIndexesValues[firstValue]) {
+                        insertStory.index = onlyIndexesValues[firstValue][secondValue];
+
+                        if (presentKey in onlyIndexesValues) {
+                            if (!onlyIndexesValues[presentKey]) {
+                                insertStory.gapBefore = true;
+                            };
+                        };
+
+                        break mainLoop;
+                    };
+                };
+            };
+        } else {
+            switch (element) {
+                case "first":
+                    insertStory.index = 0;
+
+                    break mainLoop;
+                    break;
+
+                default:
+                    break;
+            }
+        };
+    };
+
+    return insertStory;
+};
+
+const startFunc = ({ onlyIndexesValues, extractRegex, presentKey }) => {
+    const insertStory = {};
+
+    if (!extractRegex) {
+        return insertStory;
+    };
+
+    // Try each preferred location until one exists.
+    for (const preference of extractRegex) {
+
+        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/v16/forImportLine/index.js

@@ -0,0 +1,37 @@
+import fs from "fs";
+
+import defaultFunc from 'pattern-collector-anyjs-story';
+import insertImportLine from "./insertImportLine.js";
+
+const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
+    try {
+
+        const folderNameToInsert = inFolderNameToInsert;
+        const localJsPath = inJsPath;
+
+        const fileContent = fs.readFileSync(localJsPath, 'utf8');
+
+        const story = defaultFunc({
+            fileContent,
+            fileType: inFileType
+        });
+
+        insertImportLine({
+            inStory: story,
+            fileContent, extractRegex: story?.extractRegex,
+            filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
+            inTemplate1: story.regexForPullLinesStory.importRegex.reverseTemplate,
+            inTemplate: story.reverseTemplates.importRegex,
+            inParts: [`${story.variablesConnection}${folderNameToInsert}`, folderNameToInsert],
+            fileType: inFileType
+        });
+
+    } catch (error) {
+        console.log("error : ", error);
+
+    };
+};
+
+export default startFunc;
+
+// startFunc({ folderNameToInsert, fileType });

package/bin/v16/forImportLine/insertImportLine.js

@@ -0,0 +1,40 @@
+import fs from 'fs';
+import findInsertIndex from "../findInsertIndex.js";
+import addLines from "../addLines.js";
+
+function build(template, parts) {
+    return template.replace(/\{(\d+)\}/g, (_, i) => parts[i]);
+};
+
+const startFunc = ({ inStory, fileContent, filePath, extractRegex,
+    inFolderNameToInsert, lineType = "importLines", inTemplate,
+    inParts, fileType }) => {
+
+    const foundUseLinesStory = inStory.linesStory[lineType].find(element => {
+        return element.part1 === inFolderNameToInsert;
+    });
+
+    if (!foundUseLinesStory) {
+        const newLine = build(inTemplate, inParts);
+
+        const lines = fileContent.split(/\r?\n/);
+
+        const insertStory = findInsertIndex({
+            onlyIndexesValues: inStory?.onlyIndexesValues,
+            extractRegex: extractRegex?.toInsertIndex?.[fileType]?.import,
+            presentKey: lineType
+        });
+
+        addLines({
+            inLines: lines, inInsertAtIndex: insertStory?.index,
+            inNewLine: newLine, inGapBefore: insertStory?.gapBefore,
+            inGapAfter: insertStory?.gapAfter
+        });
+
+        // lines.splice(insertAtIndex, 0, newLine);
+
+        fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
+    };
+};
+
+export default startFunc;

package/bin/{v14/bothLines → v16}/forUseLine/index.js

@@ -16,11 +16,12 @@ const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
 
     insertUseLine({
         inStory: story,
-        fileContent,
+        fileContent, extractRegex: story?.extractRegex,
         filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
         inTemplate1: story.regexForPullLinesStory.consumptionRegex.reverseTemplate,
         inTemplate: story.reverseTemplates.consumptionRegex,
-        inParts: [folderNameToInsert, `${story.variablesConnection}${folderNameToInsert}`]
+        inParts: [folderNameToInsert, `${story.variablesConnection}${folderNameToInsert}`],
+        fileType: inFileType
     });
 };
 

package/bin/{v14/bothLines → v16}/forUseLine/insertUseLine.js

@@ -1,11 +1,13 @@
 import fs from 'fs';
+import findInsertIndex from "../findInsertIndex.js";
+import addLines from "../addLines.js";
 
 import {
     findImportLinesFromNpmIndex, findImportLinesIndex,
     findVariablesDeclareHereLinesIndex
 } from "../forInsertIndex.js";
 
-const findInsertIndex = ({ inStory }) => {
+const findInsertIndex1 = ({ inStory }) => {
     const importLines = findImportLinesIndex({ inStory });
     const importLinesFromNpm = findImportLinesFromNpmIndex({ inStory });
     const variablesDeclareHereLines = findVariablesDeclareHereLinesIndex({ inStory });
@@ -18,8 +20,9 @@ function build(template, parts) {
     return template.replace(/\{(\d+)\}/g, (_, i) => parts[i]);
 };
 
-const startFunc = ({ inStory, fileContent, filePath,
-    inFolderNameToInsert, lineType = "useLines", inTemplate, inParts }) => {
+const startFunc = ({ inStory, fileContent, filePath, extractRegex,
+    inFolderNameToInsert, lineType = "useLines", inTemplate, inParts,
+    fileType }) => {
 
     const foundUseLinesStory = inStory.linesStory[lineType].find(element => {
         return element.part1 === inFolderNameToInsert;
@@ -30,12 +33,17 @@ const startFunc = ({ inStory, fileContent, filePath,
 
         const lines = fileContent.split(/\r?\n/);
 
-        // const lastUseLine = inStory.lines[lineType][inStory.lines[lineType].length - 1];
-        // const insertAtIndex = lastUseLine.lineNumber;
-
-        const insertAtIndex = findInsertIndex({ inStory });
-
-        lines.splice(insertAtIndex, 0, newLine);
+        const insertStory = findInsertIndex({
+            onlyIndexesValues: inStory?.onlyIndexesValues,
+            extractRegex: extractRegex?.toInsertIndex?.[fileType]?.consumption,
+            presentKey: lineType
+        });
+
+        addLines({
+            inLines: lines, inInsertAtIndex: insertStory?.index,
+            inNewLine: newLine, inGapBefore: insertStory?.gapBefore,
+            inGapAfter: insertStory?.gapAfter
+        });
 
         fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
     };

package/bin/v16/start.js

@@ -0,0 +1,18 @@
+import forImportLine from "./forImportLine/index.js";
+import forUseLine from "./forUseLine/index.js";
+
+const startFunc = ({ inFolderNameToInsert, inFileType, jsFilePath }) => {
+    const fromImportLine = forImportLine({
+        inFolderNameToInsert, inFileType,
+        inJsPath: jsFilePath
+    });
+
+    const fromUseLine = forUseLine({
+        inFolderNameToInsert, inFileType,
+        inJsPath: jsFilePath
+    });
+
+    return { fromImportLine, fromUseLine }
+};
+
+export default startFunc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-fix-any-js",
-  "version": "1.15.3",
+  "version": "1.16.3",
   "description": "CLI to build for appjs, the endpoints",
   "keywords": [
     "cli",
@@ -10,8 +10,7 @@
     "project-generator"
   ],
   "dependencies": {
-    "express-check-any-for-import": "^1.4.7",
-    "pattern-collector-anyjs-story": "^1.19.11"
+    "pattern-collector-anyjs-story": "^1.20.4"
   },
   "type": "module",
   "exports": {

package/bin/v14/bothLines/forImportLine/index.js

@@ -1,30 +0,0 @@
-import fs from "fs";
-
-import defaultFunc from 'pattern-collector-anyjs-story';
-import insertImportLine from "./insertImportLine.js";
-
-const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
-    const folderNameToInsert = inFolderNameToInsert;
-    const localJsPath = inJsPath;
-
-    const fileContent = fs.readFileSync(localJsPath, 'utf8');
-
-    const story = defaultFunc({
-        fileContent,
-        fileType: inFileType
-    });
-
-    insertImportLine({
-        inStory: story,
-        fileContent, extractRegex: story?.extractRegex,
-        filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
-        inTemplate1: story.regexForPullLinesStory.importRegex.reverseTemplate,
-        inTemplate: story.reverseTemplates.importRegex,
-        inParts: [`${story.variablesConnection}${folderNameToInsert}`, folderNameToInsert]
-    });
-
-};
-
-export default startFunc;
-
-// startFunc({ folderNameToInsert, fileType });

package/bin/v14/bothLines/forImportLine/insertImportLine.js

@@ -1,84 +0,0 @@
-import fs from 'fs';
-
-function build(template, parts) {
-    return template.replace(/\{(\d+)\}/g, (_, i) => parts[i]);
-};
-
-const findImportLinesFromNpmIndex = ({ inStory }) => {
-    const importLinesFromNpm = inStory?.linesStory?.importLinesFromNpm;
-
-    const lastLine = importLinesFromNpm[importLinesFromNpm.length - 1];
-
-    return lastLine?.lineNumber;
-};
-
-const findImportLinesIndex = ({ inStory }) => {
-    const importLines = inStory?.linesStory?.importLines;
-
-    const lastLine = importLines[importLines.length - 1];
-
-    return lastLine?.lineNumber;
-};
-
-const findInsertIndex = ({ onlyIndexesValues, extractRegex }) => {
-    let insertIndex;
-
-    mainLoop: for (const element of extractRegex?.toInsertIndex?.import) {
-        const splitValues = element.split(".");
-        const firstValue = splitValues[0];
-        const secondValue = splitValues[1];
-
-        if (splitValues.length > 1) {
-            if (firstValue in onlyIndexesValues) {
-                if (onlyIndexesValues[firstValue]) {
-                    if (secondValue in onlyIndexesValues[firstValue]) {
-                        insertIndex = onlyIndexesValues[firstValue][secondValue];
-                        break mainLoop;
-                    };
-                };
-            };
-        } else {
-            switch (element) {
-                case "first":
-                    insertIndex = 0;
-                    break mainLoop;
-                    break;
-
-                default:
-                    break;
-            }
-        };
-    };
-
-    return insertIndex;
-};
-
-const startFunc = ({ inStory, fileContent, filePath, extractRegex,
-    inFolderNameToInsert, lineType = "importLines", inTemplate, inParts }) => {
-
-    const foundUseLinesStory = inStory.linesStory[lineType].find(element => {
-        return element.part1 === inFolderNameToInsert;
-    });
-
-    if (!foundUseLinesStory) {
-        const newLine = build(inTemplate, inParts);
-
-        const lines = fileContent.split(/\r?\n/);
-
-        // findInsertIndex({ inStory });
-
-        // const lastLine = inStory.lines[lineType][inStory.lines[lineType].length - 1];
-        // const insertAtIndex = lastLine.lineNumber;
-
-        const insertAtIndex = findInsertIndex({
-            onlyIndexesValues: inStory?.onlyIndexesValues,
-            extractRegex
-        });
-
-        lines.splice(insertAtIndex, 0, newLine);
-
-        fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
-    };
-};
-
-export default startFunc;

package/bin/v14/bothLines/index.js

@@ -1,11 +0,0 @@
-import forImportLine from "./forImportLine/index.js";
-import forUseLine from "./forUseLine/index.js";
-
-const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
-    forImportLine({ inFolderNameToInsert, inFileType, inJsPath })
-    forUseLine({ inFolderNameToInsert, inFileType, inJsPath })
-};
-
-export default startFunc;
-
-// startFunc({ folderNameToInsert, fileType });

package/bin/v14/start.js

@@ -1,11 +0,0 @@
-import bothLines from './bothLines/index.js';
-
-const startFunc = ({ inFolderNameToInsert, inFileType, jsFilePath }) => {
-
-    return bothLines({
-        inFolderNameToInsert, inFileType,
-        inJsPath: jsFilePath
-    });
-};
-
-export default startFunc;