express-fix-any-js 1.11.3 → 1.13.3

package/bin/v12/UpdateJs/bothLines/forImportLine/index.js

@@ -0,0 +1,30 @@
+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,
+        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/v12/UpdateJs/bothLines/forImportLine/insertImportLine.js

@@ -0,0 +1,55 @@
+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/v12/UpdateJs/bothLines/forInsertIndex.js

@@ -0,0 +1,19 @@
+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;
+};
+
+export { findImportLinesFromNpmIndex, findImportLinesIndex };

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

@@ -0,0 +1,29 @@
+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,
+        filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
+        inTemplate1: story.regexForPullLinesStory.consumptionRegex.reverseTemplate,
+        inTemplate: story.reverseTemplates.consumptionRegex,
+        inParts: [folderNameToInsert, `${story.variablesConnection}${folderNameToInsert}`]
+    });
+};
+
+export default startFunc;
+
+// startFunc({ folderNameToInsert, fileType });

package/bin/{v11/UpdateJs/bothLines → v12/UpdateJs/bothLines/forUseLine}/insertUseLine.js

@@ -1,5 +1,14 @@
 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]);
 };
@@ -16,8 +25,11 @@ 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 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"));

package/bin/v12/UpdateJs/bothLines/index.js

@@ -0,0 +1,11 @@
+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/{v11 → v12}/UpdateJs/index.js

@@ -1,4 +1,4 @@
-import bothLines from './bothLines/test.js';
+import bothLines from './bothLines/index.js';
 
 const startFunc = ({ inFolderNameToInsert, inFileType, jsFilePath }) => {
 

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

@@ -0,0 +1,30 @@
+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,
+        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/v13/UpdateJs/bothLines/forImportLine/insertImportLine.js

@@ -0,0 +1,55 @@
+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/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/v13/UpdateJs/bothLines/forUseLine/index.js

@@ -0,0 +1,29 @@
+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,
+        filePath: localJsPath, inFolderNameToInsert: folderNameToInsert,
+        inTemplate1: story.regexForPullLinesStory.consumptionRegex.reverseTemplate,
+        inTemplate: story.reverseTemplates.consumptionRegex,
+        inParts: [folderNameToInsert, `${story.variablesConnection}${folderNameToInsert}`]
+    });
+};
+
+export default startFunc;
+
+// startFunc({ folderNameToInsert, fileType });

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

@@ -0,0 +1,44 @@
+import fs from 'fs';
+
+import {
+    findImportLinesFromNpmIndex, findImportLinesIndex,
+    findVariablesDeclareHereLinesIndex
+} from "../forInsertIndex.js";
+
+const findInsertIndex = ({ 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,
+    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/v13/UpdateJs/bothLines/index.js

@@ -0,0 +1,11 @@
+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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-fix-any-js",
-  "version": "1.11.3",
+  "version": "1.13.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.18.1"
+    "pattern-collector-anyjs-story": "^1.19.6"
   },
   "type": "module",
   "exports": {

package/bin/v10/UpdateJs/common/AlterFileForConsume/buildUpdatedContent.js

@@ -1,28 +0,0 @@
-const startFunc = ({
-    content,
-    insertInfo,
-    toInsertLine,
-    insertAfter
-}) => {
-    const index = insertInfo.index === -1 ? content.length : insertInfo.index;
-    const before = content.slice(0, index);
-
-    const isFirstInsert =
-        insertInfo.matchedPattern === insertAfter[insertAfter.length - 1];
-
-    if (Array.isArray(toInsertLine)) {
-        return before +
-            (isFirstInsert ? "\n" : "") +
-            toInsertLine.join("\n") +
-            "\n" +
-            content.slice(index);
-    }
-
-    return before +
-        (isFirstInsert ? "\n" : "") +
-        toInsertLine +
-        "\n" +
-        content.slice(index);
-};
-
-export default startFunc;

package/bin/v10/UpdateJs/common/AlterFileForConsume/checkDuplicate.js

@@ -1,21 +0,0 @@
-const checkUseDuplicate = ({
-    inContent,
-    inFilePath,
-    inSearchText
-}) => {
-    const lines = inContent.split("\n");
-
-    const lineIndex = lines.findIndex(line =>
-        line.includes(inSearchText)
-    );
-
-    return {
-        found: lineIndex !== -1,
-        filePath: inFilePath,
-        lineNumber: lineIndex !== -1
-            ? lineIndex + 1
-            : null
-    };
-};
-
-export default checkUseDuplicate;

package/bin/v10/UpdateJs/common/AlterFileForConsume/findInsertIndex.js

@@ -1,30 +0,0 @@
-const findInsertIndex = ({
-    inContent,
-    inPatterns = []
-}) => {
-    const lines = inContent.split("\n");
-
-    let lineNumber = -1;
-    let matchedPattern = null;
-
-    lines.forEach((line, index) => {
-        const pattern = inPatterns.find(item => line.includes(item));
-
-        if (pattern) {
-            lineNumber = index;
-            matchedPattern = pattern;
-        };
-    });
-
-    return {
-        index: lineNumber === -1
-            ? -1
-            : lines
-                .slice(0, lineNumber + 1)
-                .join("\n")
-                .length + 1,
-        matchedPattern
-    };
-};
-
-export default findInsertIndex;

package/bin/v10/UpdateJs/common/AlterFileForConsume/index.js

@@ -1,61 +0,0 @@
-import readFile from "../readFile.js";
-import checkDuplicate from "./checkDuplicate.js";
-import findInsertIndex from "./findInsertIndex.js";
-import writeFile from "../writeFile.js";
-
-import buildUpdatedContent from "./buildUpdatedContent.js";
-
-const locateInsertPoint = ({ content, insertAfter }) => {
-    return findInsertIndex({
-        inContent: content,
-        inPatterns: insertAfter
-    });
-};
-
-const alterFile = ({
-    jsFilePath,
-    toInsertLine,
-    duplicationCheck,
-    insertAfter = [],
-    showLog = false
-}) => {
-    const content = readFile(jsFilePath);
-
-    const duplicateInfo = checkDuplicate({
-        inContent: content,
-        inFilePath: jsFilePath,
-        inSearchText: duplicationCheck
-    });
-
-    if (duplicateInfo.found) {
-        if (showLog) {
-            console.log(
-                `Duplicate found at line ${duplicateInfo.lineNumber}`
-            );
-        }
-
-        return duplicateInfo;
-    };
-
-    const insertInfo = locateInsertPoint({
-        content,
-        insertAfter
-    });
-
-    const updated = buildUpdatedContent({
-        content,
-        insertInfo,
-        toInsertLine,
-        insertAfter
-    });
-
-    writeFile(jsFilePath, updated);
-
-    return {
-        found: false,
-        filePath: jsFilePath,
-        lineNumber: null
-    };
-};
-
-export default alterFile;

package/bin/v10/UpdateJs/common/AlterFileForImport/buildUpdatedContent copy.js

@@ -1,27 +0,0 @@
-const startFunc = ({
-    content,
-    insertInfo,
-    toInsertLine,
-    insertAfter
-}) => {
-    const before = content.slice(0, insertInfo.index);
-
-    const isFirstInsert =
-        insertInfo.matchedPattern === insertAfter[insertAfter.length - 1];
-
-    if (Array.isArray(toInsertLine)) {
-        return before +
-            (isFirstInsert ? "\n" : "") +
-            toInsertLine.join("\n") +
-            "\n" +
-            content.slice(insertInfo.index);
-    }
-
-    return before +
-        (isFirstInsert ? "\n" : "") +
-        toInsertLine +
-        "\n" +
-        content.slice(insertInfo.index);
-};
-
-export default startFunc;

package/bin/v10/UpdateJs/common/AlterFileForImport/buildUpdatedContent.js

@@ -1,41 +0,0 @@
-const startFunc = ({
-    content,
-    insertInfo,
-    toInsertLine,
-    insertAfter
-}) => {
-
-    // let before;
-
-    // if (insertInfo.index === -1) {
-    //     before = 0;
-
-    // } else {
-
-    //     before = content.slice(0, insertInfo.index);
-
-    // };
-    // const before = content.slice(0, insertInfo.index);
-
-    const index = insertInfo.index === -1 ? 0 : insertInfo.index;
-    const before = content.slice(0, index);
-
-    const isFirstInsert =
-        insertInfo.matchedPattern === insertAfter[insertAfter.length - 1];
-
-    if (Array.isArray(toInsertLine)) {
-        return before +
-            (isFirstInsert ? "\n" : "") +
-            toInsertLine.join("\n") +
-            "\n" +
-            content.slice(index);
-    }
-
-    return before +
-        (isFirstInsert ? "\n" : "") +
-        toInsertLine +
-        "\n" +
-        content.slice(index);
-};
-
-export default startFunc;

package/bin/v10/UpdateJs/common/AlterFileForImport/checkDuplicate.js

@@ -1,14 +0,0 @@
-import { isImportPresent } from "express-check-any-for-import";
-
-const checkUseDuplicate = ({ inContent, inFilePath, inSearchText }) => {
-    const cleanText = inSearchText.match(/['"]([^'"]+)['"]/)?.[1] || inSearchText;
-    const found = isImportPresent(inContent, cleanText) || inContent.includes(inSearchText);
-
-    return {
-        found,
-        filePath: inFilePath,
-        lineNumber: found ? inContent.split("\n").findIndex(line => line.includes(cleanText)) + 1 : null
-    };
-};
-
-export default checkUseDuplicate;

package/bin/v10/UpdateJs/common/AlterFileForImport/findInsertIndex.js

@@ -1,30 +0,0 @@
-const findInsertIndex = ({
-    inContent,
-    inPatterns = []
-}) => {
-    const lines = inContent.split("\n");
-
-    let lineNumber = -1;
-    let matchedPattern = null;
-
-    lines.forEach((line, index) => {
-        const pattern = inPatterns.find(item => line.includes(item));
-
-        if (pattern) {
-            lineNumber = index;
-            matchedPattern = pattern;
-        };
-    });
-
-    return {
-        index: lineNumber === -1
-            ? -1
-            : lines
-                .slice(0, lineNumber + 1)
-                .join("\n")
-                .length + 1,
-        matchedPattern
-    };
-};
-
-export default findInsertIndex;