express-fix-any-js 1.16.3 → 1.17.2

package/bin/{v15 → v17/addTableName}/findInsertIndex.js

@@ -42,6 +42,10 @@ const startFunc1 = ({ onlyIndexesValues, extractRegex, presentKey }) => {
 const startFunc = ({ onlyIndexesValues, extractRegex, presentKey }) => {
     const insertStory = {};
 
+    if (!extractRegex) {
+        return insertStory;
+    };
+
     // Try each preferred location until one exists.
     for (const preference of extractRegex) {
 

package/bin/{v15 → v17/addTableName}/forImportLine/index.js

@@ -22,7 +22,8 @@ const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
             filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
             inTemplate1: story.regexForPullLinesStory.importRegex.reverseTemplate,
             inTemplate: story.reverseTemplates.importRegex,
-            inParts: [`${story.variablesConnection}${folderNameToInsert}`, folderNameToInsert]
+            inParts: [`${story.variablesConnection}${folderNameToInsert}`, folderNameToInsert],
+            fileType: inFileType
         });
 
     } catch (error) {

package/bin/{v15 → v17/addTableName}/forImportLine/insertImportLine.js

@@ -6,23 +6,9 @@ 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 }) => {
+    inFolderNameToInsert, lineType = "importLines", inTemplate,
+    inParts, fileType }) => {
 
     const foundUseLinesStory = inStory.linesStory[lineType].find(element => {
         return element.part1 === inFolderNameToInsert;
@@ -35,7 +21,7 @@ const startFunc = ({ inStory, fileContent, filePath, extractRegex,
 
         const insertStory = findInsertIndex({
             onlyIndexesValues: inStory?.onlyIndexesValues,
-            extractRegex: extractRegex?.toInsertIndex?.import,
+            extractRegex: extractRegex?.toInsertIndex?.[fileType]?.import,
             presentKey: lineType
         });
 

package/bin/{v15 → v17/addTableName}/forUseLine/index.js

@@ -20,7 +20,8 @@ const startFunc = ({ inFolderNameToInsert, inFileType, inJsPath }) => {
         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/{v15 → v17/addTableName}/forUseLine/insertUseLine.js

@@ -21,7 +21,8 @@ function build(template, parts) {
 };
 
 const startFunc = ({ inStory, fileContent, filePath, extractRegex,
-    inFolderNameToInsert, lineType = "useLines", inTemplate, inParts }) => {
+    inFolderNameToInsert, lineType = "useLines", inTemplate, inParts,
+    fileType }) => {
 
     const foundUseLinesStory = inStory.linesStory[lineType].find(element => {
         return element.part1 === inFolderNameToInsert;
@@ -32,12 +33,9 @@ const startFunc = ({ inStory, fileContent, filePath, extractRegex,
 
         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,
+            extractRegex: extractRegex?.toInsertIndex?.[fileType]?.consumption,
             presentKey: lineType
         });
 
@@ -47,10 +45,6 @@ const startFunc = ({ inStory, fileContent, filePath, extractRegex,
             inGapAfter: insertStory?.gapAfter
         });
 
-        // const insertAtIndex = findInsertIndex({ inStory });
-
-        //  lines.splice(insertAtIndex, 0, newLine);
-
         fs.writeFileSync(filePath, lines.join(fileContent.includes("\r\n") ? "\r\n" : "\n"));
     };
 };

package/bin/v17/addTableName/start.js

@@ -0,0 +1,44 @@
+import fs from "fs";
+
+import path from "path";
+
+import forImportLine from "./forImportLine/index.js";
+import forUseLine from "./forUseLine/index.js";
+
+const alterEndPointsJs = ({ filePath, inTableName }) => {
+    try {
+        let content = fs.readFileSync(filePath, 'utf8');
+
+        content = content.replaceAll("<TABLE_NAME>", inTableName);
+
+        fs.writeFileSync(filePath, content, "utf8");
+
+        // writeFile(filePath, content);
+    } catch (e) {
+        handleError(e);
+    };
+};
+
+const startFunc = ({ inTableName, inFileType, jsFilePath,
+    inTargetPath
+}) => {
+    let fromInternal;
+
+    switch (inFileType) {
+        case "fromEndPointsJs":
+
+            fromInternal = alterEndPointsJs({
+                filePath: path.join(inTargetPath, "end-points.js"),
+                inTableName
+            });
+
+            break;
+
+        default:
+            break;
+    };
+
+    return fromInternal;
+};
+
+export default startFunc;

package/bin/v17/hookFolder/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/v17/hookFolder/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/v17/hookFolder/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/v17/hookFolder/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/v17/hookFolder/forInsertIndex.js

@@ -0,0 +1,30 @@
+import fs from 'fs';
+
+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 findVariablesDeclareHereLinesIndex = ({ inStory }) => {
+    const variablesDeclareHereLines = inStory?.lines?.variablesDeclareHereLines;
+
+    const lastLine = variablesDeclareHereLines[variablesDeclareHereLines.length - 1];
+
+    return lastLine?.lineNumber;
+};
+
+export {
+    findImportLinesFromNpmIndex, findImportLinesIndex,
+    findVariablesDeclareHereLinesIndex
+};

package/bin/v17/hookFolder/forUseLine/index.js

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

package/bin/v17/hookFolder/forUseLine/insertUseLine.js

@@ -0,0 +1,52 @@
+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,
+    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]?.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"));
+    };
+};
+
+export default startFunc;

package/bin/v17/start.js

@@ -0,0 +1,34 @@
+import hookFolder from "./hookFolder/start.js";
+import addTableName from "./addTableName/start.js";
+
+const startFunc = ({ inFolderNameToInsert, inFileType, jsFilePath,
+    inAlterType, inTargetPath, inTableName
+}) => {
+    let fromInternal;
+
+    switch (inAlterType) {
+        case "hookFolder":
+
+            fromInternal = hookFolder({
+                inFolderNameToInsert, inFileType, jsFilePath,
+                inTargetPath
+            });
+
+            break;
+
+        case "addTableName":
+
+            fromInternal = addTableName({
+                inTableName, inFileType, jsFilePath,
+                inTargetPath
+            });
+
+            break;
+        default:
+            break;
+    };
+
+    return fromInternal;
+};
+
+export default startFunc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-fix-any-js",
-  "version": "1.16.3",
+  "version": "1.17.2",
   "description": "CLI to build for appjs, the endpoints",
   "keywords": [
     "cli",