@3lineas/d1-orm 1.0.10 → 1.0.12

package/dist/index.js

@@ -21,6 +21,10 @@ var QueryBuilder = class {
    * The where constraints for the query.
    */
   wheres = [];
+  /**
+   * The join clauses for the query.
+   */
+  joins = [];
   /**
    * The bindings for the query.
    */
@@ -122,6 +126,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.
    *
@@ -129,6 +146,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+/, "");
@@ -341,6 +361,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 {
   /**
@@ -548,6 +601,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.
    *
@@ -573,6 +654,7 @@ var Column = class {
   isNullable = false;
   isUnique = false;
   defaultValue = null;
+  checkConstraint = null;
   constructor(name, type) {
     this.name = name;
     this.type = type;
@@ -598,6 +680,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.
    */
@@ -613,6 +702,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;
   }
 };
@@ -620,8 +712,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.
@@ -638,6 +732,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.
    */
@@ -646,6 +766,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.
    */
@@ -654,6 +782,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.
    */
@@ -671,6 +829,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})`];
     }
@@ -685,12 +848,18 @@ 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}`;
   }
 };
 export {
   BelongsTo,
+  BelongsToMany,
   Blueprint,
   Column,
   Connection,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3lineas/d1-orm",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "A lightweight and powerful ORM for Cloudflare D1, inspired by Laravel Eloquent.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",