express-fix-any-js 1.13.3 → 1.15.3

package/bin/{v12/UpdateJs → v14}/bothLines/forImportLine/index.js

@@ -16,7 +16,7 @@ const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
 
     insertImportLine({
         inStory: story,
-        fileContent,
+        fileContent, extractRegex: story?.extractRegex,
         filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
         inTemplate1: story.regexForPullLinesStory.importRegex.reverseTemplate,
         inTemplate: story.reverseTemplates.importRegex,

package/bin/{v12/UpdateJs → v14}/bothLines/forImportLine/insertImportLine.js

@@ -20,14 +20,40 @@ const findImportLinesIndex = ({ inStory }) => {
     return lastLine?.lineNumber;
 };
 
-const findInsertIndex = ({ inStory }) => {
-    const importLines = findImportLinesIndex({ inStory });
-    const importLinesFromNpm = findImportLinesFromNpmIndex({ inStory });
+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 importLines ? importLines : importLinesFromNpm;
+    return insertIndex;
 };
 
-const startFunc = ({ inStory, fileContent, filePath,
+const startFunc = ({ inStory, fileContent, filePath, extractRegex,
     inFolderNameToInsert, lineType = "importLines", inTemplate, inParts }) => {
 
     const foundUseLinesStory = inStory.linesStory[lineType].find(element => {
@@ -44,7 +70,10 @@ const startFunc = ({ inStory, fileContent, filePath,
         // const lastLine = inStory.lines[lineType][inStory.lines[lineType].length - 1];
         // const insertAtIndex = lastLine.lineNumber;
 
-        const insertAtIndex = findInsertIndex({ inStory });
+        const insertAtIndex = findInsertIndex({
+            onlyIndexesValues: inStory?.onlyIndexesValues,
+            extractRegex
+        });
 
         lines.splice(insertAtIndex, 0, newLine);
 

package/bin/v15/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/v15/findInsertIndex.js

@@ -0,0 +1,75 @@
+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 = {};
+
+    // 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/{v13/UpdateJs/bothLines → v15}/forImportLine/index.js

@@ -16,7 +16,7 @@ const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
 
     insertImportLine({
         inStory: story,
-        fileContent,
+        fileContent, extractRegex: story?.extractRegex,
         filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
         inTemplate1: story.regexForPullLinesStory.importRegex.reverseTemplate,
         inTemplate: story.reverseTemplates.importRegex,

package/bin/v15/forImportLine/insertImportLine.js

@@ -0,0 +1,54 @@
+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 addLines1 = ({
+    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);
+};
+
+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/);
+
+        const insertStory = findInsertIndex({
+            onlyIndexesValues: inStory?.onlyIndexesValues,
+            extractRegex: extractRegex?.toInsertIndex?.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/{v12/UpdateJs/bothLines → v15}/forInsertIndex.js

@@ -16,4 +16,15 @@ const findImportLinesIndex = ({ inStory }) => {
     return lastLine?.lineNumber;
 };
 
-export { findImportLinesFromNpmIndex, findImportLinesIndex };
+const findVariablesDeclareHereLinesIndex = ({ inStory }) => {
+    const variablesDeclareHereLines = inStory?.lines?.variablesDeclareHereLines;
+
+    const lastLine = variablesDeclareHereLines[variablesDeclareHereLines.length - 1];
+
+    return lastLine?.lineNumber;
+};
+
+export {
+    findImportLinesFromNpmIndex, findImportLinesIndex,
+    findVariablesDeclareHereLinesIndex
+};

package/bin/{v13/UpdateJs/bothLines → v15}/forUseLine/index.js

@@ -16,7 +16,7 @@ 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,

package/bin/v15/forUseLine/insertUseLine.js

@@ -0,0 +1,58 @@
+import fs from 'fs';
+import findInsertIndex from "../findInsertIndex.js";
+import addLines from "../addLines.js";
+
+import {
+    findImportLinesFromNpmIndex, findImportLinesIndex,
+    findVariablesDeclareHereLinesIndex
+} from "../forInsertIndex.js";
+
+const findInsertIndex1 = ({ inStory }) => {
+    const importLines = findImportLinesIndex({ inStory });
+    const importLinesFromNpm = findImportLinesFromNpmIndex({ inStory });
+    const variablesDeclareHereLines = findVariablesDeclareHereLinesIndex({ inStory });
+
+    // findVariablesDeclareHereLinesIndex
+    return importLines ? importLines : variablesDeclareHereLines;
+};
+
+function build(template, parts) {
+    return template.replace(/\{(\d+)\}/g, (_, i) => parts[i]);
+};
+
+const startFunc = ({ inStory, fileContent, filePath, extractRegex,
+    inFolderNameToInsert, lineType = "useLines", 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/);
+
+        // const lastUseLine = inStory.lines[lineType][inStory.lines[lineType].length - 1];
+        // const insertAtIndex = lastUseLine.lineNumber;
+
+        const insertStory = findInsertIndex({
+            onlyIndexesValues: inStory?.onlyIndexesValues,
+            extractRegex: extractRegex?.toInsertIndex?.consumption,
+            presentKey: lineType
+        });
+
+        addLines({
+            inLines: lines, inInsertAtIndex: insertStory?.index,
+            inNewLine: newLine, inGapBefore: insertStory?.gapBefore,
+            inGapAfter: insertStory?.gapAfter
+        });
+
+        // const insertAtIndex = findInsertIndex({ inStory });
+
+        //  lines.splice(insertAtIndex, 0, newLine);
+
+        fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
+    };
+};
+
+export default startFunc;

package/bin/v15/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.13.3",
+  "version": "1.15.3",
   "description": "CLI to build for appjs, the endpoints",
   "keywords": [
     "cli",
@@ -11,7 +11,7 @@
   ],
   "dependencies": {
     "express-check-any-for-import": "^1.4.7",
-    "pattern-collector-anyjs-story": "^1.19.6"
+    "pattern-collector-anyjs-story": "^1.19.11"
   },
   "type": "module",
   "exports": {

package/bin/v12/UpdateJs/bothLines/forUseLine/insertUseLine.js

@@ -1,39 +0,0 @@
-import fs from 'fs';
-
-import { findImportLinesFromNpmIndex, findImportLinesIndex } from "../forInsertIndex.js";
-
-const findInsertIndex = ({ inStory }) => {
-    const importLines = findImportLinesIndex({ inStory });
-    const importLinesFromNpm = findImportLinesFromNpmIndex({ inStory });
-
-    return importLines ? importLines : importLinesFromNpm;
-};
-
-function build(template, parts) {
-    return template.replace(/\{(\d+)\}/g, (_, i) => parts[i]);
-};
-
-const startFunc = ({ inStory, fileContent, filePath,
-    inFolderNameToInsert, lineType = "useLines", 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/);
-
-        // const lastUseLine = inStory.lines[lineType][inStory.lines[lineType].length - 1];
-        // const insertAtIndex = lastUseLine.lineNumber;
-
-        const insertAtIndex = findInsertIndex({ inStory });
-
-        lines.splice(insertAtIndex, 0, newLine);
-
-        fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
-    };
-};
-
-export default startFunc;

package/bin/v12/start.js

@@ -1,8 +0,0 @@
-import updateJs from "./UpdateJs/index.js";
-
-const run = (args) => {
-
-  return updateJs(args);
-};
-
-export default run;

package/bin/v13/UpdateJs/bothLines/forImportLine/insertImportLine.js

@@ -1,55 +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 = ({ inStory }) => {
-    const importLines = findImportLinesIndex({ inStory });
-    const importLinesFromNpm = findImportLinesFromNpmIndex({ inStory });
-
-    return importLines ? importLines : importLinesFromNpm;
-};
-
-const startFunc = ({ inStory, fileContent, filePath,
-    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({ inStory });
-
-        lines.splice(insertAtIndex, 0, newLine);
-
-        fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
-    };
-};
-
-export default startFunc;

package/bin/v13/UpdateJs/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/v13/UpdateJs/index.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;

package/bin/v13/start.js

@@ -1,8 +0,0 @@
-import updateJs from "./UpdateJs/index.js";
-
-const run = (args) => {
-
-  return updateJs(args);
-};
-
-export default run;