jcc-express-mvc 1.8.8 → 1.8.21

package/lib/Command-Line/NodeTinker/Tinker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tinker.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Command-Line/NodeTinker/Tinker.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,QAAQ,CAAS;gBAEb,MAAM,GAAE,YAAiB;IAsBrC;;OAEG;IACH,OAAO,CAAC,YAAY;IAiEpB;;OAEG;YACW,oBAAoB;IAyFlC;;OAEG;YACW,UAAU;IAgIxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAkC1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAmCrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAsBrB;;OAEG;YACW,WAAW;IA+CzB;;OAEG;IACH,OAAO,CAAC,aAAa;IA4ErB;;OAEG;IACH,OAAO,CAAC,6BAA6B;IASrC;;OAEG;YACW,WAAW;IAiDzB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;IACH,OAAO,CAAC,eAAe;IA2BvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAqGpB;;OAEG;IACH,OAAO,CAAC,YAAY;IAmFpB;;OAEG;IACH,OAAO,CAAC,WAAW;IAenB;;OAEG;IACH,OAAO,CAAC,YAAY;IAOpB;;OAEG;IACH,OAAO,CAAC,WAAW;IAcnB;;OAEG;IACH,OAAO,CAAC,WAAW;IAYnB;;OAEG;IACH,OAAO,CAAC,WAAW;IAiCnB;;OAEG;IACH,OAAO,CAAC,QAAQ;IAkBhB;;OAEG;IACH,OAAO,CAAC,UAAU;IAmBlB;;OAEG;IACH,OAAO,CAAC,aAAa;IAmBrB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAa1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAsCrB;;OAEG;IACH,OAAO,CAAC,YAAY;IAmCpB;;OAEG;IACH,OAAO,CAAC,QAAQ;IAsBhB;;OAEG;IACU,KAAK;IAQlB;;OAEG;IACH,OAAO,CAAC,IAAI;CAKb;AAED,QAAA,MAAM,MAAM,QAEV,CAAC;AAEH,OAAO,EAAC,MAAM,EAAC,CAAA"}
+{"version":3,"file":"Tinker.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Command-Line/NodeTinker/Tinker.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,EAAE,CAAoB;IAC9B,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,QAAQ,CAAS;gBAEb,MAAM,GAAE,YAAiB;IAsBrC;;OAEG;IACH,OAAO,CAAC,YAAY;IAiEpB;;OAEG;YACW,oBAAoB;IAyFlC;;OAEG;YACW,UAAU;IAgIxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAkC1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAmCrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAsBrB;;OAEG;YACW,WAAW;IA+CzB;;OAEG;IACH,OAAO,CAAC,aAAa;IA4ErB;;OAEG;IACH,OAAO,CAAC,6BAA6B;IASrC;;OAEG;YACW,WAAW;IAiDzB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;IACH,OAAO,CAAC,eAAe;IA2BvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAqGpB;;OAEG;IACH,OAAO,CAAC,YAAY;IAmFpB;;OAEG;IACH,OAAO,CAAC,WAAW;IAenB;;OAEG;IACH,OAAO,CAAC,YAAY;IAOpB;;OAEG;IACH,OAAO,CAAC,WAAW;IAcnB;;OAEG;IACH,OAAO,CAAC,WAAW;IAYnB;;OAEG;IACH,OAAO,CAAC,WAAW;IAiCnB;;OAEG;IACH,OAAO,CAAC,QAAQ;IAkBhB;;OAEG;IACH,OAAO,CAAC,UAAU;IAmBlB;;OAEG;IACH,OAAO,CAAC,aAAa;IAmBrB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAa1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAsCrB;;OAEG;IACH,OAAO,CAAC,YAAY;IAmCpB;;OAEG;IACH,OAAO,CAAC,QAAQ;IAsBhB;;OAEG;IACU,KAAK;IAQlB;;OAEG;IACH,OAAO,CAAC,IAAI;CAKb;AAID;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,GAAE,YAAiB,GAAG,MAAM,CAK3D"}

package/lib/Command-Line/NodeTinker/Tinker.js

@@ -36,7 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tinker = exports.Tinker = void 0;
+exports.Tinker = void 0;
+exports.getTinker = getTinker;
 const readline_1 = require("readline");
 const util_1 = require("util");
 const vm = __importStar(require("vm"));
@@ -1097,5 +1098,14 @@ class Tinker {
     }
 }
 exports.Tinker = Tinker;
-const tinker = new Tinker({});
-exports.tinker = tinker;
+let tinkerInstance = null;
+/**
+ * Lazily construct Tinker so importing the artisan kernel does not attach
+ * readline to stdin/stdout (which felt like Tinker “running” for every command).
+ */
+function getTinker(config = {}) {
+    if (!tinkerInstance) {
+        tinkerInstance = new Tinker(config);
+    }
+    return tinkerInstance;
+}

package/lib/Command-Line/WatchCommand.d.ts

@@ -0,0 +1,29 @@
+export declare class WatchCommand {
+    private readonly rootPath;
+    private readonly ignoredDirs;
+    private readonly defaultWatchTargets;
+    private readonly rootFilesToWatch;
+    private watchers;
+    private child;
+    private restartTimer;
+    private isRestarting;
+    private suppressNextExitLog;
+    private pendingChanges;
+    private lastRestartAt;
+    private readonly minRestartGapMs;
+    private entryFile;
+    run(entryFile?: string): Promise<void>;
+    private refreshWatchers;
+    private collectWatchDirectories;
+    private walkDirectories;
+    private onFileChanged;
+    private shouldIgnore;
+    private startServer;
+    private restartServer;
+    private stopServer;
+    private closeWatchers;
+    private installSignalHandlers;
+    private renderServeHeader;
+    private clearTerminal;
+}
+//# sourceMappingURL=WatchCommand.d.ts.map

package/lib/Command-Line/WatchCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WatchCommand.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Command-Line/WatchCommand.ts"],"names":[],"mappings":"AAOA,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAQzB;IACH,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CASlC;IACF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IAEtD,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAO;IACvC,OAAO,CAAC,SAAS,CAAe;IAE1B,GAAG,CAAC,SAAS,SAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAcjD,OAAO,CAAC,eAAe;IAgCvB,OAAO,CAAC,uBAAuB;IAkB/B,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,aAAa;IA8BrB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,aAAa;CAQtB"}

package/lib/Command-Line/WatchCommand.js

@@ -0,0 +1,234 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WatchCommand = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
+const readline_1 = __importDefault(require("readline"));
+const colors_1 = __importDefault(require("colors"));
+const app_root_path_1 = __importDefault(require("app-root-path"));
+class WatchCommand {
+    constructor() {
+        this.rootPath = app_root_path_1.default.path;
+        this.ignoredDirs = new Set([
+            "node_modules",
+            "build",
+            "dist",
+            ".git",
+            ".idea",
+            ".vscode",
+            "storage",
+        ]);
+        this.defaultWatchTargets = [
+            "app",
+            "bootstrap",
+            "config",
+            "database",
+            "jcc-express-mvc",
+            "resources",
+            "routes",
+            "server.ts",
+        ];
+        this.rootFilesToWatch = new Set([".env"]);
+        this.watchers = [];
+        this.child = null;
+        this.restartTimer = null;
+        this.isRestarting = false;
+        this.suppressNextExitLog = false;
+        this.pendingChanges = new Set();
+        this.lastRestartAt = 0;
+        this.minRestartGapMs = 800;
+        this.entryFile = "server.ts";
+    }
+    async run(entryFile = "server.ts") {
+        const resolvedEntry = path_1.default.resolve(this.rootPath, entryFile);
+        if (!fs_1.default.existsSync(resolvedEntry)) {
+            throw new Error(`Entry file not found: ${entryFile}`);
+        }
+        this.entryFile = entryFile;
+        this.installSignalHandlers();
+        this.refreshWatchers();
+        this.renderServeHeader(path_1.default.relative(this.rootPath, resolvedEntry));
+        this.startServer(resolvedEntry);
+    }
+    refreshWatchers() {
+        this.closeWatchers();
+        const directories = this.collectWatchDirectories();
+        for (const dir of directories) {
+            try {
+                const watcher = fs_1.default.watch(dir, (_eventType, filename) => {
+                    const changed = filename ? path_1.default.join(dir, filename.toString()) : dir;
+                    this.onFileChanged(changed);
+                });
+                this.watchers.push(watcher);
+            }
+            catch {
+                // Ignore inaccessible directories
+            }
+        }
+        // Watch specific root-level files (like .env) without broadly reacting to all root changes.
+        try {
+            const rootWatcher = fs_1.default.watch(this.rootPath, (_eventType, filename) => {
+                const name = filename?.toString();
+                if (!name)
+                    return;
+                const comparableName = process.platform === "win32" ? name.toLowerCase() : name;
+                if (!this.rootFilesToWatch.has(comparableName))
+                    return;
+                this.onFileChanged(path_1.default.join(this.rootPath, name));
+            });
+            this.watchers.push(rootWatcher);
+        }
+        catch {
+            // Ignore root watcher failures
+        }
+    }
+    collectWatchDirectories() {
+        const dirs = [];
+        for (const target of this.defaultWatchTargets) {
+            const absolutePath = path_1.default.join(this.rootPath, target);
+            if (!fs_1.default.existsSync(absolutePath))
+                continue;
+            const stat = fs_1.default.statSync(absolutePath);
+            if (stat.isDirectory()) {
+                this.walkDirectories(absolutePath, dirs);
+            }
+            else {
+                dirs.push(path_1.default.dirname(absolutePath));
+            }
+        }
+        return Array.from(new Set(dirs));
+    }
+    walkDirectories(startDir, result) {
+        const baseName = path_1.default.basename(startDir);
+        if (this.ignoredDirs.has(baseName))
+            return;
+        result.push(startDir);
+        let entries = [];
+        try {
+            entries = fs_1.default.readdirSync(startDir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            if (!entry.isDirectory())
+                continue;
+            if (this.ignoredDirs.has(entry.name))
+                continue;
+            this.walkDirectories(path_1.default.join(startDir, entry.name), result);
+        }
+    }
+    onFileChanged(filePath) {
+        if (this.shouldIgnore(filePath))
+            return;
+        const relative = path_1.default.relative(this.rootPath, filePath) || filePath;
+        this.pendingChanges.add(relative);
+        if (this.restartTimer)
+            clearTimeout(this.restartTimer);
+        this.restartTimer = setTimeout(() => {
+            this.restartTimer = null;
+            this.restartServer();
+        }, 250);
+    }
+    shouldIgnore(filePath) {
+        const relativePath = path_1.default.relative(this.rootPath, filePath);
+        const normalizedPath = relativePath.split(path_1.default.sep).join("/").toLowerCase();
+        if (normalizedPath.startsWith("storage/session") ||
+            normalizedPath.startsWith("storage/sessions") ||
+            normalizedPath.startsWith("storage/framework/sessions")) {
+            return true;
+        }
+        const normalized = filePath.split(path_1.default.sep);
+        return normalized.some((part) => this.ignoredDirs.has(part));
+    }
+    startServer(entryFile) {
+        this.child = (0, child_process_1.spawn)("bun", [entryFile], {
+            cwd: this.rootPath,
+            stdio: "inherit",
+            env: process.env,
+        });
+        this.child.on("exit", (code, signal) => {
+            if (this.suppressNextExitLog) {
+                this.suppressNextExitLog = false;
+                return;
+            }
+            if (!this.isRestarting) {
+                const reason = signal ? `signal ${signal}` : `code ${code ?? 0}`;
+                console.log(colors_1.default.yellow(`\nServer exited (${reason}).`));
+            }
+        });
+    }
+    restartServer() {
+        const now = Date.now();
+        const elapsed = now - this.lastRestartAt;
+        if (elapsed < this.minRestartGapMs) {
+            this.restartTimer = setTimeout(() => {
+                this.restartTimer = null;
+                this.restartServer();
+            }, this.minRestartGapMs - elapsed);
+            return;
+        }
+        const changedPreview = Array.from(this.pendingChanges).slice(0, 3);
+        const extraCount = this.pendingChanges.size - changedPreview.length;
+        this.pendingChanges.clear();
+        const changedText = changedPreview.length === 0
+            ? "unknown"
+            : `${changedPreview.join(", ")}${extraCount > 0 ? ` (+${extraCount} more)` : ""}`;
+        this.isRestarting = true;
+        this.lastRestartAt = Date.now();
+        this.refreshWatchers();
+        this.stopServer();
+        this.renderServeHeader(this.entryFile, changedText);
+        this.startServer(path_1.default.resolve(this.rootPath, this.entryFile));
+        this.isRestarting = false;
+    }
+    stopServer() {
+        if (!this.child)
+            return;
+        this.suppressNextExitLog = true;
+        if (process.platform === "win32") {
+            this.child.kill();
+        }
+        else {
+            this.child.kill("SIGTERM");
+        }
+        this.child = null;
+    }
+    closeWatchers() {
+        for (const watcher of this.watchers)
+            watcher.close();
+        this.watchers = [];
+    }
+    installSignalHandlers() {
+        const shutdown = () => {
+            this.closeWatchers();
+            this.stopServer();
+            process.exit(0);
+        };
+        process.once("SIGINT", shutdown);
+        process.once("SIGTERM", shutdown);
+    }
+    renderServeHeader(entryLabel, changedText) {
+        this.clearTerminal();
+        if (changedText) {
+            console.log(colors_1.default.gray(`↻ Change detected: ${changedText}`));
+            console.log();
+        }
+        console.log(colors_1.default.green("👀 Watching project for changes..."));
+        console.log(colors_1.default.cyan(`→ Entry: ${entryLabel}`));
+        console.log();
+    }
+    clearTerminal() {
+        if (process.stdout.isTTY) {
+            readline_1.default.cursorTo(process.stdout, 0, 0);
+            readline_1.default.clearScreenDown(process.stdout);
+            return;
+        }
+        console.clear();
+    }
+}
+exports.WatchCommand = WatchCommand;

package/lib/Command-Line/files/Models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Models.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Command-Line/files/Models.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAEH,QAAA,MAAM,WAAW,GAAI,MAAM,MAAM,KAAG,MASnC,CAAC;AAiDF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"Models.d.ts","sourceRoot":"","sources":["../../../../jcc-express-mvc/lib/Command-Line/files/Models.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAEH,QAAA,MAAM,WAAW,GAAI,MAAM,MAAM,KAAG,MASnC,CAAC;AA0EF,eAAe,WAAW,CAAC"}

package/lib/Command-Line/files/Models.js

@@ -31,33 +31,58 @@ const createJccModel = (name) => {
 };
 const createMongooseModel = (name) => {
     return `
-  import mongoose, { HydratedDocument, InferSchemaType,Schema } from "mongoose";
+  import mongoose, { HydratedDocument, InferSchemaType, Model, Schema } from "mongoose";
 
+  const ${name}Schema = new Schema(
+    {
+      //
+    },
+    { timestamps: true }
+  );
 
-  const ${name}Schema = new mongoose.Schema({
-    //
-  },{
-    timestamps:true
-  });
+  type ${name}Attrs = InferSchemaType<typeof ${name}Schema>;
+
+  export const ${name}: Model<${name}Attrs> =
+    (mongoose.models.${name} as Model<${name}Attrs>) ||
+    mongoose.model<${name}Attrs>("${name}", ${name}Schema);
 
-  export const ${name} = mongoose.model("${name}", ${name}Schema);
-  export type ${name} = HydratedDocument<InferSchemaType<typeof ${name}Schema>>;
+  export type ${name}Document = HydratedDocument<${name}Attrs>;
   `;
 };
 const createSequelizeModel = (name) => {
     return `
-  import { Sequelize, DataTypes as SequelizeDataTypes } from "sequelize";
-  export default (sequelize: Sequelize, DataTypes: typeof SequelizeDataTypes) => {
-  const ${name} = sequelize.define("${name}", {
+ import { Model, DataTypes, Sequelize } from "sequelize";
+const sequelize = app.resolve<Sequelize>("sequelize");
+//
+export class ${name} extends Model {
+  declare id: number;
+
+  /**
+   * Define relationships between models
+   * @param models - Record<string, any>
+   */
+  static associate(models: any) {
     //
-  },{
-    tableName: "${name}",
-    timestamps: true,
-  });
+  }
 
-  return ${name};
+}
 
+${name}.init(
+  {
+    id: {
+      type: DataTypes.INTEGER,
+      primaryKey: true,
+      autoIncrement: true,
+    },
+  
+  },
+  {
+    sequelize,
+    tableName: "${name}",
+    timestamps: true,
+    modelName: "${name}",
   }
+);
   `;
 };
 exports.default = createModel;

package/lib/Console/Command.d.ts

@@ -14,9 +14,27 @@ export declare abstract class Command {
     /**
      * Execute the console command.
      */
+    /**
+     * Log an info message.
+     * @param message - The message to log.
+     */
     protected info(message: string): void;
+    /**
+     * Log an error message.
+     * @param message - The message to log.
+     */
     protected error(message: string): void;
+    /**
+     * Log a success message.
+     * @param message - The message to log.
+     */
     protected success(message: string): void;
+    /**
+     *
+     * @param file - The file path to create.
+     * @param content - The content to write to the file.
+     */
+    protected createFile(file: string, content: string): void;
     abstract handle(...args: any[]): void | Promise<void>;
 }
 //# sourceMappingURL=Command.d.ts.map

package/lib/Console/Command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Command.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Console/Command.ts"],"names":[],"mappings":"AAEA,8BAAsB,OAAO;IAC3B;;;;OAIG;IACH,SAAS,SAAM;IAEf;;;;OAIG;IACH,WAAW,SAAM;IAEjB;;OAEG;IAEH,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIrC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAItC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIxC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CACtD"}
+{"version":3,"file":"Command.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Console/Command.ts"],"names":[],"mappings":"AAMA,8BAAsB,OAAO;IAC3B;;;;OAIG;IACH,SAAS,SAAM;IAEf;;;;OAIG;IACH,WAAW,SAAM;IAEjB;;OAEG;IAEH;;;OAGG;IACH,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIrC;;;OAGG;IACH,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAItC;;;OAGG;IACH,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIxC;;;;OAIG;IACH,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAWlD,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CACtD"}

package/lib/Console/Command.js

@@ -5,6 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Command = void 0;
 const colors_1 = __importDefault(require("colors"));
+const app_root_path_1 = __importDefault(require("app-root-path"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const rootPath = app_root_path_1.default.path;
 class Command {
     constructor() {
         /**
@@ -23,14 +27,39 @@ class Command {
     /**
      * Execute the console command.
      */
+    /**
+     * Log an info message.
+     * @param message - The message to log.
+     */
     info(message) {
         console.log(colors_1.default.blue(message));
     }
+    /**
+     * Log an error message.
+     * @param message - The message to log.
+     */
     error(message) {
         console.log(colors_1.default.red(message));
     }
+    /**
+     * Log a success message.
+     * @param message - The message to log.
+     */
     success(message) {
         console.log(colors_1.default.green(message));
     }
+    /**
+     *
+     * @param file - The file path to create.
+     * @param content - The content to write to the file.
+     */
+    createFile(file, content) {
+        const filePath = path_1.default.resolve(rootPath, file);
+        const dir = path_1.default.dirname(filePath);
+        if (!fs_1.default.existsSync(dir)) {
+            fs_1.default.mkdirSync(dir, { recursive: true });
+        }
+        fs_1.default.writeFileSync(filePath, content);
+    }
 }
 exports.Command = Command;

package/lib/Container/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Container/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMhE,8BAAsB,SAAS;IAC7B,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,OAAO,CAAkC;IAEjD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAE,OAAe,GAAG,IAAI;IAI7D,IAAI,CAAC,CAAC,EACX,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EACjC,MAAM,GAAE,GAAG,EAAO,GACjB,CAAC,GAAG,SAAS;IAMhB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,UAAO,GAAG,IAAI;IAM/D,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAQ/C,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI5C,OAAO,CAAC,CAAC,EACP,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,GAAG,EAAO,EACtB,WAAW,GAAE,OAAc,GAC1B,CAAC;IAsCJ,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,iBAAiB;IAazB,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,GAAE,GAAG,EAAO,GAAG,CAAC;IA2ClD;;;;;OAKG;IACG,oBAAoB,CAAC,CAAC,EAC1B,QAAQ,EAAE,GAAG,EACb,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,CAAC,CAAC;IAgDb,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAgC5D;;;OAGG;IACH,OAAO,CAAC,aAAa;IAMrB,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAQ9B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAW9B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;CAKjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Container/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAKhE,8BAAsB,SAAS;IAC7B,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,OAAO,CAAkC;IAEjD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAE,OAAe,GAAG,IAAI;IAI7D,IAAI,CAAC,CAAC,EACX,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EACjC,MAAM,GAAE,GAAG,EAAO,GACjB,CAAC,GAAG,SAAS;IAMhB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,UAAO,GAAG,IAAI;IAM/D,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAQ/C,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI5C,OAAO,CAAC,CAAC,EACP,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,GAAG,EAAO,EACtB,WAAW,GAAE,OAAc,GAC1B,CAAC;IAsCJ,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,iBAAiB;IAazB,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,GAAE,GAAG,EAAO,GAAG,CAAC;IA2ClD;;;;;OAKG;IACG,oBAAoB,CAAC,CAAC,EAC1B,QAAQ,EAAE,GAAG,EACb,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,CAAC,CAAC;IA+Cb,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAkD5D;;;OAGG;IACH,OAAO,CAAC,aAAa;IAMrB,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAQ9B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAW9B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;CAKjC"}

package/lib/Container/index.js

@@ -141,7 +141,6 @@ class Container {
                         await requestInstance.rules();
                         return requestInstance;
                     }
-                    // console.log("model", dep.type);
                     const resolved = this.resolve(dep.type);
                     if ((0, util_1.isModelInstance)(resolved)) {
                         return await (0, util_1.resolveModelBinding)(req, dep.type, resolved);
@@ -161,13 +160,28 @@ class Container {
             const methodDeps = Reflect.getMetadata("inject:method:deps", instance, methodName);
             if (methodDeps && Array.isArray(methodDeps) && methodDeps.length > 0) {
                 const resolvedDeps = [];
-                for (const method of methodDeps) {
-                    if (!method.type ||
-                        !method.type.name ||
-                        method.type.name === "Object") {
-                        continue;
+                // for (const method of methodDeps) {
+                //   if (
+                //     !method.type ||
+                //     !method.type.name ||
+                //     method.type.name === "Object"
+                //   ) {
+                //     continue;
+                //   }
+                //   if(){
+                //   }
+                //   resolvedDeps.push(this.resolve(method.type));
+                // }
+                for (let index = 0; index < methodDeps.length; index++) {
+                    const method = methodDeps[index];
+                    if (method.type &&
+                        method.type.name &&
+                        (0, util_1.JSInBuilTClass)(method.type.name)) {
+                        resolvedDeps.push(args[index] || null);
+                    }
+                    else {
+                        resolvedDeps.push(this.resolve(method.type));
                     }
-                    resolvedDeps.push(this.resolve(method.type));
                 }
                 return instance[methodName].apply(instance, resolvedDeps);
             }

package/lib/Database/Database.d.ts

@@ -9,8 +9,9 @@ import { DatabaseConfig } from "./type";
  *   const client = db.getConnection(); // Knex | Sequelize | Mongoose
  */
 export declare class Database {
+    private readonly app?;
     private driver;
-    constructor(dbConfig?: Partial<DatabaseConfig>);
+    constructor(dbConfig?: Partial<DatabaseConfig>, app?: any | undefined);
     private resolveDriverName;
     private resolveDriver;
     connect(): Promise<void>;

package/lib/Database/Database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Database.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Database/Database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAMxC;;;;;;;;GAQG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,MAAM,CAAiB;gBAEnB,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;IAK9C,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,aAAa;IAcf,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,aAAa,IAAI,OAAO;IAIlB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAGlC"}
+{"version":3,"file":"Database.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Database/Database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAMxC;;;;;;;;GAQG;AACH,qBAAa,QAAQ;IAKjB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IAJvB,OAAO,CAAC,MAAM,CAAiB;gBAG7B,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EACjB,GAAG,CAAC,EAAE,GAAG,YAAA;IAM5B,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,aAAa;IAef,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,aAAa,IAAI,OAAO;IAIlB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAGlC"}

package/lib/Database/Database.js

@@ -15,9 +15,10 @@ const Config_1 = require("../Config/Config");
  *   const client = db.getConnection(); // Knex | Sequelize | Mongoose
  */
 class Database {
-    constructor(dbConfig) {
+    constructor(dbConfig, app) {
+        this.app = app;
         const driverName = this.resolveDriverName(dbConfig);
-        this.driver = this.resolveDriver(driverName);
+        this.driver = this.resolveDriver(driverName, app);
     }
     resolveDriverName(dbConfig) {
         if (dbConfig?.driver)
@@ -30,12 +31,12 @@ class Database {
             return "sequelize";
         return "knex"; // Default: Knex / Jcc-eloquent
     }
-    resolveDriver(driverName) {
+    resolveDriver(driverName, app) {
         switch (driverName) {
             case "sequelize":
-                return new SequelizeDriver_1.SequelizeDriver();
+                return new SequelizeDriver_1.SequelizeDriver(app?.config?.database?.sequelize);
             case "mongoose":
-                return new MongooseDriver_1.MongooseDriver();
+                return new MongooseDriver_1.MongooseDriver(app?.config?.database?.mongoose);
             case "knex":
             default:
                 return new KnexDriver_1.KnexDriver();

package/lib/Database/DatabaseServiceProvider.d.ts

@@ -18,9 +18,5 @@ export declare class DatabaseServiceProvider extends ServiceProvider {
      * True when using Sequelize or Mongoose instead of Jcc-eloquent (Knex)
      */
     externalSupportedORM(): boolean;
-    /**
-     * Load Sequelize models from app/Models and sync tables
-     */
-    private loadModelsIfSequelize;
 }
 //# sourceMappingURL=DatabaseServiceProvider.d.ts.map

package/lib/Database/DatabaseServiceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseServiceProvider.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Database/DatabaseServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAM/D;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,eAAe;gBAC9C,GAAG,EAAE,WAAW;IAI5B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAa/B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B;;OAEG;IACH,oBAAoB,IAAI,OAAO;IAY/B;;OAEG;YACW,qBAAqB;CA0CpC"}
+{"version":3,"file":"DatabaseServiceProvider.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Database/DatabaseServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAG/D;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,eAAe;gBAC9C,GAAG,EAAE,WAAW;IAI5B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAc/B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAE3B;;OAEG;IACH,oBAAoB,IAAI,OAAO;CAWhC"}