@bungres/kit 1.1.1 → 1.1.2

package/README.md

@@ -4,7 +4,7 @@ CLI toolkit for [`@bungres/orm`](https://www.npmjs.com/package/@bungres/orm) —
 
 ## Requirements
 
-- **Bun ≥ 1.3** (uses `Bun.sql` which is built-in)
+- **Bun ≥ 1.3** (uses `Bun.SQL` which is built-in)
 - **Postgres ≥ 16**
 - Built to work alongside `@bungres/orm`.
 
@@ -38,21 +38,21 @@ Run the CLI using Bun:
 bun run bungres --help
 ```
 
-| Command | Description |
-|---|---|
-| `bungres init` | Initialize bungres project with config file and db folder structure |
-| `bungres generate` | Write a single timestamped `.sql` migration file with UP/DOWN sections |
-| `bungres migrate` | Run pending `.sql` UP sections, track applied in `__bungres_migrations` |
-| `bungres rollback` | Automatically revert the last applied migration using its DOWN section |
-| `bungres push` | Apply schema directly to DB — no files (great for dev/prototyping) |
-| `bungres pull` | Introspect the DB and generate TypeScript schema |
-| `bungres status` | Show applied vs pending migrations |
-| `bungres fresh` | Drop all tables and re-run all migrations from scratch |
-| `bungres refresh` | Truncate all tables to quickly reset data without dropping schema |
-| `bungres seed` | Execute the seed script, or run the Auto-Seeder using `@faker-js/faker` |
-| `bungres studio` | Start a local web interface to browse database data |
-| `bungres tusky` | Boot up a Node REPL connected to the database with schema loaded |
-| `bungres drop` | Drop all tables, enums, and views defined in the schema (prompts for confirmation) |
+| Command            | Description                                                                        |
+| ------------------ | ---------------------------------------------------------------------------------- |
+| `bungres init`     | Initialize bungres project with config file and db folder structure                |
+| `bungres generate` | Write a single timestamped `.sql` migration file with UP/DOWN sections             |
+| `bungres migrate`  | Run pending `.sql` UP sections, track applied in `__bungres_migrations`            |
+| `bungres rollback` | Automatically revert the last applied migration using its DOWN section             |
+| `bungres push`     | Apply schema directly to DB — no files (great for dev/prototyping)                 |
+| `bungres pull`     | Introspect the DB and generate TypeScript schema                                   |
+| `bungres status`   | Show applied vs pending migrations                                                 |
+| `bungres fresh`    | Drop all tables and re-run all migrations from scratch                             |
+| `bungres refresh`  | Truncate all tables to quickly reset data without dropping schema                  |
+| `bungres seed`     | Execute the seed script, or run the Auto-Seeder using `@faker-js/faker`            |
+| `bungres studio`   | Start a local web interface to browse database data                                |
+| `bungres tusky`    | Boot up a Node REPL connected to the database with schema loaded                   |
+| `bungres drop`     | Drop all tables, enums, and views defined in the schema (prompts for confirmation) |
 
 ### Usage Examples
 
@@ -82,4 +82,5 @@ bun run bungres drop --force   # skip confirmation
 - **Auto-Seeder**: Run `bungres seed` without a custom script to automatically generate mock data for your database using `@faker-js/faker`, resolving foreign key dependencies automatically!
 
 ## License
+
 MIT

package/dist/cli.js

@@ -1668,10 +1668,26 @@ async function runDrop(config2, opts = {}) {
 
 // src/commands/migrate.ts
 import { join, resolve } from "path";
+import { existsSync, statSync } from "fs";
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 async function runMigrate(config2) {
   intro(import_picocolors2.default.bgCyan(import_picocolors2.default.black(" @bungres/kit migrate ")));
   const migrationsDir = resolve(config2.out);
+  let s = spinner();
+  s.start("Checking pending migrations...");
+  if (!existsSync(migrationsDir)) {
+    s.stop("No files found.");
+    log.warn(import_picocolors2.default.yellow(`Migration directory does not exist: ${migrationsDir}`));
+    log.info(`Run ${import_picocolors2.default.green("bungres generate")} first.`);
+    outro("Done.");
+    return;
+  }
+  if (!statSync(migrationsDir).isDirectory()) {
+    s.stop("Failed.");
+    log.error(import_picocolors2.default.red(`Migration path exists but is not a directory: ${migrationsDir}`));
+    outro("Failed.");
+    return;
+  }
   const sql = new Bun.SQL(config2.dbUrl);
   const table = config2.migrationsTable;
   const schema = config2.migrationsSchema;
@@ -1683,8 +1699,6 @@ CREATE TABLE IF NOT EXISTS ${qualifiedTable} (
   name        TEXT NOT NULL UNIQUE,
   applied_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );`.trim();
-  let s = spinner();
-  s.start("Checking pending migrations...");
   try {
     await sql.unsafe(createSchema);
     await sql.unsafe(createMigrationsTable);
@@ -1714,7 +1728,22 @@ CREATE TABLE IF NOT EXISTS ${qualifiedTable} (
     for (const file of pending) {
       s = spinner();
       s.start(`Applying ${file}...`);
-      const content = await Bun.file(join(migrationsDir, file)).text();
+      const filePath = join(migrationsDir, file);
+      if (!existsSync(filePath)) {
+        s.stop("Failed.");
+        log.error(import_picocolors2.default.red(`Migration file not found: ${filePath}`));
+        outro("Failed.");
+        return;
+      }
+      let content = "";
+      try {
+        content = await Bun.file(filePath).text();
+      } catch (err) {
+        s.stop("Failed.");
+        log.error(import_picocolors2.default.red(`Failed to read migration file ${file}: ${err.message}`));
+        outro("Failed.");
+        return;
+      }
       let upContent = content;
       const upMatch = content.match(/-- ==== UP ====([\s\S]*?)(?:-- ==== DOWN ====|$)/i);
       if (upMatch) {
@@ -1757,7 +1786,7 @@ Fresh complete.`);
 
 // src/commands/generate.ts
 import { join as join3, resolve as resolve3 } from "path";
-import { readdirSync } from "fs";
+import { readdirSync, existsSync as existsSync2, statSync as statSync2 } from "fs";
 
 // ../bungres-orm/dist/index.js
 var TableConfigSymbol = Symbol.for("BungresTableConfig");
@@ -1813,7 +1842,7 @@ function createTableFactory(casing) {
     const tableObj = {
       [TableConfigSymbol]: {
         name,
-        schema,
+        ...schema ? { schema } : {},
         columns: columnConfigs,
         indexes,
         checks,
@@ -1893,6 +1922,41 @@ var textArray = col("text[]");
 var integerArray = col("integer[]");
 var varcharArray = col("varchar[]");
 var uuidArray = col("uuid[]");
+function shiftParams(sql, paramsLength, offset) {
+  if (paramsLength === 0)
+    return sql;
+  let result2 = "";
+  let inString = false;
+  let inIdent = false;
+  let i2 = 0;
+  while (i2 < sql.length) {
+    if (sql[i2] === "'" && !inIdent) {
+      inString = !inString;
+      result2 += sql[i2];
+      i2++;
+    } else if (sql[i2] === '"' && !inString) {
+      inIdent = !inIdent;
+      result2 += sql[i2];
+      i2++;
+    } else if (!inString && !inIdent && sql[i2] === "$") {
+      const match = sql.slice(i2).match(/^\$(\d+)/);
+      if (match) {
+        const num = parseInt(match[1], 10);
+        if (num >= 1 && num <= paramsLength) {
+          result2 += `$${num + offset}`;
+          i2 += match[0].length;
+          continue;
+        }
+      }
+      result2 += sql[i2];
+      i2++;
+    } else {
+      result2 += sql[i2];
+      i2++;
+    }
+  }
+  return result2;
+}
 function sql(strings, ...values) {
   let query = "";
   const params = [];
@@ -1902,7 +1966,7 @@ function sql(strings, ...values) {
       const val = values[i2];
       if (isSQLChunk(val)) {
         const offset = params.length;
-        query += val.sql.replace(/\$(\d+)/g, (_2, n2) => `$${parseInt(n2) + offset}`);
+        query += shiftParams(val.sql, val.params.length, offset);
         params.push(...val.params);
       } else {
         params.push(val);
@@ -1920,7 +1984,7 @@ function sqlJoin(chunks, separator = ", ") {
   const parts = [];
   for (const chunk of chunks) {
     const offset = params.length;
-    parts.push(chunk.sql.replace(/\$(\d+)/g, (_2, n2) => `$${parseInt(n2) + offset}`));
+    parts.push(shiftParams(chunk.sql, chunk.params.length, offset));
     params.push(...chunk.params);
   }
   return { sql: parts.join(separator), params };
@@ -1928,6 +1992,19 @@ function sqlJoin(chunks, separator = ", ") {
 function rawSql(query) {
   return { sql: query, params: [] };
 }
+function toPgArray(val) {
+  const formatted = val.map((item) => {
+    if (item === null || item === undefined)
+      return "NULL";
+    if (typeof item === "number" || typeof item === "boolean")
+      return String(item);
+    if (Array.isArray(item))
+      return toPgArray(item);
+    const str = String(item).replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+    return `"${str}"`;
+  });
+  return `{${formatted.join(",")}}`;
+}
 function colName(c2) {
   if (typeof c2 === "string")
     return `"${c2}"`;
@@ -2018,29 +2095,29 @@ var not = (condition) => ({
 });
 var asc = (column) => sql`${rawSql(colName(column))} ASC`;
 var desc = (column) => sql`${rawSql(colName(column))} DESC`;
-function parseWhereObject(tableConfig, whereObj) {
+function parseWhereObject(tableConfig, whereObj, alias2) {
   const conditions = [];
   for (const [key, val] of Object.entries(whereObj)) {
     if (val === undefined)
       continue;
     if (key === "OR") {
-      const orConditions = val.map((o2) => parseWhereObject(tableConfig, o2));
+      const orConditions = val.map((o2) => parseWhereObject(tableConfig, o2, alias2));
       if (orConditions.length > 0)
         conditions.push(or(...orConditions));
       continue;
     }
     if (key === "AND") {
-      const andConditions = val.map((o2) => parseWhereObject(tableConfig, o2));
+      const andConditions = val.map((o2) => parseWhereObject(tableConfig, o2, alias2));
       if (andConditions.length > 0)
         conditions.push(and(...andConditions));
       continue;
     }
     if (key === "NOT") {
-      conditions.push(not(parseWhereObject(tableConfig, val)));
+      conditions.push(not(parseWhereObject(tableConfig, val, alias2)));
       continue;
     }
     const colConfig = tableConfig.columns[key];
-    const columnArg = colConfig ?? key;
+    const columnArg = colConfig ? alias2 ? { ...colConfig, tableName: alias2 } : colConfig : alias2 ? { name: key, tableName: alias2 } : key;
     if (val !== null && typeof val === "object" && !Array.isArray(val) && !(val instanceof Date) && !(val instanceof Uint8Array)) {
       const opVal = val;
       if (opVal.eq !== undefined)
@@ -2082,13 +2159,13 @@ function parseWhereObject(tableConfig, whereObj) {
   }
   return and(...conditions);
 }
-function parseOrderByObject(tableConfig, orderByObj) {
+function parseOrderByObject(tableConfig, orderByObj, alias2) {
   const parts = [];
   for (const [key, dir] of Object.entries(orderByObj)) {
     if (dir === undefined)
       continue;
     const colConfig = tableConfig.columns[key];
-    const columnArg = colConfig ?? key;
+    const columnArg = colConfig ? alias2 ? { ...colConfig, tableName: alias2 } : colConfig : alias2 ? { name: key, tableName: alias2 } : key;
     if (dir === "asc")
       parts.push(asc(columnArg));
     else if (dir === "desc")
@@ -2256,14 +2333,7 @@ class InsertBuilder {
           if (colType === "json" || colType === "jsonb") {
             params.push(val);
           } else if (Array.isArray(val)) {
-            const pgArray = "{" + val.map((item) => {
-              if (item === null || item === undefined)
-                return "NULL";
-              if (typeof item === "string")
-                return '"' + item.replace(/"/g, "\\\"") + '"';
-              return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"") + '"' : String(item);
-            }).join(",") + "}";
-            params.push(pgArray);
+            params.push(toPgArray(val));
           } else {
             params.push(JSON.stringify(val));
           }
@@ -2314,14 +2384,7 @@ class InsertBuilder {
           if (colType === "json" || colType === "jsonb") {
             params.push(value);
           } else if (Array.isArray(value)) {
-            const pgArray = "{" + value.map((item) => {
-              if (item === null || item === undefined)
-                return "NULL";
-              if (typeof item === "string")
-                return '"' + item.replace(/"/g, "\\\"") + '"';
-              return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"") + '"' : String(item);
-            }).join(",") + "}";
-            params.push(pgArray);
+            params.push(toPgArray(value));
           } else {
             params.push(JSON.stringify(value));
           }
@@ -2745,14 +2808,7 @@ class UpdateBuilder {
         if (colType === "json" || colType === "jsonb") {
           params.push(value);
         } else if (Array.isArray(value)) {
-          const pgArray = "{" + value.map((item) => {
-            if (item === null || item === undefined)
-              return "NULL";
-            if (typeof item === "string")
-              return '"' + item.replace(/"/g, "\\\"") + '"';
-            return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"") + '"' : String(item);
-          }).join(",") + "}";
-          params.push(pgArray);
+          params.push(toPgArray(value));
         } else {
           params.push(JSON.stringify(value));
         }
@@ -2995,7 +3051,7 @@ class RelationalQueryBuilder {
       const offset = params.length;
       let whereChunk = args.where;
       if (args.where && !args.where.sql) {
-        whereChunk = parseWhereObject(tableConfig, args.where);
+        whereChunk = parseWhereObject(tableConfig, args.where, alias2);
       }
       if (whereChunk && whereChunk.sql) {
         fromSql += (joinCondition ? " AND " : " WHERE ") + whereChunk.sql.replace(/\$(\d+)/g, (_2, n2) => `$${parseInt(n2) + offset}`);
@@ -3010,7 +3066,7 @@ class RelationalQueryBuilder {
         fromSql += ` ORDER BY ` + args.orderBy.sql.replace(/\$(\d+)/g, (_2, n2) => `$${parseInt(n2) + offset}`);
         params.push(...args.orderBy.params);
       } else {
-        const chunks = parseOrderByObject(tableConfig, args.orderBy);
+        const chunks = parseOrderByObject(tableConfig, args.orderBy, alias2);
         if (chunks.length > 0) {
           fromSql += ` ORDER BY ` + chunks.map((c2) => {
             const offset = params.length;
@@ -3325,6 +3381,21 @@ function formatDefaultValue(value, dataType) {
     return value ? "TRUE" : "FALSE";
   if (typeof value === "number")
     return String(value);
+  if (value instanceof Date)
+    return `'${value.toISOString()}'`;
+  if (Array.isArray(value)) {
+    if (dataType === "json" || dataType === "jsonb") {
+      return `'${JSON.stringify(value).replace(/'/g, "''")}'`;
+    }
+    const pgArray = "{" + value.map((item) => {
+      if (item === null || item === undefined)
+        return "NULL";
+      if (typeof item === "string")
+        return '"' + item.replace(/"/g, "\\\"") + '"';
+      return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"").replace(/'/g, "''") + '"' : String(item);
+    }).join(",") + "}";
+    return `'${pgArray.replace(/'/g, "''")}'`;
+  }
   return `'${JSON.stringify(value).replace(/'/g, "''")}'`;
 }
 function buildIndex(table, idx) {
@@ -3688,6 +3759,12 @@ async function runGenerate(config2, name) {
   }
   s.stop(`Loaded ${schemas2.length} schemas.`);
   const migrationsDir = resolve3(config2.out);
+  if (existsSync2(migrationsDir) && !statSync2(migrationsDir).isDirectory()) {
+    s.stop("Failed.");
+    log.error(import_picocolors3.default.red(`Migration path exists but is not a directory: ${migrationsDir}`));
+    outro("Failed.");
+    return;
+  }
   const metaDir = join3(migrationsDir, "meta");
   await Bun.$`mkdir -p ${migrationsDir}`.quiet();
   await Bun.$`mkdir -p ${metaDir}`.quiet();
@@ -3863,21 +3940,21 @@ function topoSort(schemas2) {
 
 // src/commands/init.ts
 var import_picocolors4 = __toESM(require_picocolors(), 1);
-import { existsSync } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { mkdir } from "fs/promises";
 import { join as join4 } from "path";
 async function runInit(cwd = process.cwd()) {
   intro(import_picocolors4.default.bgCyan(import_picocolors4.default.black(" @bungres/kit init ")));
   const configPath = join4(cwd, "bungres.config.ts");
-  if (existsSync(configPath)) {
+  if (existsSync3(configPath)) {
     log.warn(import_picocolors4.default.yellow("Config file already exists at bungres.config.ts"));
     outro("Failed.");
     return;
   }
   let shouldPrompt = true;
   const defaultDbDir = "src/db";
-  if (existsSync(join4(cwd, "src"))) {
-    if (!existsSync(join4(cwd, defaultDbDir, "schema.ts")) && !existsSync(join4(cwd, defaultDbDir, "client.ts"))) {
+  if (existsSync3(join4(cwd, "src"))) {
+    if (!existsSync3(join4(cwd, defaultDbDir, "schema.ts")) && !existsSync3(join4(cwd, defaultDbDir, "client.ts"))) {
       shouldPrompt = false;
     }
   }
@@ -4339,16 +4416,29 @@ async function runPush(config2, opts = {}) {
 
 // src/commands/refresh.ts
 import { join as join6, resolve as resolve5 } from "path";
+import { existsSync as existsSync4, statSync as statSync3 } from "fs";
 var import_picocolors6 = __toESM(require_picocolors(), 1);
 async function runRefresh(config2) {
   intro(import_picocolors6.default.bgCyan(import_picocolors6.default.black(" @bungres/kit refresh ")));
   const migrationsDir = resolve5(config2.out);
+  let s = spinner();
+  s.start("Checking applied migrations...");
+  if (!existsSync4(migrationsDir)) {
+    s.stop("No migration directory found.");
+    log.warn(import_picocolors6.default.yellow(`Migration directory does not exist: ${migrationsDir}`));
+    outro("Done.");
+    return;
+  }
+  if (!statSync3(migrationsDir).isDirectory()) {
+    s.stop("Failed.");
+    log.error(import_picocolors6.default.red(`Migration path exists but is not a directory: ${migrationsDir}`));
+    outro("Failed.");
+    return;
+  }
   const sql2 = new Bun.SQL(config2.dbUrl);
   const table = config2.migrationsTable;
   const schema = config2.migrationsSchema;
   const qualifiedTable = `"${schema}"."${table}"`;
-  let s = spinner();
-  s.start("Checking applied migrations...");
   try {
     const migTableCheck = await sql2.unsafe(`SELECT EXISTS (
         SELECT 1 FROM information_schema.tables
@@ -4365,6 +4455,17 @@ async function runRefresh(config2) {
       s.stop("No migrations to rollback.");
       log.info(import_picocolors6.default.yellow("Database is empty."));
     } else {
+      const missingFiles = applied.filter((row) => !existsSync4(join6(migrationsDir, row.name)));
+      if (missingFiles.length > 0) {
+        s.stop("Migration files missing.");
+        log.error(import_picocolors6.default.red(`The database tracks ${applied.length} migration(s), but ${missingFiles.length} file(s) are missing from ${migrationsDir}:`));
+        for (const f2 of missingFiles) {
+          log.error(import_picocolors6.default.red(`  - ${f2.name}`));
+        }
+        log.info("Cannot refresh without local migration files.");
+        outro("Failed.");
+        return;
+      }
       s.stop(`Found ${applied.length} migrations to rollback.`);
       const shouldRollback = await confirm({
         message: `Are you sure you want to rollback all ${applied.length} migrations and re-apply them?`,
@@ -4423,16 +4524,29 @@ Re-running all migrations...`));
 
 // src/commands/rollback.ts
 import { join as join7, resolve as resolve6 } from "path";
+import { existsSync as existsSync5, statSync as statSync4 } from "fs";
 var import_picocolors7 = __toESM(require_picocolors(), 1);
 async function runRollback(config2) {
   intro(import_picocolors7.default.bgCyan(import_picocolors7.default.black(" @bungres/kit rollback ")));
   const migrationsDir = resolve6(config2.out);
+  let activeSpinner = spinner();
+  activeSpinner.start("Checking applied migrations...");
+  if (!existsSync5(migrationsDir)) {
+    activeSpinner.stop("No migration directory found.");
+    log.warn(import_picocolors7.default.yellow(`Migration directory does not exist: ${migrationsDir}`));
+    outro("Done.");
+    return;
+  }
+  if (!statSync4(migrationsDir).isDirectory()) {
+    activeSpinner.stop("Failed.");
+    log.error(import_picocolors7.default.red(`Migration path exists but is not a directory: ${migrationsDir}`));
+    outro("Failed.");
+    return;
+  }
   const sql2 = new Bun.SQL(config2.dbUrl);
   const table = config2.migrationsTable;
   const schema = config2.migrationsSchema;
   const qualifiedTable = `"${schema}"."${table}"`;
-  let activeSpinner = spinner();
-  activeSpinner.start("Checking applied migrations...");
   try {
     const applied = await sql2.unsafe(`SELECT name FROM ${qualifiedTable} ORDER BY name DESC LIMIT 1`);
     if (applied.length === 0) {
@@ -4442,6 +4556,13 @@ async function runRollback(config2) {
       return;
     }
     const lastMigration = applied[0].name;
+    const filePath = join7(migrationsDir, lastMigration);
+    if (!existsSync5(filePath)) {
+      activeSpinner.stop("Migration file missing.");
+      log.error(import_picocolors7.default.red(`The database tracks '${lastMigration}' as applied, but the file does not exist in ${migrationsDir}.`));
+      outro("Failed.");
+      return;
+    }
     activeSpinner.stop(`Found migration to rollback: ${import_picocolors7.default.cyan(lastMigration)}`);
     const shouldRollback = await confirm({
       message: `Are you sure you want to rollback ${import_picocolors7.default.cyan(lastMigration)}?`,
@@ -4453,7 +4574,15 @@ async function runRollback(config2) {
     }
     activeSpinner = spinner();
     activeSpinner.start(`Rolling back ${lastMigration}...`);
-    const content = await Bun.file(join7(migrationsDir, lastMigration)).text();
+    let content = "";
+    try {
+      content = await Bun.file(filePath).text();
+    } catch (err) {
+      activeSpinner.stop("Failed.");
+      log.error(import_picocolors7.default.red(`Failed to read migration file ${lastMigration}: ${err.message}`));
+      outro("Failed.");
+      return;
+    }
     let downContent = "";
     const downMatch = content.match(/-- ==== DOWN ====([\s\S]*)/i);
     if (downMatch) {
@@ -4607,17 +4736,31 @@ async function runSeed(config2) {
 }
 
 // src/commands/status.ts
-import { resolve as resolve8 } from "path";
 var import_picocolors9 = __toESM(require_picocolors(), 1);
+import { existsSync as existsSync6, statSync as statSync5 } from "fs";
+import { resolve as resolve8 } from "path";
 async function runStatus(config2) {
   intro(import_picocolors9.default.bgCyan(import_picocolors9.default.black(" @bungres/kit status ")));
   const migrationsDir = resolve8(config2.out);
+  const s = spinner();
+  s.start("Checking migration status...");
+  if (!existsSync6(migrationsDir)) {
+    s.stop("No migration directory found.");
+    log.warn(import_picocolors9.default.yellow(`Migration directory does not exist: ${migrationsDir}`));
+    log.info(`Run ${import_picocolors9.default.green("bungres generate")} first.`);
+    outro("Done.");
+    return;
+  }
+  if (!statSync5(migrationsDir).isDirectory()) {
+    s.stop("Failed.");
+    log.error(import_picocolors9.default.red(`Migration path exists but is not a directory: ${migrationsDir}`));
+    outro("Failed.");
+    return;
+  }
   const sql2 = new Bun.SQL(config2.dbUrl);
   const table = config2.migrationsTable;
   const schema = config2.migrationsSchema;
   const qualifiedTable = `"${schema}"."${table}"`;
-  const s = spinner();
-  s.start("Checking migration status...");
   try {
     const tableCheck = await sql2.unsafe(`SELECT EXISTS (
         SELECT 1 FROM information_schema.tables
@@ -5550,7 +5693,7 @@ async function ensureDatabase2(dbUrl) {
 // package.json
 var package_default = {
   name: "@bungres/kit",
-  version: "1.1.1",
+  version: "1.1.2",
   description: "CLI toolkit for @bungres/orm \u2014 migrate, push, generate, pull",
   license: "MIT",
   engines: {
@@ -5601,13 +5744,13 @@ var package_default = {
     test: "bun test"
   },
   dependencies: {
-    "@bungres/orm": "^1.0.0",
+    "@bungres/orm": "^1.2.1",
     "@clack/prompts": "^1.7.0",
     picocolors: "^1.1.1"
   },
   devDependencies: {
-    "bun-types": "latest",
-    typescript: "latest"
+    "bun-types": "^1.3.14",
+    typescript: "^7.0.2"
   }
 };
 

package/dist/commands/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAanD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CA6Mf"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAanD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAqNf"}

package/dist/commands/migrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQnD,wBAAsB,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0GtE"}
+{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQnD,wBAAsB,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ItE"}

package/dist/commands/refresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../../src/commands/refresh.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AASnD,wBAAsB,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAoGtE"}
+{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../../src/commands/refresh.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AASnD,wBAAsB,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA+HtE"}

package/dist/commands/rollback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollback.d.ts","sourceRoot":"","sources":["../../src/commands/rollback.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQnD,wBAAsB,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA8FvE"}
+{"version":3,"file":"rollback.d.ts","sourceRoot":"","sources":["../../src/commands/rollback.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQnD,wBAAsB,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA8HvE"}

package/dist/commands/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQnD,wBAAsB,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAyErE"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAMnD,wBAAsB,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAyFrE"}

package/dist/commands/tusky.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tusky.d.ts","sourceRoot":"","sources":["../../src/commands/tusky.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAOnD,wBAAsB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAyEpE"}
+{"version":3,"file":"tusky.d.ts","sourceRoot":"","sources":["../../src/commands/tusky.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAWnD,wBAAsB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAyEpE"}

package/dist/index.js

@@ -267,7 +267,7 @@ function createTableFactory(casing) {
     const tableObj = {
       [TableConfigSymbol]: {
         name,
-        schema,
+        ...schema ? { schema } : {},
         columns: columnConfigs,
         indexes,
         checks,
@@ -347,6 +347,41 @@ var textArray = col("text[]");
 var integerArray = col("integer[]");
 var varcharArray = col("varchar[]");
 var uuidArray = col("uuid[]");
+function shiftParams(sql, paramsLength, offset) {
+  if (paramsLength === 0)
+    return sql;
+  let result = "";
+  let inString = false;
+  let inIdent = false;
+  let i = 0;
+  while (i < sql.length) {
+    if (sql[i] === "'" && !inIdent) {
+      inString = !inString;
+      result += sql[i];
+      i++;
+    } else if (sql[i] === '"' && !inString) {
+      inIdent = !inIdent;
+      result += sql[i];
+      i++;
+    } else if (!inString && !inIdent && sql[i] === "$") {
+      const match = sql.slice(i).match(/^\$(\d+)/);
+      if (match) {
+        const num = parseInt(match[1], 10);
+        if (num >= 1 && num <= paramsLength) {
+          result += `$${num + offset}`;
+          i += match[0].length;
+          continue;
+        }
+      }
+      result += sql[i];
+      i++;
+    } else {
+      result += sql[i];
+      i++;
+    }
+  }
+  return result;
+}
 function sql(strings, ...values) {
   let query = "";
   const params = [];
@@ -356,7 +391,7 @@ function sql(strings, ...values) {
       const val = values[i];
       if (isSQLChunk(val)) {
         const offset = params.length;
-        query += val.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`);
+        query += shiftParams(val.sql, val.params.length, offset);
         params.push(...val.params);
       } else {
         params.push(val);
@@ -374,7 +409,7 @@ function sqlJoin(chunks, separator = ", ") {
   const parts = [];
   for (const chunk of chunks) {
     const offset = params.length;
-    parts.push(chunk.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`));
+    parts.push(shiftParams(chunk.sql, chunk.params.length, offset));
     params.push(...chunk.params);
   }
   return { sql: parts.join(separator), params };
@@ -382,6 +417,19 @@ function sqlJoin(chunks, separator = ", ") {
 function rawSql(query) {
   return { sql: query, params: [] };
 }
+function toPgArray(val) {
+  const formatted = val.map((item) => {
+    if (item === null || item === undefined)
+      return "NULL";
+    if (typeof item === "number" || typeof item === "boolean")
+      return String(item);
+    if (Array.isArray(item))
+      return toPgArray(item);
+    const str = String(item).replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+    return `"${str}"`;
+  });
+  return `{${formatted.join(",")}}`;
+}
 function colName(c) {
   if (typeof c === "string")
     return `"${c}"`;
@@ -472,29 +520,29 @@ var not = (condition) => ({
 });
 var asc = (column) => sql`${rawSql(colName(column))} ASC`;
 var desc = (column) => sql`${rawSql(colName(column))} DESC`;
-function parseWhereObject(tableConfig, whereObj) {
+function parseWhereObject(tableConfig, whereObj, alias2) {
   const conditions = [];
   for (const [key, val] of Object.entries(whereObj)) {
     if (val === undefined)
       continue;
     if (key === "OR") {
-      const orConditions = val.map((o) => parseWhereObject(tableConfig, o));
+      const orConditions = val.map((o) => parseWhereObject(tableConfig, o, alias2));
       if (orConditions.length > 0)
         conditions.push(or(...orConditions));
       continue;
     }
     if (key === "AND") {
-      const andConditions = val.map((o) => parseWhereObject(tableConfig, o));
+      const andConditions = val.map((o) => parseWhereObject(tableConfig, o, alias2));
       if (andConditions.length > 0)
         conditions.push(and(...andConditions));
       continue;
     }
     if (key === "NOT") {
-      conditions.push(not(parseWhereObject(tableConfig, val)));
+      conditions.push(not(parseWhereObject(tableConfig, val, alias2)));
       continue;
     }
     const colConfig = tableConfig.columns[key];
-    const columnArg = colConfig ?? key;
+    const columnArg = colConfig ? alias2 ? { ...colConfig, tableName: alias2 } : colConfig : alias2 ? { name: key, tableName: alias2 } : key;
     if (val !== null && typeof val === "object" && !Array.isArray(val) && !(val instanceof Date) && !(val instanceof Uint8Array)) {
       const opVal = val;
       if (opVal.eq !== undefined)
@@ -536,13 +584,13 @@ function parseWhereObject(tableConfig, whereObj) {
   }
   return and(...conditions);
 }
-function parseOrderByObject(tableConfig, orderByObj) {
+function parseOrderByObject(tableConfig, orderByObj, alias2) {
   const parts = [];
   for (const [key, dir] of Object.entries(orderByObj)) {
     if (dir === undefined)
       continue;
     const colConfig = tableConfig.columns[key];
-    const columnArg = colConfig ?? key;
+    const columnArg = colConfig ? alias2 ? { ...colConfig, tableName: alias2 } : colConfig : alias2 ? { name: key, tableName: alias2 } : key;
     if (dir === "asc")
       parts.push(asc(columnArg));
     else if (dir === "desc")
@@ -710,14 +758,7 @@ class InsertBuilder {
           if (colType === "json" || colType === "jsonb") {
             params.push(val);
           } else if (Array.isArray(val)) {
-            const pgArray = "{" + val.map((item) => {
-              if (item === null || item === undefined)
-                return "NULL";
-              if (typeof item === "string")
-                return '"' + item.replace(/"/g, "\\\"") + '"';
-              return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"") + '"' : String(item);
-            }).join(",") + "}";
-            params.push(pgArray);
+            params.push(toPgArray(val));
           } else {
             params.push(JSON.stringify(val));
           }
@@ -768,14 +809,7 @@ class InsertBuilder {
           if (colType === "json" || colType === "jsonb") {
             params.push(value);
           } else if (Array.isArray(value)) {
-            const pgArray = "{" + value.map((item) => {
-              if (item === null || item === undefined)
-                return "NULL";
-              if (typeof item === "string")
-                return '"' + item.replace(/"/g, "\\\"") + '"';
-              return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"") + '"' : String(item);
-            }).join(",") + "}";
-            params.push(pgArray);
+            params.push(toPgArray(value));
           } else {
             params.push(JSON.stringify(value));
           }
@@ -1199,14 +1233,7 @@ class UpdateBuilder {
         if (colType === "json" || colType === "jsonb") {
           params.push(value);
         } else if (Array.isArray(value)) {
-          const pgArray = "{" + value.map((item) => {
-            if (item === null || item === undefined)
-              return "NULL";
-            if (typeof item === "string")
-              return '"' + item.replace(/"/g, "\\\"") + '"';
-            return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"") + '"' : String(item);
-          }).join(",") + "}";
-          params.push(pgArray);
+          params.push(toPgArray(value));
         } else {
           params.push(JSON.stringify(value));
         }
@@ -1449,7 +1476,7 @@ class RelationalQueryBuilder {
       const offset = params.length;
       let whereChunk = args.where;
       if (args.where && !args.where.sql) {
-        whereChunk = parseWhereObject(tableConfig, args.where);
+        whereChunk = parseWhereObject(tableConfig, args.where, alias2);
       }
       if (whereChunk && whereChunk.sql) {
         fromSql += (joinCondition ? " AND " : " WHERE ") + whereChunk.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`);
@@ -1464,7 +1491,7 @@ class RelationalQueryBuilder {
         fromSql += ` ORDER BY ` + args.orderBy.sql.replace(/\$(\d+)/g, (_, n) => `$${parseInt(n) + offset}`);
         params.push(...args.orderBy.params);
       } else {
-        const chunks = parseOrderByObject(tableConfig, args.orderBy);
+        const chunks = parseOrderByObject(tableConfig, args.orderBy, alias2);
         if (chunks.length > 0) {
           fromSql += ` ORDER BY ` + chunks.map((c) => {
             const offset = params.length;
@@ -1779,6 +1806,21 @@ function formatDefaultValue(value, dataType) {
     return value ? "TRUE" : "FALSE";
   if (typeof value === "number")
     return String(value);
+  if (value instanceof Date)
+    return `'${value.toISOString()}'`;
+  if (Array.isArray(value)) {
+    if (dataType === "json" || dataType === "jsonb") {
+      return `'${JSON.stringify(value).replace(/'/g, "''")}'`;
+    }
+    const pgArray = "{" + value.map((item) => {
+      if (item === null || item === undefined)
+        return "NULL";
+      if (typeof item === "string")
+        return '"' + item.replace(/"/g, "\\\"") + '"';
+      return typeof item === "object" ? '"' + JSON.stringify(item).replace(/"/g, "\\\"").replace(/'/g, "''") + '"' : String(item);
+    }).join(",") + "}";
+    return `'${pgArray.replace(/'/g, "''")}'`;
+  }
   return `'${JSON.stringify(value).replace(/'/g, "''")}'`;
 }
 function buildIndex(table, idx) {
@@ -3655,7 +3697,7 @@ async function runPush(config, opts = {}) {
 }
 // src/commands/generate.ts
 import { join as join3, resolve as resolve3 } from "path";
-import { readdirSync } from "fs";
+import { readdirSync, existsSync, statSync } from "fs";
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 async function runGenerate(config, name) {
   intro(import_picocolors2.default.bgCyan(import_picocolors2.default.black(" @bungres/kit generate ")));
@@ -3670,6 +3712,12 @@ async function runGenerate(config, name) {
   }
   s.stop(`Loaded ${schemas.length} schemas.`);
   const migrationsDir = resolve3(config.out);
+  if (existsSync(migrationsDir) && !statSync(migrationsDir).isDirectory()) {
+    s.stop("Failed.");
+    log.error(import_picocolors2.default.red(`Migration path exists but is not a directory: ${migrationsDir}`));
+    outro("Failed.");
+    return;
+  }
   const metaDir = join3(migrationsDir, "meta");
   await Bun.$`mkdir -p ${migrationsDir}`.quiet();
   await Bun.$`mkdir -p ${metaDir}`.quiet();
@@ -3844,10 +3892,26 @@ function topoSort(schemas) {
 }
 // src/commands/migrate.ts
 import { join as join4, resolve as resolve4 } from "path";
+import { existsSync as existsSync2, statSync as statSync2 } from "fs";
 var import_picocolors3 = __toESM(require_picocolors(), 1);
 async function runMigrate(config) {
   intro(import_picocolors3.default.bgCyan(import_picocolors3.default.black(" @bungres/kit migrate ")));
   const migrationsDir = resolve4(config.out);
+  let s = spinner();
+  s.start("Checking pending migrations...");
+  if (!existsSync2(migrationsDir)) {
+    s.stop("No files found.");
+    log.warn(import_picocolors3.default.yellow(`Migration directory does not exist: ${migrationsDir}`));
+    log.info(`Run ${import_picocolors3.default.green("bungres generate")} first.`);
+    outro("Done.");
+    return;
+  }
+  if (!statSync2(migrationsDir).isDirectory()) {
+    s.stop("Failed.");
+    log.error(import_picocolors3.default.red(`Migration path exists but is not a directory: ${migrationsDir}`));
+    outro("Failed.");
+    return;
+  }
   const sql2 = new Bun.SQL(config.dbUrl);
   const table = config.migrationsTable;
   const schema = config.migrationsSchema;
@@ -3859,8 +3923,6 @@ CREATE TABLE IF NOT EXISTS ${qualifiedTable} (
   name        TEXT NOT NULL UNIQUE,
   applied_at  TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );`.trim();
-  let s = spinner();
-  s.start("Checking pending migrations...");
   try {
     await sql2.unsafe(createSchema);
     await sql2.unsafe(createMigrationsTable);
@@ -3890,7 +3952,22 @@ CREATE TABLE IF NOT EXISTS ${qualifiedTable} (
     for (const file of pending) {
       s = spinner();
       s.start(`Applying ${file}...`);
-      const content = await Bun.file(join4(migrationsDir, file)).text();
+      const filePath = join4(migrationsDir, file);
+      if (!existsSync2(filePath)) {
+        s.stop("Failed.");
+        log.error(import_picocolors3.default.red(`Migration file not found: ${filePath}`));
+        outro("Failed.");
+        return;
+      }
+      let content = "";
+      try {
+        content = await Bun.file(filePath).text();
+      } catch (err) {
+        s.stop("Failed.");
+        log.error(import_picocolors3.default.red(`Failed to read migration file ${file}: ${err.message}`));
+        outro("Failed.");
+        return;
+      }
       let upContent = content;
       const upMatch = content.match(/-- ==== UP ====([\s\S]*?)(?:-- ==== DOWN ====|$)/i);
       if (upMatch) {
@@ -4176,17 +4253,31 @@ function toCamelCase(str) {
   return str.replace(/_([a-z])/g, (_2, c2) => c2.toUpperCase());
 }
 // src/commands/status.ts
-import { resolve as resolve6 } from "path";
 var import_picocolors4 = __toESM(require_picocolors(), 1);
+import { existsSync as existsSync3, statSync as statSync3 } from "fs";
+import { resolve as resolve6 } from "path";
 async function runStatus(config) {
   intro(import_picocolors4.default.bgCyan(import_picocolors4.default.black(" @bungres/kit status ")));
   const migrationsDir = resolve6(config.out);
+  const s = spinner();
+  s.start("Checking migration status...");
+  if (!existsSync3(migrationsDir)) {
+    s.stop("No migration directory found.");
+    log.warn(import_picocolors4.default.yellow(`Migration directory does not exist: ${migrationsDir}`));
+    log.info(`Run ${import_picocolors4.default.green("bungres generate")} first.`);
+    outro("Done.");
+    return;
+  }
+  if (!statSync3(migrationsDir).isDirectory()) {
+    s.stop("Failed.");
+    log.error(import_picocolors4.default.red(`Migration path exists but is not a directory: ${migrationsDir}`));
+    outro("Failed.");
+    return;
+  }
   const sql2 = new Bun.SQL(config.dbUrl);
   const table = config.migrationsTable;
   const schema = config.migrationsSchema;
   const qualifiedTable = `"${schema}"."${table}"`;
-  const s = spinner();
-  s.start("Checking migration status...");
   try {
     const tableCheck = await sql2.unsafe(`SELECT EXISTS (
         SELECT 1 FROM information_schema.tables

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bungres/kit",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "CLI toolkit for @bungres/orm — migrate, push, generate, pull",
   "license": "MIT",
   "engines": {
@@ -51,12 +51,12 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@bungres/orm": "^1.0.0",
+    "@bungres/orm": "^1.2.1",
     "@clack/prompts": "^1.7.0",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
-    "bun-types": "latest",
-    "typescript": "latest"
+    "bun-types": "^1.3.14",
+    "typescript": "^7.0.2"
   }
 }