oakbun 0.2.2 → 0.4.0

package/dist/index.js

@@ -20,6 +20,188 @@ import {
   __toCommonJS
 } from "./chunk-Z6ZWNWWR.js";
 
+// src/schema/table.ts
+function defineTable(name, schema) {
+  return new TableBuilder(name, schema);
+}
+function sqlColName(jsKey, col) {
+  return col.def.columnName ?? jsKey;
+}
+function toCreateTableSql(table) {
+  const cols = Object.entries(table.schema).map(([jsKey, col]) => {
+    const c = col;
+    const sqlName = c.def.columnName ?? jsKey;
+    let def = `"${sqlName}" `;
+    switch (c.def.type) {
+      case "INTEGER":
+        def += "INTEGER";
+        break;
+      case "TEXT":
+      case "UUID":
+        def += "TEXT";
+        break;
+      case "REAL":
+        def += "REAL";
+        break;
+      case "BOOLEAN":
+        def += "INTEGER";
+        break;
+      // SQLite has no BOOLEAN
+      case "TIMESTAMP":
+        def += "TEXT";
+        break;
+      // ISO string in SQLite
+      case "JSON":
+        def += "TEXT";
+        break;
+      case "BLOB":
+        def += "BLOB";
+        break;
+    }
+    if (c.def.primaryKey) def += " PRIMARY KEY";
+    if (c.def.autoIncrement && c.def.type === "INTEGER") def += " AUTOINCREMENT";
+    if (!c.def.nullable && !c.def.primaryKey) def += " NOT NULL";
+    if (c.def.unique) def += " UNIQUE";
+    return def;
+  });
+  return `CREATE TABLE IF NOT EXISTS "${table.name}" (${cols.join(", ")})`;
+}
+var TableBuilder;
+var init_table = __esm({
+  "src/schema/table.ts"() {
+    "use strict";
+    TableBuilder = class _TableBuilder {
+      constructor(_name, _schema) {
+        this._name = _name;
+        this._schema = _schema;
+      }
+      _name;
+      _schema;
+      _hooks = [];
+      _events = {};
+      _relations = {};
+      _softDeleteColumn = null;
+      // Register table-level hook (no ctx)
+      hook(handlers) {
+        this._hooks.push(handlers);
+        return this;
+      }
+      /**
+       * Designate a column as the soft-delete timestamp.
+       * Once set, all SELECTs automatically add `WHERE "col" IS NULL`.
+       * Use `.withDeleted()` on the query to opt out.
+       *
+       * The column must exist in the schema (validated in `build()`).
+       *
+       * @example
+       * const usersTable = defineTable('users', {
+       *   id:        column.integer().primaryKey(),
+       *   deletedAt: column.timestamp().nullable(),
+       * }).withSoftDelete('deletedAt').build()
+       */
+      withSoftDelete(col) {
+        this._softDeleteColumn = col;
+        return this;
+      }
+      emits(map) {
+        const next = new _TableBuilder(this._name, this._schema);
+        for (const h of this._hooks) next._hooks.push(h);
+        next._events = map;
+        for (const [k, v] of Object.entries(this._relations)) {
+          ;
+          next._relations[k] = v;
+        }
+        ;
+        next._softDeleteColumn = this._softDeleteColumn;
+        return next;
+      }
+      /**
+       * Declare a belongs-to relation — FK lives on this table.
+       * Returns a new builder with the relation type added to TRelations.
+       *
+       * @example
+       * const postsTable = defineTable('posts', { authorId: column.integer() })
+       *   .belongsTo('author', () => usersTable, 'authorId')
+       *   .build()
+       */
+      belongsTo(name, getTable, foreignKey) {
+        if (name in this._relations) {
+          throw new Error(`Relation '${name}' is already defined on table '${this._name}'`);
+        }
+        const rel = { kind: "belongsTo", name, getTable, foreignKey };
+        this._relations[name] = rel;
+        return this;
+      }
+      /**
+       * Declare a has-many relation — FK lives on the foreign table.
+       * Returns a new builder with the relation type added to TRelations.
+       *
+       * @example
+       * const usersTable = defineTable('users', { id: column.integer().primaryKey() })
+       *   .hasMany('posts', () => postsTable, 'authorId')
+       *   .build()
+       */
+      hasMany(name, getTable, foreignKey) {
+        if (name in this._relations) {
+          throw new Error(`Relation '${name}' is already defined on table '${this._name}'`);
+        }
+        const rel = { kind: "hasMany", name, getTable, foreignKey };
+        this._relations[name] = rel;
+        return this;
+      }
+      /**
+       * Declare a many-to-many relation via a pivot table.
+       *
+       * @example
+       * const postsTable = defineTable('posts', { ... })
+       *   .manyToMany('tags', () => tagsTable, postTagsTable, 'postId', 'tagId')
+       *   .build()
+       */
+      manyToMany(name, getTable, pivotTable, localKey, foreignKey) {
+        if (name in this._relations) {
+          throw new Error(`Relation '${name}' is already defined on table '${this._name}'`);
+        }
+        this._relations[name] = {
+          kind: "manyToMany",
+          name,
+          getTable,
+          foreignKey,
+          pivot: { table: pivotTable, localKey, foreignKey }
+        };
+        return this;
+      }
+      build() {
+        if (this._softDeleteColumn !== null && !(this._softDeleteColumn in this._schema)) {
+          throw new Error(
+            `withSoftDelete: column '${this._softDeleteColumn}' is not defined in table '${this._name}'. Add it to the schema: column.timestamp().nullable()`
+          );
+        }
+        return {
+          name: this._name,
+          schema: this._schema,
+          primaryKey: this._findPrimaryKey(),
+          hooks: [...this._hooks],
+          // copy — immutable after build
+          events: { ...this._events },
+          // _eventMap is typed as InferTableEvents<T, TEvents> — the concrete shape.
+          // At runtime it's an empty object (events hold only the string names, not payloads).
+          // The field exists solely so TypeScript can infer TMap in onEvent() without
+          // recomputing the conditional InferTableEvents each time.
+          _eventMap: {},
+          relations: { ...this._relations },
+          softDeleteColumn: this._softDeleteColumn
+        };
+      }
+      _findPrimaryKey() {
+        for (const [key, col] of Object.entries(this._schema)) {
+          if (col.def.primaryKey) return key;
+        }
+        return "id";
+      }
+    };
+  }
+});
+
 // src/events/index.ts
 var events_exports = {};
 __export(events_exports, {
@@ -517,13 +699,14 @@ function buildDelete(tableName, pk, pkValue) {
 }
 function deserializeRow(table, row) {
   const result = {};
-  for (const [key, col] of Object.entries(table.schema)) {
+  for (const [jsKey, col] of Object.entries(table.schema)) {
     const c = col;
-    const raw = row[key];
+    const sqlName = sqlColName(jsKey, c);
+    const raw = row[sqlName] !== void 0 ? row[sqlName] : row[jsKey];
     if (c.def.type === "TIMESTAMP" && raw !== null && raw !== void 0) {
-      result[key] = new Date(raw);
+      result[jsKey] = new Date(raw);
     } else {
-      result[key] = raw;
+      result[jsKey] = raw;
     }
   }
   return result;
@@ -621,6 +804,7 @@ var ON_CLAUSE_PATTERN;
 var init_sql = __esm({
   "src/db/sql.ts"() {
     "use strict";
+    init_table();
     init_errors();
     ON_CLAUSE_PATTERN = /^([\w]+)\.([\w]+)\s*=\s*([\w]+)\.([\w]+)$/;
   }
@@ -638,6 +822,27 @@ __export(db_exports, {
   UnionBuilder: () => UnionBuilder,
   VelnDB: () => VelnDB
 });
+function mapWhere(conditions, schema) {
+  if (typeof conditions !== "object" || conditions === null || Array.isArray(conditions)) {
+    return conditions;
+  }
+  const result = {};
+  for (const [jsKey, val] of Object.entries(conditions)) {
+    const col = schema[jsKey];
+    const sqlName = col?.def.columnName ?? jsKey;
+    result[sqlName] = val;
+  }
+  return result;
+}
+function mapDataToSql(data, schema) {
+  const result = {};
+  for (const [jsKey, val] of Object.entries(data)) {
+    const col = schema[jsKey];
+    const sqlName = col?.def.columnName ?? jsKey;
+    result[sqlName] = val;
+  }
+  return result;
+}
 function mergeWhereAnd(a, b) {
   const aIsPlain = !("OR" in a) && !("AND" in a);
   const bIsPlain = !("OR" in b) && !("AND" in b);
@@ -1055,7 +1260,7 @@ var init_db = __esm({
         return mergeWhereAnd(this.conditions, softFilter);
       }
       _buildSelectSQL() {
-        const conditions = this._effectiveConditions();
+        const conditions = mapWhere(this._effectiveConditions(), this.table.schema);
         if (this._rawWhere.length === 0) {
           return buildSelect(
             this.table.name,
@@ -1167,7 +1372,7 @@ var init_db = __esm({
         const alias = "_agg";
         const colExpr = col ? `"${col}"` : "*";
         const { sql: whereSql, params } = buildWhere(
-          this._effectiveConditions(),
+          mapWhere(this._effectiveConditions(), this.table.schema),
           this._dialect
         );
         let sqlStr;
@@ -1193,7 +1398,7 @@ var init_db = __esm({
       async select() {
         let finalSql;
         let finalParams;
-        const effectiveConditions = this._effectiveConditions();
+        const effectiveConditions = mapWhere(this._effectiveConditions(), this.table.schema);
         if (this._rawWhere.length === 0) {
           const { sql, params } = buildSelect(
             this.table.name,
@@ -1353,10 +1558,11 @@ var init_db = __esm({
         const finalPatch = await this.hooks.runBeforeUpdate(this.table, this.ctx, current, patch);
         const pk = this.table.primaryKey;
         const pkValue = current[pk];
+        const pkSqlName = this.table.schema[pk]?.def.columnName ?? pk;
         const { sql, params } = buildUpdate(
           this.table.name,
-          finalPatch,
-          pk,
+          mapDataToSql(finalPatch, this.table.schema),
+          pkSqlName,
           pkValue
         );
         await this.adapter.execute(sql, params);
@@ -1392,7 +1598,8 @@ var init_db = __esm({
                 `updateMany: row is missing primary key "${pk}" \u2014 every row must include the PK`
               );
             }
-            const selectSql = `SELECT * FROM "${this.table.name}" WHERE "${pk}" = ?`;
+            const pkSqlName = this.table.schema[pk]?.def.columnName ?? pk;
+            const selectSql = `SELECT * FROM "${this.table.name}" WHERE "${pkSqlName}" = ?`;
             const currentRows = await txAdapter.query(selectSql, [pkValue]);
             if (currentRows.length === 0) {
               throw new Error(`updateMany: record with ${pk}=${String(pkValue)} not found`);
@@ -1403,7 +1610,7 @@ var init_db = __esm({
             const finalPatch = await this.hooks.runBeforeUpdate(this.table, this.ctx, current, patch);
             const { sql, params } = buildUpdate(
               this.table.name,
-              finalPatch,
+              mapDataToSql(finalPatch, this.table.schema),
               pk,
               pkValue
             );
@@ -1432,7 +1639,8 @@ var init_db = __esm({
         await this.hooks.runBeforeDelete(this.table, this.ctx, current);
         const pk = this.table.primaryKey;
         const pkValue = current[pk];
-        const { sql, params } = buildDelete(this.table.name, pk, pkValue);
+        const pkSqlName = this.table.schema[pk]?.def.columnName ?? pk;
+        const { sql, params } = buildDelete(this.table.name, pkSqlName, pkValue);
         await this.adapter.execute(sql, params);
         await this.hooks.runAfterDelete(this.table, this.ctx, current, this.queue);
         return current;
@@ -1571,11 +1779,12 @@ var init_db = __esm({
             `softDelete() called on table '${this.table.name}' which has no soft delete column. Add .withSoftDelete('deletedAt') to the table definition.`
           );
         }
+        const colSqlName = this.table.schema[col]?.def.columnName ?? col;
         const { sql, params } = buildSoftDeleteUpdate(
           this.table.name,
-          col,
+          colSqlName,
           this._value,
-          this._conditions,
+          mapWhere(this._conditions, this.table.schema),
           this._dialect
         );
         await this.adapter.execute(sql, params);
@@ -1741,12 +1950,14 @@ var init_db = __esm({
         }
         return results;
       }
-      /** Serialize values for storage. Date → ISO string. Drops undefined values. */
+      /** Serialize values for storage. Maps JS keys → SQL column names. Date → ISO string. Drops undefined. */
       _serializeForInsert(data) {
         const result = {};
-        for (const [key, val] of Object.entries(data)) {
+        for (const [jsKey, val] of Object.entries(data)) {
           if (val === void 0) continue;
-          result[key] = val instanceof Date ? val.toISOString() : val;
+          const col = this.table.schema[jsKey];
+          const sqlName = col?.def.columnName ?? jsKey;
+          result[sqlName] = val instanceof Date ? val.toISOString() : val;
         }
         return result;
       }
@@ -1921,6 +2132,17 @@ var Column = class _Column {
   defaultFn(fn) {
     return new _Column({ ...this.def, defaultFn: fn });
   }
+  /**
+   * Set an explicit SQL column name, independent of the JS property key.
+   * Use this to map camelCase TypeScript keys to snake_case SQL columns.
+   *
+   * @example
+   * passwordHash: column.text().name('password_hash')
+   * // INSERT uses "password_hash", SELECT returns { passwordHash: ... }
+   */
+  name(columnName) {
+    return new _Column({ ...this.def, columnName });
+  }
 };
 var base = (type) => ({
   type,
@@ -1940,179 +2162,11 @@ var column = {
   json: () => new Column({ ...base("JSON") })
 };
 
-// src/schema/table.ts
-var TableBuilder = class _TableBuilder {
-  constructor(_name, _schema) {
-    this._name = _name;
-    this._schema = _schema;
-  }
-  _name;
-  _schema;
-  _hooks = [];
-  _events = {};
-  _relations = {};
-  _softDeleteColumn = null;
-  // Register table-level hook (no ctx)
-  hook(handlers) {
-    this._hooks.push(handlers);
-    return this;
-  }
-  /**
-   * Designate a column as the soft-delete timestamp.
-   * Once set, all SELECTs automatically add `WHERE "col" IS NULL`.
-   * Use `.withDeleted()` on the query to opt out.
-   *
-   * The column must exist in the schema (validated in `build()`).
-   *
-   * @example
-   * const usersTable = defineTable('users', {
-   *   id:        column.integer().primaryKey(),
-   *   deletedAt: column.timestamp().nullable(),
-   * }).withSoftDelete('deletedAt').build()
-   */
-  withSoftDelete(col) {
-    this._softDeleteColumn = col;
-    return this;
-  }
-  emits(map) {
-    const next = new _TableBuilder(this._name, this._schema);
-    for (const h of this._hooks) next._hooks.push(h);
-    next._events = map;
-    for (const [k, v] of Object.entries(this._relations)) {
-      ;
-      next._relations[k] = v;
-    }
-    ;
-    next._softDeleteColumn = this._softDeleteColumn;
-    return next;
-  }
-  /**
-   * Declare a belongs-to relation — FK lives on this table.
-   * Returns a new builder with the relation type added to TRelations.
-   *
-   * @example
-   * const postsTable = defineTable('posts', { authorId: column.integer() })
-   *   .belongsTo('author', () => usersTable, 'authorId')
-   *   .build()
-   */
-  belongsTo(name, getTable, foreignKey) {
-    if (name in this._relations) {
-      throw new Error(`Relation '${name}' is already defined on table '${this._name}'`);
-    }
-    const rel = { kind: "belongsTo", name, getTable, foreignKey };
-    this._relations[name] = rel;
-    return this;
-  }
-  /**
-   * Declare a has-many relation — FK lives on the foreign table.
-   * Returns a new builder with the relation type added to TRelations.
-   *
-   * @example
-   * const usersTable = defineTable('users', { id: column.integer().primaryKey() })
-   *   .hasMany('posts', () => postsTable, 'authorId')
-   *   .build()
-   */
-  hasMany(name, getTable, foreignKey) {
-    if (name in this._relations) {
-      throw new Error(`Relation '${name}' is already defined on table '${this._name}'`);
-    }
-    const rel = { kind: "hasMany", name, getTable, foreignKey };
-    this._relations[name] = rel;
-    return this;
-  }
-  /**
-   * Declare a many-to-many relation via a pivot table.
-   *
-   * @example
-   * const postsTable = defineTable('posts', { ... })
-   *   .manyToMany('tags', () => tagsTable, postTagsTable, 'postId', 'tagId')
-   *   .build()
-   */
-  manyToMany(name, getTable, pivotTable, localKey, foreignKey) {
-    if (name in this._relations) {
-      throw new Error(`Relation '${name}' is already defined on table '${this._name}'`);
-    }
-    this._relations[name] = {
-      kind: "manyToMany",
-      name,
-      getTable,
-      foreignKey,
-      pivot: { table: pivotTable, localKey, foreignKey }
-    };
-    return this;
-  }
-  build() {
-    if (this._softDeleteColumn !== null && !(this._softDeleteColumn in this._schema)) {
-      throw new Error(
-        `withSoftDelete: column '${this._softDeleteColumn}' is not defined in table '${this._name}'. Add it to the schema: column.timestamp().nullable()`
-      );
-    }
-    return {
-      name: this._name,
-      schema: this._schema,
-      primaryKey: this._findPrimaryKey(),
-      hooks: [...this._hooks],
-      // copy — immutable after build
-      events: { ...this._events },
-      // _eventMap is typed as InferTableEvents<T, TEvents> — the concrete shape.
-      // At runtime it's an empty object (events hold only the string names, not payloads).
-      // The field exists solely so TypeScript can infer TMap in onEvent() without
-      // recomputing the conditional InferTableEvents each time.
-      _eventMap: {},
-      relations: { ...this._relations },
-      softDeleteColumn: this._softDeleteColumn
-    };
-  }
-  _findPrimaryKey() {
-    for (const [key, col] of Object.entries(this._schema)) {
-      if (col.def.primaryKey) return key;
-    }
-    return "id";
-  }
-};
-function defineTable(name, schema) {
-  return new TableBuilder(name, schema);
-}
-function toCreateTableSql(table) {
-  const cols = Object.entries(table.schema).map(([name, col]) => {
-    const c = col;
-    let def = `"${name}" `;
-    switch (c.def.type) {
-      case "INTEGER":
-        def += "INTEGER";
-        break;
-      case "TEXT":
-      case "UUID":
-        def += "TEXT";
-        break;
-      case "REAL":
-        def += "REAL";
-        break;
-      case "BOOLEAN":
-        def += "INTEGER";
-        break;
-      // SQLite has no BOOLEAN
-      case "TIMESTAMP":
-        def += "TEXT";
-        break;
-      // ISO string in SQLite
-      case "JSON":
-        def += "TEXT";
-        break;
-      case "BLOB":
-        def += "BLOB";
-        break;
-    }
-    if (c.def.primaryKey) def += " PRIMARY KEY";
-    if (c.def.autoIncrement && c.def.type === "INTEGER") def += " AUTOINCREMENT";
-    if (!c.def.nullable && !c.def.primaryKey) def += " NOT NULL";
-    if (c.def.unique) def += " UNIQUE";
-    return def;
-  });
-  return `CREATE TABLE IF NOT EXISTS "${table.name}" (${cols.join(", ")})`;
-}
+// src/index.ts
+init_table();
 
 // src/schema/audit.ts
+init_table();
 var _baseAuditFields = {
   id: column.integer().primaryKey(),
   tableName: column.text(),