bun-query-builder 0.1.36 → 0.1.37

package/dist/bin/cli.js

@@ -24621,8 +24621,45 @@ function resolveRelation(definition, relationName) {
       pivotTimestamps: Boolean(config6?.pivot?.timestamps)
     };
   }
+  const resolveThrough = (field, type) => {
+    if (!field || typeof field !== "object" || Array.isArray(field))
+      return null;
+    const entry = field[relationName] ?? field[Object.keys(field).find((k2) => k2.toLowerCase() === relationName.toLowerCase()) ?? ""];
+    if (!entry || typeof entry !== "object")
+      return null;
+    const throughModelName = entry.through;
+    const targetModelName = entry.target;
+    if (!throughModelName || !targetModelName)
+      return null;
+    const throughModel = getModelFromRegistry(throughModelName);
+    const throughDef = throughModel?.getDefinition?.() || throughModel?.definition;
+    const throughTable = throughModel?.getTable?.() || throughDef?.table || toTableName(throughModelName);
+    const throughPk = throughDef?.primaryKey || "id";
+    const targetModel = getModelFromRegistry(targetModelName);
+    const targetTable = targetModel?.getTable?.() || toTableName(targetModelName);
+    return {
+      type,
+      relatedModelName: targetModelName,
+      relatedTable: targetTable,
+      foreignKey: `${toSnakeCase(parentName)}_id`,
+      localKey: parentPk,
+      throughTable,
+      throughForeignKey: `${toSnakeCase(parentName)}_id`,
+      throughLocalKey: throughPk,
+      targetForeignKey: `${singularizeWord(throughTable)}_id`
+    };
+  };
+  const hmt = resolveThrough(definition.hasManyThrough, "hasManyThrough");
+  if (hmt)
+    return hmt;
+  const hot = resolveThrough(definition.hasOneThrough, "hasOneThrough");
+  if (hot)
+    return hot;
   return null;
 }
+function singularizeWord(table) {
+  return table.endsWith("s") ? table.slice(0, -1) : table;
+}
 
 class BelongsToManyRelationBuilder {
   _parent;
@@ -25259,6 +25296,40 @@ class ModelQueryBuilder {
           instance.setRelation(relationName, relatedInstances);
         }
       }
+      if (rel.type === "hasManyThrough" || rel.type === "hasOneThrough") {
+        const parentIds = instances.map((i2) => i2.get(pk)).filter((id) => id != null);
+        if (parentIds.length === 0)
+          continue;
+        const throughPk = rel.throughLocalKey || "id";
+        const throughPh = parentIds.map(() => "?").join(", ");
+        const throughRows = await exec.all(`SELECT ${throughPk}, ${rel.throughForeignKey} FROM ${rel.throughTable} WHERE ${rel.throughForeignKey} IN (${throughPh})`, parentIds);
+        if (throughRows.length === 0) {
+          for (const instance of instances)
+            instance.setRelation(relationName, rel.type === "hasManyThrough" ? [] : null);
+          continue;
+        }
+        const throughToParent = new Map;
+        for (const t2 of throughRows)
+          throughToParent.set(t2[throughPk], t2[rel.throughForeignKey]);
+        const throughIds = [...new Set(throughRows.map((t2) => t2[throughPk]))];
+        const targetPh = throughIds.map(() => "?").join(", ");
+        const targetRows = await exec.all(`SELECT * FROM ${rel.relatedTable} WHERE ${rel.targetForeignKey} IN (${targetPh})`, throughIds);
+        const relatedModelDef = getModelFromRegistry(rel.relatedModelName);
+        const relDef = relatedModelDef?.getDefinition?.() || relatedModelDef?.definition || this._definition;
+        const byParent = new Map;
+        for (const row of targetRows) {
+          const parentVal = throughToParent.get(row[rel.targetForeignKey]);
+          if (parentVal == null)
+            continue;
+          if (!byParent.has(parentVal))
+            byParent.set(parentVal, []);
+          byParent.get(parentVal).push(new ModelInstance(relDef, row));
+        }
+        for (const instance of instances) {
+          const group = byParent.get(instance.get(pk)) || [];
+          instance.setRelation(relationName, rel.type === "hasManyThrough" ? group : group[0] ?? null);
+        }
+      }
     }
   }
   async get() {
@@ -30135,7 +30206,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.1.36";
+var version2 = "0.1.37";
 
 // bin/cli.ts
 init_actions();

package/dist/orm.d.ts

@@ -163,11 +163,15 @@ declare interface OrmExecutor {
  * populated only for `belongsToMany` relations.
  */
 declare interface ResolvedRelation {
-  type: 'hasMany' | 'hasOne' | 'belongsTo' | 'belongsToMany'
+  type: 'hasMany' | 'hasOne' | 'belongsTo' | 'belongsToMany' | 'hasManyThrough' | 'hasOneThrough'
   relatedModelName: string
   relatedTable: string
   foreignKey: string
   localKey: string
+  throughTable?: string
+  throughForeignKey?: string
+  throughLocalKey?: string
+  targetForeignKey?: string
   pivotTable?: string
   pivotFkParent?: string
   pivotFkRelated?: string

package/dist/src/index.js

@@ -24621,8 +24621,45 @@ function resolveRelation(definition, relationName) {
       pivotTimestamps: Boolean(config6?.pivot?.timestamps)
     };
   }
+  const resolveThrough = (field, type) => {
+    if (!field || typeof field !== "object" || Array.isArray(field))
+      return null;
+    const entry = field[relationName] ?? field[Object.keys(field).find((k2) => k2.toLowerCase() === relationName.toLowerCase()) ?? ""];
+    if (!entry || typeof entry !== "object")
+      return null;
+    const throughModelName = entry.through;
+    const targetModelName = entry.target;
+    if (!throughModelName || !targetModelName)
+      return null;
+    const throughModel = getModelFromRegistry(throughModelName);
+    const throughDef = throughModel?.getDefinition?.() || throughModel?.definition;
+    const throughTable = throughModel?.getTable?.() || throughDef?.table || toTableName(throughModelName);
+    const throughPk = throughDef?.primaryKey || "id";
+    const targetModel = getModelFromRegistry(targetModelName);
+    const targetTable = targetModel?.getTable?.() || toTableName(targetModelName);
+    return {
+      type,
+      relatedModelName: targetModelName,
+      relatedTable: targetTable,
+      foreignKey: `${toSnakeCase(parentName)}_id`,
+      localKey: parentPk,
+      throughTable,
+      throughForeignKey: `${toSnakeCase(parentName)}_id`,
+      throughLocalKey: throughPk,
+      targetForeignKey: `${singularizeWord(throughTable)}_id`
+    };
+  };
+  const hmt = resolveThrough(definition.hasManyThrough, "hasManyThrough");
+  if (hmt)
+    return hmt;
+  const hot = resolveThrough(definition.hasOneThrough, "hasOneThrough");
+  if (hot)
+    return hot;
   return null;
 }
+function singularizeWord(table) {
+  return table.endsWith("s") ? table.slice(0, -1) : table;
+}
 
 class BelongsToManyRelationBuilder {
   _parent;
@@ -25259,6 +25296,40 @@ class ModelQueryBuilder {
           instance.setRelation(relationName, relatedInstances);
         }
       }
+      if (rel.type === "hasManyThrough" || rel.type === "hasOneThrough") {
+        const parentIds = instances.map((i2) => i2.get(pk)).filter((id) => id != null);
+        if (parentIds.length === 0)
+          continue;
+        const throughPk = rel.throughLocalKey || "id";
+        const throughPh = parentIds.map(() => "?").join(", ");
+        const throughRows = await exec.all(`SELECT ${throughPk}, ${rel.throughForeignKey} FROM ${rel.throughTable} WHERE ${rel.throughForeignKey} IN (${throughPh})`, parentIds);
+        if (throughRows.length === 0) {
+          for (const instance of instances)
+            instance.setRelation(relationName, rel.type === "hasManyThrough" ? [] : null);
+          continue;
+        }
+        const throughToParent = new Map;
+        for (const t2 of throughRows)
+          throughToParent.set(t2[throughPk], t2[rel.throughForeignKey]);
+        const throughIds = [...new Set(throughRows.map((t2) => t2[throughPk]))];
+        const targetPh = throughIds.map(() => "?").join(", ");
+        const targetRows = await exec.all(`SELECT * FROM ${rel.relatedTable} WHERE ${rel.targetForeignKey} IN (${targetPh})`, throughIds);
+        const relatedModelDef = getModelFromRegistry(rel.relatedModelName);
+        const relDef = relatedModelDef?.getDefinition?.() || relatedModelDef?.definition || this._definition;
+        const byParent = new Map;
+        for (const row of targetRows) {
+          const parentVal = throughToParent.get(row[rel.targetForeignKey]);
+          if (parentVal == null)
+            continue;
+          if (!byParent.has(parentVal))
+            byParent.set(parentVal, []);
+          byParent.get(parentVal).push(new ModelInstance(relDef, row));
+        }
+        for (const instance of instances) {
+          const group = byParent.get(instance.get(pk)) || [];
+          instance.setRelation(relationName, rel.type === "hasManyThrough" ? group : group[0] ?? null);
+        }
+      }
     }
   }
   async get() {

package/package.json

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