@keshavsoft/kschema-api-gen-actions 1.15.4 → 1.16.2

package/README.md

@@ -301,6 +301,8 @@ bin/
 
 ---
 
+this is config driven
+
 # Contributing
 
 Pull requests are welcome.
@@ -317,4 +319,5 @@ MIT
 
 # Author
 
-Created by KeshavSoft.
+Created by KeshavSoft.
+

package/bin/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import getLatestVersion from "./core/getLatestVersion.js";
 import loadRunner from "./core/loadRunner.js";

package/bin/v16/config/actions.json

@@ -0,0 +1,35 @@
+[
+    {
+        "cmd": "ShowAll",
+        "file": "showAll",
+        "exportFile": "ShowAll",
+        "group": "GetMethods",
+        "description": "Generate ShowAll GET action",
+        "endPointsJs": {
+            "importLine": "import { getFunc } from './ShowAll/controller.js';",
+            "usageLine": "router.get('/ShowAll', (req, res) => getFunc({ res, inTableName : tableName}));"
+        }
+    },
+    {
+        "cmd": "Insert",
+        "file": "insert",
+        "exportFile": "Insert",
+        "group": "PostMethods",
+        "description": "Generate Insert POST action",
+        "endPointsJs": {
+            "importLine": "import { postFunc } from './Insert/controller.js';",
+            "usageLine": "router.post('/Insert', express.json(), (req, res) => postFunc({ req, res, inTableName : tableName}));"
+        }
+    },
+    {
+        "cmd": "Distinct",
+        "file": "distinct",
+        "exportFile": "Distinct",
+        "group": "GetMethods",
+        "description": "Generate Distinct GET action",
+        "endPointsJs": {
+            "importLine": "import distinctFunc from './Distinct/controller.js';",
+            "usageLine": "router.get('/Distinct/:columnName', (req, res) => distinctFunc({ req, res, inTableName : tableName}));"
+        }
+    }
+]

package/bin/{v13/tasks/actions/GetMethods/ShowAll → v16/tasks/actions/GetMethods/Distinct/V1}/template/controller.js

@@ -1,9 +1,14 @@
 import { fromJsonPath } from './service.js';
 import { ConflictError, StorageError } from './errors.js';
 
-const getFunc = ({ res, inTableName }) => {
+const getFunc = ({ req, res, inTableName }) => {
     try {
-        const message = fromJsonPath({ inTableName });
+        const columnName = req.params.columnName;
+
+        const message = fromJsonPath({
+            inTableName,
+            inColumnName: columnName
+        });
 
         res.type("application/json").send(message);
     } catch (err) {

package/bin/v16/tasks/actions/GetMethods/Distinct/V1/template/service.js

@@ -0,0 +1,12 @@
+import { kschema } from "@keshavsoft/kschema";
+
+const fromJsonPath = ({ inTableName, inColumnName }) => {
+    const tableName = inTableName;
+
+    const array = kschema.table(tableName).query.aggregate.distinct(inColumnName);
+    const collection = array.map(str => ({ [inColumnName]: str }));
+
+    return collection;
+};
+
+export { fromJsonPath };

package/bin/{v14/tasks/actions/GetMethods/ShowAll → v16/tasks/actions/GetMethods/Distinct/V2}/template/controller.js

@@ -1,9 +1,14 @@
 import { fromJsonPath } from './service.js';
 import { ConflictError, StorageError } from './errors.js';
 
-const getFunc = ({ res, inTableName }) => {
+const distinctFunc = ({ req, res, inTableName }) => {
     try {
-        const message = fromJsonPath({ inTableName });
+        const columnName = req.params.columnName;
+
+        const message = fromJsonPath({
+            inTableName,
+            inColumnName: columnName
+        });
 
         res.type("application/json").send(message);
     } catch (err) {
@@ -18,4 +23,4 @@ const getFunc = ({ res, inTableName }) => {
     }
 };
 
-export { getFunc };
+export default distinctFunc;

package/bin/v16/tasks/actions/GetMethods/Distinct/V2/template/service.js

@@ -0,0 +1,12 @@
+import { kschema } from "@keshavsoft/kschema";
+
+const fromJsonPath = ({ inTableName, inColumnName }) => {
+    const tableName = inTableName;
+
+    const array = kschema.table(tableName).query.aggregate.distinct(inColumnName);
+    const collection = array.map(str => ({ [inColumnName]: str }));
+
+    return collection;
+};
+
+export { fromJsonPath };

package/bin/{v13 → v16}/tasks/actions/distinct.js

@@ -1,18 +1,17 @@
 import path from "path";
-import { endPointsJs } from "@keshavsoft/kschema-api-check";
+import endPointsJs from "@keshavsoft/kschema-api-check";
 
-import { locateSource } from "./GetMethods/ShowAll/steps/locateSource.js";
-import { locateDestination } from "./GetMethods/ShowAll/steps/locateDestination.js";
+import { locateSource } from "./GetMethods/Distinct/V2/steps/locateSource.js";
+import { locateDestination } from "./GetMethods/Distinct/V2/steps/locateDestination.js";
 import { createFolder } from "../core/createFolder.js";
 
-// import updateEndPointsJs from "./ShowAll/steps/updateEndPointsJs.js";
-import createHttpFile from "./GetMethods/ShowAll/steps/createHttpFile.js";
+import createHttpFile from "./GetMethods/Distinct/V2/steps/createHttpFile.js";
 
-import { announce } from "./GetMethods/ShowAll/steps/announce.js";
+import { announce } from "./GetMethods/Distinct/V2/steps/announce.js";
 
-import resolveFolderName from "./GetMethods/ShowAll/steps/resolveFolderName.js";
+import resolveFolderName from "./GetMethods/Distinct/V2/steps/resolveFolderName.js";
 
-export default ({ cmd = "", toPath, isAnnounce = true, checkBeforeCreate = true }) => {
+const startFunc = async ({ cmd = "", toPath, isAnnounce = true, checkBeforeCreate = true }) => {
     const localToPath = toPath;
 
     const resolvedFolderName = resolveFolderName({
@@ -37,16 +36,11 @@ export default ({ cmd = "", toPath, isAnnounce = true, checkBeforeCreate = true
     });
 
     if (createFolderResponse.KTF) {
-        endPointsJs({
+        await endPointsJs({
             toPath: localToPath,
             action: resolvedFolderName
         });
 
-        // updateEndPointsJs({
-        //     appJsPath: `${localToPath}/end-points.js`,
-        //     endpoint: resolvedFolderName
-        // });
-
         createHttpFile({
             inTargetPath: path.join(localToPath, resolvedFolderName),
             toPath: process.cwd()
@@ -56,4 +50,6 @@ export default ({ cmd = "", toPath, isAnnounce = true, checkBeforeCreate = true
     if (isAnnounce) announce({ inResolvedFolderName: resolvedFolderName });
 
     return resolveFolderName;
-};
+};
+
+export default startFunc

package/bin/{v14 → v16}/tasks/actions/showAll.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { endPointsJs } from "@keshavsoft/kschema-api-check";
+import endPointsJs from "@keshavsoft/kschema-api-check";
 
 import { locateSource } from "./GetMethods/ShowAll/steps/locateSource.js";
 import { locateDestination } from "./GetMethods/ShowAll/steps/locateDestination.js";
@@ -12,7 +12,7 @@ import { announce } from "./GetMethods/ShowAll/steps/announce.js";
 
 import resolveFolderName from "./GetMethods/ShowAll/steps/resolveFolderName.js";
 
-export default ({ cmd = "", toPath, isAnnounce = true, checkBeforeCreate = true }) => {
+export default async ({ cmd = "", toPath, isAnnounce = true, checkBeforeCreate = true }) => {
     const localToPath = toPath;
 
     const resolvedFolderName = resolveFolderName({
@@ -37,11 +37,18 @@ export default ({ cmd = "", toPath, isAnnounce = true, checkBeforeCreate = true
     });
 
     if (createFolderResponse.KTF) {
-        endPointsJs({
+        const loadEndPointsJs = await endPointsJs();
+
+        await loadEndPointsJs({
             toPath: localToPath,
             action: resolvedFolderName
         });
 
+        // await endPointsJs({
+        //     toPath: localToPath,
+        //     action: resolvedFolderName
+        // });
+
         // updateEndPointsJs({
         //     appJsPath: `${localToPath}/end-points.js`,
         //     endpoint: resolvedFolderName

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keshavsoft/kschema-api-gen-actions",
-  "version": "1.15.4",
+  "version": "1.16.2",
   "description": "CLI to scaffold projects using templates",
   "keywords": [
     "cli",
@@ -11,7 +11,7 @@
   ],
   "dependencies": {
     "@keshavsoft/kschema": "^1.17.8",
-    "@keshavsoft/kschema-api-check": "^1.11.4"
+    "@keshavsoft/kschema-api-check": "^1.12.2"
   },
   "type": "module",
   "exports": {

package/bin/v13/config/actions.json

@@ -1,20 +0,0 @@
-[
-    {
-        "cmd": "showAll",
-        "file": "showAll",
-        "exportFile": "ShowAll",
-        "group": "GetMethods"
-    },
-    {
-        "cmd": "insert",
-        "file": "insert",
-        "exportFile": "Insert",
-        "group": "PostMethods"
-    },
-    {
-        "cmd": "distinct",
-        "file": "distinct",
-        "exportFile": "Distinct",
-        "group": "GetMethods"
-    }
-]

package/bin/v13/core/showUsage.js

@@ -1,50 +0,0 @@
-/*
-KSchema CLI – Entry Flow
-
-1. Read user input from terminal (parseInput)
-2. If no command → show usage (first-time user safety)
-3. If help flags → show usage (quick guidance)
-4. Resolve command dynamically (no hardcoding logic)
-5. If command not found → inform + guide back to usage
-6. Execute command with parsed input
-
-Goal:
-- Zero confusion for user
-- Single source of truth (showUsage)
-- Easy to extend (just add commands, no core changes)
-*/
-
-export default function showUsage(version) {
-    const g = "\x1b[32m";
-    const y = "\x1b[33m";
-    const c = "\x1b[36m";
-    const gray = "\x1b[90m";
-    const r = "\x1b[0m";
-
-    console.log(`
-${c}🚀 KSchema Api Generator v${version}${r}
-
-${y}Usage:${r}
-  ${g}npx @keshavsoft/kschema-api-gen${r} <command> [options]
-
-${y}Commands:${r}
-  ${g}StartEndPoint${r}     Initialize a new folder and files
-  ${g}AddSubRoute${r}       Initialize a new folder and files
-  ${g}AddTableName${r}      Initialize a new folder and files for TableName
-  ${g}ShowAll${r}           Initialize a new folder and files for action
-  
-  ${g}CreateApi${r}         Creates new end point and hooks to app.js
-  ${g}InsertApi${r}         Creates new InsertApi end point and hooks to app.js
-  
-${y}Examples:${r}
-  ${gray}npx @keshavsoft/kschema-api-gen StartEndPoint${r}
-  ${gray}npx @keshavsoft/kschema-api-gen AddSubRoute${r}
-  ${gray}npx @keshavsoft/kschema-api-gen AddTableName${r}
-  ${gray}npx @keshavsoft/kschema-api-gen ShowAll${r}
-  ${gray}npx @keshavsoft/kschema-api-gen CreateApi Api/V1/journals/ShowAll${r}
-  ${gray}npx @keshavsoft/kschema-api-gen InsertApi Api/V1/journals/Insert${r}
-
-${y}Tip:${r}
-  ${gray}npm i -g @keshavsoft/kschema-api-gen${r}
-`);
-}

package/bin/v13/start.js

@@ -1,22 +0,0 @@
-import parseInput from "./core/parseInput.js";
-import resolveCommand from "./core/resolveCommand.js";
-import showUsage from './core/showUsage.js';
-import pkg from '../../package.json' with { type: 'json' };
-
-const version = pkg.version;
-
-const run = async () => {
-  const input = parseInput();
-
-  if (!input.cmd) return showUsage(version);
-
-  if (input.cmd === "--help" || input.cmd === "-h" || input.cmd === "help") return showUsage(version);
-
-  const command = resolveCommand(input.cmd);
-
-  if (!command) return (console.log(`Unknown command: ${input.cmd}\n`), showUsage(version));
-
-  await command(input);
-};
-
-export default run;

package/bin/v13/tasks/actions/GetMethods/Distinct/template/service.js

@@ -1,9 +0,0 @@
-import { kschema } from "@keshavsoft/kschema";
-
-const fromJsonPath = ({ inTableName }) => {
-    const tableName = inTableName;
-
-    return kschema.table(tableName).query.aggregate.distinct("AccountName");
-};
-
-export { fromJsonPath };

package/bin/v13/tasks/actions/showAll.js

@@ -1,59 +0,0 @@
-import path from "path";
-import { endPointsJs } from "@keshavsoft/kschema-api-check";
-
-import { locateSource } from "./GetMethods/ShowAll/steps/locateSource.js";
-import { locateDestination } from "./GetMethods/ShowAll/steps/locateDestination.js";
-import { createFolder } from "../core/createFolder.js";
-
-// import updateEndPointsJs from "./ShowAll/steps/updateEndPointsJs.js";
-import createHttpFile from "./GetMethods/ShowAll/steps/createHttpFile.js";
-
-import { announce } from "./GetMethods/ShowAll/steps/announce.js";
-
-import resolveFolderName from "./GetMethods/ShowAll/steps/resolveFolderName.js";
-
-export default ({ cmd = "", toPath, isAnnounce = true, checkBeforeCreate = true }) => {
-    const localToPath = toPath;
-
-    const resolvedFolderName = resolveFolderName({
-        name: cmd
-    });
-
-    if (resolvedFolderName.KTF === false) {
-        console.log(resolvedFolderName.KReason);
-
-        return;
-    };
-
-    const source = locateSource();
-    const destination = locateDestination({
-        inResolvedFolderName: resolvedFolderName,
-        toPath: localToPath
-    });
-
-    const createFolderResponse = createFolder({
-        source, destination,
-        isAnnounce, checkBeforeCreate
-    });
-
-    if (createFolderResponse.KTF) {
-        endPointsJs({
-            toPath: localToPath,
-            action: resolvedFolderName
-        });
-
-        // updateEndPointsJs({
-        //     appJsPath: `${localToPath}/end-points.js`,
-        //     endpoint: resolvedFolderName
-        // });
-
-        createHttpFile({
-            inTargetPath: path.join(localToPath, resolvedFolderName),
-            toPath: process.cwd()
-        });
-    };
-
-    if (isAnnounce) announce({ inResolvedFolderName: resolvedFolderName });
-
-    return resolveFolderName;
-};

package/bin/v14/commands/loadCommand.js

@@ -1,11 +0,0 @@
-import actions from "../config/actions.json" with { type: "json" };
-
-export default async function loadCommand(name) {
-    const matched = actions.find(x => x.exportFile === name);
-
-    if (!matched) return null;
-
-    const module = await import(`../tasks/actions/${matched.file}.js`);
-
-    return module.default;
-};

package/bin/v14/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 });
-};

package/bin/v14/core/parseInput.js

@@ -1,8 +0,0 @@
-export default function parseInput() {
-    const [cmd] = process.argv.slice(2);
-
-    return {
-        cmd: cmd || null,
-        toPath: process.cwd()
-    };
-};

package/bin/v14/core/resolveCommand.js

@@ -1,11 +0,0 @@
-import actions from "../config/actions.json" with { type: "json" };
-
-export default async function resolveCommand(cmd) {
-    const matched = actions.find(x => x.cmd === cmd);
-
-    if (!matched) return null;
-
-    const module = await import(`../tasks/actions/${matched.file}.js`);
-
-    return module.default;
-};

package/bin/v14/tasks/actions/GetMethods/Distinct/template/controller.js

@@ -1,21 +0,0 @@
-import { fromJsonPath } from './service.js';
-import { ConflictError, StorageError } from './errors.js';
-
-const getFunc = ({ res, inTableName }) => {
-    try {
-        const message = fromJsonPath({ inTableName });
-
-        res.type("application/json").send(message);
-    } catch (err) {
-        if (err instanceof ConflictError)
-            return res.status(409).send(err.message);
-
-        if (err instanceof StorageError)
-            return res.status(500).send("Failed to persist data");
-
-        console.error(err);
-        res.status(500).send("Unexpected error");
-    }
-};
-
-export { getFunc };

package/bin/v14/tasks/actions/GetMethods/Distinct/template/service.js

@@ -1,9 +0,0 @@
-import { kschema } from "@keshavsoft/kschema";
-
-const fromJsonPath = ({ inTableName }) => {
-    const tableName = inTableName;
-
-    return kschema.table(tableName).query.aggregate.distinct("AccountName");
-};
-
-export { fromJsonPath };

package/bin/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/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/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/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/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/updateImports/buildImport.js

@@ -1,9 +0,0 @@
-const buildImport = ({ inFuncName, inEndpoint }) => {
-    const localEndpoint = inEndpoint;
-
-    const safeName = localEndpoint.replace(/[^a-zA-Z0-9]/g, "_");
-
-    return `import { ${inFuncName} } from "./${localEndpoint}/controller.js";`;
-};
-
-export default buildImport;

package/bin/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/updateImports/checkDuplicate.js

@@ -1,8 +0,0 @@
-const checkUseDuplicate = (inContent, inEndpoint) => {
-    const localContent = inContent;
-    const localEndpoint = inEndpoint;
-
-    return localContent.includes(`app.use("/${localEndpoint}"`);
-};
-
-export default checkUseDuplicate;

package/bin/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/updateImports/findInsertIndex.js

@@ -1,10 +0,0 @@
-const findInsertIndex = (inContent) => {
-    const localContent = inContent;
-
-    const matches = [...localContent.matchAll(/^\s*import.*$/gm)];
-    const last = matches.at(-1);
-
-    return last ? last.index + last[0].length : 0;
-};
-
-export default findInsertIndex;

package/bin/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/updateImports/index.js

@@ -1,45 +0,0 @@
-import readFile from "../common/readFile.js";
-import buildImport from "./buildImport.js";
-import checkDuplicate from "./checkDuplicate.js";
-import findInsertIndex from "./findInsertIndex.js";
-import writeFile from "../common/writeFile.js";
-
-const updateImports = ({ appJsPath, endpoint, showLog, inFuncName }) => {
-    const summary = {
-        import: { added: false, line: null },
-    };
-
-    const content = readFile(appJsPath);
-
-    const importLine = buildImport({
-        inEndpoint: endpoint,
-        inFuncName
-    });
-
-    if (checkDuplicate(content, endpoint)) {
-        summary.import.skipped = true;
-
-        if (showLog) console.log(summary);
-
-        return summary;
-    };
-
-    const index = findInsertIndex(content);
-
-    const before = content.slice(0, index);
-    const lineNumber = before.split("\n").length + 1;
-
-    const updated =
-        before + "\n" + importLine + content.slice(index);
-
-    writeFile(appJsPath, updated);
-
-    summary.import.added = true;
-    summary.import.line = lineNumber;
-
-    if (showLog) console.log(summary);
-
-    return summary;
-};
-
-export default updateImports;

package/bin/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/updateUse/buildUseLine.js

@@ -1,9 +0,0 @@
-const appOrRouter = "router";
-
-const buildUseLine = ({ inEndpoint, inFuncName }) => {
-    return `${appOrRouter}.get('/${inEndpoint}', (req, res) => ${inFuncName}({ res, inTableName : tableName}));`;
-
-    // return `${appOrRouter}.use("/${inEndpoint}", ${inFuncName});`;
-};
-
-export default buildUseLine;

package/bin/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/updateUse/checkDuplicate.js

@@ -1,8 +0,0 @@
-const checkDuplicate = (inContent, inEndpoint) => {
-    const localContent = inContent;
-    const localEndpoint = inEndpoint;
-
-    return localContent.includes(`app.use("/${localEndpoint}"`);
-};
-
-export default checkDuplicate;

package/bin/v14/tasks/actions/GetMethods/ShowAll/steps/UpdateRoutesJs/updateUse/findInsertIndex.js

@@ -1,10 +0,0 @@
-const findUseInsertIndex = (inContent) => {
-    const localContent = inContent;
-
-    const matches = [...localContent.matchAll(/const\s+router\s*=\s*express\.Router\(\)/g)];
-    const match = matches.at(0);
-
-    return match ? match.index + match[0].length : localContent.length;
-};
-
-export default findUseInsertIndex;