okmodel 0.4.0 → 0.5.0

package/dist/shared/{awrsqrn7.js → p7pfx624.js}

@@ -34,7 +34,7 @@ import {
   isRecord,
   registerFailFix,
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   safetyInstalled,
   runSafety
@@ -179,7 +179,7 @@ async function planInsert(table, input, options, mods, generators, scope, tenanc
       keyFields: undefined
     };
   }
-  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./jns2wx4t.js");
+  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./9tgmr1gh.js");
   const conflict = conflictMod?.readConflict(table, options.onConflict, allow);
   const chunks = chunkRows(rows.map((row) => cellsFor(columns, row)));
   const statements = [];

package/dist/shared/{xrfnq5k8.js → qgvt8nx1.js}

@@ -42,12 +42,21 @@ var FIND_OPTIONS = [
   "limit",
   "orderBy",
   "select",
+  "route",
   "signal",
   "timeout",
   "where"
 ];
-var ONE_OPTIONS = ["include", "orderBy", "select", "signal", "timeout", "where"];
-var FILTER_OPTIONS = ["signal", "timeout", "where"];
+var ONE_OPTIONS = [
+  "include",
+  "orderBy",
+  "route",
+  "select",
+  "signal",
+  "timeout",
+  "where"
+];
+var FILTER_OPTIONS = ["route", "signal", "timeout", "where"];
 function readOptionNames(op) {
   if (op === "find")
     return FIND_OPTIONS;

package/dist/shared/{84ptn35q.js → qy9rdq0g.js}

@@ -1,21 +1,22 @@
 import {
   open2
 } from "./wqem4jed.js";
+import"./8bwbwy8h.js";
 import"./n442h54c.js";
-import"./8jb4ymh2.js";
 import {
   assertRoleHealth
-} from "./hcmdtwgh.js";
+} from "./szm0cksa.js";
+import"./fancm5pt.js";
 import {
   errorDoc,
   assertTargetPolicy,
   selectTarget,
   openProject
-} from "./q6zsyh31.js";
+} from "./xdpj5kkm.js";
 import {
   omitManagedObjects
-} from "./n5y9zyj1.js";
-import"./41kv2xdm.js";
+} from "./ayz64vzj.js";
+import"./8xsbagad.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{qn0srwwq.js → r6pj4fq2.js}

@@ -2,7 +2,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./kkzwp3d2.js";
+} from "./bt9sfq0z.js";
 import {
   emitWhere,
   emitOrder,
@@ -15,7 +15,7 @@ import {
   list,
   isRecord,
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   OkmError2,
   throwNamed2
@@ -32,6 +32,7 @@ var OPTIONS = [
   "max",
   "orderBy",
   "limit",
+  "route",
   "signal",
   "timeout"
 ];
@@ -79,7 +80,8 @@ function plan(session, table, options, mods, view) {
     orderBy,
     limit: record.limit,
     signal: record.signal,
-    timeout: record.timeout
+    timeout: record.timeout,
+    route: record.route
   }, mods.all, session.scope, session.schema.model[table], session.schema, view);
   const call = { ...base, op: "aggregate", build: statement(spec) };
   return readHandle(session, table, call, mods, (compiled, rows) => decode(compiled, rows));

package/dist/shared/{2321avmn.js → r73pt594.js}

@@ -1,40 +1,43 @@
 import {
   parseCatalog2
-} from "./8jb4ymh2.js";
+} from "./8bwbwy8h.js";
 import"./wqem4jed.js";
 import"./n442h54c.js";
 import {
   applyTarget2,
   backfillTiming2
-} from "./s4mb6a4b.js";
+} from "./xhh1srw3.js";
 import {
-  introspectSchema,
   sealViews,
   catalogQuery2,
   managedRoleOptions2
-} from "./xghkt7a9.js";
+} from "./wxn4b7pp.js";
 import {
   loadMigrations,
   catalogsEqual,
   snapshotDifference
-} from "./7nk68fj8.js";
+} from "./kdkxh3kb.js";
+import"./szm0cksa.js";
+import {
+  introspectSchema
+} from "./fancm5pt.js";
 import {
   lintMigrationDirectory,
   hasError,
   lintRefusal,
   selectTarget,
   openProject
-} from "./q6zsyh31.js";
+} from "./xdpj5kkm.js";
 import {
   canonicalTypeName,
   classOf,
   strictestClass,
   planMigration,
   parsePlan
-} from "./n5y9zyj1.js";
+} from "./ayz64vzj.js";
 import {
   quoteIdent
-} from "./41kv2xdm.js";
+} from "./8xsbagad.js";
 import {
   catalog,
   isDomain
@@ -225,9 +228,8 @@ async function proveSnapshot(config, url, target, flags, history) {
       })),
       ...config.roles !== undefined ? { migrationRole: config.roles.migration, schema: replayed } : {}
     });
-    const runner = catalogQuery2(sql);
-    const liveProvided = await introspectSchema(runner, provided, "public", managedRoleOptions2(config.roles));
-    const liveReplayed = await introspectSchema(runner, replayed, "public", managedRoleOptions2(config.roles));
+    const liveProvided = await introspectScratch(sql, provided, config);
+    const liveReplayed = await introspectScratch(sql, replayed, config);
     const difference = snapshotDifference(liveProvided, liveReplayed);
     if (difference === undefined)
       return;
@@ -284,7 +286,7 @@ async function replayHistory(config, url, target, flags, history) {
         ],
         ...config.roles !== undefined ? { migrationRole: config.roles.migration, schema: scratch } : {}
       });
-      const live = await introspectSchema(runner, scratch, "public", managedRoleOptions2(config.roles));
+      const live = await introspectScratch(sql, scratch, config);
       const sealed = await sealViews(runner, migration.catalog);
       const back = planMigration({ before: live, after: sealed, name: migration.id });
       if (back.steps.length === 0)
@@ -300,6 +302,10 @@ async function replayHistory(config, url, target, flags, history) {
   }
   return failures;
 }
+async function introspectScratch(sql, schema, config) {
+  await sql.unsafe(`set search_path to ${quoteIdent(schema)}`);
+  return introspectSchema(catalogQuery2(sql), schema, "public", managedRoleOptions2(config.roles));
+}
 function historyFailure(history, index, back) {
   const migration = history[index];
   const id = migration?.id ?? "migration";
@@ -349,9 +355,11 @@ function sameSql(planned, file) {
 function retargetSteps(steps, schema) {
   const from = `${quoteIdent("public")}.`;
   const to = `${quoteIdent(schema)}.`;
+  const fromDefaults = `in schema ${quoteIdent("public")} `;
+  const toDefaults = `in schema ${quoteIdent(schema)} `;
   return steps.map((step) => ({
     ...step,
-    sql: step.sql.replaceAll(from, to),
+    sql: step.sql.replaceAll(from, to).replaceAll(fromDefaults, toDefaults),
     ...step.backfill === undefined ? {} : { backfill: { ...step.backfill, table: step.backfill.table.replaceAll(from, to) } }
   }));
 }

package/dist/shared/{kj680nxv.js → rasvvzgz.js}

@@ -3,13 +3,15 @@ import {
   applyProject2,
   pushProject2,
   backfillTiming2
-} from "./s4mb6a4b.js";
-import"./7nk68fj8.js";
-import"./q6zsyh31.js";
-import"./n5y9zyj1.js";
+} from "./xhh1srw3.js";
+import"./kdkxh3kb.js";
+import"./szm0cksa.js";
+import"./fancm5pt.js";
+import"./xdpj5kkm.js";
+import"./ayz64vzj.js";
 import"./n442h54c.js";
-import"./41kv2xdm.js";
-import"./8jb4ymh2.js";
+import"./8xsbagad.js";
+import"./8bwbwy8h.js";
 import"./wqem4jed.js";
 export {
   applyProject2 as applyProject,

package/dist/shared/{hcmdtwgh.js → szm0cksa.js}

@@ -1,3 +1,6 @@
+import {
+  FUNCTION_ARG_TYPES
+} from "./fancm5pt.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -92,7 +95,7 @@ async function functionExists(runner, schema, name, args) {
   const result = await runner.execute(`select 1 from pg_proc p
      join pg_namespace n on n.oid = p.pronamespace
      where n.nspname = $1 and p.proname = $2
-       and replace(pg_get_function_identity_arguments(p.oid), ' ', '') = $3`, [schema, name, args]);
+       and ${FUNCTION_ARG_TYPES} = $3`, [schema, name, args]);
   return result.rows.length > 0;
 }
 function truthy(value) {

package/dist/shared/{axhk06q1.js → tq9afp8d.js}

@@ -11,7 +11,7 @@ import {
   quote,
   isRecord,
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   isOperator,
   operatorName,

package/dist/shared/wxn4b7pp.js

@@ -0,0 +1,252 @@
+import {
+  cellText,
+  VIEW_DEPENDENCIES,
+  viewDependencyEdges,
+  PUBLIC,
+  introspectSchema
+} from "./fancm5pt.js";
+import {
+  planMigration
+} from "./ayz64vzj.js";
+import {
+  quoteIdent,
+  createObjectSql
+} from "./8xsbagad.js";
+import {
+  normaliseViewQuery,
+  viewObject,
+  materializedViewObject
+} from "./y005b761.js";
+import {
+  catalog
+} from "./g7ez901n.js";
+import {
+  OkmError2
+} from "./52szzakm.js";
+
+// src/tooling/migrate/drift.ts
+import postgres from "postgres";
+
+// src/dialects/pg/view/scratch.ts
+var SCRATCH = "okm_view_seal";
+var VIEW_SHAPE = `
+  select c.relname as name, c.relkind as kind, pg_get_viewdef(c.oid, true) as query,
+    (
+      select coalesce(string_agg(
+        a.attname || '|' || format_type(a.atttypid, a.atttypmod),
+        E'\\n' order by a.attnum
+      ), '')
+      from pg_attribute a
+      where a.attrelid = c.oid and a.attnum > 0 and not a.attisdropped
+    ) as columns
+  from pg_class c
+  join pg_namespace n on n.oid = c.relnamespace
+  where n.nspname = $1 and c.relkind in ('v', 'm')
+`;
+async function sealViews(runner, source) {
+  const views = source.objects.filter((object) => object.kind === "view" || object.kind === "materializedView");
+  if (views.length === 0)
+    return source;
+  await dropScratch(runner);
+  await runner.query(`create schema ${quoteIdent(SCRATCH)}`);
+  try {
+    await runner.query(`set search_path to ${quoteIdent(SCRATCH)}`);
+    await createObjects(runner, source, "type");
+    for (const object of source.objects) {
+      if (object.kind !== "table")
+        continue;
+      await runner.query(stubTable(object, source));
+    }
+    await createObjects(runner, source, "function");
+    await createViews(runner, views);
+    const shapes = await runner.query(VIEW_SHAPE, [SCRATCH]);
+    const deps = await runner.query(VIEW_DEPENDENCIES, [SCRATCH]);
+    const edges = viewDependencyEdges(deps, PUBLIC, source.objects);
+    const byName = new Map(shapes.map((row) => [cellText(row.name), row]));
+    const next = source.objects.map((object) => {
+      if (object.kind !== "view" && object.kind !== "materializedView")
+        return object;
+      const row = byName.get(object.identity.name);
+      if (row === undefined) {
+        throw new OkmError2("OKM1020", `View ${object.identity.name} was not created in the scratch schema.`, {
+          fix: { summary: "The query has to run against the tables in this schema." }
+        });
+      }
+      const columns = readColumns(object, cellText(row.columns));
+      const query = normaliseViewQuery(cellText(row.query));
+      const dependencies = edges.get(object.identity.name) ?? [];
+      if (object.kind === "view") {
+        return viewObject({
+          namespace: object.identity.namespace,
+          name: object.identity.name,
+          columns,
+          query,
+          owner: object.owner,
+          provenance: object.provenance,
+          dependencies
+        });
+      }
+      return materializedViewObject({
+        namespace: object.identity.namespace,
+        name: object.identity.name,
+        columns,
+        query,
+        owner: object.owner,
+        provenance: object.provenance,
+        dependencies,
+        ...object.definition.refresh !== undefined ? { refresh: object.definition.refresh } : {}
+      });
+    });
+    return catalog(next);
+  } finally {
+    await runner.query("set search_path to public");
+    await dropScratch(runner);
+  }
+}
+async function createObjects(runner, source, kind) {
+  for (const object of source.objects) {
+    if (object.kind !== kind)
+      continue;
+    const statement = createObjectSql(object, SCRATCH);
+    if (statement !== undefined)
+      await runner.query(statement);
+  }
+}
+async function createViews(runner, views) {
+  const pending = [...views];
+  let last = "";
+  for (let pass = 0;pass < views.length && pending.length > 0; pass += 1) {
+    const failed = [];
+    let created = 0;
+    for (const object of pending) {
+      const sql = object.kind === "materializedView" ? `create materialized view ${quoteIdent(object.identity.name)} as ${object.definition.query} with no data` : `create view ${quoteIdent(object.identity.name)} as ${object.definition.query}`;
+      try {
+        await runner.query(sql);
+        created += 1;
+      } catch (error) {
+        last = error instanceof Error ? error.message : String(error);
+        failed.push(object);
+      }
+    }
+    if (created === 0) {
+      throw new OkmError2("OKM1020", `View ${failed[0]?.identity.name ?? ""} could not be created. ${last}`, {
+        fix: { summary: "The query has to run against the tables in this schema." }
+      });
+    }
+    pending.length = 0;
+    pending.push(...failed);
+  }
+}
+function stubTable(object, source) {
+  const columns = source.objects.filter((item) => item.kind === "column" && item.identity.parent.name === object.identity.name);
+  const lines = columns.map((column) => `${quoteIdent(column.identity.name)} ${column.definition.dataType}`);
+  return `create table ${quoteIdent(object.identity.name)} (${lines.join(", ")})`;
+}
+function readColumns(object, printed) {
+  const live = printed.length === 0 ? [] : printed.split(`
+`);
+  const declared = object.definition.columns;
+  if (live.length !== declared.length) {
+    throw mismatch(object.identity.name, declared.map((column) => column.name).join(", "), printed);
+  }
+  return declared.map((column, index) => {
+    const line = live[index] ?? "";
+    const splitAt = line.indexOf("|");
+    const name = splitAt < 0 ? line : line.slice(0, splitAt);
+    const type = splitAt < 0 ? "" : line.slice(splitAt + 1);
+    if (name !== column.name || type !== column.dataType) {
+      throw mismatch(object.identity.name, `${column.name}:${column.dataType}`, live[index] ?? "");
+    }
+    return column;
+  });
+}
+function mismatch(view, declared, live) {
+  return new OkmError2("OKM1020", `View ${view} declares ${declared} and the database has ${live}.`, { fix: { summary: "Declare the columns the query returns, in that order, with those types." } });
+}
+async function dropScratch(runner) {
+  const present = await runner.query(`select 1 as ok from pg_namespace where nspname = $1`, [
+    SCRATCH
+  ]);
+  if (present.length === 0)
+    return;
+  const rows = await runner.query(`
+    select c.relname as name, c.relkind as kind
+    from pg_class c
+    join pg_namespace n on n.oid = c.relnamespace
+    where n.nspname = $1 and c.relkind in ('v', 'm', 'r')
+  `, [SCRATCH]);
+  const views = rows.filter((row) => cellText(row.kind) === "v" || cellText(row.kind) === "m");
+  for (let pass = 0;pass < Math.max(views.length, 1); pass += 1) {
+    for (const row of views) {
+      const kind = cellText(row.kind) === "m" ? "materialized view" : "view";
+      try {
+        await runner.query(`drop ${kind} if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}`);
+      } catch {}
+    }
+  }
+  for (const row of rows) {
+    if (cellText(row.kind) !== "r")
+      continue;
+    await runner.query(`drop table if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}`);
+  }
+  await runner.query(`drop schema if exists ${quoteIdent(SCRATCH)} cascade`);
+}
+
+// src/tooling/migrate/drift.ts
+async function assertAuthorDrift2(url, author, roles) {
+  const sql = postgres(url, {
+    max: 1,
+    connect_timeout: 5,
+    idle_timeout: 1,
+    onnotice: () => {}
+  });
+  try {
+    const present = await sql`
+      select to_regclass('public.okm_meta')::text as reg
+    `;
+    if (present[0]?.reg == null)
+      return;
+    const runner = catalogQuery2(sql);
+    const authorOnServer = await sealViews(runner, author);
+    const live = await introspectSchema(runner, "public", "public", managedRoleOptions2(roles));
+    const plan = planMigration({ before: live, after: authorOnServer, name: "check" });
+    if (plan.steps.length === 0)
+      return;
+    throw new OkmError2("OKM1520", `The database differs from the schema.
+${plan.steps.map((step) => step.sql).join(`
+`)}`, {
+      fix: {
+        summary: "Change the schema or the database so okm check reports no difference."
+      }
+    });
+  } finally {
+    await sql.end({ timeout: 5 });
+  }
+}
+function catalogQuery2(sql) {
+  return {
+    async query(text, params) {
+      const rows = await sql.unsafe(text, params === undefined ? undefined : [...params]);
+      return rows.map((row) => {
+        const copy = {};
+        for (const [key, value] of Object.entries(row))
+          copy[key] = value;
+        return copy;
+      });
+    }
+  };
+}
+function managedRoleOptions2(roles) {
+  const names = managedRoleNames(roles);
+  return names === undefined ? undefined : { managedRoles: names };
+}
+function managedRoleNames(roles) {
+  if (roles === undefined)
+    return;
+  const names = new Set([roles.migration, roles.app]);
+  for (const role of roles.managed ?? [])
+    names.add(role.name);
+  return [...names];
+}
+
+export { sealViews, assertAuthorDrift2, catalogQuery2, managedRoleOptions2 };

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

@@ -8,8 +8,9 @@ import {
   defaultPrivilegeObject,
   serializeCatalog2,
   catalogHash2,
+  startupCatalog2,
   parseCatalog2
-} from "./8jb4ymh2.js";
+} from "./8bwbwy8h.js";
 import {
   open2
 } from "./wqem4jed.js";
@@ -22,7 +23,7 @@ import {
   formatPlan,
   parsePlan,
   staleRenames
-} from "./n5y9zyj1.js";
+} from "./ayz64vzj.js";
 import {
   contributedFields
 } from "./n0dgs0pb.js";
@@ -623,7 +624,7 @@ var ERROR_DOCS = [
   {
     code: "OKM1840",
     title: "Replica not allowed",
-    summary: ".replica() was used on an operation that requires the primary, or inside tx().",
+    summary: "A replica route was used on an operation that requires the primary, or inside tx().",
     fix: "Run the operation on the primary. Writes, batch, locks, and tx() never go to a replica."
   },
   {
@@ -642,7 +643,7 @@ var ERROR_DOCS = [
     code: "OKM1843",
     title: "No eligible replica",
     summary: "A replica was required and none is eligible: unhealthy, behind the session, or none configured.",
-    fix: "Configure a replica or drop .replica(). This call does not read the primary."
+    fix: "Configure a replica or drop the route. This call does not read the primary."
   },
   {
     code: "OKM1844",
@@ -1334,6 +1335,13 @@ function selectTarget(config, name) {
   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) {
@@ -1351,6 +1359,9 @@ function resolveTarget(name, input) {
     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 {
@@ -1945,7 +1956,7 @@ 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("./hqjsxnz7.js");
+  const { assertAuthorDrift } = await import("./ykv7wh5b.js");
   await assertAuthorDrift(target.url, opened.built.catalog, opened.config.roles);
   return findings;
 }
@@ -2046,9 +2057,9 @@ function withRoles(built, config) {
 function writeArtifact(cwd, config, built) {
   const directory = join2(cwd, config.out ?? ".okm");
   mkdirSync(directory, { recursive: true });
-  const text = serializeCatalog2(built.catalog);
-  writeFileSync(join2(directory, "catalog.json"), text);
-  writeFileSync(join2(directory, "catalog.hash"), `${catalogHash2(built.catalog)}
+  const startup = startupCatalog2(built.catalog);
+  writeFileSync(join2(directory, "catalog.json"), serializeCatalog2(startup));
+  writeFileSync(join2(directory, "catalog.hash"), `${catalogHash2(startup)}
 `);
   writeFileSync(join2(directory, "types.d.ts"), `${emitRowTypes(built)}${referenceAugmentation(built)}`);
   return directory;