okmodel 0.8.0 → 0.9.1

package/dist/shared/{zbqbmmrp.js → n6je5b28.js}

@@ -3,18 +3,18 @@ import {
 } from "./cm3w0ywp.js";
 import {
   noTimeout
-} from "./q0cqt2sp.js";
+} from "./tr64w5p0.js";
 import {
   noticeBuffer,
   WireSession
-} from "./mtw6jz76.js";
+} from "./e275q7sd.js";
 import {
   BUNSQL_CAPABILITIES,
   driverErrors,
   rejectClosed,
   mapFailure,
   runCall
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/bunsql.ts
 import { SQL as BunSQL } from "bun";
@@ -30,7 +30,6 @@ function open5(config) {
   let closed = false;
   const isClosed = () => closed;
   const named = config.prepared === "named";
-  const parked = [];
   let dropped = 0;
   let closures = 0;
   const sql = new BunSQL(config.url, {
@@ -57,7 +56,6 @@ function open5(config) {
   });
   const held = {
     sql,
-    parked,
     acquireMs,
     counters,
     notices,
@@ -66,26 +64,26 @@ function open5(config) {
   };
   const run = (text, params, watch) => {
     const sent = dropped;
-    return root.query(text, params, watch).catch((error) => import("./wvdjznah.js").then((mod) => mod.recover(sql, error, text, root.depth(), clientPools.has(pool), dropped > sent, () => root.query(text, params, watch))));
+    return root.query(text, params, watch).catch((error) => import("./rcjm0yn7.js").then((mod) => mod.recover(sql, error, text, root.depth(), clientPools.has(pool), dropped > sent, () => root.query(text, params, watch))));
   };
   const afterDrop = (text, params, watch) => {
     if (dropped === 0)
       return run(text, params, watch);
     const seen = dropped;
-    return import("./wvdjznah.js").then((mod) => mod.drainClosed(sql).then(() => {
+    return import("./rcjm0yn7.js").then((mod) => mod.drainClosed(sql).then(() => {
       if (dropped === seen)
         dropped = 0;
       return run(text, params, watch);
     }));
   };
-  const checkout = () => closed ? rejectClosed() : import("./wvdjznah.js").then((mod) => mod.checkout(held));
+  const checkout = () => closed ? rejectClosed() : import("./rcjm0yn7.js").then((mod) => mod.checkout(held));
   const pool = {
     capabilities: BUNSQL_CAPABILITIES,
     execute(text, params, options) {
       const refused = noTimeout(options);
       if (refused !== undefined)
         return refused;
-      return runCall(closed, options, (watch) => releaseParked(parked).then(() => afterDrop(text, params, watch)));
+      return runCall(closed, options, (watch) => afterDrop(text, params, watch));
     },
     async batch(statements, options) {
       const refused = noTimeout(options);
@@ -101,17 +99,16 @@ function open5(config) {
     reserve: () => checkout(),
     stream(text, params) {
       return async function* () {
-        const { streamRows } = await import("./wvdjznah.js");
+        const { streamRows } = await import("./rcjm0yn7.js");
         yield* streamRows(checkout, text, params);
       }();
     },
     listen(channel, onNotify) {
-      return import("./wvdjznah.js").then((mod) => mod.listen(sql, parked, closed, channel, onNotify));
+      return import("./rcjm0yn7.js").then((mod) => mod.listen(sql, closed, channel, onNotify));
     },
     stats: () => statsOf(counters, max),
     async close() {
       closed = true;
-      await releaseParked(parked);
       await sql.close();
     }
   };
@@ -149,24 +146,14 @@ async function reserve(sql, acquireMs, counters) {
       const errors = await driverErrors();
       throw errors.acquireTimeout();
     }
+    if (error instanceof Error && (error.message === "Connection closed" || error.message === "connection must be a PostgresSQLConnection")) {
+      throw new DriverError2(error.message, { cause: error, sqlstate: "08006" });
+    }
     throw await mapFailure(error);
   } finally {
     counters.waiting = Math.max(0, counters.waiting - 1);
   }
 }
-async function park(parked, reserved) {
-  parked.push(reserved);
-  while (parked.length > 1) {
-    const extra = parked.shift();
-    if (extra !== undefined)
-      await releaseReserved(extra);
-  }
-}
-async function releaseParked(parked) {
-  const pending = parked.splice(0);
-  for (const reserved of pending)
-    await releaseReserved(reserved);
-}
 function releaseReserved(reserved) {
   const done = reserved.release();
   return done instanceof Promise ? done.then(() => {
@@ -187,4 +174,4 @@ function statsOf(counters, size) {
   };
 }
 
-export { markClientPool, open5, send2, reserve, park };
+export { markClientPool, open5, send2, reserve, releaseReserved };

package/dist/shared/{b6d6p0zc.js → ns35jqz0.js}

@@ -1,13 +1,13 @@
+import {
+  renderCatalog2
+} from "./fk9vef30.js";
 import {
   viewGlobalReason,
   viewMentions
-} from "./760ppr76.js";
-import {
-  renderCatalog
-} from "./sjk86yrx.js";
+} from "./4a3mmhhe.js";
 import {
   createClient
-} from "./bah9nbg3.js";
+} from "./xbvz446k.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -189,29 +189,30 @@ function bindFactories(host, definitions) {
   }
   return bound;
 }
-async function insertRow(host, table, overrides, children, inherited) {
-  if (host.creating.has(table)) {
+async function insertRow(host, table, overrides, children, inherited, creating) {
+  const inflight = creating ?? new Set;
+  if (inflight.has(table)) {
     throw new OkmError2("invalid", `Factory cycle at ${table}.`, {
       fix: { summary: "A ref() points back at a row that is still being created." }
     });
   }
-  host.creating.add(table);
+  inflight.add(table);
   try {
-    return await insertPrepared(host, table, overrides, children, inherited);
+    return await insertPrepared(host, table, overrides, children, inherited, inflight);
   } finally {
-    host.creating.delete(table);
+    inflight.delete(table);
   }
 }
-async function insertPrepared(host, table, overrides, children, inherited) {
+async function insertPrepared(host, table, overrides, children, inherited, creating) {
   const facts = requireTable(host, table);
   const defined = host.definitions.get(table)?.(context(host)) ?? {};
   const merged = { ...defined, ...overrides };
-  const key = host.schema.tenancy?.key;
-  const taken = takeTenant(merged, facts.tenant ? key : undefined);
+  const keys = tenantKeyNames(host);
+  const taken = takeTenant(merged, facts.tenant ? keys : []);
   const requested = taken.tenant ?? inherited;
   const tenant = facts.tenant ? requested ?? host.rng.uuid() : undefined;
-  const resolved = await resolveRefs(host, taken.rest, tenant);
-  await fillRequired(host, facts, resolved, tenant);
+  const resolved = await resolveRefs(host, taken.rest, tenant, creating);
+  await fillRequired(host, facts, resolved, tenant, creating);
   const row = await writeRow(host, facts, resolved, tenant);
   host.cache.set(cacheKey(table, facts.tenant ? tenant : undefined), row);
   host.created.set(table, (host.created.get(table) ?? 0) + 1);
@@ -227,7 +228,7 @@ async function insertPrepared(host, table, overrides, children, inherited) {
       }
       const link = linkFields(host, facts, requireTable(host, child), row);
       for (let index = 0;index < count; index += 1) {
-        await insertRow(host, child, link, undefined, tenant);
+        await insertRow(host, child, link, undefined, tenant, creating);
       }
     }
   }
@@ -276,20 +277,26 @@ function context(host) {
     }
   };
 }
-function takeTenant(row, key) {
-  if (key === undefined || !Object.hasOwn(row, key))
+function takeTenant(row, keys) {
+  if (keys.length === 0)
     return { tenant: undefined, rest: row };
-  const value = row[key];
   const rest = { ...row };
-  delete rest[key];
-  if (typeof value !== "string" || value.length === 0) {
-    throw new OkmError2("invalid", `${key} must be a uuid string.`, {
-      fix: { summary: `Pass create({ ${key} }) the tenant uuid.` }
-    });
+  let tenant;
+  for (const key of keys) {
+    if (!Object.hasOwn(rest, key))
+      continue;
+    const value = rest[key];
+    delete rest[key];
+    if (typeof value !== "string" || value.length === 0) {
+      throw new OkmError2("invalid", `${key} must be a uuid string.`, {
+        fix: { summary: `Pass create({ ${key} }) the tenant uuid.` }
+      });
+    }
+    tenant ??= value;
   }
-  return { tenant: value, rest };
+  return { tenant, rest };
 }
-async function resolveRefs(host, row, tenant) {
+async function resolveRefs(host, row, tenant, creating) {
   const resolved = {};
   for (const field of Object.keys(row)) {
     const value = row[field];
@@ -298,18 +305,18 @@ async function resolveRefs(host, row, tenant) {
       resolved[field] = value;
       continue;
     }
-    resolved[field] = primaryValue(await referenced(host, target, tenant), requireTable(host, target), host.schema.tenancy?.key);
+    resolved[field] = primaryValue(await referenced(host, target, tenant, creating), requireTable(host, target), tenantKeyNames(host));
   }
   return resolved;
 }
-async function fillRequired(host, facts, row, tenant) {
+async function fillRequired(host, facts, row, tenant, creating) {
   for (const column of facts.columns) {
     if (!isRequired(column) || Object.hasOwn(row, column.field))
       continue;
     const foreign = facts.foreignKeys.find((key) => key.columns.includes(column.sql));
     if (foreign !== undefined) {
       const target = factsBySql(host, foreign.target);
-      const parent = await referenced(host, target.name, tenant);
+      const parent = await referenced(host, target.name, tenant, creating);
       assignForeign(host, facts, foreign, parent, row);
       if (Object.hasOwn(row, column.field))
         continue;
@@ -319,7 +326,7 @@ async function fillRequired(host, facts, row, tenant) {
 }
 function assignForeign(host, child, foreign, parent, row) {
   const target = factsBySql(host, foreign.target);
-  const key = host.schema.tenancy?.key;
+  const keys = new Set(tenantKeyNames(host));
   for (let index = 0;index < foreign.columns.length; index += 1) {
     const childSql = foreign.columns[index];
     const parentSql = foreign.targetColumns[index];
@@ -327,25 +334,36 @@ function assignForeign(host, child, foreign, parent, row) {
       continue;
     const field = fieldOf(child, childSql);
     const source = fieldOf(target, parentSql);
-    if (field === undefined || source === undefined || field === key)
+    if (field === undefined || source === undefined || keys.has(field))
       continue;
     if (!Object.hasOwn(row, field))
       row[field] = parent[source];
   }
 }
-async function referenced(host, table, tenant) {
+async function referenced(host, table, tenant, creating) {
   const facts = requireTable(host, table);
   const scope = facts.tenant ? tenant : undefined;
   const cached = host.cache.get(cacheKey(table, scope));
   if (cached !== undefined)
     return cached;
-  return insertRow(host, table, scope === undefined ? undefined : tenantOverride(host, scope), undefined, scope);
+  return insertRow(host, table, scope === undefined ? undefined : tenantOverride(host, scope), undefined, scope, creating);
 }
 function tenantOverride(host, tenant) {
-  const key = host.schema.tenancy?.key;
-  if (key === undefined)
+  const keys = tenantKeyNames(host);
+  if (keys.length === 0)
     return;
-  return { [key]: tenant };
+  const overrides = {};
+  for (const key of keys)
+    overrides[key] = tenant;
+  return overrides;
+}
+function tenantKeyNames(host) {
+  const tenancy = host.schema.tenancy;
+  if (tenancy === undefined)
+    return [];
+  if (tenancy.keys !== undefined && tenancy.keys.length > 0)
+    return tenancy.keys;
+  return [tenancy.key];
 }
 function linkFields(host, parent, child, row) {
   const many = parent.relations.find((relation) => relation.kind === "many" && relation.table === child.name);
@@ -366,7 +384,7 @@ function linkFields(host, parent, child, row) {
   });
 }
 function paired(host, child, parent, childSql, parentSql, row) {
-  const key = host.schema.tenancy?.key;
+  const keys = new Set(tenantKeyNames(host));
   const linked = {};
   for (let index = 0;index < childSql.length; index += 1) {
     const childName = childSql[index];
@@ -375,7 +393,7 @@ function paired(host, child, parent, childSql, parentSql, row) {
       continue;
     const field = fieldOf(child, childName);
     const source = fieldOf(parent, parentName);
-    if (field === undefined || source === undefined || field === key)
+    if (field === undefined || source === undefined || keys.has(field))
       continue;
     linked[field] = row[source];
   }
@@ -463,8 +481,9 @@ function enumLabels(catalog, dataType) {
   }
   return;
 }
-function primaryValue(row, facts, tenantKey) {
-  const fields = facts.primary.filter((field) => field !== tenantKey);
+function primaryValue(row, facts, tenantKeys) {
+  const skip = new Set(tenantKeys);
+  const fields = facts.primary.filter((field) => !skip.has(field));
   if (fields.length !== 1) {
     throw new OkmError2("invalid", `ref(${facts.name}) needs a single primary key.`, {
       fix: { summary: "Set the foreign-key columns in the factory." }
@@ -590,16 +609,18 @@ async function isolation(host) {
   }
 }
 async function checkTable(host, facts, tenantA, tenantB) {
-  const key = host.schema.tenancy?.key;
-  if (key === undefined)
-    return;
   const keys = tenantKeys(host);
+  if (keys.length === 0)
+    return;
   if (host.definitions.size > 0 && !host.definitions.has(facts.name)) {
     throw new OkmError2("invalid", `Factory ${facts.name} is missing.`, {
       fix: { summary: `Add ${facts.name} to factories().` }
     });
   }
-  const row = await insertRow(host, facts.name, { [key]: tenantB }, undefined, tenantB);
+  const overrides = {};
+  for (const key of keys)
+    overrides[key] = tenantB;
+  const row = await insertRow(host, facts.name, overrides, undefined, tenantB);
   const where = primaryWhere(facts, row, keys);
   const client = openTenant(host, tenantA);
   const handle = tableHandle2(client, facts.name);
@@ -762,7 +783,14 @@ async function checkFlips(host, facts, keys, tenantA, tenantB) {
         continue;
       values[flipped] = tenantB;
       const client = openTenant(host, values);
-      const stored = await tableHandle2(client, facts.name).insert(data);
+      let stored;
+      try {
+        stored = await tableHandle2(client, facts.name).insert(data);
+      } catch (error) {
+        if (error instanceof OkmError2 && error.kind === "foreign_key")
+          continue;
+        throw error;
+      }
       if (!isRow2(stored))
         continue;
       const where = primaryWhere(facts, stored, keys);
@@ -863,9 +891,8 @@ async function checkView(host, view, keys, tenantA, tenantB) {
     for (const tenant of [tenantA, tenantB]) {
       for (const name of sources) {
         const facts = requireFacts(host, name);
-        const key = keys[0];
         const overrides = markerFor(view, facts, keys, tenant);
-        if (key !== undefined)
+        for (const key of keys)
           overrides[key] = tenant;
         const row = await insertRow(host, name, overrides, undefined, tenant);
         if (tenant === tenantB)
@@ -1301,7 +1328,7 @@ async function testing2(schema, options) {
   const seed = options.seed ?? 1;
   const pool = await options.driver;
   if (options.migrate !== false) {
-    for (const statement of renderCatalog(schema.catalog, "public")) {
+    for (const statement of renderCatalog2(schema.catalog, "public")) {
       if (statement.trim().length === 0)
         continue;
       await pool.execute(statement);
@@ -1317,7 +1344,6 @@ async function testing2(schema, options) {
     facts,
     rng: rng(seed),
     cache: new Map,
-    creating: new Set,
     created: new Map,
     definitions: new Map
   };

package/dist/shared/{n05z9nwz.js → nstwgzn8.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./bah9nbg3.js";
+} from "./xbvz446k.js";
 import {
   emitWhere,
   emitOrder,

package/dist/{tooling/shared/08kemxjd.js → shared/pgsak1yw.js}

@@ -2,7 +2,7 @@ import {
   resetSession2,
   resetQueried2,
   refuseWhenLost2
-} from "./4d2w25vw.js";
+} from "./99qp9vtg.js";
 export {
   refuseWhenLost2 as refuseWhenLost,
   resetQueried2 as resetQueried,