@stacksjs/database 0.70.108 → 0.70.109

package/dist/fk-audit.d.ts

@@ -1,3 +1,4 @@
+import type { Model } from '@stacksjs/types';
 /**
  * Glob, but resilient to "directory doesn't exist yet" (the userland
  * `app/Models/` directory in particular often doesn't exist when the
@@ -5,6 +6,8 @@
  * created any models yet). Avoids the Bun Glob ENOENT.
  */
 export declare function safeGlob(pattern: string): string[];
+/** Build the same FK shapes as bun-query-builder's model migration plan. */
+export declare function getDeclaredFKsFromModels(models: Model[]): DeclaredFK[];
 /**
  * Walk every model file (user + framework defaults) and return the
  * full list of declared `belongsTo` foreign keys.

package/dist/fk-audit.js

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
 import { dirname } from "node:path";
-import { plural, singular, snakeCase } from "@stacksjs/strings";
+import { plural, snakeCase } from "@stacksjs/strings";
 import { path } from "@stacksjs/path";
 import { globSync } from "@stacksjs/storage";
 export function safeGlob(pattern) {
@@ -13,11 +13,60 @@ export function safeGlob(pattern) {
     return [];
   }
 }
+function modelTable(model) {
+  return model.table || plural(snakeCase(model.name || ""));
+}
+function modelNameForColumn(column) {
+  return column.replace(/_id$/, "").split("_").map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("");
+}
+export function getDeclaredFKsFromModels(models) {
+  const meta = new Map(models.map((model) => [String(model.name ?? ""), {
+    primaryKey: String(model.primaryKey ?? "id"),
+    table: modelTable(model)
+  }])), declared = [], seen = new Set, push = (fk) => {
+    const key = `${fk.fromTable}.${fk.fromColumn}\u2192${fk.toTable}.${fk.toColumn}`.toLowerCase();
+    if (seen.has(key))
+      return;
+    seen.add(key);
+    declared.push(fk);
+  };
+  for (const model of models) {
+    const fromTable = modelTable(model), modelName = String(model.name ?? ""), attributes = model.attributes ?? {};
+    for (const [attributeName, attribute] of Object.entries(attributes)) {
+      const fromColumn = snakeCase(attributeName);
+      if (!fromColumn.endsWith("_id") || attribute.foreignKey === !1)
+        continue;
+      if (attribute.foreignKey && typeof attribute.foreignKey === "object") {
+        push({
+          fromTable,
+          fromColumn,
+          toTable: attribute.foreignKey.table,
+          toColumn: attribute.foreignKey.column ?? "id",
+          model: modelName
+        });
+        continue;
+      }
+      const related = meta.get(modelNameForColumn(fromColumn));
+      if (related)
+        push({ fromTable, fromColumn, toTable: related.table, toColumn: related.primaryKey, model: modelName });
+    }
+    const belongsTo = model.belongsTo, relations = Array.isArray(belongsTo) ? belongsTo : belongsTo && typeof belongsTo === "object" ? Object.keys(belongsTo).map((name) => ({ model: name })) : [];
+    for (const entry of relations) {
+      const relatedName = typeof entry === "string" ? entry : String(entry.model ?? "");
+      if (!relatedName)
+        continue;
+      const fromColumn = typeof entry === "object" && entry.foreignKey ? String(entry.foreignKey) : `${snakeCase(relatedName)}_id`;
+      if (Object.keys(attributes).some((attribute) => snakeCase(attribute) === fromColumn))
+        continue;
+      const related = meta.get(relatedName);
+      if (related)
+        push({ fromTable, fromColumn, toTable: related.table, toColumn: related.primaryKey, model: modelName });
+    }
+  }
+  return declared;
+}
 export async function getDeclaredFKs() {
-  const modelFiles = [
-    ...safeGlob(path.userModelsPath("*.ts")),
-    ...safeGlob(path.storagePath("framework/defaults/app/Models/**/*.ts"))
-  ], declared = [];
+  const userModelFiles = safeGlob(path.userModelsPath("*.ts")), modelFiles = userModelFiles.length > 0 ? userModelFiles : safeGlob(path.storagePath("framework/defaults/app/Models/**/*.ts")), models = [];
   for (const modelFile of modelFiles) {
     let model;
     try {
@@ -25,36 +74,10 @@ export async function getDeclaredFKs() {
     } catch {
       continue;
     }
-    if (!model || typeof model !== "object")
-      continue;
-    const fromTable = model.table || plural(snakeCase(model.name || "")), belongsTo = model.belongsTo;
-    if (Array.isArray(belongsTo))
-      for (const entry of belongsTo) {
-        const related = typeof entry === "string" ? entry : entry?.model ?? "";
-        if (!related)
-          continue;
-        const fromColumn = `${snakeCase(singular(related))}_id`, toTable = plural(snakeCase(related));
-        declared.push({
-          fromTable,
-          fromColumn,
-          toTable,
-          toColumn: "id",
-          model: model.name || ""
-        });
-      }
-    else if (belongsTo && typeof belongsTo === "object")
-      for (const related of Object.keys(belongsTo)) {
-        const fromColumn = `${snakeCase(singular(related))}_id`, toTable = plural(snakeCase(related));
-        declared.push({
-          fromTable,
-          fromColumn,
-          toTable,
-          toColumn: "id",
-          model: model.name || ""
-        });
-      }
+    if (model && typeof model === "object")
+      models.push(model);
   }
-  return declared;
+  return getDeclaredFKsFromModels(models);
 }
 export async function getLiveFKs() {
   const { db } = await import("./utils"), dialect = await currentDialect();

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/database",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.108",
+  "version": "0.70.109",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -58,15 +58,15 @@
     "bun-query-builder": "^0.1.55"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.70.108",
-    "@stacksjs/config": "0.70.108",
-    "@stacksjs/logging": "0.70.108",
-    "@stacksjs/router": "0.70.108",
+    "@stacksjs/cli": "0.70.109",
+    "@stacksjs/config": "0.70.109",
+    "@stacksjs/logging": "0.70.109",
+    "@stacksjs/router": "0.70.109",
     "better-dx": "^0.2.16",
-    "@stacksjs/path": "0.70.108",
-    "@stacksjs/query-builder": "0.70.108",
-    "@stacksjs/storage": "0.70.108",
-    "@stacksjs/strings": "0.70.108",
-    "@stacksjs/utils": "0.70.108"
+    "@stacksjs/path": "0.70.109",
+    "@stacksjs/query-builder": "0.70.109",
+    "@stacksjs/storage": "0.70.109",
+    "@stacksjs/strings": "0.70.109",
+    "@stacksjs/utils": "0.70.109"
   }
 }