bun-query-builder 0.2.6 → 0.2.8

package/dist/bin/cli.js

@@ -11701,6 +11701,9 @@ function applyConfig(userConfig) {
   if (userConfig.softDeletes) {
     config5.softDeletes = { ...config5.softDeletes, ...userConfig.softDeletes };
   }
+  if (userConfig.vitess) {
+    config5.vitess = { ...config5.vitess, ...userConfig.vitess };
+  }
 }
 function setConfig(userConfig) {
   if (userConfig.dialect && _lastConfiguredDialect && userConfig.dialect !== _lastConfiguredDialect) {
@@ -11722,6 +11725,7 @@ var init_config = __esm(() => {
   defaultConfig4 = {
     verbose: true,
     snapshotDir: ".qb",
+    migrationDir: "database/migrations",
     dialect: "postgres",
     database: {
       database: "test_db",
@@ -11730,6 +11734,9 @@ var init_config = __esm(() => {
       host: "localhost",
       port: 5432
     },
+    vitess: {
+      sharded: true
+    },
     timestamps: {
       createdAt: "created_at",
       updatedAt: "updated_at",
@@ -17970,7 +17977,7 @@ function parseMysqlEnum(columnType) {
     return;
   return m[1].split(",").map((s) => s.trim().replace(/^'(.*)'$/s, "$1").replace(/''/g, "'")).filter((s) => s.length > 0);
 }
-function groupPhysicalIndexes(table, rows) {
+function groupPhysicalIndexes(_table, rows) {
   const byName = new Map;
   for (const r of rows) {
     if (r.isPrimary)
@@ -18531,11 +18538,16 @@ var VitessDriver;
 var init_vitess = __esm(() => {
   init_mysql();
   VitessDriver = class VitessDriver extends MySQLDriver {
-    getAutoIncrementClause(_column) {
-      return "";
+    sharded;
+    constructor(sharded = true) {
+      super();
+      this.sharded = sharded;
+    }
+    getAutoIncrementClause(column) {
+      return this.sharded ? "" : super.getAutoIncrementClause(column);
     }
     renderColumn(column) {
-      if (!column.references)
+      if (!this.sharded || !column.references)
         return super.renderColumn(column);
       const { references: _references, ...withoutReference } = column;
       return super.renderColumn(withoutReference);
@@ -18543,10 +18555,12 @@ var init_vitess = __esm(() => {
     createTable(table) {
       return super.createTable(table);
     }
-    addForeignKey() {
-      return "";
+    addForeignKey(...args) {
+      return this.sharded ? "" : super.addForeignKey(...args);
     }
     createMigrationsTable() {
+      if (!this.sharded)
+        return super.createMigrationsTable();
       return `CREATE TABLE IF NOT EXISTS migrations (
       migration VARCHAR(255) NOT NULL PRIMARY KEY,
       executed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
@@ -18767,7 +18781,7 @@ function getDialectDriver(dialect) {
     case "singlestore":
       return new SingleStoreDriver;
     case "vitess":
-      return new VitessDriver;
+      return new VitessDriver(config5.vitess?.sharded ?? true);
     case "sqlite":
       return new SQLiteDriver;
     default:
@@ -18775,6 +18789,7 @@ function getDialectDriver(dialect) {
   }
 }
 var init_drivers = __esm(() => {
+  init_config();
   init_mysql();
   init_postgres();
   init_singlestore();
@@ -18789,7 +18804,7 @@ var init_drivers = __esm(() => {
 
 // src/workspace.ts
 import { existsSync as existsSync16 } from "fs";
-import { dirname as dirname8, join as join9 } from "path";
+import { dirname as dirname8, isAbsolute as isAbsolute3, join as join9 } from "path";
 import process24 from "process";
 function findWorkspaceRoot2(startPath = process24.cwd()) {
   let currentPath = startPath;
@@ -18800,8 +18815,9 @@ function findWorkspaceRoot2(startPath = process24.cwd()) {
   }
   return process24.cwd();
 }
-function getSqlDirectory(workspaceRoot) {
-  return join9(workspaceRoot ?? findWorkspaceRoot2(), "database", "migrations");
+function getSqlDirectory(workspaceRoot, migrationDir = "database/migrations") {
+  const configured = migrationDir || "database/migrations";
+  return isAbsolute3(configured) ? configured : join9(workspaceRoot ?? findWorkspaceRoot2(), configured);
 }
 var init_workspace = () => {};
 
@@ -18910,7 +18926,7 @@ function getWorkspaceRoot() {
   return findWorkspaceRoot2();
 }
 function ensureSqlDirectory(workspaceRoot) {
-  const sqlDir = getSqlDirectory(workspaceRoot);
+  const sqlDir = getSqlDirectory(workspaceRoot, config5.migrationDir);
   if (!existsSync17(sqlDir)) {
     mkdirSync8(sqlDir, { recursive: true });
     info(`-- Created SQL directory: ${sqlDir}`);
@@ -19163,7 +19179,7 @@ async function deleteMigrationFiles(dir, workspaceRoot, opts = {}) {
     unlinkSync(statePath);
     info(`-- Removed legacy migration state file: ${statePath}`);
   }
-  removeGeneratedMigrationFiles(getSqlDirectory(workspaceRoot));
+  removeGeneratedMigrationFiles(getSqlDirectory(workspaceRoot, config5.migrationDir));
 }
 function removeGeneratedMigrationFiles(sqlDir) {
   if (!existsSync17(sqlDir))
@@ -19358,7 +19374,7 @@ async function migrateRollback(options = {}) {
       console.log(`  - ${migration.migration}`);
     }
     console.log();
-    const sqlDir = getSqlDirectory();
+    const sqlDir = getSqlDirectory(undefined, config5.migrationDir);
     let reversedAny = false;
     for (const migration of migrationsToRollback) {
       try {
@@ -19408,7 +19424,7 @@ import { existsSync as existsSync19, readdirSync as readdirSync8 } from "fs";
 async function migrateStatus() {
   const dialect = config5.dialect || "postgres";
   const driver = getDialectDriver(dialect);
-  const sqlDir = getSqlDirectory();
+  const sqlDir = getSqlDirectory(undefined, config5.migrationDir);
   console.log("-- Migration Status");
   console.log(`-- Dialect: ${dialect}`);
   console.log(`-- SQL directory: ${sqlDir}`);
@@ -28103,7 +28119,7 @@ var init_factory = () => {};
 
 // src/loader.ts
 import { readdirSync as readdirSync12 } from "fs";
-import { basename, extname as extname4, isAbsolute as isAbsolute3, join as join17 } from "path";
+import { basename, extname as extname4, isAbsolute as isAbsolute5, join as join17 } from "path";
 import process30 from "process";
 function isModelFile(name) {
   const ext = extname4(name);
@@ -28136,7 +28152,7 @@ function collectModelFiles(dir) {
 }
 async function loadModels(options) {
   const cwd = options.cwd ?? process30.cwd();
-  const dir = isAbsolute3(options.modelsDir) ? options.modelsDir : join17(cwd, options.modelsDir);
+  const dir = isAbsolute5(options.modelsDir) ? options.modelsDir : join17(cwd, options.modelsDir);
   const result = {};
   for (const full of collectModelFiles(dir)) {
     const cacheBuster = `?t=${Date.now()}-${Math.random().toString(36).slice(2)}`;
@@ -28270,7 +28286,7 @@ function findWorkspaceRoot5(startPath) {
 }
 function ensureSqlDirectory2() {
   const workspaceRoot = findWorkspaceRoot5(process31.cwd());
-  const sqlDir = join18(workspaceRoot, "database", "migrations");
+  const sqlDir = getSqlDirectory(workspaceRoot, config5.migrationDir);
   if (!existsSync23(sqlDir)) {
     mkdirSync10(sqlDir, { recursive: true });
     info2(`-- Created SQL directory: ${sqlDir}`);
@@ -29272,7 +29288,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     if (preserveUnknownColumns && removedCols.length > 0) {
       const preserved = removedCols.map((name) => prevCols[name]);
       const preservedNames = new Set(removedCols);
-      const keptIndexes = prev.indexes.filter((idx) => idx.columns.some((c2) => preservedNames.has(c2)) && !currIdx[indexKey(idx)]);
+      const keptIndexes = prev.indexes.filter((idx) => idx.columns.some((c2) => preservedNames.has(c2)) && !currIdx[indexKey(idx, prev.table)]);
       info2(`-- Keeping ${preserved.length} column(s) on "${curr.table}" no model declares: ${removedCols.join(", ")} \u2014 reconciled from the database, where an undeclared column is out of scope rather than removed`);
       curr = { ...curr, columns: [...curr.columns, ...preserved], indexes: [...curr.indexes, ...keptIndexes] };
       currCols = mapColumnsByName(curr.columns);
@@ -29432,6 +29448,7 @@ var init_migrations = __esm(() => {
   init_drivers();
   init_sqlite();
   init_meta();
+  init_workspace();
   createdMigrationFiles = [];
 });
 
@@ -31514,7 +31531,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.6";
+var version2 = "0.2.8";
 
 // bin/cli.ts
 init_actions();

package/dist/drivers/vitess.d.ts

@@ -6,8 +6,10 @@ import type { ColumnPlan, TablePlan } from '../migrations';
  * Vitess shards MySQL behind vtgate, which speaks the MySQL wire protocol, so
  * runtime DML (placeholders, backtick quoting, `ON DUPLICATE KEY UPDATE`,
  * `LAST_INSERT_ID`) is identical — see `isMysqlLike` in `config.ts`. Only DDL
- * diverges, and every divergence below follows from one fact: a keyspace is
- * split across shards that share nothing.
+ * diverges only when the keyspace is sharded. An unsharded keyspace retains
+ * normal MySQL AUTO_INCREMENT and foreign-key support, so this driver takes
+ * the topology explicitly instead of conflating "behind vtgate" with
+ * "distributed across shards".
  *
  *  - **No foreign keys.** Enforcing one would need a cross-shard read on every
  *    write, so vtgate rejects them in a sharded keyspace. Both forms are
@@ -30,9 +32,10 @@ import type { ColumnPlan, TablePlan } from '../migrations';
  * driver needs to know how a table is sharded.
  */
 export declare class VitessDriver extends MySQLDriver {
-  protected getAutoIncrementClause(_column: ColumnPlan): string;
+  constructor(sharded?: boolean);
+  protected getAutoIncrementClause(column: ColumnPlan): string;
   protected renderColumn(column: ColumnPlan): string;
   createTable(table: TablePlan): string;
-  addForeignKey(): string;
+  addForeignKey(...args: Parameters<MySQLDriver['addForeignKey']>): string;
   createMigrationsTable(): string;
 }

package/dist/src/index.js

@@ -11700,6 +11700,9 @@ function applyConfig(userConfig) {
   if (userConfig.softDeletes) {
     config5.softDeletes = { ...config5.softDeletes, ...userConfig.softDeletes };
   }
+  if (userConfig.vitess) {
+    config5.vitess = { ...config5.vitess, ...userConfig.vitess };
+  }
 }
 function setConfig(userConfig) {
   if (userConfig.dialect && _lastConfiguredDialect && userConfig.dialect !== _lastConfiguredDialect) {
@@ -11721,6 +11724,7 @@ var init_config = __esm(() => {
   defaultConfig4 = {
     verbose: true,
     snapshotDir: ".qb",
+    migrationDir: "database/migrations",
     dialect: "postgres",
     database: {
       database: "test_db",
@@ -11729,6 +11733,9 @@ var init_config = __esm(() => {
       host: "localhost",
       port: 5432
     },
+    vitess: {
+      sharded: true
+    },
     timestamps: {
       createdAt: "created_at",
       updatedAt: "updated_at",
@@ -17969,7 +17976,7 @@ function parseMysqlEnum(columnType) {
     return;
   return m[1].split(",").map((s) => s.trim().replace(/^'(.*)'$/s, "$1").replace(/''/g, "'")).filter((s) => s.length > 0);
 }
-function groupPhysicalIndexes(table, rows) {
+function groupPhysicalIndexes(_table, rows) {
   const byName = new Map;
   for (const r of rows) {
     if (r.isPrimary)
@@ -18530,11 +18537,16 @@ var VitessDriver;
 var init_vitess = __esm(() => {
   init_mysql();
   VitessDriver = class VitessDriver extends MySQLDriver {
-    getAutoIncrementClause(_column) {
-      return "";
+    sharded;
+    constructor(sharded = true) {
+      super();
+      this.sharded = sharded;
+    }
+    getAutoIncrementClause(column) {
+      return this.sharded ? "" : super.getAutoIncrementClause(column);
     }
     renderColumn(column) {
-      if (!column.references)
+      if (!this.sharded || !column.references)
         return super.renderColumn(column);
       const { references: _references, ...withoutReference } = column;
       return super.renderColumn(withoutReference);
@@ -18542,10 +18554,12 @@ var init_vitess = __esm(() => {
     createTable(table) {
       return super.createTable(table);
     }
-    addForeignKey() {
-      return "";
+    addForeignKey(...args) {
+      return this.sharded ? "" : super.addForeignKey(...args);
     }
     createMigrationsTable() {
+      if (!this.sharded)
+        return super.createMigrationsTable();
       return `CREATE TABLE IF NOT EXISTS migrations (
       migration VARCHAR(255) NOT NULL PRIMARY KEY,
       executed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
@@ -18766,7 +18780,7 @@ function getDialectDriver(dialect) {
     case "singlestore":
       return new SingleStoreDriver;
     case "vitess":
-      return new VitessDriver;
+      return new VitessDriver(config5.vitess?.sharded ?? true);
     case "sqlite":
       return new SQLiteDriver;
     default:
@@ -18774,6 +18788,7 @@ function getDialectDriver(dialect) {
   }
 }
 var init_drivers = __esm(() => {
+  init_config();
   init_mysql();
   init_postgres();
   init_singlestore();
@@ -18788,7 +18803,7 @@ var init_drivers = __esm(() => {
 
 // src/workspace.ts
 import { existsSync as existsSync16 } from "fs";
-import { dirname as dirname8, join as join9 } from "path";
+import { dirname as dirname8, isAbsolute as isAbsolute3, join as join9 } from "path";
 import process24 from "process";
 function findWorkspaceRoot2(startPath = process24.cwd()) {
   let currentPath = startPath;
@@ -18799,8 +18814,9 @@ function findWorkspaceRoot2(startPath = process24.cwd()) {
   }
   return process24.cwd();
 }
-function getSqlDirectory(workspaceRoot) {
-  return join9(workspaceRoot ?? findWorkspaceRoot2(), "database", "migrations");
+function getSqlDirectory(workspaceRoot, migrationDir = "database/migrations") {
+  const configured = migrationDir || "database/migrations";
+  return isAbsolute3(configured) ? configured : join9(workspaceRoot ?? findWorkspaceRoot2(), configured);
 }
 var init_workspace = () => {};
 
@@ -18909,7 +18925,7 @@ function getWorkspaceRoot() {
   return findWorkspaceRoot2();
 }
 function ensureSqlDirectory(workspaceRoot) {
-  const sqlDir = getSqlDirectory(workspaceRoot);
+  const sqlDir = getSqlDirectory(workspaceRoot, config5.migrationDir);
   if (!existsSync17(sqlDir)) {
     mkdirSync8(sqlDir, { recursive: true });
     info(`-- Created SQL directory: ${sqlDir}`);
@@ -19162,7 +19178,7 @@ async function deleteMigrationFiles(dir, workspaceRoot, opts = {}) {
     unlinkSync(statePath);
     info(`-- Removed legacy migration state file: ${statePath}`);
   }
-  removeGeneratedMigrationFiles(getSqlDirectory(workspaceRoot));
+  removeGeneratedMigrationFiles(getSqlDirectory(workspaceRoot, config5.migrationDir));
 }
 function removeGeneratedMigrationFiles(sqlDir) {
   if (!existsSync17(sqlDir))
@@ -19357,7 +19373,7 @@ async function migrateRollback(options = {}) {
       console.log(`  - ${migration.migration}`);
     }
     console.log();
-    const sqlDir = getSqlDirectory();
+    const sqlDir = getSqlDirectory(undefined, config5.migrationDir);
     let reversedAny = false;
     for (const migration of migrationsToRollback) {
       try {
@@ -19407,7 +19423,7 @@ import { existsSync as existsSync19, readdirSync as readdirSync8 } from "fs";
 async function migrateStatus() {
   const dialect = config5.dialect || "postgres";
   const driver = getDialectDriver(dialect);
-  const sqlDir = getSqlDirectory();
+  const sqlDir = getSqlDirectory(undefined, config5.migrationDir);
   console.log("-- Migration Status");
   console.log(`-- Dialect: ${dialect}`);
   console.log(`-- SQL directory: ${sqlDir}`);
@@ -28102,7 +28118,7 @@ var init_factory = () => {};
 
 // src/loader.ts
 import { readdirSync as readdirSync12 } from "fs";
-import { basename, extname as extname4, isAbsolute as isAbsolute3, join as join17 } from "path";
+import { basename, extname as extname4, isAbsolute as isAbsolute5, join as join17 } from "path";
 import process30 from "process";
 function isModelFile(name) {
   const ext = extname4(name);
@@ -28135,7 +28151,7 @@ function collectModelFiles(dir) {
 }
 async function loadModels(options) {
   const cwd = options.cwd ?? process30.cwd();
-  const dir = isAbsolute3(options.modelsDir) ? options.modelsDir : join17(cwd, options.modelsDir);
+  const dir = isAbsolute5(options.modelsDir) ? options.modelsDir : join17(cwd, options.modelsDir);
   const result = {};
   for (const full of collectModelFiles(dir)) {
     const cacheBuster = `?t=${Date.now()}-${Math.random().toString(36).slice(2)}`;
@@ -28269,7 +28285,7 @@ function findWorkspaceRoot5(startPath) {
 }
 function ensureSqlDirectory2() {
   const workspaceRoot = findWorkspaceRoot5(process31.cwd());
-  const sqlDir = join18(workspaceRoot, "database", "migrations");
+  const sqlDir = getSqlDirectory(workspaceRoot, config5.migrationDir);
   if (!existsSync23(sqlDir)) {
     mkdirSync10(sqlDir, { recursive: true });
     info2(`-- Created SQL directory: ${sqlDir}`);
@@ -29271,7 +29287,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     if (preserveUnknownColumns && removedCols.length > 0) {
       const preserved = removedCols.map((name) => prevCols[name]);
       const preservedNames = new Set(removedCols);
-      const keptIndexes = prev.indexes.filter((idx) => idx.columns.some((c2) => preservedNames.has(c2)) && !currIdx[indexKey(idx)]);
+      const keptIndexes = prev.indexes.filter((idx) => idx.columns.some((c2) => preservedNames.has(c2)) && !currIdx[indexKey(idx, prev.table)]);
       info2(`-- Keeping ${preserved.length} column(s) on "${curr.table}" no model declares: ${removedCols.join(", ")} \u2014 reconciled from the database, where an undeclared column is out of scope rather than removed`);
       curr = { ...curr, columns: [...curr.columns, ...preserved], indexes: [...curr.indexes, ...keptIndexes] };
       currCols = mapColumnsByName(curr.columns);
@@ -29431,6 +29447,7 @@ var init_migrations = __esm(() => {
   init_drivers();
   init_sqlite();
   init_meta();
+  init_workspace();
   createdMigrationFiles = [];
 });
 

package/dist/types.d.ts

@@ -192,6 +192,10 @@ export declare interface DatabaseConfig {
   ssl?: boolean
   pool?: PoolConfig
 }
+/** Vitess topology controls that affect generated DDL. */
+export declare interface VitessConfig {
+  sharded: boolean
+}
 /**
  * # `BrowserConfig`
  *
@@ -226,6 +230,7 @@ export declare interface BrowserConfig {
 export declare interface QueryBuilderConfig {
   verbose: boolean
   snapshotDir: string
+  migrationDir: string
   dialect: SupportedDialect
   database: DatabaseConfig
   browser?: BrowserConfig
@@ -236,6 +241,7 @@ export declare interface QueryBuilderConfig {
   transactionDefaults: TransactionDefaultsConfig
   sql: SqlConfig
   sqlite?: SqliteConfig
+  vitess?: VitessConfig
   features: FeatureToggles
   debug?: {
     captureText: boolean
@@ -293,10 +299,10 @@ export declare interface UnsafeOptions {
  *   but its DDL adds distributed-table concepts (`SHARD KEY`, `SORT KEY`,
  *   `ROWSTORE`/columnstore) and drops foreign keys — handled by the dedicated
  *   `SingleStoreDriver`.
- * - 'vitess': Sharded MySQL behind vtgate. Shares MySQL's wire protocol and
- *   DML (see `isMysqlLike`), but a sharded keyspace rejects foreign keys and
- *   AUTO_INCREMENT, and its sharding topology lives in a separate VSchema
- *   document rather than in DDL — handled by the dedicated `VitessDriver`.
+ * - 'vitess': MySQL behind vtgate. Shares MySQL's wire protocol and DML (see
+ *   `isMysqlLike`). Unsharded keyspaces retain normal MySQL DDL, while a
+ *   sharded keyspace rejects foreign keys and AUTO_INCREMENT; select that
+ *   stricter profile with `vitess.sharded`.
  * - 'sqlite': Lightweight engine; some features are limited or emulated
  * - 'browser': Browser-compatible mode that uses fetch() API calls instead of direct database connections
  */

package/dist/workspace.d.ts

@@ -0,0 +1,8 @@
+/**
+ * The nearest ancestor of `startPath` containing a `package.json`, or the
+ * working directory when there is none — which keeps a bare directory (a test
+ * fixture, a scratch folder) working as its own workspace.
+ */
+export declare function findWorkspaceRoot(startPath?: string): string;
+/** The configured migration corpus, resolved from the workspace root. */
+export declare function getSqlDirectory(workspaceRoot?: string, migrationDir?: string): string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",