express-fix-any-js 1.7.2 → 1.7.7

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

@@ -0,0 +1,27 @@
+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/v7/UpdateJs/common/AlterFileForConsume/checkDuplicate.js

@@ -0,0 +1,21 @@
+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/v7/UpdateJs/common/AlterFileForConsume/findInsertIndex.js

@@ -0,0 +1,30 @@
+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/v7/UpdateJs/common/AlterFileForConsume/index.js

@@ -0,0 +1,61 @@
+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/v7/UpdateJs/common/AlterFileForImport/buildUpdatedContent.js

@@ -0,0 +1,27 @@
+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/v7/UpdateJs/common/AlterFileForImport/checkDuplicate.js

@@ -0,0 +1,14 @@
+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/v7/UpdateJs/common/AlterFileForImport/findInsertIndex.js

@@ -0,0 +1,30 @@
+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/v7/UpdateJs/common/AlterFileForImport/index.js

@@ -0,0 +1,61 @@
+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/v7/UpdateJs/index.js

@@ -1,14 +1,16 @@
-import alterFile from "./common/AlterFile/index.js";
+// import alterFile from "./common/AlterFile/index.js";
 import validateCheckLines from "./validateCheckLines.js";
+import alterFileForImport from "./common/AlterFileForImport/index.js";
+import alterFileForConsume from "./common/AlterFileForConsume/index.js";
 
 const updateAppJs = ({ inJsFilePath, inCheckLines,
     showLog = false }) => {
 
     const localCheckLines = inCheckLines;
-    
+
     validateCheckLines(localCheckLines);
 
-    const importResult = alterFile({
+    const importResult = alterFileForImport({
         jsFilePath: inJsFilePath,
         toInsertLine: localCheckLines.importLines.toInsertLine,
         duplicationCheck: localCheckLines.importLines.duplicationCheck,
@@ -16,7 +18,7 @@ const updateAppJs = ({ inJsFilePath, inCheckLines,
         showLog
     });
 
-    const useResult = alterFile({
+    const useResult = alterFileForConsume({
         jsFilePath: inJsFilePath,
         toInsertLine: localCheckLines.useLines.toInsertLine,
         duplicationCheck: localCheckLines.useLines.duplicationCheck,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-fix-any-js",
-  "version": "1.7.2",
+  "version": "1.7.7",
   "description": "CLI to build for appjs, the endpoints",
   "keywords": [
     "cli",
@@ -10,7 +10,7 @@
     "project-generator"
   ],
   "dependencies": {
-    "express-check-any-for-import": "file:../ks1/express-check-any-for-import"
+    "express-check-any-for-import": "^1.4.6"
   },
   "type": "module",
   "exports": {
@@ -33,4 +33,4 @@
   "bugs": {
     "url": "https://github.com/keshavsoft/express-fix-any-js/issues"
   }
-}
+}