okmodel 0.9.0 → 0.9.1

package/dist/shared/{2szgv6yj.js → ns35jqz0.js}

@@ -4,10 +4,10 @@ import {
 import {
   viewGlobalReason,
   viewMentions
-} from "./760ppr76.js";
+} from "./4a3mmhhe.js";
 import {
   createClient
-} from "./npdftanb.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)
@@ -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/{xtsydxjg.js → nstwgzn8.js}

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

package/dist/shared/{stfa9xcw.js → py2zrrm6.js}

@@ -1,18 +1,19 @@
 import {
   open2
-} from "./dd5pmnky.js";
+} from "./jvxcp1qk.js";
 import"./12z7aznj.js";
 import"./n442h54c.js";
 import"./fk9vef30.js";
 import {
   openProject
-} from "./2zdxkt7b.js";
+} from "./wp7y8q3y.js";
 import {
+  driverUrl,
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   selectTarget
-} from "./6nae0spm.js";
+} from "./bdekbvmt.js";
 import {
   isExactVersion,
   compareExtensionVersions
@@ -41,7 +42,7 @@ var TYPES = `
   where e.extname = $1
     and d.deptype = 'e'
     and d.classid = 'pg_type'::regclass
-    and t.typtype in ('b', 'e', 'd')
+    and t.typtype in ('b', 'e', 'd', 'c')
   order by t.typname
 `;
 var FUNCTIONS = `
@@ -312,7 +313,7 @@ async function extProject(cwd, command, flags) {
   const opened = await openProject(cwd);
   const target = selectTarget(opened.config, flags.target);
   assertTargetPolicy(target, "check", flags.allowProtected);
-  const pool = open2({ url: target.url, max: 1 });
+  const pool = open2({ url: driverUrl(target.url), max: 1 });
   try {
     if (command === "list")
       return formatList(await readExtensions(pool));
@@ -424,7 +425,7 @@ async function withServer(cwd, flags, body) {
   const opened = await openProject(cwd);
   const target = selectTarget(opened.config, flags.target);
   assertTargetPolicy(target, "check", flags.allowProtected);
-  const pool = open2({ url: target.url, max: 1 });
+  const pool = open2({ url: driverUrl(target.url), max: 1 });
   try {
     return await body(pool);
   } catch (error) {

package/dist/shared/{9dr2qnx7.js → qqm3ze6q.js}

@@ -17,7 +17,7 @@ import {
   snakeCase,
   emittedTypeName,
   rejectLater
-} from "./gcefca6p.js";
+} from "./f9t9g54z.js";
 import {
   ColumnBuilder2,
   formatType

package/dist/shared/{cf8zdz5p.js → rcjm0yn7.js}

@@ -4,8 +4,8 @@ import {
 import {
   send2,
   reserve,
-  park
-} from "./62b603gr.js";
+  releaseReserved
+} from "./n6je5b28.js";
 import {
   resetSession2,
   refuseWhenLost2
@@ -62,19 +62,13 @@ function lostQuery(error) {
 function socketClosed(error) {
   if (!(error instanceof Error))
     return false;
-  if (error.message === "Connection closed")
+  if (bunClosed(error.message))
     return true;
-  return error.cause instanceof Error && error.cause.message === "Connection closed";
+  return error.cause instanceof Error && bunClosed(error.cause.message);
 }
-async function listen(sql, parked, closed, channel, onNotify) {
+async function listen(sql, closed, channel, onNotify) {
   if (closed)
     return rejectClosed();
-  const pending = parked.splice(0);
-  for (const reserved of pending) {
-    const done = reserved.release();
-    if (done instanceof Promise)
-      await done;
-  }
   const subscription = await sql.listen(channel, onNotify);
   return async () => {
     await subscription.unlisten();
@@ -84,7 +78,7 @@ async function checkout(held) {
   const { counters, isClosed } = held;
   if (isClosed())
     return rejectClosed();
-  const reserved = await takeOpen(held) ?? await reserve(held.sql, held.acquireMs, counters);
+  const reserved = await reserve(held.sql, held.acquireMs, counters);
   counters.reserved += 1;
   const session = new WireSession((text, params) => send2(reserved, text, params), held.notices, isClosed, false, () => {
     counters.reservedBusy += 1;
@@ -140,20 +134,33 @@ async function checkout(held) {
       try {
         if (!lost.on)
           await reset(session, reserved);
-      } catch (error) {
-        if (lostQuery(error) || reportsClosed(reserved))
-          lost.on = true;
-        else
-          throw error;
+        else if (session.depth() > 0 && !reportsClosed(reserved)) {
+          await reserved.unsafe("ROLLBACK").catch(() => {
+            return;
+          });
+          session.abandon();
+        }
+      } catch {
+        lost.on = true;
       } finally {
         counters.reserved = Math.max(0, counters.reserved - 1);
         if (lost.on) {
           try {
             reserved.release();
           } catch {}
-          await flushClosed(held.sql);
-        } else
-          await park(held.parked, reserved);
+          if (counters.reserved === 0)
+            await flushClosed(held.sql);
+        } else {
+          try {
+            await releaseReserved(reserved);
+          } catch {
+            try {
+              reserved.release();
+            } catch {}
+            if (counters.reserved === 0)
+              await flushClosed(held.sql);
+          }
+        }
       }
     }
   };
@@ -161,20 +168,6 @@ async function checkout(held) {
 function reportsClosed(reserved) {
   return Reflect.get(reserved, "closed") === true;
 }
-async function takeOpen(held) {
-  while (held.parked.length > 0) {
-    const next = held.parked.pop();
-    if (next === undefined)
-      return;
-    if (!reportsClosed(next))
-      return next;
-    try {
-      next.release();
-    } catch {}
-    await flushClosed(held.sql);
-  }
-  return;
-}
 async function flushClosed(sql) {
   for (let attempt = 0;attempt < 3; attempt += 1) {
     try {

package/dist/shared/{ckz05z15.js → rged92v6.js}

@@ -1,14 +1,17 @@
 import {
   assertAuthorDrift2,
+  sealDomainChecks2,
   catalogQuery2,
   managedRoleOptions2
-} from "./90sg0w5a.js";
-import"./myk8fswx.js";
-import"./6nae0spm.js";
+} from "./4pkz5nvw.js";
+import"./e1c55v04.js";
+import"./mz48rs74.js";
+import"./bdekbvmt.js";
 import"./fk9vef30.js";
 import"./12z7aznj.js";
 export {
   assertAuthorDrift2 as assertAuthorDrift,
   catalogQuery2 as catalogQuery,
-  managedRoleOptions2 as managedRoleOptions
+  managedRoleOptions2 as managedRoleOptions,
+  sealDomainChecks2 as sealDomainChecks
 };

package/dist/shared/{qvwwp1mp.js → rw4tpcd0.js}

@@ -6,31 +6,35 @@ import {
 } from "./fk9vef30.js";
 import"./n442h54c.js";
 import"./cm3w0ywp.js";
-import"./dd5pmnky.js";
+import"./jvxcp1qk.js";
 import {
   watchReserved2
-} from "./bphrgwz9.js";
-import {
-  ensureMigrationTables2
-} from "./ccsmhv9r.js";
+} from "./3dr444ny.js";
 import {
   sealViews,
   catalogQuery2,
   managedRoleOptions2
-} from "./90sg0w5a.js";
+} from "./4pkz5nvw.js";
+import {
+  ensureMigrationTables2
+} from "./8ma6drzr.js";
 import {
   assumeRole,
   grantSchema,
+  ownSchema,
   assertSchemaUsageLanded,
   catalogsEqual,
   snapshotDifference
-} from "./3456242y.js";
+} from "./8p2bgye0.js";
 import {
   roleExists
-} from "./jpybhf98.js";
+} from "./6xqvesa5.js";
+import {
+  probeStableBackend
+} from "./e1c55v04.js";
 import {
   introspectSchema
-} from "./myk8fswx.js";
+} from "./mz48rs74.js";
 import {
   projectPath,
   loadSnapshots,
@@ -44,22 +48,23 @@ import {
   hasError,
   lintRefusal,
   openProject
-} from "./2zdxkt7b.js";
+} from "./wp7y8q3y.js";
 import {
+  driverUrl,
   sqlStatements,
   transactionControl,
   canonicalTypeName,
   createdRoleName,
   createRoleOnce,
+  changesRole,
   classOf,
   strictestClass,
   planMigration,
   sessionFailure,
   finishQuiet,
   assertDirectConnection,
-  assertStableBackend,
   selectTarget
-} from "./6nae0spm.js";
+} from "./bdekbvmt.js";
 import {
   isConnectionLost
 } from "./cnkky55j.js";
@@ -154,7 +159,7 @@ function retargetSteps(steps, schema, source = "public") {
   }));
 }
 async function inCheckTransaction(url, scratch, config, allowPooler, run) {
-  const sql = postgres(url, {
+  const sql = postgres(driverUrl(url), {
     max: 1,
     connect_timeout: 5,
     idle_timeout: 1,
@@ -174,7 +179,7 @@ async function inCheckTransaction(url, scratch, config, allowPooler, run) {
   let rolledBack = false;
   let xid = "";
   try {
-    await assertStableBackend(async () => {
+    await probeStableBackend(url, async () => {
       const rows = await reserved.unsafe("select pg_backend_pid()::text as pid");
       const pid = cell(rows[0], "pid");
       return pid ?? "";
@@ -273,7 +278,7 @@ function closedError() {
   return Object.assign(new Error("CONNECTION_CLOSED"), { code: "CONNECTION_CLOSED" });
 }
 async function dropScratch(url, scratch) {
-  const sql = postgres(url, {
+  const sql = postgres(driverUrl(url), {
     max: 1,
     connect_timeout: 5,
     idle_timeout: 1,
@@ -322,6 +327,9 @@ async function runSteps(sql, connection, scratch, migrationRole, migration, sess
     if (prepared.sql.length === 0)
       continue;
     try {
+      if (migrationRole !== undefined && !changesRole(step.sql) && session.setRole !== migrationRole && await roleExists(connection, migrationRole)) {
+        await assumeRole(connection, migrationRole, session);
+      }
       const created = createdRoleName(step.sql);
       const existed = created !== undefined && await roleExists(connection, created);
       if (step.backfill !== undefined) {
@@ -332,17 +340,18 @@ async function runSteps(sql, connection, scratch, migrationRole, migration, sess
       } else if (!existed) {
         await sql.unsafe(createRoleOnce(prepared.sql.replace(/;\s*$/, "")));
       }
-      if (created !== undefined && created === migrationRole) {
-        if (!existed) {
-          await grantSchema(connection, scratch, created);
-          await connection.execute(`grant select, insert, update on okm_meta, okm_history, okm_backfill to ${quoteIdent2(created)}`);
-        }
-        await assumeRole(connection, created, session);
+      if (created !== undefined && created === migrationRole && !existed) {
+        await grantSchema(connection, scratch, created);
+        await ownSchema(connection, scratch, created);
+        await connection.execute(`grant select, insert, update on okm_meta, okm_history, okm_backfill to ${quoteIdent2(created)}`);
       }
     } catch (error) {
       throw failStep(migration.id, index, error);
     }
   }
+  if (migrationRole !== undefined && session.setRole !== migrationRole && await roleExists(connection, migrationRole)) {
+    await assumeRole(connection, migrationRole, session);
+  }
 }
 function prepareCheckSql(sql) {
   const parts = sqlStatements(sql);

package/dist/shared/{bsek72fg.js → s5qe47a6.js}

@@ -54,6 +54,9 @@ function scanLiteral(literal, state) {
   for (let index = 0;index < literal.length; index += 1) {
     const char = literal[index] ?? "";
     const code = literal.charCodeAt(index);
+    if (char === "\\") {
+      fragmentError("A fragment cannot include a backslash.", "Pass the value as an interpolation.");
+    }
     if (state.quote !== undefined) {
       if (char !== state.quote)
         continue;

package/dist/shared/{1d9q9cv2.js → smxzjz60.js}

@@ -1,7 +1,7 @@
 import {
   emitSqlSelect,
   decodeSqlNumber
-} from "./3bb7wsqt.js";
+} from "./ycnft340.js";
 import {
   refusePrototypeKey
 } from "./a62rb2da.js";
@@ -10,7 +10,7 @@ import {
 } from "./9a4ae4p8.js";
 import {
   readSelectFragment
-} from "./bsek72fg.js";
+} from "./s5qe47a6.js";
 import {
   emitWhere,
   emitOrder,

package/dist/shared/{c3mvnq7a.js → th5rnaxw.js}

@@ -1,7 +1,7 @@
 import {
   build2,
   identityColumn2
-} from "./s7he5e5d.js";
+} from "./67w3kn71.js";
 export {
   build2 as build,
   identityColumn2 as identityColumn