jcc-express-mvc 1.8.8 → 1.8.21

package/lib/Jcc-eloquent/lib/Schema/BluePrint/index.js

@@ -339,18 +339,33 @@ class Blueprint {
         return this;
     }
     /**
-     * Adds an index to the column.
-     */
-    index(indexName) {
-        if (typeof indexName === "string") {
-            BaseSchemaEntity_1.BaseSchemaEntity.columns.push(`INDEX ${indexName} (${indexName})`);
-        }
-        else if (Array.isArray(indexName)) {
-            BaseSchemaEntity_1.BaseSchemaEntity.columns.push(`INDEX ${this.tableName}_${indexName.join("_")} (${indexName.join(",")})`);
-        }
-        else {
-            BaseSchemaEntity_1.BaseSchemaEntity.AddQueryToLastIndex(`INDEX`);
+     * Adds an index (Laravel-style):
+     * - index("email")
+     * - index(["email", "status"])
+     * - index("email", "idx_users_email")
+     */
+    index(columns, indexName) {
+        if (columns === undefined) {
+            // Chain style: table.integer("last_activity").index()
+            // Must be a table-level INDEX clause, not "INT NOT NULL INDEX" (invalid in MySQL).
+            if (BaseSchemaEntity_1.BaseSchemaEntity.columns.length === 0) {
+                throw new Error("index() chain requires a preceding column definition");
+            }
+            const lastCol = BaseSchemaEntity_1.BaseSchemaEntity.columns[BaseSchemaEntity_1.BaseSchemaEntity.columns.length - 1];
+            const colMatch = lastCol.match(/^(`?\w+`?)\s/);
+            const colName = colMatch ? colMatch[1].replace(/`/g, "") : "";
+            if (!colName) {
+                throw new Error("Could not parse column name for index()");
+            }
+            const table = this.tableName || "table";
+            const name = indexName || `idx_${table}_${colName}`;
+            BaseSchemaEntity_1.BaseSchemaEntity.columns.push(`INDEX ${name} (${colName})`);
+            return this;
         }
+        const columnList = Array.isArray(columns) ? columns : [columns];
+        const table = this.tableName || "table";
+        const name = indexName || `idx_${table}_${columnList.join("_")}`;
+        BaseSchemaEntity_1.BaseSchemaEntity.columns.push(`INDEX ${name} (${columnList.join(", ")})`);
         return this;
     }
     //start
@@ -372,7 +387,7 @@ class Blueprint {
      * Adds a SMALLINT column to the schema.
      */
     smallInteger(column) {
-        BaseSchemaEntity_1.BaseSchemaEntity.columns.push(`${column}SMALLINT NOT NULL`);
+        BaseSchemaEntity_1.BaseSchemaEntity.columns.push(`${column} SMALLINT NOT NULL`);
         return this;
     }
     /**
@@ -584,8 +599,22 @@ class Blueprint {
     }
     /**
      * Makes the column unsigned.
+     * MySQL requires TYPE UNSIGNED NOT NULL — not TYPE NOT NULL UNSIGNED (append was invalid).
      */
     unsigned() {
+        if (BaseSchemaEntity_1.BaseSchemaEntity.columns.length === 0) {
+            throw new Error("No columns available to modify");
+        }
+        const lastIndex = BaseSchemaEntity_1.BaseSchemaEntity.columns.length - 1;
+        const col = BaseSchemaEntity_1.BaseSchemaEntity.columns[lastIndex];
+        if (/\bUNSIGNED\b/i.test(col)) {
+            return this;
+        }
+        const replaced = col.replace(/\b(INT|BIGINT|SMALLINT|MEDIUMINT|TINYINT)(\(\d+\))? NOT NULL\b/i, "$1$2 UNSIGNED NOT NULL");
+        if (replaced !== col) {
+            BaseSchemaEntity_1.BaseSchemaEntity.columns[lastIndex] = replaced;
+            return this;
+        }
         BaseSchemaEntity_1.BaseSchemaEntity.AddQueryToLastIndex("UNSIGNED");
         return this;
     }

package/lib/Jcc-eloquent/lib/Schema/Translator/Sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sqlite.d.ts","sourceRoot":"","sources":["../../../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Schema/Translator/Sqlite.ts"],"names":[],"mappings":"AAKA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAC,eAAe,CAoI5B;IAEF,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAuDzC;;;;OAIG;WACW,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IA6BjD;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAOnC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAsCnC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;CAc1C"}
+{"version":3,"file":"Sqlite.d.ts","sourceRoot":"","sources":["../../../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Schema/Translator/Sqlite.ts"],"names":[],"mappings":"AAKA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAC,eAAe,CAoI5B;IAEF,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAuDzC;;;;OAIG;WACW,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAkCjD;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAOnC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAsCnC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;CA4C1C"}

package/lib/Jcc-eloquent/lib/Schema/Translator/Sqlite.js

@@ -81,7 +81,11 @@ class SQLiteTranslator {
             .replace(/,\s*\)/g, ")") // remove trailing commas in parentheses
             .replace(/\s+ON\s*,/g, ",") // clean up malformed ON clauses
             .replace(/\s+ON\s*\)/g, ")"); // clean up malformed ON clauses at end of parentheses
-        return this.SQLiteFKFixer(sqliteSql);
+        // FK reordering is only relevant for CREATE TABLE statements.
+        if (/^\s*CREATE\s+TABLE\b/i.test(sqliteSql)) {
+            return this.SQLiteFKFixer(sqliteSql);
+        }
+        return sqliteSql;
     }
     /**
      * Converts MySQL CONCAT() function to SQLite concatenation operator ||
@@ -141,6 +145,20 @@ class SQLiteTranslator {
             "3. DROP old table\n" +
             "4. RENAME new table */\n" +
             "-- ALTER TABLE $1 attempted to modify column $2 to $3");
+        sql = sql.replace(/ALTER\s+TABLE\s+(\w+)\s+CHANGE\s+COLUMN\s+(\w+)\s+(\w+)\s+([^;]+)/gi, "/* SQLite doesn't support CHANGE COLUMN directly. Use: \n" +
+            "1. CREATE new table with desired schema\n" +
+            "2. INSERT data from old table\n" +
+            "3. DROP old table\n" +
+            "4. RENAME new table */\n" +
+            "-- ALTER TABLE $1 attempted to change column $2 to $3 $4");
+        sql = sql.replace(/ALTER\s+TABLE\s+(\w+)\s+DROP\s+COLUMN\s+(\w+)\s*;?/gi, "/* SQLite supports DROP COLUMN only in newer versions and with constraints caveats. " +
+            "Safer cross-version approach is table rebuild. */\n" +
+            "-- ALTER TABLE $1 attempted to drop column $2");
+        sql = sql.replace(/ALTER\s+TABLE\s+(\w+)\s+DROP\s+INDEX\s+(\w+)\s*;?/gi, "/* SQLite drops indexes with standalone DROP INDEX, not ALTER TABLE DROP INDEX. */\n" +
+            "DROP INDEX IF EXISTS $2;");
+        sql = sql.replace(/ALTER\s+TABLE\s+(\w+)\s+DROP\s+FOREIGN\s+KEY\s+(\w+)\s*;?/gi, "/* SQLite doesn't support dropping a foreign key constraint directly. " +
+            "Rebuild table without the constraint. */\n" +
+            "-- ALTER TABLE $1 attempted to drop foreign key $2");
         return sql;
     }
 }
@@ -188,9 +206,9 @@ SQLiteTranslator.conversionRules = [
     // Character set and collation
     { pattern: /CHARACTER\s+SET\s+\w+/gi, replacement: "" },
     { pattern: /COLLATE\s+\w+/gi, replacement: "" },
-    // Key declarations
+    // Key declarations (single or multi-column)
     {
-        pattern: /\bKEY\s+`?(\w+)`?\s+\(`?(\w+)`?\)/gi,
+        pattern: /\bKEY\s+`?([a-zA-Z0-9_]+)`?\s+\(([^)]+)\)/gi,
         replacement: "INDEX $1($2)",
     },
     // UNSIGNED attribute (not supported in SQLite)

package/lib/Jcc-eloquent/lib/Schema/Translator/postgres.d.ts

@@ -5,6 +5,7 @@ export declare class PostgresTranslator {
      * @returns The PostgreSQL-compatible query string.
      */
     private static replaceQuestionMarks;
+    private static normalizeCommon;
     private static translateCreateTable;
     /**
      * Translates MySQL ALTER TABLE statements to PostgreSQL.

package/lib/Jcc-eloquent/lib/Schema/Translator/postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Schema/Translator/postgres.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAkB;IAC7B;;;;OAIG;IAEH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAKnC,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAwDnC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAMlC;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAaxC"}
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Schema/Translator/postgres.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAkB;IAC7B;;;;OAIG;IAEH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAKnC,OAAO,CAAC,MAAM,CAAC,eAAe;IA6D9B,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAcnC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAyElC;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAaxC"}

package/lib/Jcc-eloquent/lib/Schema/Translator/postgres.js

@@ -11,17 +11,18 @@ class PostgresTranslator {
         let counter = 1;
         return query.replace(/\?/g, () => `$${counter++}`);
     }
-    static translateCreateTable(query) {
-        // Replace MySQL types with PostgreSQL equivalents
+    static normalizeCommon(query) {
+        // Remove MySQL identifier quoting.
+        query = query.replace(/`([^`]+)`/g, "$1");
         // Handle AUTO_INCREMENT columns first (order matters)
         query = query.replace(/\bBIGINT\s+UNSIGNED\s+AUTO_INCREMENT\b/gi, "BIGSERIAL");
         query = query.replace(/\bINT\s+UNSIGNED\s+AUTO_INCREMENT\b/gi, "SERIAL");
         query = query.replace(/\bBIGINT\s+AUTO_INCREMENT\b/gi, "BIGSERIAL");
         query = query.replace(/\bINT\s+AUTO_INCREMENT\b/gi, "SERIAL");
         query = query.replace(/\b(MEDIUMINT|SMALLINT)\s+AUTO_INCREMENT\b/gi, "SERIAL");
-        // Remove UNSIGNED keyword (PostgreSQL doesn't have unsigned types)
+        // Remove UNSIGNED keyword (PostgreSQL doesn't support unsigned types)
         query = query.replace(/\s+UNSIGNED\b/gi, "");
-        // Replace remaining AUTO_INCREMENT (shouldn't happen after above, but just in case)
+        // Replace remaining AUTO_INCREMENT (safety fallback)
         query = query.replace(/\s+AUTO_INCREMENT\b/gi, "");
         // Data type mappings
         query = query.replace(/\bTINYINT\b/gi, "SMALLINT");
@@ -30,20 +31,29 @@ class PostgresTranslator {
         query = query.replace(/\bBIGINT\b/gi, "BIGINT");
         query = query.replace(/\bFLOAT\b/gi, "REAL");
         query = query.replace(/\bDOUBLE\b/gi, "DOUBLE PRECISION");
-        // BLOB and binary types
-        query = query.replace(/\b(TINYBLOB|BLOB|MEDIUMBLOB|LONGBLOB|BINARY|VARBINARY)\b/gi, "BYTEA");
-        // Date/time types
         query = query.replace(/\bDATETIME\b/gi, "TIMESTAMP");
-        // Text types
         query = query.replace(/\b(TINYTEXT|MEDIUMTEXT|LONGTEXT)\b/gi, "TEXT");
+        query = query.replace(/\b(TINYBLOB|BLOB|MEDIUMBLOB|LONGBLOB|BINARY|VARBINARY)\b/gi, "BYTEA");
         // Remove MySQL-specific clauses
         query = query.replace(/\s+ON\s+UPDATE\s+CURRENT_TIMESTAMP\b/gi, "");
-        // Handle ENGINE, CHARSET, etc. (remove MySQL-specific table options)
+        // MySQL unique-key syntax inside CREATE TABLE.
+        query = query.replace(/\bUNIQUE\s+KEY\s+([a-zA-Z0-9_]+)\s*\(([^)]+)\)/gi, "CONSTRAINT $1 UNIQUE ($2)");
+        // PostgreSQL BOOLEAN defaults must be TRUE/FALSE (not 1/0).
+        query = query.replace(/\bBOOLEAN\b([^,;]*?)\bDEFAULT\s+([01])\b/gi, (_match, between, bit) => `BOOLEAN${between}DEFAULT ${bit === "1" ? "TRUE" : "FALSE"}`);
+        // Table options not supported in PostgreSQL
         query = query.replace(/\s+ENGINE\s*=\s*\w+/gi, "");
         query = query.replace(/\s+DEFAULT\s+CHARSET\s*=\s*\w+/gi, "");
         query = query.replace(/\s+COLLATE\s*=\s*\w+/gi, "");
+        return query;
+    }
+    static translateCreateTable(query) {
+        query = this.normalizeCommon(query);
+        // MySQL inline non-unique index definitions are not valid in PostgreSQL CREATE TABLE.
+        // Remove these clauses to keep CREATE TABLE executable.
+        query = query.replace(/\s*,\s*(?:INDEX|KEY)\s+[a-zA-Z0-9_]+\s*\([^)]+\)/gi, "");
         // Clean up extra whitespace
         query = query.replace(/\s+/g, " ").trim();
+        query = query.replace(/,\s*\)/g, ")");
         return query;
     }
     /**
@@ -52,9 +62,55 @@ class PostgresTranslator {
      * @returns The PostgreSQL-compatible query string.
      */
     static translateAlterTable(query) {
-        // Handle ALTER TABLE specific translations
-        // This is a placeholder - you'd need to implement specific ALTER TABLE logic
-        return this.translateCreateTable(query);
+        query = this.normalizeCommon(query);
+        // DROP FOREIGN KEY name -> DROP CONSTRAINT name
+        query = query.replace(/\bDROP\s+FOREIGN\s+KEY\s+([a-zA-Z0-9_]+)/gi, "DROP CONSTRAINT $1");
+        // DROP INDEX name -> DROP CONSTRAINT name (for unique/index-like constraints emitted by schema builder)
+        query = query.replace(/\bDROP\s+INDEX\s+([a-zA-Z0-9_]+)/gi, "DROP CONSTRAINT $1");
+        // CHANGE COLUMN old new TYPE ... -> RENAME + TYPE (+ null/default when present)
+        query = query.replace(/\bCHANGE\s+COLUMN\s+([a-zA-Z0-9_]+)\s+([a-zA-Z0-9_]+)\s+([A-Z]+(?:\([^)]+\))?)([^,;]*)/gi, (_match, oldCol, newCol, type, tail) => {
+            const ops = [
+                `RENAME COLUMN ${oldCol} TO ${newCol}`,
+                `ALTER COLUMN ${newCol} TYPE ${type}`,
+            ];
+            const t = String(tail || "");
+            if (/\bNOT\s+NULL\b/i.test(t)) {
+                ops.push(`ALTER COLUMN ${newCol} SET NOT NULL`);
+            }
+            else if (/\bNULL\b/i.test(t)) {
+                ops.push(`ALTER COLUMN ${newCol} DROP NOT NULL`);
+            }
+            const defaultMatch = t.match(/\bDEFAULT\s+([^\s,;]+)/i);
+            if (defaultMatch?.[1]) {
+                ops.push(`ALTER COLUMN ${newCol} SET DEFAULT ${defaultMatch[1]}`);
+            }
+            return ops.join(", ");
+        });
+        // MODIFY COLUMN col TYPE ... -> ALTER COLUMN statements (+ null/default when present)
+        query = query.replace(/\bMODIFY\s+COLUMN\s+([a-zA-Z0-9_]+)\s+([A-Z]+(?:\([^)]+\))?)([^,;]*)/gi, (_match, col, type, tail) => {
+            const ops = [`ALTER COLUMN ${col} TYPE ${type}`];
+            const t = String(tail || "");
+            if (/\bNOT\s+NULL\b/i.test(t)) {
+                ops.push(`ALTER COLUMN ${col} SET NOT NULL`);
+            }
+            else if (/\bNULL\b/i.test(t)) {
+                ops.push(`ALTER COLUMN ${col} DROP NOT NULL`);
+            }
+            const defaultMatch = t.match(/\bDEFAULT\s+([^\s,;]+)/i);
+            if (defaultMatch?.[1]) {
+                ops.push(`ALTER COLUMN ${col} SET DEFAULT ${defaultMatch[1]}`);
+            }
+            return ops.join(", ");
+        });
+        // AFTER/FIRST are MySQL-only column positioning hints.
+        query = query.replace(/\s+AFTER\s+[a-zA-Z0-9_]+/gi, "");
+        query = query.replace(/\s+FIRST\b/gi, "");
+        // Boolean defaults in ALTER statements as well.
+        query = query.replace(/\bALTER\s+COLUMN\s+([a-zA-Z0-9_]+)\s+SET\s+DEFAULT\s+([01])\b/gi, (_match, col, bit) => `ALTER COLUMN ${col} SET DEFAULT ${bit === "1" ? "TRUE" : "FALSE"}`);
+        // Clean up extra whitespace
+        query = query.replace(/\s+/g, " ").trim();
+        query = query.replace(/,\s*;/g, ";");
+        return query;
     }
     /**
      * Main translation method that handles both CREATE TABLE and ALTER TABLE statements.
@@ -70,8 +126,8 @@ class PostgresTranslator {
         else if (trimmedQuery.toUpperCase().startsWith("ALTER TABLE")) {
             return this.translateAlterTable(this.replaceQuestionMarks(trimmedQuery));
         }
-        // For other query types, just replace question marks
-        return this.replaceQuestionMarks(trimmedQuery);
+        // For other query types, replace placeholders and normalize identifier quoting.
+        return this.replaceQuestionMarks(trimmedQuery).replace(/`([^`]+)`/g, "$1");
     }
 }
 exports.PostgresTranslator = PostgresTranslator;

package/lib/Jcc-eloquent/lib/Schema/index.d.ts

@@ -1,5 +1,17 @@
 import { Blueprint } from "./BluePrint";
 export declare class Schema {
+    /**
+     * SQL emitted by Schema.create/table/drop/… in order, so migrations can omit
+     * `return` and still run; multiple calls in one `up()`/`down()` are all kept.
+     */
+    private static generatedSqlBatch;
+    /** Clear before running a migration `up`/`down` to avoid stale SQL. */
+    static clearLastGeneratedSql(): void;
+    private static captureGeneratedSql;
+    /**
+     * All statements captured since {@link clearLastGeneratedSql}, then clears the batch.
+     */
+    static consumeAllGeneratedSql(): string[];
     /**
      * Creates a new table using a blueprint.
      */

package/lib/Jcc-eloquent/lib/Schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Schema/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,qBAAa,MAAM;IACjB;;OAEG;IACH,MAAM,CAAC,MAAM,CACX,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,GACvC,MAAM;IAiBT;;OAEG;IACH,MAAM,CAAC,KAAK,CACV,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,GACvC,MAAM;IAiBT;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAgB3C,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI9C;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAgB1C;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAgBtC;;OAEG;IACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAe/C;;OAEG;WACU,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA0C1D;;OAEG;WACU,SAAS,CACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC;IAmDnB;;OAEG;WACU,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAmDpE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/Schema/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,qBAAa,MAAM;IACjB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAgB;IAEhD,uEAAuE;IACvE,MAAM,CAAC,qBAAqB,IAAI,IAAI;IAIpC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAKlC;;OAEG;IACH,MAAM,CAAC,sBAAsB,IAAI,MAAM,EAAE;IAMzC;;OAEG;IACH,MAAM,CAAC,MAAM,CACX,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,GACvC,MAAM;IAiBT;;OAEG;IACH,MAAM,CAAC,KAAK,CACV,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,GACvC,MAAM;IAiBT;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAkB3C,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI9C;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAgB1C;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAgBtC;;OAEG;IACH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAe/C;;OAEG;WACU,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA0C1D;;OAEG;WACU,SAAS,CACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC;IAmDnB;;OAEG;WACU,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAmDpE"}

package/lib/Jcc-eloquent/lib/Schema/index.js

@@ -8,6 +8,22 @@ const DB_1 = require("../DB");
 const Config_1 = require("../../../Config/Config");
 // dotenv.config({ path: `${appRootPath.path}/.env` });
 class Schema {
+    /** Clear before running a migration `up`/`down` to avoid stale SQL. */
+    static clearLastGeneratedSql() {
+        this.generatedSqlBatch = [];
+    }
+    static captureGeneratedSql(sql) {
+        this.generatedSqlBatch.push(sql);
+        return sql;
+    }
+    /**
+     * All statements captured since {@link clearLastGeneratedSql}, then clears the batch.
+     */
+    static consumeAllGeneratedSql() {
+        const out = [...this.generatedSqlBatch];
+        this.generatedSqlBatch = [];
+        return out;
+    }
     /**
      * Creates a new table using a blueprint.
      */
@@ -18,7 +34,7 @@ class Schema {
             }
             const blueprint = new BluePrint_1.Blueprint(tableName);
             callback(blueprint);
-            return blueprint.toSQL("CREATE", tableName);
+            return this.captureGeneratedSql(blueprint.toSQL("CREATE", tableName));
         }
         catch (error) {
             throw new DatabaseError_1.DatabaseError(`Failed to create table '${tableName}': ${error.message}`, constant_1.SCHEMA_CREATE_ERROR);
@@ -34,7 +50,7 @@ class Schema {
             }
             const blueprint = new BluePrint_1.Blueprint(tableName);
             callback(blueprint);
-            return blueprint.toSQL("ALTER", tableName);
+            return this.captureGeneratedSql(blueprint.toSQL("ALTER", tableName));
         }
         catch (error) {
             throw new DatabaseError_1.DatabaseError(`Failed to alter table '${tableName}': ${error.message}`, constant_1.SCHEMA_CREATE_ERROR);
@@ -49,7 +65,7 @@ class Schema {
                 throw new Error("Table name cannot be empty");
             }
             const blueprint = new BluePrint_1.Blueprint(tableName);
-            return blueprint.toSQL("DROP TABLE IF EXISTS", tableName);
+            return this.captureGeneratedSql(blueprint.toSQL("DROP TABLE IF EXISTS", tableName));
         }
         catch (error) {
             throw new DatabaseError_1.DatabaseError(`Failed to drop table '${tableName}': ${error.message}`, constant_1.SCHEMA_CREATE_ERROR);
@@ -67,7 +83,7 @@ class Schema {
                 throw new Error("Table name cannot be empty");
             }
             const blueprint = new BluePrint_1.Blueprint(tableName);
-            return blueprint.toSQL("TRUNCATE TABLE", tableName);
+            return this.captureGeneratedSql(blueprint.toSQL("TRUNCATE TABLE", tableName));
         }
         catch (error) {
             throw new DatabaseError_1.DatabaseError(`Failed to truncate table '${tableName}': ${error.message}`, constant_1.SCHEMA_CREATE_ERROR);
@@ -82,7 +98,7 @@ class Schema {
                 throw new Error("Table name cannot be empty");
             }
             const blueprint = new BluePrint_1.Blueprint(tableName);
-            return blueprint.toSQL("DROP TABLE", tableName);
+            return this.captureGeneratedSql(blueprint.toSQL("DROP TABLE", tableName));
         }
         catch (error) {
             throw new DatabaseError_1.DatabaseError(`Failed to drop table '${tableName}': ${error.message}`, constant_1.SCHEMA_CREATE_ERROR);
@@ -96,7 +112,7 @@ class Schema {
             if (!from || from.trim() === "" || !to || to.trim() === "") {
                 throw new Error("Table names cannot be empty");
             }
-            return `RENAME TABLE ${from} TO ${to};`;
+            return this.captureGeneratedSql(`RENAME TABLE ${from} TO ${to};`);
         }
         catch (error) {
             throw new DatabaseError_1.DatabaseError(`Failed to rename table from '${from}' to '${to}': ${error.message}`, constant_1.SCHEMA_CREATE_ERROR);
@@ -235,3 +251,8 @@ class Schema {
     }
 }
 exports.Schema = Schema;
+/**
+ * SQL emitted by Schema.create/table/drop/… in order, so migrations can omit
+ * `return` and still run; multiple calls in one `up()`/`down()` are all kept.
+ */
+Schema.generatedSqlBatch = [];

package/lib/Jcc-eloquent/lib/utils/index.d.ts

@@ -1,3 +1,4 @@
+import type { Request } from "express";
 import { Model } from "../Model";
 export declare class Utils {
     /**
@@ -52,6 +53,15 @@ export declare class Utils {
      * - `active`: A boolean indicating if the link corresponds to the current page.
      */
     static generatePaginationLinks(path: string, currentPage: number, lastPage: number): Record<string, any>[];
+    /**
+     * Merge `request.query` with overrides into a full URL (pathname + search).
+     * Pass `null` / `undefined` in overrides to remove a query key.
+     */
+    static mergeRequestQuery(request: Request, overrides: Record<string, string | number | boolean | null | undefined>): string;
+    /** Encode a cursor column value for `?cursor=` (base64url JSON). */
+    static encodeCursorValue(value: unknown): string;
+    /** Decode `?cursor=` from {@link encodeCursorValue} or fall back to raw string / number. */
+    static decodeCursorValue(encoded: string): unknown;
     /**
      * Extracts and returns metadata and configurations for a given Model.
      * @param {any} Model - The model whose metadata needs to be extracted. This should follow the ORM's Model structure.
@@ -84,5 +94,8 @@ export declare class Utils {
     static getModelFile(modelType: string): Promise<typeof Model>;
     static formatDate(): string;
     static isClass(value: any): boolean;
+    static isPostgres(): boolean;
+    static isMysql(): boolean;
+    static isSqlite(): boolean;
 }
 //# sourceMappingURL=index.d.ts.map

package/lib/Jcc-eloquent/lib/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/utils/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,qBAAa,KAAK;IAChB;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAKrC;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIvC;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQpC;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAYrD,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG;IAkBjC;;;;;;OAMG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO;IAMzE;;;;;OAKG;IACH,MAAM,CAAC,oBAAoB,CACzB,cAAc,EAAE,MAAM,GAAG,MAAM,GAC9B,MAAM,GAAG,MAAM;IAUlB;;;;;;OAMG;IACH,MAAM,CAAC,uBAAuB,CAC5B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM;IAalB;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;;;;;;;IAenE;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAQxC;;;OAGG;IACH,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM;IAmBhD;;;;OAIG;WACU,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,KAAK,CAAC;IAwDnE,MAAM,CAAC,UAAU;IAYjB,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;CAMpC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../jcc-express-mvc/lib/Jcc-eloquent/lib/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGvC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGjC,qBAAa,KAAK;IAChB;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAKrC;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIvC;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQpC;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAYrD,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG;IAkBjC;;;;;;OAMG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO;IAMzE;;;;;OAKG;IACH,MAAM,CAAC,oBAAoB,CACzB,cAAc,EAAE,MAAM,GAAG,MAAM,GAC9B,MAAM,GAAG,MAAM;IAUlB;;;;;;OAMG;IACH,MAAM,CAAC,uBAAuB,CAC5B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM;IAalB;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CACtB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,GACtE,MAAM;IAmBT,oEAAoE;IACpE,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;IAOhD,4FAA4F;IAC5F,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAelD;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;;;;;;;IAenE;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAQxC;;;OAGG;IACH,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM;IAmBhD;;;;OAIG;WACU,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,KAAK,CAAC;IAwDnE,MAAM,CAAC,UAAU;IAYjB,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO;IAOnC,MAAM,CAAC,UAAU,IAAI,OAAO;IAO5B,MAAM,CAAC,OAAO,IAAI,OAAO;IAOzB,MAAM,CAAC,QAAQ,IAAI,OAAO;CAO3B"}

package/lib/Jcc-eloquent/lib/utils/index.js

@@ -41,6 +41,7 @@ const inflection = __importStar(require("inflection"));
 const DatabaseError_1 = require("../Error/DatabaseError");
 const app_root_path_1 = __importDefault(require("app-root-path"));
 const Model_1 = require("../Model");
+const Config_1 = require("../../../Config/Config");
 class Utils {
     /**
      * Pluralizes a string.
@@ -153,6 +154,54 @@ class Utils {
         }
         return links;
     }
+    /**
+     * Merge `request.query` with overrides into a full URL (pathname + search).
+     * Pass `null` / `undefined` in overrides to remove a query key.
+     */
+    static mergeRequestQuery(request, overrides) {
+        const host = request.get("host") || "localhost";
+        const proto = (request.protocol || "http").replace(/:$/, "");
+        const pathname = request.path || "/";
+        const base = `${proto}://${host}${pathname}`;
+        const u = new URL(base);
+        const sp = u.searchParams;
+        for (const [k, v] of Object.entries(request.query)) {
+            if (v === undefined || v === null)
+                continue;
+            const val = Array.isArray(v) ? v[0] : v;
+            sp.set(k, String(val));
+        }
+        for (const [k, v] of Object.entries(overrides)) {
+            if (v === null || v === undefined)
+                sp.delete(k);
+            else
+                sp.set(k, String(v));
+        }
+        return u.toString();
+    }
+    /** Encode a cursor column value for `?cursor=` (base64url JSON). */
+    static encodeCursorValue(value) {
+        const v = value instanceof Date ? value.toISOString() : value;
+        const payload = JSON.stringify({ v });
+        return Buffer.from(payload, "utf8").toString("base64url");
+    }
+    /** Decode `?cursor=` from {@link encodeCursorValue} or fall back to raw string / number. */
+    static decodeCursorValue(encoded) {
+        if (encoded == null || encoded === "")
+            return undefined;
+        try {
+            const json = JSON.parse(Buffer.from(encoded, "base64url").toString("utf8"));
+            if (json && typeof json === "object" && "v" in json)
+                return json.v;
+        }
+        catch {
+            /* fall through */
+        }
+        const n = Number(encoded);
+        if (!Number.isNaN(n) && String(n) === String(encoded).trim())
+            return n;
+        return encoded;
+    }
     /**
      * Extracts and returns metadata and configurations for a given Model.
      * @param {any} Model - The model whose metadata needs to be extracted. This should follow the ORM's Model structure.
@@ -265,5 +314,18 @@ class Utils {
         return (typeof value === "function" &&
             /^\s*class\s+/.test(Function.prototype.toString.call(value)));
     }
+    static isPostgres() {
+        return (Config_1.config.get("DB_CONNECTION").toLowerCase() === "postgres" ||
+            Config_1.config.get("DB_ORM").toLowerCase() === "pg");
+    }
+    static isMysql() {
+        return (Config_1.config.get("DB_CONNECTION").toLowerCase() === "mysql" ||
+            Config_1.config.get("DB_ORM").toLowerCase() === "mysql2");
+    }
+    static isSqlite() {
+        return (Config_1.config.get("DB_CONNECTION").toLowerCase() === "sqlite" ||
+            Config_1.config.get("DB_ORM").toLowerCase() === "better-sqlite3" ||
+            Config_1.config.get("DB_ORM").toLowerCase() === "bun:sqlite");
+    }
 }
 exports.Utils = Utils;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Middleware/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAyB,EAEvB,cAAc,EACf,MAAM,SAAS,CAAC;AAcjB,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAc;gBAEb,GAAG,EAAE,WAAW;IAW5B,eAAe;IAWf,GAAG,CAAC,gBAAgB,EAAE,cAAc,EAAE;IAmCtC,OAAO,CAAC,yBAAyB;IAQjC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,UAAU;CAGnB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Middleware/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAyB,EAEvB,cAAc,EACf,MAAM,SAAS,CAAC;AAejB,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAc;gBAEb,GAAG,EAAE,WAAW;IAW5B,eAAe;IAWf,GAAG,CAAC,gBAAgB,EAAE,cAAc,EAAE;IA8BtC,OAAO,CAAC,yBAAyB;IASjC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,UAAU;CAGnB"}

package/lib/Middleware/index.js

@@ -11,10 +11,11 @@ const request_1 = require("../Request/request");
 const morgan_1 = __importDefault(require("morgan"));
 const Config_1 = require("../Config/Config");
 const express_rate_limit_1 = __importDefault(require("express-rate-limit"));
-const express_session_1 = __importDefault(require("express-session"));
 const cookie_parser_1 = __importDefault(require("cookie-parser"));
 const connect_flash_1 = __importDefault(require("connect-flash"));
 const express_fileupload_1 = __importDefault(require("express-fileupload"));
+const ExpressJccSession_1 = require("../Session/ExpressJccSession");
+const SessionManager_1 = require("../Session/SessionManager");
 class Middleware {
     //
     constructor(app) {
@@ -40,12 +41,7 @@ class Middleware {
             this.express.json(),
             this.express.urlencoded({ extended: false }),
             (0, cookie_parser_1.default)(),
-            (0, express_session_1.default)({
-                secret: process.env.SESSION_SECRET || "your_secret",
-                resave: false,
-                saveUninitialized: false,
-                cookie: { secure: false },
-            }),
+            this.app.resolve(SessionManager_1.SessionManager.name).getExpressMiddleware(),
             (0, connect_flash_1.default)(),
             (0, express_fileupload_1.default)(),
             (0, cors_1.default)(this.corsOption()),
@@ -68,6 +64,7 @@ class Middleware {
     }
     requestResponseMiddleware() {
         return (req, res, next) => {
+            req.jccSession = (0, ExpressJccSession_1.createExpressJccSession)(req);
             new Response_1.HttpResponse(req, res);
             new request_1.HttpRequest(req, res);
             next();

package/lib/Model/Sequelize.d.ts

@@ -0,0 +1,3 @@
+export declare class SequelizeModel {
+}
+//# sourceMappingURL=Sequelize.d.ts.map

package/lib/Model/Sequelize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Sequelize.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Model/Sequelize.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAc;CAAG"}

package/lib/Model/Sequelize.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SequelizeModel = void 0;
+class SequelizeModel {
+}
+exports.SequelizeModel = SequelizeModel;

package/lib/Providers/SessionServiceProvider.d.ts

@@ -0,0 +1,12 @@
+import type { Application } from "../Application/Application";
+import { ServiceProvider } from "./ServiceProvider";
+/**
+ * Registers {@link SessionManager} from `app.config.session` (Laravel-style: driver, lifetime, stores).
+ * Used by {@link Middleware} to mount `express-session` with the correct store.
+ */
+export declare class SessionServiceProvider extends ServiceProvider {
+    constructor(app: Application);
+    register(): void;
+    private mergeSessionConfig;
+}
+//# sourceMappingURL=SessionServiceProvider.d.ts.map

package/lib/Providers/SessionServiceProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionServiceProvider.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Providers/SessionServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,eAAe;gBAC7C,GAAG,EAAE,WAAW;IAI5B,QAAQ,IAAI,IAAI;IAMhB,OAAO,CAAC,kBAAkB;CA+B3B"}

package/lib/Providers/SessionServiceProvider.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionServiceProvider = void 0;
+const ServiceProvider_1 = require("./ServiceProvider");
+const SessionManager_1 = require("../Session/SessionManager");
+/**
+ * Registers {@link SessionManager} from `app.config.session` (Laravel-style: driver, lifetime, stores).
+ * Used by {@link Middleware} to mount `express-session` with the correct store.
+ */
+class SessionServiceProvider extends ServiceProvider_1.ServiceProvider {
+    constructor(app) {
+        super(app);
+    }
+    register() {
+        this.app.singleton(SessionManager_1.SessionManager.name, () => {
+            return new SessionManager_1.SessionManager(this.mergeSessionConfig());
+        });
+    }
+    mergeSessionConfig() {
+        const raw = (this.app.config?.session ?? {});
+        const defaultLifetime = 120 * 60 * 1000;
+        const lifetimeMs = typeof raw.lifetime === "number" && raw.lifetime > 0
+            ? raw.lifetime
+            : defaultLifetime;
+        const cookieBase = raw.cookie ?? {
+            name: "connect.sid",
+            httpOnly: true,
+            secure: false,
+            sameSite: "lax",
+            maxAge: lifetimeMs,
+        };
+        const cookie = {
+            ...cookieBase,
+            maxAge: cookieBase.maxAge ?? lifetimeMs,
+            path: cookieBase.path ?? "/",
+        };
+        return {
+            driver: raw.driver ?? "file",
+            lifetime: lifetimeMs,
+            cookie,
+            files: raw.files,
+            database: raw.database,
+            redis: raw.redis,
+        };
+    }
+}
+exports.SessionServiceProvider = SessionServiceProvider;