peta-orm 0.2.3 → 0.2.5

package/dist/{index-zth6eamb.js → index-qb301480.js}

@@ -5,6 +5,7 @@ import {
   CreateViewNode,
   IdentifierNode,
   InsertQueryNode,
+  ManyToMany,
   MergeQueryNode,
   NOOP_QUERY_EXECUTOR,
   OperatorNode,
@@ -30,7 +31,7 @@ import {
   parseTable,
   parseValueExpression,
   preventAwait
-} from "./index-qwps5bne.js";
+} from "./index-sm1xx8gs.js";
 import {
   __require
 } from "./index-k18nf2r7.js";
@@ -2091,6 +2092,8 @@ class MigrationGenerator {
     const timestamp = new Date().toISOString().replace(/[-:T.Z]/g, "").slice(0, 14);
     const parts = [];
     const indexParts = [];
+    const warnings = [];
+    const registeredTables = new Set([...models.values()].map((m) => m.table).filter(Boolean));
     for (const [, modelClass] of models) {
       const table = modelClass.table;
       if (!table)
@@ -2102,16 +2105,30 @@ class MigrationGenerator {
           indexParts.push(this.#generateCreateIndex(table, colName));
         }
       }
+      for (const [relName, rel] of Object.entries(modelClass.relations ?? {})) {
+        if (rel instanceof ManyToMany) {
+          const through = rel.throughTable;
+          if (!registeredTables.has(through)) {
+            warnings.push(`// \u26A0 Detected ManyToMany "${modelClass.name}.${relName}" references table "${through}" ` + `but no model is registered for it.
+` + `//   Add a model class with static override table = "${through}" to include the pivot ` + `table in the generated migration.`);
+          }
+        }
+      }
     }
     const upBody = [...parts, ...indexParts].join(`
 
 `);
     const downTables = [...models.values()].filter((m) => m.table).map((m) => `  await db.schema.dropTable("${m.table}").ifExists().execute()`);
+    const warningBlock = warnings.length > 0 ? `  // Warnings:
+${warnings.join(`
+`)}
+
+` : "";
     return `import type { Kysely } from "kysely"
 import { sql } from "kysely"
 
 export async function up(db: Kysely<any>): Promise<void> {
-${upBody}
+${warningBlock}${upBody}
 }
 
 export async function down(db: Kysely<any>): Promise<void> {
@@ -2122,7 +2139,7 @@ ${downTables.join(`
   }
   #generateCreateTable(table, columns) {
     const lines = [];
-    lines.push(`  await db.schema.createTable("${table}")`);
+    lines.push(`  await db.schema.createTable("${table}").ifNotExists()`);
     for (const [name, col] of Object.entries(columns)) {
       const typeSql = this.#mapType(col);
       const cb = this.#columnCallback(col);

package/dist/{index-qwps5bne.js → index-sm1xx8gs.js}

@@ -7473,7 +7473,8 @@ function validateTransactionSettings(settings) {
 // src/peta.ts
 import { resolve } from "path";
 function isModelClass(value) {
-  return typeof value === "function" && typeof value.table === "string" && value.table.length > 0 && typeof value.columns === "object" && value.columns !== null;
+  const v = value;
+  return typeof value === "function" && typeof v.table === "string" && v.table.length > 0 && typeof v.columns === "object" && v.columns !== null;
 }
 
 class Peta {
@@ -7531,4 +7532,297 @@ class Peta {
   }
 }
 
-export { isString, isNumber, isBoolean, isNull, isDate, isBigInt, getLast, freeze, IdentifierNode, CreateTableNode, AliasNode, isOperationNodeSource, OperatorNode, RawNode, parseStringReference, ValueNode, parseValueExpression, ParensNode, preventAwait, InsertQueryNode, MergeQueryNode, QueryNode, createQueryId, WithSchemaPlugin, NOOP_QUERY_EXECUTOR, SetOperationNode, parseTable, CreateViewNode, isModelClass, Peta };
+// src/relations/relation.ts
+var thunkCache = new WeakMap;
+function resolve2(thunk) {
+  let cls = thunkCache.get(thunk);
+  if (!cls) {
+    cls = thunk();
+    thunkCache.set(thunk, cls);
+  }
+  return cls;
+}
+function guessForeignKey(modelClass) {
+  const table = modelClass.table;
+  const singular = table.endsWith("s") ? table.slice(0, -1) : table;
+  return `${singular}Id`;
+}
+function groupByArray(items, key) {
+  const result = {};
+  for (const item of items) {
+    const v = item.get(key);
+    if (v == null)
+      continue;
+    const k = String(v);
+    if (!result[k])
+      result[k] = [];
+    result[k].push(item);
+  }
+  return result;
+}
+
+class Relation {
+  type;
+  #relatedThunk;
+  constructor(type, relatedThunk) {
+    this.type = type;
+    this.#relatedThunk = relatedThunk;
+  }
+  get relatedModelClass() {
+    return resolve2(this.#relatedThunk);
+  }
+  async loadEager(models, relationName, constraints) {
+    const qb = this.relatedModelClass.query();
+    this.addEagerConstraints(qb, models);
+    if (constraints)
+      constraints(qb);
+    const results = await qb.execute();
+    this.match(models, results, relationName);
+  }
+}
+
+class HasMany extends Relation {
+  #options;
+  constructor(relatedThunk, options = {}) {
+    super("hasMany", relatedThunk);
+    this.#options = options;
+  }
+  get foreignKey() {
+    return this.#options.foreignKey ?? guessForeignKey(this.relatedModelClass);
+  }
+  get localKey() {
+    return this.#options.localKey ?? "id";
+  }
+  query(parent) {
+    return this.relatedModelClass.query().where(this.foreignKey, "=", parent.get(this.localKey));
+  }
+  addEagerConstraints(query, models) {
+    const keys = models.map((m) => m.get(this.localKey)).filter((k) => k != null);
+    if (keys.length > 0) {
+      query.whereIn(this.foreignKey, keys);
+    }
+  }
+  match(models, results, relationName) {
+    const grouped = groupByArray(results, this.foreignKey);
+    for (const model of models) {
+      const key = String(model.get(this.localKey));
+      model.$setRelation(relationName, grouped[key] ?? []);
+    }
+  }
+  async getResults(parent) {
+    return await this.query(parent).execute();
+  }
+}
+
+class BelongsTo extends Relation {
+  #options;
+  constructor(relatedThunk, options = {}) {
+    super("belongsTo", relatedThunk);
+    this.#options = options;
+  }
+  get foreignKey() {
+    return this.#options.foreignKey ?? guessForeignKey(this.relatedModelClass);
+  }
+  get localKey() {
+    return this.#options.localKey ?? "id";
+  }
+  query(parent) {
+    return this.relatedModelClass.query().where(this.localKey, "=", parent.get(this.foreignKey));
+  }
+  addEagerConstraints(query, models) {
+    const keys = models.map((m) => m.get(this.foreignKey)).filter((k) => k != null);
+    if (keys.length > 0) {
+      query.whereIn(this.localKey, keys);
+    }
+  }
+  match(models, results, relationName) {
+    const grouped = groupByArray(results, this.localKey);
+    for (const model of models) {
+      const key = String(model.get(this.foreignKey));
+      model.$setRelation(relationName, grouped[key]?.[0] ?? null);
+    }
+  }
+  async getResults(parent) {
+    return await this.query(parent).executeTakeFirst() ?? null;
+  }
+}
+
+class HasOne extends Relation {
+  #options;
+  constructor(relatedThunk, options = {}) {
+    super("hasOne", relatedThunk);
+    this.#options = options;
+  }
+  get foreignKey() {
+    return this.#options.foreignKey ?? guessForeignKey(this.relatedModelClass);
+  }
+  get localKey() {
+    return this.#options.localKey ?? "id";
+  }
+  query(parent) {
+    return this.relatedModelClass.query().where(this.foreignKey, "=", parent.get(this.localKey));
+  }
+  addEagerConstraints(query, models) {
+    const keys = models.map((m) => m.get(this.localKey)).filter((k) => k != null);
+    if (keys.length > 0) {
+      query.whereIn(this.foreignKey, keys);
+    }
+  }
+  match(models, results, relationName) {
+    const grouped = groupByArray(results, this.foreignKey);
+    for (const model of models) {
+      const key = String(model.get(this.localKey));
+      model.$setRelation(relationName, grouped[key]?.[0] ?? null);
+    }
+  }
+  async getResults(parent) {
+    return await this.query(parent).executeTakeFirst() ?? null;
+  }
+}
+
+class ManyToMany extends Relation {
+  #options;
+  #pivotExtras;
+  constructor(relatedThunk, options) {
+    super("manyToMany", relatedThunk);
+    this.#options = options;
+    this.#pivotExtras = options.pivotExtras ?? [];
+  }
+  get foreignKey() {
+    return this.#options.foreignKey ?? guessForeignKey(this.relatedModelClass);
+  }
+  get localKey() {
+    return this.#options.localKey ?? "id";
+  }
+  get throughTable() {
+    return this.#options.through;
+  }
+  get foreignPivotKey() {
+    return this.#options.foreignPivotKey ?? snakeCase(this.foreignKey);
+  }
+  get relatedPivotKey() {
+    return this.#options.relatedPivotKey ?? snakeCase(guessForeignKey(this.relatedModelClass));
+  }
+  #hasExtras() {
+    return this.#pivotExtras.length > 0;
+  }
+  query(parent) {
+    const parentKey = parent.get(this.localKey);
+    const peta = this.relatedModelClass.peta;
+    if (!peta)
+      return this.relatedModelClass.query();
+    if (this.#hasExtras()) {
+      const _relatedTable = this.relatedModelClass.table;
+      const peta2 = this.relatedModelClass.peta;
+      if (!peta2)
+        return this.relatedModelClass.query();
+      const subQb = peta2.kysely.selectFrom(this.throughTable).select(this.relatedPivotKey).where(this.foreignPivotKey, "=", parentKey);
+      return this.relatedModelClass.query().whereIn("id", subQb);
+    }
+    const subquery = peta.kysely.selectFrom(this.throughTable).select(this.relatedPivotKey).where(this.foreignPivotKey, "=", parentKey);
+    return this.relatedModelClass.query().whereIn("id", subquery);
+  }
+  addEagerConstraints(query, models) {
+    const keys = models.map((m) => m.get(this.localKey)).filter((k) => k != null);
+    if (keys.length === 0) {
+      query.whereIn("id", []);
+      return;
+    }
+    const relatedTable = this.relatedModelClass.table;
+    query.innerJoin(this.throughTable, `${this.throughTable}.${this.relatedPivotKey}`, `${relatedTable}.${this.localKey}`);
+    query.whereIn(`${this.throughTable}.${this.foreignPivotKey}`, keys);
+  }
+  match(models, results, relationName) {
+    const grouped = groupByArray(results, `_pivot_${this.foreignPivotKey}`);
+    for (const model of models) {
+      const key = String(model.get(this.localKey));
+      const items = grouped[key] ?? [];
+      for (const item of items) {
+        const pivotData = {};
+        for (const ek of Object.keys(item.attributes ?? {})) {
+          if (ek.startsWith("_pivot_")) {
+            pivotData[ek.slice(7)] = item.get(ek);
+          }
+        }
+        if (Object.keys(pivotData).length > 0) {
+          item.$setRelation("_pivot", pivotData);
+        }
+      }
+      model.$setRelation(relationName, items);
+    }
+  }
+  async getResults(parent) {
+    return await this.query(parent).execute();
+  }
+}
+
+class HasManyThrough extends Relation {
+  #options;
+  #throughThunk;
+  constructor(relatedThunk, throughThunk, options = {}) {
+    super("hasManyThrough", relatedThunk);
+    this.#throughThunk = throughThunk;
+    this.#options = options;
+  }
+  get foreignKey() {
+    return this.#options.foreignKey ?? guessForeignKey(resolve2(this.#throughThunk));
+  }
+  get localKey() {
+    return this.#options.localKey ?? "id";
+  }
+  get throughModelClass() {
+    return resolve2(this.#throughThunk);
+  }
+  get throughForeignKey() {
+    return this.#options.throughForeignKey ?? guessForeignKey(this.relatedModelClass);
+  }
+  get throughLocalKey() {
+    return this.#options.throughLocalKey ?? guessForeignKey(this.throughModelClass);
+  }
+  query(parent) {
+    const parentKey = parent.get(this.localKey);
+    const peta = this.relatedModelClass.peta;
+    if (!peta)
+      return this.relatedModelClass.query();
+    const throughTable = this.throughModelClass.table;
+    const _relatedTable = this.relatedModelClass.table;
+    const subquery = peta.kysely.selectFrom(throughTable).select(this.throughForeignKey).where(this.foreignKey, "=", parentKey);
+    return this.relatedModelClass.query().whereIn("id", subquery);
+  }
+  addEagerConstraints(query, models) {
+    const keys = models.map((m) => m.get(this.localKey)).filter((k) => k != null);
+    if (keys.length === 0) {
+      query.whereIn("id", []);
+      return;
+    }
+    const throughTable = this.throughModelClass.table;
+    const relatedTable = this.relatedModelClass.table;
+    query.innerJoin(throughTable, `${throughTable}.${this.throughForeignKey}`, `${relatedTable}.${this.localKey}`);
+    query.whereIn(`${throughTable}.${this.foreignKey}`, keys);
+  }
+  match(models, results, relationName) {
+    const _throughTable = this.throughModelClass.table;
+    const grouped = groupByArray(results, `_through_${this.foreignKey}`);
+    for (const model of models) {
+      const key = String(model.get(this.localKey));
+      model.$setRelation(relationName, grouped[key] ?? []);
+    }
+  }
+  async getResults(parent) {
+    const parentKey = parent.get(this.localKey);
+    const peta = this.relatedModelClass.peta;
+    if (!peta)
+      return [];
+    const throughTable = this.throughModelClass.table;
+    const rows = await peta.kysely.selectFrom(throughTable).select(this.throughForeignKey).where(this.foreignKey, "=", parentKey).execute();
+    const ids = rows.map((r) => r[this.throughForeignKey]).filter(Boolean);
+    if (ids.length === 0)
+      return [];
+    return await this.relatedModelClass.query().whereIn("id", ids).execute();
+  }
+}
+function snakeCase(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1).replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
+}
+
+export { isString, isNumber, isBoolean, isNull, isDate, isBigInt, getLast, freeze, IdentifierNode, CreateTableNode, AliasNode, isOperationNodeSource, OperatorNode, RawNode, parseStringReference, ValueNode, parseValueExpression, ParensNode, preventAwait, InsertQueryNode, MergeQueryNode, QueryNode, createQueryId, WithSchemaPlugin, NOOP_QUERY_EXECUTOR, SetOperationNode, parseTable, CreateViewNode, isModelClass, Peta, HasMany, BelongsTo, HasOne, ManyToMany, HasManyThrough };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export type { WithArg } from "./builder";
-export { DeleteBuilder, EagerLoader, InsertBuilder, ModelQueryBuilder, UpdateBuilder } from "./builder";
+export { DeleteBuilder, EagerLoader, ModelQueryBuilder, UpdateBuilder } from "./builder";
 export { Collection } from "./collection/collection";
 export { ArkTypeSchemaConfig } from "./columns/arktype-config";
 export type { ColumnShape, ColumnValue } from "./columns/column";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACvG,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAC3C,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACvE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC3G,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,YAAY,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAC1F,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChE,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAC7F,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAC3C,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACvE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC3G,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,YAAY,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAC1F,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChE,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAC7F,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}