okmodel 0.5.0 → 0.5.1

package/dist/shared/{xdpj5kkm.js → qv2ydck9.js}

@@ -13,17 +13,22 @@ import {
 } from "./8bwbwy8h.js";
 import {
   open2
-} from "./wqem4jed.js";
+} from "./krxx77g0.js";
 import {
   canonicalTypeName,
   batchSizeField,
   aboutBatchCount,
+  sqlStatements,
   parseReplace,
   planMigration,
   formatPlan,
   parsePlan,
-  staleRenames
-} from "./ayz64vzj.js";
+  staleRenames,
+  assertTargetPolicy,
+  assertTargetAlias,
+  listTargets,
+  selectTarget
+} from "./ga3sfy93.js";
 import {
   contributedFields
 } from "./n0dgs0pb.js";
@@ -38,7 +43,7 @@ import {
 import {
   snakeCase,
   emittedTypeName
-} from "./jsd07prz.js";
+} from "./ntneex2a.js";
 import {
   ColumnBuilder2
 } from "./c9z5g0fm.js";
@@ -150,8 +155,8 @@ var ERROR_DOCS = [
   {
     code: "OKM1102",
     title: "Unfiltered write",
-    summary: "update or delete would run with an empty where.",
-    fix: "Pass a filter. undefined in a write filter does not mean every row."
+    summary: "A write with no effective predicate, including undefined values, is OKM1102.",
+    fix: "Pass a predicate, or .all(reason). An undefined-only where is the same as {}."
   },
   {
     code: "OKM1104",
@@ -180,14 +185,14 @@ var ERROR_DOCS = [
   {
     code: "OKM1120",
     title: "Unknown field",
-    summary: "A field name in where, select, orderBy, or include is not on the table.",
-    fix: "Use a field from the catalog. The error includes a nearest-name hint when one is close."
+    summary: "The name is not a field or an option. timeout and signal go in the second argument of update. Options go first: tx(options, fn).",
+    fix: "Use a field from the catalog, or move the option. The error includes a nearest-name hint when one is close."
   },
   {
     code: "OKM1121",
     title: "Object as value",
-    summary: "A plain object was passed where a value is required. JSON cannot create an operator.",
-    fix: "Wrap the value with eq. eq is the equality form for json and jsonb."
+    summary: "An empty or() branch is OKM1121. or() takes one array: or([a, b]). A plain object was passed where a value is required.",
+    fix: "Give every or() branch a predicate. Pass an array: or([a, b]). Wrap a json value with eq."
   },
   {
     code: "OKM1122",
@@ -252,8 +257,8 @@ var ERROR_DOCS = [
   {
     code: "OKM1510",
     title: "Unsafe migration",
-    summary: "A migration has an unresolved lint error, or an override with an empty reason or a code the statement did not trigger.",
-    fix: "Put `-- okm-allow OKM15xx: reason` on the line above the statement. The code must be one that statement triggered, and the reason must not be empty."
+    summary: "A migration has an unresolved lint error, or an override with an empty reason or a code no statement in the step triggered.",
+    fix: "Put `-- okm-allow OKM15xx: reason` on the step. The code must be one a statement in that step triggered, and the reason must not be empty. The line silences that code on every statement of the step."
   },
   {
     code: "OKM1511",
@@ -444,8 +449,8 @@ var ERROR_DOCS = [
   {
     code: "OKM1542",
     title: "Data statement",
-    summary: "A migration contains a data statement outside backfill().",
-    fix: "Move the statement into backfill(). Data changes are batched and resumable there."
+    summary: "A migration contains a data statement outside backfill(), or a DO or CALL whose body is not analysed.",
+    fix: "Move insert, update, delete, merge, and truncate into backfill(). DO and CALL are refused because the body is not analysed. Allow OKM1542 with a reason to keep one."
   },
   {
     code: "OKM1543",
@@ -686,6 +691,12 @@ var ERROR_DOCS = [
     title: "Target not named",
     summary: "Several targets are configured and the command was not given --target.",
     fix: "Pass --target <name>. The command does not guess."
+  },
+  {
+    code: "OKM1854",
+    title: "Pooler session",
+    summary: "Two statements on the same connection saw different backend pids. A transaction-mode pooler is in the way.",
+    fix: "Use a direct connection, or pass --allow-pooler."
   }
 ];
 var byCode;
@@ -740,7 +751,7 @@ var STEP_RULES = [
   rule("OKM1536", "locking", "error", "Adding a foreign key without NOT VALID locks the table while it scans.", (input) => hit(foreignKeyWithoutNotValid(input), "adds a foreign key without NOT VALID")),
   rule("OKM1537", "locking", "error", "SET NOT NULL locks the table while it scans for nulls.", (input) => hit(unsafeSetNotNull(input), "sets NOT NULL")),
   rule("OKM1538", "locking", "warning", "A type change that rewrites the table locks it for the rewrite.", (input) => typeChange(input, "rewrite")),
-  rule("OKM1542", "data-dependent", "error", "A data statement outside backfill() is not a migration step.", (input) => hit(dataStatement(input.step), "changes rows outside backfill()"))
+  rule("OKM1542", "data-dependent", "error", "A data statement outside backfill(), or DO or CALL, is not a migration step.", (input) => dataStatement(input.step))
 ];
 var COLUMN_RULES = [
   {
@@ -800,12 +811,18 @@ function normalized(sql) {
   return out;
 }
 function dataStatement(step) {
-  if (step.backfill !== undefined)
-    return false;
   const text = normalized(step.sql);
-  if (/^(?:insert|update|delete|merge|truncate)\b/.test(text))
-    return true;
-  return /^with\b/.test(text) && /\b(?:insert|update|delete|merge)\b/.test(text);
+  if (/^(?:do|call)\b/.test(text))
+    return ["the body is not analysed"];
+  if (step.backfill !== undefined)
+    return [];
+  if (/^(?:insert|update|delete|merge|truncate)\b/.test(text)) {
+    return ["changes rows outside backfill()"];
+  }
+  if (/^with\b/.test(text) && /\b(?:insert|update|delete|merge)\b/.test(text)) {
+    return ["changes rows outside backfill()"];
+  }
+  return [];
 }
 function matches(step, kind, pattern) {
   return pattern.test(normalized(step.sql)) || step.kind === kind;
@@ -980,9 +997,10 @@ function validates(input, kind) {
     return true;
   return false;
 }
+var TYPE_CHANGE = /^alter table\s+(\S+)\s+alter column\s+(\S+)\s+(?:set data type|type)\b/;
 function typeChange(input, mode) {
   const text = normalized(input.step.sql);
-  const changing = /^alter table\s+\S+\s+alter column\s+\S+\s+set data type\b/.test(text) || input.step.kind === "set-column-type";
+  const changing = TYPE_CHANGE.test(text) || input.step.kind === "set-column-type";
   if (!changing)
     return [];
   const compared = columnTypes(input);
@@ -1009,7 +1027,7 @@ function typeChange(input, mode) {
 }
 function columnTypes(input) {
   const text = normalized(input.step.sql);
-  const match = /^alter table\s+(\S+)\s+alter column\s+(\S+)\s+set data type\b/.exec(text);
+  const match = TYPE_CHANGE.exec(text);
   const table = lastName(match?.[1]);
   const column = lastName(match?.[2]);
   if (table === undefined || column === undefined)
@@ -1178,34 +1196,76 @@ function lintRefusal(findings) {
   });
 }
 function lintStep(step, number, before, after, existingTables, earlier, later) {
-  const hits = [];
-  for (const rule of STEP_RULES) {
-    for (const reason of rule.check({ step, before, after, existingTables, earlier, later })) {
-      hits.push({ code: rule.code, severity: rule.severity, reason });
+  const texts = statementTexts(step);
+  const multi = texts.length > 1;
+  const earlierStatements = earlier.flatMap(contextSteps);
+  const laterStatements = later.flatMap(contextSteps);
+  const perStatement = [];
+  const triggered = new Set;
+  texts.forEach((sql, index) => {
+    const statement = multi ? withoutKind(step, sql) : withSql(step, sql);
+    const hits = [];
+    for (const rule of STEP_RULES) {
+      for (const reason of rule.check({
+        step: statement,
+        before,
+        after,
+        existingTables,
+        earlier: earlierStatements,
+        later: laterStatements
+      })) {
+        const hit = { code: rule.code, severity: rule.severity, reason };
+        hits.push(hit);
+        triggered.add(hit.code);
+      }
     }
-  }
-  const triggered = new Set(hits.map((item) => item.code));
+    const place = multi ? `step ${String(number)} statement ${String(index + 1)}` : `step ${String(number)}`;
+    perStatement.push({ place, hits });
+  });
   const silenced = new Set;
   const findings = [];
-  const place = `step ${String(number)}`;
+  const stepPlace = `step ${String(number)}`;
   for (const allow of step.allows ?? []) {
     if (allow.reason.trim().length === 0 || allow.code.length === 0) {
-      findings.push(finding("error", "OKM1510", place, "override needs a reason"));
+      findings.push(finding("error", "OKM1510", stepPlace, "override needs a reason"));
       continue;
     }
     if (!triggered.has(allow.code)) {
-      findings.push(finding("error", "OKM1510", place, `override ${allow.code} does not match this statement`));
+      findings.push(finding("error", "OKM1510", stepPlace, `override ${allow.code} does not match this statement`));
       continue;
     }
     silenced.add(allow.code);
   }
-  for (const hit of hits) {
-    if (silenced.has(hit.code))
-      continue;
-    findings.push(finding(hit.severity, hit.code, place, hit.reason));
+  for (const item of perStatement) {
+    for (const hit of item.hits) {
+      if (silenced.has(hit.code))
+        continue;
+      findings.push(finding(hit.severity, hit.code, item.place, hit.reason));
+    }
   }
   return findings;
 }
+function statementTexts(step) {
+  const statements = sqlStatements(step.sql);
+  return statements.length === 0 ? [step.sql] : statements;
+}
+function contextSteps(step) {
+  const statements = sqlStatements(step.sql);
+  if (statements.length === 0)
+    return [step];
+  if (statements.length === 1 && statements[0] === step.sql)
+    return [step];
+  return statements.map((sql) => withSql(step, sql));
+}
+function withSql(step, sql) {
+  if (sql === step.sql)
+    return step;
+  return { ...step, sql };
+}
+function withoutKind(step, sql) {
+  const { kind: _kind, ...rest } = step;
+  return { ...rest, sql };
+}
 function finding(severity, code, place, reason) {
   const doc = errorDoc(code);
   if (doc === undefined)
@@ -1227,158 +1287,6 @@ function columnPlace(column) {
   return `${column.identity.parent.name}.${column.identity.name}`;
 }
 
-// src/tooling/migrate/policy.ts
-var READ = new Set([
-  "plan",
-  "status",
-  "check",
-  "drift",
-  "verify",
-  "pull",
-  "catalog-export",
-  "inspect"
-]);
-var ALLOWED = new Set(["expand", "reference", "provision"]);
-var FORWARD_ONLY = new Set(["drop", "rollback"]);
-function assertTargetPolicy(target, operation, allowProtected = false) {
-  if (FORWARD_ONLY.has(operation)) {
-    throw new OkmError2("invalid", "There is no down migration.", {
-      fix: { summary: "Recovery is a new forward migration." }
-    });
-  }
-  if (!target.protected || allowProtected)
-    return;
-  if (READ.has(operation) || ALLOWED.has(operation))
-    return;
-  throw new OkmError2("OKM1850", `${operation} is blocked on protected target ${target.name}.`, {
-    kind: "forbidden",
-    fix: {
-      summary: "Run a read-only command or an expand migration, or pass --allow-protected for this invocation."
-    }
-  });
-}
-function assertTargetAlias(targets) {
-  const groups = new Map;
-  for (const target of targets) {
-    const key = `${target.host}
-${target.port}
-${target.database}`;
-    const group = groups.get(key);
-    if (group === undefined)
-      groups.set(key, [target]);
-    else
-      group.push(target);
-  }
-  for (const group of groups.values()) {
-    const protectedTarget = group.find((target) => target.protected);
-    const open = group.find((target) => !target.protected);
-    if (protectedTarget !== undefined && open !== undefined) {
-      throw new OkmError2("OKM1852", `${open.name} and ${protectedTarget.name} resolve to the same database and disagree about protection.`, {
-        fix: {
-          summary: "Give those targets the same protection flag. okm check and okm doctor both report this."
-        }
-      });
-    }
-  }
-}
-function assertDirectConnection(url, allowPooler) {
-  if (allowPooler)
-    return;
-  const endpoint = endpointOf(url);
-  const parsed = new URL(url);
-  const host = endpoint.host;
-  if (host.includes("pooler") || host.includes("pgbouncer") || host.includes("-pooler") || endpoint.port === "6543" || parsed.searchParams.get("pgbouncer") === "true") {
-    throw new OkmError2("invalid", `Refusing pooler host ${host}. Apply needs a direct connection.`, { fix: { summary: "Use a direct connection, or pass --allow-pooler." } });
-  }
-}
-function listTargets(config) {
-  if (config.database !== undefined && config.targets !== undefined) {
-    throw new OkmError2("invalid", "Set database or targets, not both.", {
-      fix: { summary: "database is the one target named default. Use targets for more than one." }
-    });
-  }
-  const entries = [];
-  if (config.database !== undefined)
-    entries.push(["default", config.database]);
-  if (config.targets !== undefined) {
-    for (const name of Object.keys(config.targets).sort()) {
-      const input = config.targets[name];
-      if (input !== undefined)
-        entries.push([name, input]);
-    }
-  }
-  return entries.map(([name, input]) => resolveTarget(name, input));
-}
-function selectTarget(config, name) {
-  const targets = listTargets(config);
-  if (targets.length === 0) {
-    throw new OkmError2("OKM1845", "No target is configured.", {
-      fix: { summary: "Set database or targets in okmodel.config.ts." }
-    });
-  }
-  if (name === undefined) {
-    if (targets.length === 1) {
-      const only = targets[0];
-      if (only !== undefined)
-        return only;
-    }
-    throw new OkmError2("OKM1853", "Several targets are configured and --target was not passed.", {
-      fix: { summary: "Pass --target <name>. The command does not guess." }
-    });
-  }
-  const found = targets.find((target) => target.name === name);
-  if (found === undefined) {
-    throw new OkmError2("OKM1845", `Target ${name} is not configured.`, {
-      fix: { summary: "Pass a name from targets, or database for the target named default." }
-    });
-  }
-  return found;
-}
-function resolveTarget(name, input) {
-  if (typeof input !== "string" && isReplicaTarget(input)) {
-    throw new OkmError2("OKM1845", `Target ${name} is a replica. Migrations run on the primary only.`, {
-      fix: {
-        summary: "Set database or targets to the primary URL. A replica is not a migration target."
-      }
-    });
-  }
-  const url = typeof input === "string" ? input : input.url;
-  const protectedTarget = typeof input === "string" ? false : input.protected === true;
-  if (url === undefined || url.length === 0) {
-    throw new OkmError2("OKM1845", `Target ${name} has no url.`, {
-      fix: { summary: "Set the target url. A target is not inferred from the environment." }
-    });
-  }
-  const endpoint = endpointOf(url);
-  return {
-    name,
-    url,
-    protected: protectedTarget,
-    host: endpoint.host,
-    port: endpoint.port,
-    database: endpoint.database
-  };
-}
-function isReplicaTarget(input) {
-  return "primary" in input || "replicas" in input || "weight" in input || "pool" in input;
-}
-function endpointOf(url) {
-  let parsed;
-  try {
-    parsed = new URL(url);
-  } catch {
-    throw new OkmError2("OKM1845", "The target URL is not a Postgres URL.", {
-      fix: { summary: "Pass a postgres:// URL for the target." }
-    });
-  }
-  const database = decodeURIComponent(parsed.pathname.replace(/^\//, ""));
-  return {
-    host: parsed.hostname.toLowerCase(),
-    port: parsed.port.length > 0 ? parsed.port : "5432",
-    database
-  };
-}
-
 // src/tooling/migrate/project.ts
 import { existsSync as existsSync2, mkdirSync, readdirSync as readdirSync2, readFileSync as readFileSync2, writeFileSync } from "node:fs";
 import { basename, join as join2 } from "node:path";
@@ -1462,9 +1370,20 @@ function emitRowTypes(source) {
   lines.push(updates.join(`
 `));
   lines.push("}");
-  return `${lines.join(`
+  const body = `${lines.join(`
 `)}
 `;
+  const aliases = [];
+  if (body.includes("jsonb<"))
+    aliases.push("export type jsonb<T> = T;");
+  if (body.includes("json<"))
+    aliases.push("export type json<T> = T;");
+  if (aliases.length === 0)
+    return body;
+  return `${aliases.join(`
+`)}
+
+${body}`;
 }
 function propertyName(name) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name) ? name : JSON.stringify(name);
@@ -1487,7 +1406,7 @@ function fields(item, kind, source) {
     const state = builder.state;
     if (kind === "row") {
       if (!state.hidden) {
-        printed.push(`  readonly ${field}: ${valueType(state, "required")};`);
+        printed.push(`  readonly ${field}: ${valueType(state)};`);
       }
       continue;
     }
@@ -1496,7 +1415,8 @@ function fields(item, kind, source) {
       continue;
     }
     const mode = kind === "update" ? "optional" : written;
-    printed.push(`  readonly ${field}: ${valueType(state, mode)};`);
+    const label = valueType(state);
+    printed.push(mode === "optional" ? `  readonly ${field}?: ${label};` : `  readonly ${field}: ${label};`);
   }
   return printed.join(`
 `);
@@ -1515,7 +1435,7 @@ function updateMode(state) {
     return "omit";
   return "optional";
 }
-function valueType(state, mode) {
+function valueType(state) {
   let label = scalarLabel(state);
   if (state.dims > 0) {
     for (let rank = 0;rank < state.dims; rank += 1) {
@@ -1525,9 +1445,6 @@ function valueType(state, mode) {
   if (state.nullable) {
     label += " | null";
   }
-  if (mode === "optional") {
-    label += " | undefined";
-  }
   return label;
 }
 function scalarLabel(state) {
@@ -1563,8 +1480,9 @@ function scalarLabel(state) {
     case "bytea":
       return "Uint8Array";
     case "json":
+      return "json<unknown>";
     case "jsonb":
-      return "unknown";
+      return "jsonb<unknown>";
     case "timestamptz":
       return "Temporal.Instant";
     case "timestamp":
@@ -1610,7 +1528,7 @@ function baseName(dataType) {
 // src/dialects/pg/role/index.ts
 var PROVENANCE = { origin: "file", name: "roles" };
 var RELATION = ["SELECT", "INSERT", "UPDATE", "DELETE"];
-var READ2 = ["SELECT"];
+var READ = ["SELECT"];
 var ROUTINE = ["EXECUTE"];
 var SEQUENCE = ["USAGE", "SELECT"];
 function attachRoles(source, input) {
@@ -1712,7 +1630,7 @@ function privilegesFor(kind) {
   if (kind === "sequence")
     return SEQUENCE;
   if (kind === "materializedView")
-    return READ2;
+    return READ;
   if (kind === "namespace")
     return [];
   return RELATION;
@@ -1770,20 +1688,40 @@ async function readRowEstimates(url, schema, tables) {
     await pool.close();
   }
 }
-function annotateLock(step, estimates) {
+function annotateLock(step, estimates, aliases = new Map) {
   const pieces = lockPieces(step);
   const text = withBatches(step, pieces.map((piece) => {
     if (piece.table === undefined)
       return piece.mode;
-    return `${piece.mode} on ${piece.table}, ${estimatePhrase(estimates.get(piece.table))}`;
-  }).join("; "), estimates);
+    return `${piece.mode} on ${piece.table}, ${estimatePhrase(lookupEstimate(piece.table, estimates, aliases))}`;
+  }).join("; "), estimates, aliases);
   if (step.safeRewrite === true)
     return `${text}; safe rewrite applied`;
-  if (exclusiveOverLarge(pieces, estimates)) {
+  if (exclusiveOverLarge(pieces, estimates, aliases)) {
     return `${text}; note: more than ${String(LARGE_TABLE_ROWS)} estimated rows`;
   }
   return text;
 }
+function renameAliases(steps) {
+  const map = new Map;
+  for (const step of steps) {
+    if (step.kind !== "rename-table")
+      continue;
+    const match = /^alter table "(?:(?:[^"]|"")*)"\."((?:[^"]|"")*)" rename to "((?:[^"]|"")*)"/.exec(step.sql);
+    const from = match?.[1]?.replaceAll('""', '"');
+    const to = match?.[2]?.replaceAll('""', '"');
+    if (from !== undefined && to !== undefined)
+      map.set(to, from);
+  }
+  return map;
+}
+function lookupEstimate(table, estimates, aliases) {
+  const direct = estimates.get(table);
+  if (direct !== undefined)
+    return direct;
+  const previous = aliases.get(table);
+  return previous === undefined ? undefined : estimates.get(previous);
+}
 function aboutRows(count) {
   const rounded = Math.max(0, Math.round(count));
   if (rounded < 1000)
@@ -1803,12 +1741,12 @@ function aboutRows(count) {
   }
   return `about ${String(rounded)} rows`;
 }
-function withBatches(step, text, estimates) {
+function withBatches(step, text, estimates, aliases = new Map) {
   const batch = step.backfill?.batch;
   if (batch === undefined)
     return text;
   const name = step.tables?.[0];
-  const estimate = name === undefined ? undefined : estimates.get(name);
+  const estimate = name === undefined ? undefined : lookupEstimate(name, estimates, aliases);
   if (estimate === undefined || estimate.kind !== "rows")
     return text;
   return `${text}, about ${String(aboutBatchCount(estimate.reltuples, batch))} batches`;
@@ -1870,11 +1808,11 @@ function lockPieces(step) {
   }
   return pieces;
 }
-function exclusiveOverLarge(pieces, estimates) {
+function exclusiveOverLarge(pieces, estimates, aliases = new Map) {
   for (const piece of pieces) {
     if (piece.mode !== "ACCESS EXCLUSIVE" || piece.table === undefined)
       continue;
-    const estimate = estimates.get(piece.table);
+    const estimate = lookupEstimate(piece.table, estimates, aliases);
     if (estimate === undefined || estimate.kind !== "rows")
       continue;
     if (estimate.reltuples > LARGE_TABLE_ROWS)
@@ -1956,8 +1894,9 @@ async function checkProject(cwd, flags) {
   const target = selectTarget(opened.config, named);
   assertTargetPolicy(target, "check", flags?.allowProtected ?? false);
   assertTargetPolicy(target, "drift", flags?.allowProtected ?? false);
-  const { assertAuthorDrift } = await import("./ykv7wh5b.js");
-  await assertAuthorDrift(target.url, opened.built.catalog, opened.config.roles);
+  const { assertAuthorDrift } = await import("./6qd27mx0.js");
+  const allowPooler = flags?.allowPooler === true || opened.config.allowPooler === true;
+  await assertAuthorDrift(target.url, opened.built.catalog, opened.config.roles, allowPooler);
   return findings;
 }
 function unlistedTableFiles(schemaSource, fileNames) {
@@ -2016,7 +1955,8 @@ async function displayPlan(config, plan, invoke) {
   } catch {
     return offline;
   }
-  return formatPlan(plan, (step) => annotateLock(step, estimates));
+  const aliases = renameAliases(plan.steps);
+  return formatPlan(plan, (step) => annotateLock(step, estimates, aliases));
 }
 function lintOpened(opened) {
   const plan = planMigration({
@@ -2200,4 +2140,4 @@ function runtimeImportsValidate(source) {
   return false;
 }
 
-export { errorDoc, lintMigrationDirectory, formatFindings, hasError, lintRefusal, assertTargetPolicy, assertDirectConnection, listTargets, selectTarget, buildProject, generateProject, planProject, checkProject, projectHead, openProject, loadBuiltSchema, loadConfig, loadSchema };
+export { errorDoc, lintMigrationDirectory, formatFindings, hasError, lintRefusal, buildProject, generateProject, planProject, checkProject, projectHead, openProject, loadBuiltSchema, loadConfig, loadSchema };

package/dist/shared/{k7cc9nzk.js → r2sp8hrc.js}

@@ -1,16 +1,16 @@
 import {
   isConnectionLost
-} from "./tbszx8mz.js";
+} from "./pf0d8f77.js";
 import {
   openClient,
   withHttp,
   settleCall
-} from "./bt9sfq0z.js";
+} from "./hf22e0wt.js";
 import {
   rejectKeys,
   isRecord,
   fail
-} from "./qgvt8nx1.js";
+} from "./gbtcc2d7.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -92,6 +92,9 @@ class Frame {
   }
 }
 async function tx(session, args) {
+  if (typeof args[0] === "function" && args.length > 1) {
+    fail("OKM1120", "options go first: tx(options, fn).");
+  }
   const fn = typeof args[0] === "function" ? args[0] : args[1];
   const given = typeof args[0] === "function" ? {} : args[0] ?? {};
   try {

package/dist/shared/{fb00y8fp.js → r8x5qhd7.js}

@@ -1,17 +1,17 @@
 import {
   send,
   connectClient
-} from "./6p5k20sm.js";
+} from "./96qcj21c.js";
 import {
   isConnectionLost
-} from "./tbszx8mz.js";
+} from "./pf0d8f77.js";
 import {
   WireSession
-} from "./zvbjc949.js";
+} from "./4az561fn.js";
 import {
   rejectClosed,
   runCall
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 
 // src/adapters/pg/nodepostgres-extra.ts
 var RESET_ALL = "RESET ALL";
@@ -43,7 +43,7 @@ async function checkout(held) {
   return {
     execute: (text, params, options) => guard(() => runCall(isClosed(), options, (watch) => session.query(text, params, watch))),
     batch: (statements, options) => guard(() => runCall(isClosed(), options, async (watch) => {
-      const { runAtomicBatch } = await import("./b066g80h.js");
+      const { runAtomicBatch } = await import("./efmy2gcg.js");
       return runAtomicBatch(session, statements, watch);
     })),
     cancel() {

package/dist/shared/{fyqkk1m0.js → sdc7r2ww.js}

@@ -1,11 +1,12 @@
 import"./8bwbwy8h.js";
 import"./n442h54c.js";
-import"./wqem4jed.js";
+import"./krxx77g0.js";
 import {
-  listTargets,
   loadConfig
-} from "./xdpj5kkm.js";
-import"./ayz64vzj.js";
+} from "./qv2ydck9.js";
+import {
+  listTargets
+} from "./ga3sfy93.js";
 import"./8xsbagad.js";
 
 // src/tooling/migrate/dev.ts
@@ -19,7 +20,7 @@ async function devProject(cwd) {
 `;
   const directory = join(cwd, config.out ?? ".okm", "dev-db");
   mkdirSync(directory, { recursive: true });
-  const { open } = await import("./gdh9mrtp.js");
+  const { open } = await import("./f5cw5q5r.js");
   const pool = await open({ dataDir: directory });
   try {
     await pool.execute("select 1");