bun-query-builder 0.1.50 → 0.1.52

package/dist/bin/cli.js

@@ -18078,6 +18078,14 @@ class MySQLDriver {
     if (defaultValue) {
       parts.push(defaultValue);
     }
+    if (column.references) {
+      let reference = `REFERENCES ${this.quoteIdentifier(column.references.table)}(${this.quoteIdentifier(column.references.column)})`;
+      if (column.references.onDelete)
+        reference += ` ON DELETE ${column.references.onDelete.toUpperCase()}`;
+      if (column.references.onUpdate)
+        reference += ` ON UPDATE ${column.references.onUpdate.toUpperCase()}`;
+      parts.push(reference);
+    }
     return parts.join(" ");
   }
 }
@@ -18245,6 +18253,14 @@ class PostgresDriver {
     if (defaultValue) {
       parts.push(defaultValue);
     }
+    if (column.references) {
+      let reference = `REFERENCES ${this.quoteIdentifier(column.references.table)}(${this.quoteIdentifier(column.references.column)})`;
+      if (column.references.onDelete)
+        reference += ` ON DELETE ${column.references.onDelete.toUpperCase()}`;
+      if (column.references.onUpdate)
+        reference += ` ON UPDATE ${column.references.onUpdate.toUpperCase()}`;
+      parts.push(reference);
+    }
     return parts.join(" ");
   }
 }
@@ -28014,7 +28030,8 @@ function buildMigrationPlan2(models, options) {
     for (const attrName of Object.keys(attrs)) {
       const attr = attrs[attrName];
       const columnName = snakeCase(attrName);
-      const isNullable = true;
+      const validatorRequired = Boolean(attr.validation?.rule?.isRequired);
+      const isNullable = attrName === primaryKey ? false : attr.nullable ?? !(attr.required ?? validatorRequired);
       let inferred;
       let enumValues;
       const isPk = attrName === primaryKey;
@@ -28309,7 +28326,12 @@ function generateSql(plan, opts = {}) {
   const emit = opts.dryRun ? () => false : createMigrationFile;
   const statements = [];
   const driver = getDialectDriver(plan.dialect);
-  for (const t2 of plan.tables) {
+  const { tables, deferredForeignKeys } = orderTablesForCreate(plan.tables, plan.dialect);
+  for (const [tableIndex, originalTable] of tables.entries()) {
+    const t2 = {
+      ...originalTable,
+      columns: originalTable.columns.map((column) => deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)) ? { ...column, references: undefined } : column)
+    };
     const tableStatements = [];
     const enumTypes = new Set;
     for (const c2 of t2.columns) {
@@ -28327,30 +28349,25 @@ function generateSql(plan, opts = {}) {
     }
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
+    for (const idx of t2.indexes)
+      tableStatements.push(driver.createIndex(t2.table, idx));
+    if (tableIndex === tables.length - 1) {
+      for (const deferredTable of tables) {
+        for (const column of deferredTable.columns) {
+          if (!column.references || !deferredForeignKeys.has(foreignKeyKey(deferredTable.table, column.name)))
+            continue;
+          const addForeignKey = driver.addForeignKey(deferredTable.table, column.name, column.references.table, column.references.column, column.references.onDelete, column.references.onUpdate);
+          if (addForeignKey)
+            tableStatements.push(addForeignKey);
+        }
+      }
+    }
     statements.push(...tableStatements);
     const combinedStatement = tableStatements.join(`
 
 `);
     emit(combinedStatement, `create-${t2.table}-table`);
   }
-  for (const t2 of plan.tables) {
-    for (const c2 of t2.columns) {
-      if (c2.references) {
-        const alterTableStatement = driver.addForeignKey(t2.table, c2.name, c2.references.table, c2.references.column, c2.references.onDelete, c2.references.onUpdate);
-        if (!alterTableStatement)
-          continue;
-        statements.push(alterTableStatement);
-        emit(alterTableStatement, `alter-${t2.table}-${c2.name}`);
-      }
-    }
-  }
-  for (const t2 of plan.tables) {
-    for (const idx of t2.indexes) {
-      const createIndexStatement = driver.createIndex(t2.table, idx);
-      statements.push(createIndexStatement);
-      emit(createIndexStatement, `create-${idx.name}-index-in-${t2.table}`);
-    }
-  }
   const totalChanges = migrationsCreatedCount + migrationsUpdatedCount;
   if (totalChanges === 0) {
     info2("-- Nothing to migrate");
@@ -28364,6 +28381,39 @@ function generateSql(plan, opts = {}) {
   }
   return statements;
 }
+function foreignKeyKey(table, column) {
+  return `${table}\x00${column}`;
+}
+function orderTablesForCreate(input, dialect) {
+  if (dialect === "sqlite" || input.length < 2)
+    return { tables: input, deferredForeignKeys: new Set };
+  const byName = new Map(input.map((table) => [table.table, table]));
+  const dependencies = new Map;
+  for (const table of input) {
+    dependencies.set(table.table, new Set(table.columns.map((column) => column.references?.table).filter((target) => Boolean(target && target !== table.table && byName.has(target)))));
+  }
+  const ordered = [];
+  const emitted = new Set;
+  while (ordered.length < input.length) {
+    const ready = input.find((table) => !emitted.has(table.table) && [...dependencies.get(table.table) ?? []].every((target) => emitted.has(target)));
+    if (!ready)
+      break;
+    ordered.push(ready);
+    emitted.add(ready.table);
+  }
+  const cycleTables = new Set(input.filter((table) => !emitted.has(table.table)).map((table) => table.table));
+  const deferredForeignKeys = new Set;
+  for (const table of input) {
+    if (!cycleTables.has(table.table))
+      continue;
+    for (const column of table.columns) {
+      if (column.references && cycleTables.has(column.references.table) && column.references.table !== table.table)
+        deferredForeignKeys.add(foreignKeyKey(table.table, column.name));
+    }
+  }
+  ordered.push(...input.filter((table) => cycleTables.has(table.table)));
+  return { tables: ordered, deferredForeignKeys };
+}
 function generateSqlString(plan) {
   return generateSql(plan).join(`
 `);
@@ -28572,59 +28622,58 @@ function generateDiffOperations(previous, next, opts = {}) {
       info2(`-- Detected dropped table: ${tableName}`);
     }
   }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      const tableStatements = [];
-      const enumTypes2 = new Set;
-      for (const c2 of t2.columns) {
-        if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
-          const enumTypeName = `${t2.table}_${c2.name}_type`;
-          c2.enumTypeName = enumTypeName;
-          if (!enumTypes2.has(enumTypeName)) {
-            const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
-            if (createEnumStatement) {
-              tableStatements.push(createEnumStatement);
-            }
-            enumTypes2.add(enumTypeName);
+  const newTablePlans = Object.keys(nextTables).filter((tableName) => !prevTables[tableName]).map((tableName) => nextTables[tableName]);
+  const { tables: orderedNewTables, deferredForeignKeys } = orderTablesForCreate(newTablePlans, dialect);
+  for (const [tableIndex, originalTable] of orderedNewTables.entries()) {
+    const t2 = {
+      ...originalTable,
+      columns: originalTable.columns.map((column) => deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)) ? { ...column, references: undefined } : column)
+    };
+    const tableStatements = [];
+    const enumTypes2 = new Set;
+    for (const c2 of t2.columns) {
+      if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
+        const enumTypeName = `${t2.table}_${c2.name}_type`;
+        c2.enumTypeName = enumTypeName;
+        if (!enumTypes2.has(enumTypeName)) {
+          const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
+          if (createEnumStatement) {
+            tableStatements.push(createEnumStatement);
           }
+          enumTypes2.add(enumTypeName);
         }
       }
-      const createTableStatement = driver.createTable(t2);
-      tableStatements.push(createTableStatement);
-      chunks.push(...tableStatements);
-      operations.push({ kind: "create_table", table: t2.table, destructive: false, sql: createTableStatement });
-      const combinedStatement = tableStatements.join(`
-
-`);
-      emit(combinedStatement, `create-${t2.table}-table`);
     }
-  }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      for (const idx of t2.indexes) {
-        const createIndexStatement = driver.createIndex(t2.table, idx);
-        chunks.push(createIndexStatement);
-        operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
-        emit(createIndexStatement, `create-${idx.name}-index-in-${t2.table}`);
-      }
+    const createTableStatement = driver.createTable(t2);
+    tableStatements.push(createTableStatement);
+    for (const idx of t2.indexes) {
+      const createIndexStatement = driver.createIndex(t2.table, idx);
+      tableStatements.push(createIndexStatement);
+      operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
     }
-  }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      for (const c2 of t2.columns) {
-        if (c2.references) {
-          const alterTableStatement = driver.addForeignKey(t2.table, c2.name, c2.references.table, c2.references.column, c2.references.onDelete, c2.references.onUpdate);
-          if (!alterTableStatement)
+    for (const column of originalTable.columns) {
+      if (column.references && !deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)))
+        operations.push({ kind: "add_foreign_key", table: originalTable.table, column: column.name, destructive: false, sql: createTableStatement });
+    }
+    if (tableIndex === orderedNewTables.length - 1) {
+      for (const deferredTable of orderedNewTables) {
+        for (const column of deferredTable.columns) {
+          if (!column.references || !deferredForeignKeys.has(foreignKeyKey(deferredTable.table, column.name)))
             continue;
-          chunks.push(alterTableStatement);
-          operations.push({ kind: "add_foreign_key", table: t2.table, column: c2.name, destructive: false, sql: alterTableStatement });
-          emit(alterTableStatement, `alter-${t2.table}-${c2.name}`);
+          const addForeignKey = driver.addForeignKey(deferredTable.table, column.name, column.references.table, column.references.column, column.references.onDelete, column.references.onUpdate);
+          if (!addForeignKey)
+            continue;
+          tableStatements.push(addForeignKey);
+          operations.push({ kind: "add_foreign_key", table: deferredTable.table, column: column.name, destructive: false, sql: addForeignKey });
         }
       }
     }
+    chunks.push(...tableStatements);
+    operations.push({ kind: "create_table", table: t2.table, destructive: false, sql: createTableStatement });
+    const combinedStatement = tableStatements.join(`
+
+`);
+    emit(combinedStatement, `create-${t2.table}-table`);
   }
   const enumTypes = new Set;
   for (const tableName of Object.keys(nextTables)) {
@@ -30902,7 +30951,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.1.50";
+var version2 = "0.1.52";
 
 // bin/cli.ts
 init_actions();

package/dist/schema.d.ts

@@ -52,6 +52,8 @@ export declare interface ForeignKeyConfig {
  * ```
  */
 export declare interface Attribute {
+  required?: boolean
+  nullable?: boolean
   default?: string | number | boolean | Date
   unique?: boolean
   order?: number

package/dist/src/index.js

@@ -18077,6 +18077,14 @@ class MySQLDriver {
     if (defaultValue) {
       parts.push(defaultValue);
     }
+    if (column.references) {
+      let reference = `REFERENCES ${this.quoteIdentifier(column.references.table)}(${this.quoteIdentifier(column.references.column)})`;
+      if (column.references.onDelete)
+        reference += ` ON DELETE ${column.references.onDelete.toUpperCase()}`;
+      if (column.references.onUpdate)
+        reference += ` ON UPDATE ${column.references.onUpdate.toUpperCase()}`;
+      parts.push(reference);
+    }
     return parts.join(" ");
   }
 }
@@ -18244,6 +18252,14 @@ class PostgresDriver {
     if (defaultValue) {
       parts.push(defaultValue);
     }
+    if (column.references) {
+      let reference = `REFERENCES ${this.quoteIdentifier(column.references.table)}(${this.quoteIdentifier(column.references.column)})`;
+      if (column.references.onDelete)
+        reference += ` ON DELETE ${column.references.onDelete.toUpperCase()}`;
+      if (column.references.onUpdate)
+        reference += ` ON UPDATE ${column.references.onUpdate.toUpperCase()}`;
+      parts.push(reference);
+    }
     return parts.join(" ");
   }
 }
@@ -28013,7 +28029,8 @@ function buildMigrationPlan2(models, options) {
     for (const attrName of Object.keys(attrs)) {
       const attr = attrs[attrName];
       const columnName = snakeCase(attrName);
-      const isNullable = true;
+      const validatorRequired = Boolean(attr.validation?.rule?.isRequired);
+      const isNullable = attrName === primaryKey ? false : attr.nullable ?? !(attr.required ?? validatorRequired);
       let inferred;
       let enumValues;
       const isPk = attrName === primaryKey;
@@ -28308,7 +28325,12 @@ function generateSql(plan, opts = {}) {
   const emit = opts.dryRun ? () => false : createMigrationFile;
   const statements = [];
   const driver = getDialectDriver(plan.dialect);
-  for (const t2 of plan.tables) {
+  const { tables, deferredForeignKeys } = orderTablesForCreate(plan.tables, plan.dialect);
+  for (const [tableIndex, originalTable] of tables.entries()) {
+    const t2 = {
+      ...originalTable,
+      columns: originalTable.columns.map((column) => deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)) ? { ...column, references: undefined } : column)
+    };
     const tableStatements = [];
     const enumTypes = new Set;
     for (const c2 of t2.columns) {
@@ -28326,30 +28348,25 @@ function generateSql(plan, opts = {}) {
     }
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
+    for (const idx of t2.indexes)
+      tableStatements.push(driver.createIndex(t2.table, idx));
+    if (tableIndex === tables.length - 1) {
+      for (const deferredTable of tables) {
+        for (const column of deferredTable.columns) {
+          if (!column.references || !deferredForeignKeys.has(foreignKeyKey(deferredTable.table, column.name)))
+            continue;
+          const addForeignKey = driver.addForeignKey(deferredTable.table, column.name, column.references.table, column.references.column, column.references.onDelete, column.references.onUpdate);
+          if (addForeignKey)
+            tableStatements.push(addForeignKey);
+        }
+      }
+    }
     statements.push(...tableStatements);
     const combinedStatement = tableStatements.join(`
 
 `);
     emit(combinedStatement, `create-${t2.table}-table`);
   }
-  for (const t2 of plan.tables) {
-    for (const c2 of t2.columns) {
-      if (c2.references) {
-        const alterTableStatement = driver.addForeignKey(t2.table, c2.name, c2.references.table, c2.references.column, c2.references.onDelete, c2.references.onUpdate);
-        if (!alterTableStatement)
-          continue;
-        statements.push(alterTableStatement);
-        emit(alterTableStatement, `alter-${t2.table}-${c2.name}`);
-      }
-    }
-  }
-  for (const t2 of plan.tables) {
-    for (const idx of t2.indexes) {
-      const createIndexStatement = driver.createIndex(t2.table, idx);
-      statements.push(createIndexStatement);
-      emit(createIndexStatement, `create-${idx.name}-index-in-${t2.table}`);
-    }
-  }
   const totalChanges = migrationsCreatedCount + migrationsUpdatedCount;
   if (totalChanges === 0) {
     info2("-- Nothing to migrate");
@@ -28363,6 +28380,39 @@ function generateSql(plan, opts = {}) {
   }
   return statements;
 }
+function foreignKeyKey(table, column) {
+  return `${table}\x00${column}`;
+}
+function orderTablesForCreate(input, dialect) {
+  if (dialect === "sqlite" || input.length < 2)
+    return { tables: input, deferredForeignKeys: new Set };
+  const byName = new Map(input.map((table) => [table.table, table]));
+  const dependencies = new Map;
+  for (const table of input) {
+    dependencies.set(table.table, new Set(table.columns.map((column) => column.references?.table).filter((target) => Boolean(target && target !== table.table && byName.has(target)))));
+  }
+  const ordered = [];
+  const emitted = new Set;
+  while (ordered.length < input.length) {
+    const ready = input.find((table) => !emitted.has(table.table) && [...dependencies.get(table.table) ?? []].every((target) => emitted.has(target)));
+    if (!ready)
+      break;
+    ordered.push(ready);
+    emitted.add(ready.table);
+  }
+  const cycleTables = new Set(input.filter((table) => !emitted.has(table.table)).map((table) => table.table));
+  const deferredForeignKeys = new Set;
+  for (const table of input) {
+    if (!cycleTables.has(table.table))
+      continue;
+    for (const column of table.columns) {
+      if (column.references && cycleTables.has(column.references.table) && column.references.table !== table.table)
+        deferredForeignKeys.add(foreignKeyKey(table.table, column.name));
+    }
+  }
+  ordered.push(...input.filter((table) => cycleTables.has(table.table)));
+  return { tables: ordered, deferredForeignKeys };
+}
 function generateSqlString(plan) {
   return generateSql(plan).join(`
 `);
@@ -28571,59 +28621,58 @@ function generateDiffOperations(previous, next, opts = {}) {
       info2(`-- Detected dropped table: ${tableName}`);
     }
   }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      const tableStatements = [];
-      const enumTypes2 = new Set;
-      for (const c2 of t2.columns) {
-        if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
-          const enumTypeName = `${t2.table}_${c2.name}_type`;
-          c2.enumTypeName = enumTypeName;
-          if (!enumTypes2.has(enumTypeName)) {
-            const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
-            if (createEnumStatement) {
-              tableStatements.push(createEnumStatement);
-            }
-            enumTypes2.add(enumTypeName);
+  const newTablePlans = Object.keys(nextTables).filter((tableName) => !prevTables[tableName]).map((tableName) => nextTables[tableName]);
+  const { tables: orderedNewTables, deferredForeignKeys } = orderTablesForCreate(newTablePlans, dialect);
+  for (const [tableIndex, originalTable] of orderedNewTables.entries()) {
+    const t2 = {
+      ...originalTable,
+      columns: originalTable.columns.map((column) => deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)) ? { ...column, references: undefined } : column)
+    };
+    const tableStatements = [];
+    const enumTypes2 = new Set;
+    for (const c2 of t2.columns) {
+      if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
+        const enumTypeName = `${t2.table}_${c2.name}_type`;
+        c2.enumTypeName = enumTypeName;
+        if (!enumTypes2.has(enumTypeName)) {
+          const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
+          if (createEnumStatement) {
+            tableStatements.push(createEnumStatement);
           }
+          enumTypes2.add(enumTypeName);
         }
       }
-      const createTableStatement = driver.createTable(t2);
-      tableStatements.push(createTableStatement);
-      chunks.push(...tableStatements);
-      operations.push({ kind: "create_table", table: t2.table, destructive: false, sql: createTableStatement });
-      const combinedStatement = tableStatements.join(`
-
-`);
-      emit(combinedStatement, `create-${t2.table}-table`);
     }
-  }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      for (const idx of t2.indexes) {
-        const createIndexStatement = driver.createIndex(t2.table, idx);
-        chunks.push(createIndexStatement);
-        operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
-        emit(createIndexStatement, `create-${idx.name}-index-in-${t2.table}`);
-      }
+    const createTableStatement = driver.createTable(t2);
+    tableStatements.push(createTableStatement);
+    for (const idx of t2.indexes) {
+      const createIndexStatement = driver.createIndex(t2.table, idx);
+      tableStatements.push(createIndexStatement);
+      operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
     }
-  }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      for (const c2 of t2.columns) {
-        if (c2.references) {
-          const alterTableStatement = driver.addForeignKey(t2.table, c2.name, c2.references.table, c2.references.column, c2.references.onDelete, c2.references.onUpdate);
-          if (!alterTableStatement)
+    for (const column of originalTable.columns) {
+      if (column.references && !deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)))
+        operations.push({ kind: "add_foreign_key", table: originalTable.table, column: column.name, destructive: false, sql: createTableStatement });
+    }
+    if (tableIndex === orderedNewTables.length - 1) {
+      for (const deferredTable of orderedNewTables) {
+        for (const column of deferredTable.columns) {
+          if (!column.references || !deferredForeignKeys.has(foreignKeyKey(deferredTable.table, column.name)))
             continue;
-          chunks.push(alterTableStatement);
-          operations.push({ kind: "add_foreign_key", table: t2.table, column: c2.name, destructive: false, sql: alterTableStatement });
-          emit(alterTableStatement, `alter-${t2.table}-${c2.name}`);
+          const addForeignKey = driver.addForeignKey(deferredTable.table, column.name, column.references.table, column.references.column, column.references.onDelete, column.references.onUpdate);
+          if (!addForeignKey)
+            continue;
+          tableStatements.push(addForeignKey);
+          operations.push({ kind: "add_foreign_key", table: deferredTable.table, column: column.name, destructive: false, sql: addForeignKey });
         }
       }
     }
+    chunks.push(...tableStatements);
+    operations.push({ kind: "create_table", table: t2.table, destructive: false, sql: createTableStatement });
+    const combinedStatement = tableStatements.join(`
+
+`);
+    emit(combinedStatement, `create-${t2.table}-table`);
   }
   const enumTypes = new Set;
   for (const tableName of Object.keys(nextTables)) {

package/package.json

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