@3lineas/d1-orm 1.0.11 → 1.0.12

package/dist/index.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   BelongsTo: () => BelongsTo,
+  BelongsToMany: () => BelongsToMany,
   Blueprint: () => Blueprint,
   Column: () => Column,
   Connection: () => Connection,
@@ -129,6 +130,10 @@ var QueryBuilder = class {
    * The where constraints for the query.
    */
   wheres = [];
+  /**
+   * The join clauses for the query.
+   */
+  joins = [];
   /**
    * The bindings for the query.
    */
@@ -230,6 +235,19 @@ var QueryBuilder = class {
     this.offsetValue = offset;
     return this;
   }
+  /**
+   * Get the table associated with the query.
+   */
+  getTable() {
+    return this.table;
+  }
+  /**
+   * Add a JOIN clause to the query.
+   */
+  join(table, first, operator, second) {
+    this.joins.push(`JOIN ${table} ON ${first} ${operator} ${second}`);
+    return this;
+  }
   /**
    * Get the SQL representation of the query.
    *
@@ -237,6 +255,9 @@ var QueryBuilder = class {
    */
   toSql() {
     let sql = `SELECT ${this.columns.join(", ")} FROM ${this.table}`;
+    if (this.joins.length > 0) {
+      sql += ` ${this.joins.join(" ")}`;
+    }
     if (this.wheres.length > 0) {
       const constraints = this.wheres.map((w, i) => {
         if (i === 0) return w.replace(/^OR\s+/, "");
@@ -496,6 +517,39 @@ var BelongsTo = class extends Relationship {
   }
 };
 
+// src/core/relationships/belongs-to-many.ts
+var BelongsToMany = class extends Relationship {
+  pivotTable;
+  foreignPivotKey;
+  relatedPivotKey;
+  parentKey;
+  relatedKey;
+  constructor(query, parent, pivotTable, foreignPivotKey, relatedPivotKey, parentKey, relatedKey) {
+    super(query, parent);
+    this.pivotTable = pivotTable;
+    this.foreignPivotKey = foreignPivotKey;
+    this.relatedPivotKey = relatedPivotKey;
+    this.parentKey = parentKey;
+    this.relatedKey = relatedKey;
+    this.addConstraints();
+  }
+  addConstraints() {
+    const parentValue = this.parent.attributes[this.parentKey];
+    const relatedTable = this.query.getTable();
+    this.query.join(
+      this.pivotTable,
+      `${relatedTable}.${this.relatedKey}`,
+      "=",
+      `${this.pivotTable}.${this.relatedPivotKey}`
+    );
+    this.query.where(
+      `${this.pivotTable}.${this.foreignPivotKey}`,
+      "=",
+      parentValue
+    );
+  }
+};
+
 // src/models/model.ts
 var Model = class {
   /**
@@ -703,6 +757,34 @@ var Model = class {
     const ok = ownerKey || "id";
     return new BelongsTo(instance.newQuery(), this, fk, ok);
   }
+  /**
+   * Define a many-to-many relationship.
+   *
+   * @param related - The related model class.
+   * @param table - The pivot table name.
+   * @param foreignPivotKey - The foreign key of the parent model on the pivot table.
+   * @param relatedPivotKey - The foreign key of the related model on the pivot table.
+   * @param parentKey - The key on the parent model (usually id).
+   * @param relatedKey - The key on the related model (usually id).
+   * @returns A BelongsToMany relationship instance.
+   */
+  belongsToMany(related, table, foreignPivotKey, relatedPivotKey, parentKey, relatedKey) {
+    const instance = new related();
+    const pivotTable = table || [this.getTable().slice(0, -1), instance.getTable().slice(0, -1)].sort().join("_");
+    const fpk = foreignPivotKey || this.getForeignKey();
+    const rpk = relatedPivotKey || instance.getForeignKey();
+    const pk = parentKey || "id";
+    const rk = relatedKey || "id";
+    return new BelongsToMany(
+      instance.newQuery(),
+      this,
+      pivotTable,
+      fpk,
+      rpk,
+      pk,
+      rk
+    );
+  }
   /**
    * Get the default foreign key name for the model.
    *
@@ -728,6 +810,7 @@ var Column = class {
   isNullable = false;
   isUnique = false;
   defaultValue = null;
+  checkConstraint = null;
   constructor(name, type) {
     this.name = name;
     this.type = type;
@@ -753,6 +836,13 @@ var Column = class {
     this.defaultValue = value;
     return this;
   }
+  /**
+   * Add a check constraint (primarily for enums).
+   */
+  check(expression) {
+    this.checkConstraint = expression;
+    return this;
+  }
   /**
    * Convert the column definition to SQL.
    */
@@ -768,6 +858,9 @@ var Column = class {
       const formattedValue = typeof this.defaultValue === "string" ? `'${this.defaultValue}'` : this.defaultValue;
       sql += ` DEFAULT ${formattedValue}`;
     }
+    if (this.checkConstraint) {
+      sql += ` CHECK (${this.checkConstraint})`;
+    }
     return sql;
   }
 };
@@ -775,8 +868,10 @@ var Blueprint = class {
   table;
   columns = [];
   commands = [];
-  constructor(table) {
+  isAlter = false;
+  constructor(table, isAlter = false) {
     this.table = table;
+    this.isAlter = isAlter;
   }
   /**
    * Add an auto-incrementing ID column.
@@ -793,6 +888,32 @@ var Blueprint = class {
     this.columns.push(col);
     return col;
   }
+  /**
+   * Add a text (long string) column.
+   */
+  text(column) {
+    const col = new Column(column, "TEXT");
+    this.columns.push(col);
+    return col;
+  }
+  /**
+   * Add a JSON column (stored as TEXT).
+   */
+  json(column) {
+    const col = new Column(column, "TEXT");
+    this.columns.push(col);
+    return col;
+  }
+  /**
+   * Add an enum column (TEXT with CHECK constraint).
+   */
+  enum(column, values) {
+    const col = new Column(column, "TEXT");
+    const checkExpr = values.map((v) => `'${v}'`).join(", ");
+    col.check(`${column} IN (${checkExpr})`);
+    this.columns.push(col);
+    return col;
+  }
   /**
    * Add an integer column.
    */
@@ -801,6 +922,14 @@ var Blueprint = class {
     this.columns.push(col);
     return col;
   }
+  /**
+   * Add a float (REAL) column.
+   */
+  float(column) {
+    const col = new Column(column, "REAL");
+    this.columns.push(col);
+    return col;
+  }
   /**
    * Add a boolean column.
    */
@@ -809,6 +938,36 @@ var Blueprint = class {
     this.columns.push(col);
     return col;
   }
+  /**
+   * Add a date column (TEXT or INTEGER).
+   */
+  date(column) {
+    const col = new Column(column, "TEXT");
+    this.columns.push(col);
+    return col;
+  }
+  /**
+   * Add a datetime column (TEXT or INTEGER).
+   */
+  datetime(column) {
+    const col = new Column(column, "TEXT");
+    this.columns.push(col);
+    return col;
+  }
+  /**
+   * Add a blob column.
+   */
+  blob(column) {
+    const col = new Column(column, "BLOB");
+    this.columns.push(col);
+    return col;
+  }
+  /**
+   * Add a foreign key column (alias for integer).
+   */
+  foreign(column) {
+    return this.integer(column);
+  }
   /**
    * Add created_at and updated_at timestamp columns.
    */
@@ -826,6 +985,11 @@ var Blueprint = class {
         if (typeof col === "string") return col;
         return col.toSql();
       });
+      if (this.isAlter) {
+        return colDefinitions.map(
+          (def) => `ALTER TABLE ${this.table} ADD COLUMN ${def}`
+        );
+      }
       const cols = colDefinitions.join(", ");
       return [`CREATE TABLE IF NOT EXISTS ${this.table} (${cols})`];
     }
@@ -840,6 +1004,11 @@ var Schema = class {
     callback(blueprint);
     return blueprint.toSql()[0];
   }
+  static table(table, callback) {
+    const blueprint = new Blueprint(table, true);
+    callback(blueprint);
+    return blueprint.toSql();
+  }
   static dropIfExists(table) {
     return `DROP TABLE IF EXISTS ${table}`;
   }
@@ -847,6 +1016,7 @@ var Schema = class {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BelongsTo,
+  BelongsToMany,
   Blueprint,
   Column,
   Connection,

package/dist/index.d.cts

@@ -99,6 +99,10 @@ declare class QueryBuilder {
      * The where constraints for the query.
      */
     protected wheres: string[];
+    /**
+     * The join clauses for the query.
+     */
+    protected joins: string[];
     /**
      * The bindings for the query.
      */
@@ -169,6 +173,14 @@ declare class QueryBuilder {
      * @returns The QueryBuilder instance.
      */
     offset(offset: number): this;
+    /**
+     * Get the table associated with the query.
+     */
+    getTable(): string;
+    /**
+     * Add a JOIN clause to the query.
+     */
+    join(table: string, first: string, operator: string, second: string): this;
     /**
      * Get the SQL representation of the query.
      *
@@ -278,6 +290,16 @@ declare class BelongsTo<Related extends Model> extends Relationship<Related> {
     addConstraints(): void;
 }
 
+declare class BelongsToMany<Related extends Model> extends Relationship<Related> {
+    protected pivotTable: string;
+    protected foreignPivotKey: string;
+    protected relatedPivotKey: string;
+    protected parentKey: string;
+    protected relatedKey: string;
+    constructor(query: ModelQueryBuilder<Related>, parent: Model, pivotTable: string, foreignPivotKey: string, relatedPivotKey: string, parentKey: string, relatedKey: string);
+    addConstraints(): void;
+}
+
 /**
  * Base Model class for D1 ORM.
  *
@@ -413,6 +435,18 @@ declare class Model {
      * @returns A BelongsTo relationship instance.
      */
     belongsTo<Related extends Model>(related: new () => Related, foreignKey?: string, ownerKey?: string): BelongsTo<Related>;
+    /**
+     * Define a many-to-many relationship.
+     *
+     * @param related - The related model class.
+     * @param table - The pivot table name.
+     * @param foreignPivotKey - The foreign key of the parent model on the pivot table.
+     * @param relatedPivotKey - The foreign key of the related model on the pivot table.
+     * @param parentKey - The key on the parent model (usually id).
+     * @param relatedKey - The key on the related model (usually id).
+     * @returns A BelongsToMany relationship instance.
+     */
+    belongsToMany<Related extends Model>(related: new () => Related, table?: string, foreignPivotKey?: string, relatedPivotKey?: string, parentKey?: string, relatedKey?: string): BelongsToMany<Related>;
     /**
      * Get the default foreign key name for the model.
      *
@@ -474,6 +508,7 @@ declare class Column {
     protected isNullable: boolean;
     protected isUnique: boolean;
     protected defaultValue: any;
+    protected checkConstraint: string | null;
     constructor(name: string, type: string);
     /**
      * Set the column as nullable.
@@ -487,6 +522,10 @@ declare class Column {
      * Set the default value for the column.
      */
     default(value: any): this;
+    /**
+     * Add a check constraint (primarily for enums).
+     */
+    check(expression: string): this;
     /**
      * Convert the column definition to SQL.
      */
@@ -499,7 +538,8 @@ declare class Blueprint {
     protected table: string;
     protected columns: (Column | string)[];
     protected commands: string[];
-    constructor(table: string);
+    protected isAlter: boolean;
+    constructor(table: string, isAlter?: boolean);
     /**
      * Add an auto-incrementing ID column.
      */
@@ -508,14 +548,46 @@ declare class Blueprint {
      * Add a string (TEXT) column.
      */
     string(column: string): Column;
+    /**
+     * Add a text (long string) column.
+     */
+    text(column: string): Column;
+    /**
+     * Add a JSON column (stored as TEXT).
+     */
+    json(column: string): Column;
+    /**
+     * Add an enum column (TEXT with CHECK constraint).
+     */
+    enum(column: string, values: string[]): Column;
     /**
      * Add an integer column.
      */
     integer(column: string): Column;
+    /**
+     * Add a float (REAL) column.
+     */
+    float(column: string): Column;
     /**
      * Add a boolean column.
      */
     boolean(column: string): Column;
+    /**
+     * Add a date column (TEXT or INTEGER).
+     */
+    date(column: string): Column;
+    /**
+     * Add a datetime column (TEXT or INTEGER).
+     */
+    datetime(column: string): Column;
+    /**
+     * Add a blob column.
+     */
+    blob(column: string): Column;
+    /**
+     * Add a foreign key column (alias for integer).
+     */
+    foreign(column: string): Column;
     /**
      * Add created_at and updated_at timestamp columns.
      */
@@ -528,7 +600,8 @@ declare class Blueprint {
 
 declare class Schema {
     static create(table: string, callback: (table: Blueprint) => void): string;
+    static table(table: string, callback: (table: Blueprint) => void): string[];
     static dropIfExists(table: string): string;
 }
 
-export { BelongsTo, Blueprint, Column, Connection, type D1Database, type D1ExecResult, type D1PreparedStatement, type D1Result, type D1Value, Database, HasMany, HasOne, Model, ModelQueryBuilder, QueryBuilder, Relationship, Schema };
+export { BelongsTo, BelongsToMany, Blueprint, Column, Connection, type D1Database, type D1ExecResult, type D1PreparedStatement, type D1Result, type D1Value, Database, HasMany, HasOne, Model, ModelQueryBuilder, QueryBuilder, Relationship, Schema };

package/dist/index.d.ts

@@ -99,6 +99,10 @@ declare class QueryBuilder {
      * The where constraints for the query.
      */
     protected wheres: string[];
+    /**
+     * The join clauses for the query.
+     */
+    protected joins: string[];
     /**
      * The bindings for the query.
      */
@@ -169,6 +173,14 @@ declare class QueryBuilder {
      * @returns The QueryBuilder instance.
      */
     offset(offset: number): this;
+    /**
+     * Get the table associated with the query.
+     */
+    getTable(): string;
+    /**
+     * Add a JOIN clause to the query.
+     */
+    join(table: string, first: string, operator: string, second: string): this;
     /**
      * Get the SQL representation of the query.
      *
@@ -278,6 +290,16 @@ declare class BelongsTo<Related extends Model> extends Relationship<Related> {
     addConstraints(): void;
 }
 
+declare class BelongsToMany<Related extends Model> extends Relationship<Related> {
+    protected pivotTable: string;
+    protected foreignPivotKey: string;
+    protected relatedPivotKey: string;
+    protected parentKey: string;
+    protected relatedKey: string;
+    constructor(query: ModelQueryBuilder<Related>, parent: Model, pivotTable: string, foreignPivotKey: string, relatedPivotKey: string, parentKey: string, relatedKey: string);
+    addConstraints(): void;
+}
+
 /**
  * Base Model class for D1 ORM.
  *
@@ -413,6 +435,18 @@ declare class Model {
      * @returns A BelongsTo relationship instance.
      */
     belongsTo<Related extends Model>(related: new () => Related, foreignKey?: string, ownerKey?: string): BelongsTo<Related>;
+    /**
+     * Define a many-to-many relationship.
+     *
+     * @param related - The related model class.
+     * @param table - The pivot table name.
+     * @param foreignPivotKey - The foreign key of the parent model on the pivot table.
+     * @param relatedPivotKey - The foreign key of the related model on the pivot table.
+     * @param parentKey - The key on the parent model (usually id).
+     * @param relatedKey - The key on the related model (usually id).
+     * @returns A BelongsToMany relationship instance.
+     */
+    belongsToMany<Related extends Model>(related: new () => Related, table?: string, foreignPivotKey?: string, relatedPivotKey?: string, parentKey?: string, relatedKey?: string): BelongsToMany<Related>;
     /**
      * Get the default foreign key name for the model.
      *
@@ -474,6 +508,7 @@ declare class Column {
     protected isNullable: boolean;
     protected isUnique: boolean;
     protected defaultValue: any;
+    protected checkConstraint: string | null;
     constructor(name: string, type: string);
     /**
      * Set the column as nullable.
@@ -487,6 +522,10 @@ declare class Column {
      * Set the default value for the column.
      */
     default(value: any): this;
+    /**
+     * Add a check constraint (primarily for enums).
+     */
+    check(expression: string): this;
     /**
      * Convert the column definition to SQL.
      */
@@ -499,7 +538,8 @@ declare class Blueprint {
     protected table: string;
     protected columns: (Column | string)[];
     protected commands: string[];
-    constructor(table: string);
+    protected isAlter: boolean;
+    constructor(table: string, isAlter?: boolean);
     /**
      * Add an auto-incrementing ID column.
      */
@@ -508,14 +548,46 @@ declare class Blueprint {
      * Add a string (TEXT) column.
      */
     string(column: string): Column;
+    /**
+     * Add a text (long string) column.
+     */
+    text(column: string): Column;
+    /**
+     * Add a JSON column (stored as TEXT).
+     */
+    json(column: string): Column;
+    /**
+     * Add an enum column (TEXT with CHECK constraint).
+     */
+    enum(column: string, values: string[]): Column;
     /**
      * Add an integer column.
      */
     integer(column: string): Column;
+    /**
+     * Add a float (REAL) column.
+     */
+    float(column: string): Column;
     /**
      * Add a boolean column.
      */
     boolean(column: string): Column;
+    /**
+     * Add a date column (TEXT or INTEGER).
+     */
+    date(column: string): Column;
+    /**
+     * Add a datetime column (TEXT or INTEGER).
+     */
+    datetime(column: string): Column;
+    /**
+     * Add a blob column.
+     */
+    blob(column: string): Column;
+    /**
+     * Add a foreign key column (alias for integer).
+     */
+    foreign(column: string): Column;
     /**
      * Add created_at and updated_at timestamp columns.
      */
@@ -528,7 +600,8 @@ declare class Blueprint {
 
 declare class Schema {
     static create(table: string, callback: (table: Blueprint) => void): string;
+    static table(table: string, callback: (table: Blueprint) => void): string[];
     static dropIfExists(table: string): string;
 }
 
-export { BelongsTo, Blueprint, Column, Connection, type D1Database, type D1ExecResult, type D1PreparedStatement, type D1Result, type D1Value, Database, HasMany, HasOne, Model, ModelQueryBuilder, QueryBuilder, Relationship, Schema };
+export { BelongsTo, BelongsToMany, Blueprint, Column, Connection, type D1Database, type D1ExecResult, type D1PreparedStatement, type D1Result, type D1Value, Database, HasMany, HasOne, Model, ModelQueryBuilder, QueryBuilder, Relationship, Schema };