@skalfa/skalfa-cli 1.0.2 → 1.0.4

package/dist/commands/add-extension.js

@@ -20,7 +20,6 @@ exports.extensions = {
     cron: "@skalfa/skalfa-cron",
     da: "@skalfa/skalfa-da",
     socket: "@skalfa/skalfa-socket",
-    notification: "@skalfa/notification",
     orm: "@skalfa/skalfa-orm"
 };
 exports.extensionNames = Object.keys(exports.extensions);
@@ -267,16 +266,6 @@ async function scaffoldUtilityExtension(projectRoot, ext) {
                 // Uncomment DA block
                 content = content.replace(/\/\/ if \(process\.env\.DA_HOST[\s\S]*?\/\/ }/g, (match) => match.replace(/^\/\/ ?/gm, ""));
             }
-            if (ext === "cron") {
-                importsToAdd.push("cron");
-                // Uncomment Cron block
-                content = content.replace(/\/\/ cron\.worker\(\)/g, "cron.worker()");
-            }
-            if (ext === "socket") {
-                importsToAdd.push("socket");
-                // Uncomment Socket block
-                content = content.replace(/\/\/ if \(process\.env\.SOCKET_PORT[\s\S]*?\/\/ }/g, (match) => match.replace(/^\/\/ ?/gm, ""));
-            }
             // Update import statement at the top of app.ts
             if (importsToAdd.length > 0) {
                 const importRegex = /import\s*\{\s*([\s\S]*?)\s*\}\s*from\s*["']@utils["']/;
@@ -290,6 +279,42 @@ async function scaffoldUtilityExtension(projectRoot, ext) {
             }
             node_fs_1.default.writeFileSync(appTsPath, content, "utf8");
         }
+        // 5. Update package.json scripts for workers
+        const packageJsonPath = node_path_1.default.join(projectRoot, "package.json");
+        if (node_fs_1.default.existsSync(packageJsonPath) && ["cron", "queue", "socket"].includes(ext)) {
+            const pkg = JSON.parse(node_fs_1.default.readFileSync(packageJsonPath, "utf8"));
+            pkg.scripts = pkg.scripts || {};
+            let scriptKey = "";
+            let scriptVal = "";
+            if (ext === "cron") {
+                scriptKey = "start:cron";
+                scriptVal = "bun run app/jobs/crons/worker.cron.ts";
+            }
+            else if (ext === "queue") {
+                scriptKey = "start:queue";
+                scriptVal = "bun run app/jobs/queues/worker.queue.ts";
+            }
+            else if (ext === "socket") {
+                scriptKey = "start:socket";
+                scriptVal = "bun run app/jobs/sockets/worker.socket.ts";
+            }
+            if (scriptKey) {
+                pkg.scripts[scriptKey] = scriptVal;
+                // Update dev concurrently command
+                const devScript = pkg.scripts["dev"] || "";
+                const runCmd = `bun ${scriptKey}`;
+                if (devScript.includes("concurrently")) {
+                    if (!devScript.includes(runCmd)) {
+                        const cleanDev = devScript.trim();
+                        pkg.scripts["dev"] = `${cleanDev} "${runCmd}"`;
+                    }
+                }
+                else {
+                    pkg.scripts["dev"] = `concurrently --raw "bun run --watch app/app.ts" "bun skalfa watch:barrels" "${runCmd}"`;
+                }
+            }
+            node_fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2), "utf8");
+        }
     }
     finally {
         cleanup();

package/dist/commands/create-api.js

@@ -105,9 +105,16 @@ async function createApi(projectName) {
         // Cleanup temp extract folder
         node_fs_1.default.rmSync(tempExtractDir, { recursive: true, force: true });
     }
-    // Cleanup git directory if present and rename package
+    // Cleanup git and github directories if present and rename package
     (0, fs_1.removeDirectory)(node_path_1.default.join(target, ".git"));
+    (0, fs_1.removeDirectory)(node_path_1.default.join(target, ".github"));
     renamePackage(target, packageName);
+    // Rename .npmignore to .gitignore if it exists (npm renames .gitignore to .npmignore during pack/publish)
+    const npmignorePath = node_path_1.default.join(target, ".npmignore");
+    const gitignorePath = node_path_1.default.join(target, ".gitignore");
+    if (node_fs_1.default.existsSync(npmignorePath) && !node_fs_1.default.existsSync(gitignorePath)) {
+        node_fs_1.default.renameSync(npmignorePath, gitignorePath);
+    }
     // Customize project with selected options
     customizeProject(target, {
         redis: finalRedis,
@@ -139,27 +146,33 @@ function customizeProject(target, opts) {
     const utilsIndexPath = node_path_1.default.join(target, "utils", "index.ts");
     const appTsPath = node_path_1.default.join(target, "app", "app.ts");
     const isDev = !!process.env[TEMPLATE_ENV_KEY];
-    // 1. Update dependencies in package.json
+    // 1. Update dependencies and scripts in package.json
     if (node_fs_1.default.existsSync(packageJsonPath)) {
         const pkg = JSON.parse(node_fs_1.default.readFileSync(packageJsonPath, "utf8"));
         pkg.dependencies = pkg.dependencies || {};
+        pkg.scripts = pkg.scripts || {};
         // Base ORM integration (always included)
         pkg.dependencies["@skalfa/skalfa-orm"] = isDev ? "file:../skalfa-orm" : "^1.0.0";
         if (isDev) {
             pkg.dependencies["@skalfa/skalfa-api-core"] = "file:../skalfa-api-core";
         }
+        const devCommands = ["bun run --watch app/app.ts", "bun skalfa watch:barrels"];
         if (opts.redis) {
             pkg.dependencies["@skalfa/skalfa-redis"] = isDev ? "file:../skalfa-redis" : "^1.0.0";
             pkg.dependencies["ioredis"] = "^5.4.1";
         }
         if (opts.queue) {
             pkg.dependencies["@skalfa/skalfa-queue"] = isDev ? "file:../skalfa-queue" : "^1.0.0";
+            pkg.scripts["start:queue"] = "bun run app/jobs/queues/worker.queue.ts";
+            devCommands.push("bun start:queue");
         }
         if (opts.cache) {
             pkg.dependencies["@skalfa/skalfa-cache"] = isDev ? "file:../skalfa-cache" : "^1.0.0";
         }
         if (opts.cron) {
             pkg.dependencies["@skalfa/skalfa-cron"] = isDev ? "file:../skalfa-cron" : "^1.0.0";
+            pkg.scripts["start:cron"] = "bun run app/jobs/crons/worker.cron.ts";
+            devCommands.push("bun start:cron");
         }
         if (opts.da) {
             pkg.dependencies["@skalfa/skalfa-da"] = isDev ? "file:../skalfa-da" : "^1.0.0";
@@ -168,7 +181,11 @@ function customizeProject(target, opts) {
         if (opts.socket) {
             pkg.dependencies["@skalfa/skalfa-socket"] = isDev ? "file:../skalfa-socket" : "^1.0.0";
             pkg.dependencies["socket.io"] = "^4.7.5";
+            pkg.scripts["start:socket"] = "bun run app/jobs/sockets/worker.socket.ts";
+            devCommands.push("bun start:socket");
         }
+        // Update dev script with concurrently
+        pkg.scripts["dev"] = `concurrently --raw ${devCommands.map(cmd => `\\"${cmd}\\"`).join(" ")}`;
         node_fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2), "utf8");
     }
     // 2. Add path mappings in tsconfig.json
@@ -252,16 +269,6 @@ function customizeProject(target, opts) {
             // Uncomment DA block
             content = content.replace(/\/\/ if \(process\.env\.DA_HOST[\s\S]*?\/\/ }/g, (match) => match.replace(/^\/\/ ?/gm, ""));
         }
-        if (opts.cron) {
-            importsToAdd.push("cron");
-            // Uncomment Cron block
-            content = content.replace(/\/\/ cron\.worker\(\)/g, "cron.worker()");
-        }
-        if (opts.socket) {
-            importsToAdd.push("socket");
-            // Uncomment Socket block
-            content = content.replace(/\/\/ if \(process\.env\.SOCKET_PORT[\s\S]*?\/\/ }/g, (match) => match.replace(/^\/\/ ?/gm, ""));
-        }
         // Update import statement at the top of app.ts
         if (importsToAdd.length > 0) {
             const baseImports = ["controller", "db", "logger", "middleware", "storage", "registry"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalfa/skalfa-cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Skalfa API scaffolding and extension installer CLI.",
   "main": "dist/bin/skalfa.js",
   "bin": {

package/dist/bin/aluna.js

@@ -1,44 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const add_extension_1 = require("../commands/add-extension");
-const create_api_1 = require("../commands/create-api");
-const pick_1 = require("../commands/pick");
-const program = new commander_1.Command();
-program
-    .name("aluna")
-    .description("Create Aluna API projects and install optional extensions.")
-    .version("0.1.0");
-program
-    .command("create-api")
-    .description("Create a new API project from the local aluna-api template.")
-    .argument("<name>", "project folder and package name")
-    .action((name) => {
-    runCommand(() => (0, create_api_1.createApi)(name));
-});
-program
-    .command("add")
-    .description("Install an optional Aluna extension into the current project.")
-    .argument("<extension>", `extension name: ${add_extension_1.extensionNames.join(", ")}`)
-    .action((extension) => {
-    runCommand(() => (0, add_extension_1.addExtension)(extension));
-});
-program
-    .command("pick")
-    .description("Eject/copy a core utility from @aluna/aluna-api-core into your local utils folder for customization.")
-    .argument("<utility>", `utility name: ${pick_1.UTILITIES.join(", ")}`)
-    .action((utility) => {
-    runCommand(() => (0, pick_1.pickUtility)(utility));
-});
-program.parse(process.argv);
-function runCommand(command) {
-    try {
-        command();
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Error: ${message}`);
-        process.exitCode = 1;
-    }
-}

package/dist/bin/kava.js

@@ -1,70 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const node_child_process_1 = require("node:child_process");
-const node_path_1 = __importDefault(require("node:path"));
-const node_fs_1 = __importDefault(require("node:fs"));
-const add_extension_1 = require("../commands/add-extension");
-const create_api_1 = require("../commands/create-api");
-const pick_1 = require("../commands/pick");
-const fs_1 = require("../utils/fs");
-// Dynamic routing / forwarding logic
-const args = process.argv.slice(2);
-const knownCommands = ["create-api", "add", "pick"];
-if (args.length > 0 && !knownCommands.includes(args[0]) && !["-h", "--help", "-v", "--version", "help"].includes(args[0])) {
-    const projectRoot = (0, fs_1.findProjectRoot)(process.cwd());
-    if (projectRoot) {
-        const localCliPath = node_path_1.default.join(projectRoot, "utils", "commands", "kava.ts");
-        if (node_fs_1.default.existsSync(localCliPath)) {
-            try {
-                // Forward arguments directly to local kava.ts using Bun
-                (0, node_child_process_1.execSync)(`bun run utils/commands/kava.ts ${args.join(" ")}`, { stdio: "inherit" });
-                process.exit(0);
-            }
-            catch (err) {
-                process.exit(1);
-            }
-        }
-    }
-}
-const program = new commander_1.Command();
-program
-    .name("kava")
-    .description("Create Kava API projects and install optional extensions.")
-    .version("0.1.0");
-program
-    .command("create-api")
-    .description("Create a new Kava API project.")
-    .argument("<name>", "project folder and package name")
-    .action(async (name) => {
-    await runCommand(() => (0, create_api_1.createApi)(name));
-});
-program
-    .command("add")
-    .description("Install an optional Kava extension into the current project.")
-    .argument("<extension>", `extension name: ${add_extension_1.extensionNames.join(", ")}`)
-    .action(async (extension) => {
-    await runCommand(() => (0, add_extension_1.addExtension)(extension));
-});
-program
-    .command("pick")
-    .description("Eject/copy a core utility from @kava/kava-api-core into your local utils folder for customization.")
-    .argument("<utility>", `utility name: ${pick_1.UTILITIES.join(", ")}`)
-    .action(async (utility) => {
-    await runCommand(() => (0, pick_1.pickUtility)(utility));
-});
-program.parse(process.argv);
-async function runCommand(command) {
-    try {
-        await command();
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Error: ${message}`);
-        process.exit(1);
-    }
-}