@stacksjs/database 0.70.187 → 0.70.188

package/dist/seeder.d.ts

@@ -5,6 +5,14 @@ import type { Attribute, Model } from '@stacksjs/types';
  * list stays a single source of truth.
  */
 export declare function isProtectedModel(name: string): boolean;
+/**
+ * Choose one consistent set of parent ids per record.
+ *
+ * Split out from the query above so the rule can be exercised without a
+ * database: given the parent rows, the same input always produces rows whose
+ * foreign keys agree with one another.
+ */
+export declare function chooseRelations(pools: { column: string, rows: Record<string, unknown>[] }[], count: number): Record<string, unknown>[];
 /**
  * Seeds the database from your models.
  *

package/dist/seeder.js

@@ -87,7 +87,7 @@ function isPasswordField(fieldName, attr) {
     return !0;
   return !1;
 }
-async function generateRecord(attributes, modelName, verbose = !1) {
+async function generateRecord(attributes, modelName, report = !1) {
   const record = {};
   for (const [fieldName, attr] of Object.entries(attributes)) {
     const columnName = snakeCase(fieldName);
@@ -97,8 +97,8 @@ async function generateRecord(attributes, modelName, verbose = !1) {
         value = attr.factory(faker);
       } catch (err) {
         const errorMsg = err instanceof Error ? err.message : String(err);
-        if (verbose)
-          log.warn(`  Factory failed for ${modelName}.${fieldName}: ${errorMsg}`);
+        if (report)
+          log.warn(`  Factory failed for ${modelName}.${fieldName}: ${errorMsg} \u2014 seeding the default instead.`);
         if (attr.default !== void 0)
           value = attr.default;
         else
@@ -113,8 +113,7 @@ async function generateRecord(attributes, modelName, verbose = !1) {
         value = await hashMake(value, { algorithm: "bcrypt" });
       } catch (err) {
         const errorMsg = err instanceof Error ? err.message : String(err);
-        if (verbose)
-          log.warn(`  Failed to hash password for ${modelName}.${fieldName}: ${errorMsg}`);
+        log.warn(`  Failed to hash password for ${modelName}.${fieldName}: ${errorMsg}`);
       }
     record[columnName] = value;
   }
@@ -140,11 +139,54 @@ function fixtureToColumns(fixture) {
     out[snakeCase(key)] = value;
   return out;
 }
-async function generateRecords(model, verbose = !1) {
-  const records = [];
+async function existingRows(table) {
+  try {
+    return await db.selectFrom(table).selectAll().limit(500).execute();
+  } catch {
+    return [];
+  }
+}
+async function relationColumns(model) {
+  const parents = parentModels(model);
+  if (parents.length === 0)
+    return [];
+  const pools = [];
+  for (const parent of parents) {
+    const column = `${snakeCase(parent)}_id`;
+    if (model.attributes[column] || model.attributes[parent])
+      continue;
+    const rows = await existingRows(`${snakeCase(parent)}s`);
+    if (rows.length > 0)
+      pools.push({ column, rows });
+  }
+  return chooseRelations(pools, model.count);
+}
+export function chooseRelations(pools, count) {
+  if (pools.length === 0)
+    return [];
+  const wanted = new Set(pools.map((pool) => pool.column)), specificity = (pool) => {
+    const sample = pool.rows[0] ?? {};
+    return [...wanted].filter((column) => column !== pool.column && (column in sample)).length;
+  }, ordered = [...pools].sort((a, b) => specificity(b) - specificity(a));
+  return Array.from({ length: count }, () => {
+    const row = {};
+    for (const pool of ordered) {
+      if (row[pool.column] != null)
+        continue;
+      const agrees = (candidate) => [...wanted].every((column) => row[column] == null || candidate[column] == null || candidate[column] === row[column]), candidates = pool.rows.filter(agrees), from = candidates.length > 0 ? candidates : pool.rows, chosen = from[Math.floor(Math.random() * from.length)];
+      row[pool.column] = chosen.id;
+      for (const column of wanted)
+        if (column !== pool.column && row[column] == null && chosen[column] != null)
+          row[column] = chosen[column];
+    }
+    return row;
+  });
+}
+async function generateRecords(model) {
+  const records = [], relations = await relationColumns(model);
   for (let i = 0;i < model.count; i++) {
-    const record = await generateRecord(model.attributes, model.name, verbose && i === 0), fixture = model.fixtures[i];
-    records.push(fixture ? { ...record, ...fixtureToColumns(fixture) } : record);
+    const record = await generateRecord(model.attributes, model.name, i === 0), fixture = model.fixtures[i], withRelations = { ...record, ...relations[i] ?? {} };
+    records.push(fixture ? { ...withRelations, ...fixtureToColumns(fixture) } : withRelations);
   }
   return records;
 }
@@ -180,7 +222,7 @@ async function seedModel(model, options) {
         };
       }
     }
-    const records = await generateRecords(model, options.verbose);
+    const records = await generateRecords(model);
     if (records.length === 0)
       return {
         model: model.name,
@@ -189,12 +231,6 @@ async function seedModel(model, options) {
         success: !0,
         duration: Date.now() - startTime
       };
-    if (options.fresh)
-      try {
-        await db.deleteFrom(model.table).execute();
-        if (options.verbose)
-          log.info(`  Truncated table: ${model.table}`);
-      } catch {}
     const batchSize = 100;
     let inserted = 0;
     for (let i = 0;i < records.length; i += batchSize) {
@@ -225,16 +261,44 @@ async function seedModel(model, options) {
     };
   }
 }
+function parentModels(model) {
+  const belongsTo = model.model.belongsTo;
+  if (Array.isArray(belongsTo))
+    return belongsTo.map((entry) => typeof entry === "string" ? entry : String(entry?.model ?? "")).filter(Boolean);
+  if (belongsTo && typeof belongsTo === "object")
+    return Object.values(belongsTo).map((value) => String(value?.model ?? value)).filter(Boolean);
+  return [];
+}
+async function clearTables(models, verbose) {
+  for (const model of [...models].reverse())
+    try {
+      await db.deleteFrom(model.table).execute();
+      if (verbose)
+        log.info(`  Truncated table: ${model.table}`);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (/no such table|doesn't exist|does not exist/i.test(message))
+        continue;
+      throw Error(`Could not empty ${model.table} before seeding: ${message}`);
+    }
+}
 function sortModelsByDependencies(models) {
-  const priority = {
-    User: 0,
-    Team: 1,
-    Project: 2
+  const byName = new Map(models.map((model) => [model.name, model])), ordered = [], state = new Map, visit = (model) => {
+    const status = state.get(model.name);
+    if (status === "done" || status === "visiting")
+      return;
+    state.set(model.name, "visiting");
+    for (const parentName of parentModels(model)) {
+      const parent = byName.get(parentName);
+      if (parent && parent !== model)
+        visit(parent);
+    }
+    state.set(model.name, "done");
+    ordered.push(model);
   };
-  return models.sort((a, b) => {
-    const priorityA = priority[a.name] ?? 10, priorityB = priority[b.name] ?? 10;
-    return priorityA - priorityB;
-  });
+  for (const model of models)
+    visit(model);
+  return ordered;
 }
 export async function seed(config = {}) {
   const startTime = Date.now();
@@ -277,6 +341,8 @@ export async function seed(config = {}) {
   models = sortModelsByDependencies(models);
   if (verbose)
     log.info(`Found ${models.length} seedable model(s)`);
+  if (config.fresh)
+    await clearTables(models, verbose);
   const results = [];
   for (const model of models) {
     if (verbose)

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/database",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.187",
+  "version": "0.70.188",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -60,15 +60,15 @@
     "dynamodb-tooling": "^0.3.2"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.70.187",
-    "@stacksjs/config": "0.70.187",
-    "@stacksjs/logging": "0.70.187",
-    "@stacksjs/router": "0.70.187",
+    "@stacksjs/cli": "0.70.188",
+    "@stacksjs/config": "0.70.188",
+    "@stacksjs/logging": "0.70.188",
+    "@stacksjs/router": "0.70.188",
     "better-dx": "^0.2.17",
-    "@stacksjs/path": "0.70.187",
-    "@stacksjs/query-builder": "0.70.187",
-    "@stacksjs/storage": "0.70.187",
-    "@stacksjs/strings": "0.70.187",
-    "@stacksjs/utils": "0.70.187"
+    "@stacksjs/path": "0.70.188",
+    "@stacksjs/query-builder": "0.70.188",
+    "@stacksjs/storage": "0.70.188",
+    "@stacksjs/strings": "0.70.188",
+    "@stacksjs/utils": "0.70.188"
   }
 }