express-fix-any-js 1.3.8 → 1.4.2

package/bin/{v2 → v4}/UpdateJs/common/AlterFile/index.js

@@ -5,14 +5,6 @@ import writeFile from "../writeFile.js";
 
 import buildUpdatedContent from "./buildUpdatedContent.js";
 
-const validateDuplicate = ({ content, jsFilePath, duplicationCheck }) => {
-    return checkDuplicate({
-        inContent: content,
-        inFilePath: jsFilePath,
-        inSearchText: duplicationCheck
-    });
-};
-
 const locateInsertPoint = ({ content, insertAfter }) => {
     return findInsertIndex({
         inContent: content,
@@ -29,9 +21,22 @@ const alterFile = ({
 }) => {
     const content = readFile(jsFilePath);
 
-    const duplicateInfo = validateDuplicate({ content, jsFilePath, duplicationCheck });
+    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 index = locateInsertPoint({ content, importInsertAfter });
     const insertInfo = locateInsertPoint({
         content,
         insertAfter

package/bin/v4/UpdateJs/index.js

@@ -0,0 +1,56 @@
+// v2/AppJs/index.js
+
+import checkLines from "./checkLines.json" with {type: "json"};
+import alterFile from "./common/AlterFile/index.js";
+
+const validateCheckLines = (obj) => {
+    if (typeof obj !== "object" || obj === null || Array.isArray(obj)) {
+        throw new TypeError("inCheckLines must be a valid object.");
+    }
+    for (const key of ["importLines", "useLines"]) {
+        if (!(key in obj)) {
+            throw new Error(`inCheckLines must contain "${key}".`);
+        }
+        const section = obj[key];
+        if (typeof section !== "object" || section === null || Array.isArray(section)) {
+            throw new TypeError(`inCheckLines.${key} must be an object.`);
+        }
+        if (typeof section.toInsertLine !== "string") {
+            throw new TypeError(`inCheckLines.${key}.toInsertLine must be a string.`);
+        }
+        if (typeof section.duplicationCheck !== "string") {
+            throw new TypeError(`inCheckLines.${key}.duplicationCheck must be a string.`);
+        }
+        if (!Array.isArray(section.insertAfter)) {
+            throw new TypeError(`inCheckLines.${key}.insertAfter must be an array.`);
+        }
+    }
+};
+
+const updateAppJs = ({ inJsFilePath, inCheckLines,
+    showLog = false }) => {
+
+    const localCheckLines = (inCheckLines && Object.keys(inCheckLines).length > 0) ? inCheckLines : checkLines;
+    
+    validateCheckLines(localCheckLines);
+
+    alterFile({
+        jsFilePath: inJsFilePath,
+        toInsertLine: localCheckLines.importLines.toInsertLine,
+        duplicationCheck: localCheckLines.importLines.duplicationCheck,
+        insertAfter: localCheckLines.importLines.insertAfter,
+        showLog
+    });
+
+    alterFile({
+        jsFilePath: inJsFilePath,
+        toInsertLine: localCheckLines.useLines.toInsertLine,
+        duplicationCheck: localCheckLines.useLines.duplicationCheck,
+        insertAfter: localCheckLines.useLines.insertAfter,
+        showLog
+    });
+
+    return false;
+};
+
+export default updateAppJs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-fix-any-js",
-  "version": "1.3.8",
+  "version": "1.4.2",
   "description": "CLI to build for appjs, the endpoints",
   "keywords": [
     "cli",
@@ -9,8 +9,7 @@
     "node",
     "project-generator"
   ],
-  "dependencies": {
-  },
+  "dependencies": {},
   "type": "module",
   "exports": {
     ".": "./index.js"
@@ -32,4 +31,4 @@
   "bugs": {
     "url": "https://github.com/keshavsoft/express-fix-any-js/issues"
   }
-}
+}

package/bin/v2/EndPointsJs/UpdateJs/common/AlterFile/index.js

@@ -1,51 +0,0 @@
-import readFile from "../readFile.js";
-import checkDuplicate from "./checkDuplicate.js";
-import findInsertIndex from "./findInsertIndex.js";
-import writeFile from "../writeFile.js";
-import validateAppJsPath from "../../validations/validateAppJsPath.js";
-
-import buildUpdatedContent from "./buildUpdatedContent.js";
-
-const validateDuplicate = ({ content, jsFilePath, duplicationCheck }) => {
-    return checkDuplicate({
-        inContent: content,
-        inFilePath: jsFilePath,
-        inSearchText: duplicationCheck
-    });
-};
-
-const locateInsertPoint = ({ content, insertAfter }) => {
-    return findInsertIndex({
-        inContent: content,
-        inPatterns: insertAfter
-    });
-};
-
-const alterFile = ({
-    jsFilePath,
-    toInsertLine,
-    duplicationCheck,
-    insertAfter = [],
-    showLog = false
-}) => {
-    const content = readFile(jsFilePath);
-
-    const duplicateInfo = validateDuplicate({ content, jsFilePath, duplicationCheck });
-
-    // const index = locateInsertPoint({ content, importInsertAfter });
-    const insertInfo = locateInsertPoint({
-        content,
-        insertAfter
-    });
-
-    const updated = buildUpdatedContent({
-        content,
-        insertInfo,
-        toInsertLine,
-        insertAfter
-    });
-
-    writeFile(jsFilePath, updated);
-};
-
-export default alterFile;

package/bin/v2/EndPointsJs/UpdateJs/index.js

@@ -1,34 +0,0 @@
-// v2/AppJs/index.js
-
-import checkLines from "./checkLines.json" with {type: "json"};
-import validateEndpoint from "./validations/validateEndpoint.js";
-import alterFile from "./common/AlterFile/index.js";
-
-const updateAppJs = ({ inJsFilePath, actionName, inCheckLines,
-    showLog = false }) => {
-
-    validateEndpoint({ endpoint: actionName });
-
-    const localCheckLines = inCheckLines || checkLines;
-    // console.log("bbbbbbbbbbbb : ", localCheckLines);
-
-    alterFile({
-        jsFilePath: inJsFilePath,
-        toInsertLine: localCheckLines.importLines.toInsertLine,
-        duplicationCheck: localCheckLines.importLines.duplicationCheck,
-        insertAfter: localCheckLines.importLines.insertAfter,
-        showLog
-    });
-
-    alterFile({
-        jsFilePath: inJsFilePath,
-        toInsertLine: localCheckLines.useLines.toInsertLine,
-        duplicationCheck: localCheckLines.useLines.duplicationCheck,
-        insertAfter: localCheckLines.useLines.insertAfter,
-        showLog
-    });
-
-    return false;
-};
-
-export default updateAppJs;

package/bin/v2/EndPointsJs/UpdateJs/validations/validateAppJsPath.js

@@ -1,11 +0,0 @@
-// v2/AppJs/validations/validateAppJsPath.js
-
-import fs from "fs";
-
-const validateAppJsPath = ({ jsFilePath }) => {
-    if (!fs.existsSync(jsFilePath)) {
-        throw new Error(`${jsFilePath} file not found`);
-    };
-};
-
-export default validateAppJsPath;

package/bin/v2/EndPointsJs/UpdateJs/validations/validateEndpoint.js

@@ -1,9 +0,0 @@
-// v2/AppJs/validations/validateEndpoint.js
-
-const validateEndpoint = ({ endpoint }) => {
-    if (!endpoint || endpoint.trim() === "") {
-        throw new Error("endpoint should not be empty");
-    };
-};
-
-export default validateEndpoint;

package/bin/v2/EndPointsJs/index.js

@@ -1,12 +0,0 @@
-import updateJs from "./UpdateJs/index.js";
-
-export default ({ actionName, inJsFilePath, inCheckLines, showLog }) => {
-    const fromUpdate = updateJs({
-        inJsFilePath,
-        actionName,
-        inCheckLines,
-        showLog
-    });
-
-    return true;
-};

package/bin/v2/UpdateJs/checkLines.json

@@ -1,18 +0,0 @@
-{
-    "importLines": {
-        "toInsertLine": "import funcFrom${endpoint} from './${endpoint}/controller.js';",
-        "duplicationCheck": "from './${endpoint}/controller.js'",
-        "insertAfter": [
-            "import funcFrom",
-            "import express"
-        ]
-    },
-    "useLines": {
-        "toInsertLine": "router.post('/${endpoint}', express.json(), (req, res) => funcFrom${endpoint}({ req, res, inTablePath: tablePath }));",
-        "duplicationCheck": "router.use('/${endpoint}'",
-        "insertAfter": [
-            "router.",
-            "const router = "
-        ]
-    }
-}

package/bin/v2/UpdateJs/common/AlterFile/buildUpdatedContent.js

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

package/bin/v2/UpdateJs/common/AlterFile/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/v2/UpdateJs/common/AlterFile/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/v2/UpdateJs/common/readFile.js

@@ -1,8 +0,0 @@
-import fs from "fs";
-
-const readFile = (inAppJsPath) => {
-    const localPath = inAppJsPath;
-    return fs.readFileSync(localPath, "utf-8");
-};
-
-export default readFile;

package/bin/v2/UpdateJs/common/writeFile.js

@@ -1,10 +0,0 @@
-import fs from "fs";
-
-const writeFile = (inAppJsPath, inContent) => {
-    const localPath = inAppJsPath;
-    const localContent = inContent;
-
-    fs.writeFileSync(localPath, localContent);
-};
-
-export default writeFile;

package/bin/v2/UpdateJs/index.js

@@ -1,31 +0,0 @@
-// v2/AppJs/index.js
-
-import checkLines from "./checkLines.json" with {type: "json"};
-import alterFile from "./common/AlterFile/index.js";
-
-const updateAppJs = ({ inJsFilePath, inCheckLines,
-    showLog = false }) => {
-
-    const localCheckLines = inCheckLines || checkLines;
-    // console.log("bbbbbbbbbbbb : ", localCheckLines);
-
-    alterFile({
-        jsFilePath: inJsFilePath,
-        toInsertLine: localCheckLines.importLines.toInsertLine,
-        duplicationCheck: localCheckLines.importLines.duplicationCheck,
-        insertAfter: localCheckLines.importLines.insertAfter,
-        showLog
-    });
-
-    alterFile({
-        jsFilePath: inJsFilePath,
-        toInsertLine: localCheckLines.useLines.toInsertLine,
-        duplicationCheck: localCheckLines.useLines.duplicationCheck,
-        insertAfter: localCheckLines.useLines.insertAfter,
-        showLog
-    });
-
-    return false;
-};
-
-export default updateAppJs;

package/bin/v2/core/createFolder.js

@@ -1,34 +0,0 @@
-import fs from "fs";
-
-export const createFolder = ({ source, destination, checkBeforeCreate = false, isAnnounce = true }) => {
-    if (checkBeforeCreate) {
-        return createFolderWithCheck({ source, destination, isAnnounce });
-    } else {
-        return createOnly({ source, destination });
-    };
-};
-
-const createOnly = ({ source, destination }) => {
-    fs.mkdirSync(destination, { recursive: true });
-
-    fs.cpSync(source, destination, { recursive: true });
-
-    return {
-        KTF: true
-    };
-};
-
-const createFolderWithCheck = ({ source, destination, isAnnounce }) => {
-    if (fs.existsSync(destination)) {
-        if (isAnnounce) console.log("Folder already exists :", destination);
-
-        return {
-            KTF: false,
-            KReason: "Folder already exists"
-        };
-    };
-
-    if (isAnnounce) console.log("Folder created :", destination);
-
-    return createOnly({ source, destination });
-};