okmodel 0.4.0 → 0.5.0

package/dist/shared/{s4mb6a4b.js → xhh1srw3.js}

@@ -2,8 +2,8 @@ import {
   open2
 } from "./wqem4jed.js";
 import {
-  catalogHash2
-} from "./8jb4ymh2.js";
+  startupHash2
+} from "./8bwbwy8h.js";
 import {
   runTarget,
   assumeRole,
@@ -15,12 +15,12 @@ import {
   provisionMark,
   expandProvisioned,
   installSnapshot
-} from "./7nk68fj8.js";
+} from "./kdkxh3kb.js";
 import {
   assertCreateRole,
   currentUser,
   roleExists
-} from "./hcmdtwgh.js";
+} from "./szm0cksa.js";
 import {
   lintMigrationDirectory,
   hasError,
@@ -31,13 +31,13 @@ import {
   projectHead,
   loadBuiltSchema,
   loadConfig
-} from "./q6zsyh31.js";
+} from "./xdpj5kkm.js";
 import {
   changesRole,
   batchSizeField,
   assertExtensionsAvailable,
   planMigration
-} from "./n5y9zyj1.js";
+} from "./ayz64vzj.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -202,6 +202,7 @@ async function applyTarget2(request) {
     await connection.execute(META);
     await connection.execute(HISTORY);
     await connection.execute(BACKFILL);
+    const restamped = await restampLegacy(connection, request);
     const history = await readHistory(connection);
     const done = expandProvisioned(request.migrations, history.done, history.ids);
     const units = request.migrations.flatMap((migration) => applyUnits(migration, done));
@@ -221,7 +222,7 @@ async function applyTarget2(request) {
     if (request.snapshot !== undefined) {
       await insertReference(connection, request);
     }
-    return report;
+    return restamped.length === 0 ? report : { ...report, restamped };
   } finally {
     if (locked)
       await connection.execute("select pg_advisory_unlock(hashtext($1))", [
@@ -306,7 +307,7 @@ no changes
     migrations: [
       {
         id: "push",
-        catalogHash: catalogHash2(head.catalog),
+        catalogHash: startupHash2(head.catalog),
         steps: plan.steps
       }
     ],
@@ -323,15 +324,58 @@ function backfillTiming2(backfill) {
 function formatReport(report) {
   const role = report.setRole !== undefined ? `set role ${report.setRole}
 ` : "";
+  const restamped = (report.restamped ?? []).map((id) => `restamped ${id}
+`).join("");
   if (report.applied.length === 0)
     return `target ${report.target}
-${role}nothing to apply
+${role}${restamped}nothing to apply
 `;
   return `target ${report.target}
-${role}${report.applied.map((id) => `applied ${id}`).join(`
+${role}${restamped}${report.applied.map((id) => `applied ${id}`).join(`
 `)}
 `;
 }
+async function restampLegacy(connection, request) {
+  const pairs = [];
+  for (const migration of request.migrations) {
+    if (migration.legacyHash === undefined)
+      continue;
+    pairs.push({
+      id: migration.id,
+      mark: provisionMark(migration.id),
+      legacy: migration.legacyHash,
+      startup: migration.catalogHash
+    });
+  }
+  if (pairs.length === 0)
+    return [];
+  await connection.execute("begin");
+  try {
+    const result = await connection.execute(RESTAMP, [JSON.stringify(pairs)]);
+    const restamped = result.rows.flatMap((row) => typeof row[0] === "string" ? [row[0]] : []);
+    if (restamped.length > 0) {
+      assertTargetPolicy({ name: request.target, protected: request.protected }, "history-repair", request.allowProtected === true);
+    }
+    await connection.execute("commit");
+    return restamped;
+  } catch (error) {
+    await connection.execute("rollback");
+    throw error;
+  }
+}
+var RESTAMP = `with pairs as (
+  select * from json_to_recordset($1::json) as p(id text, mark text, legacy text, startup text)
+), history as (
+  update okm_history h set catalog_hash = p.startup from pairs p
+   where h.migration_id in (p.id, p.mark) and h.catalog_hash = p.legacy
+  returning p.id, h.migration_id
+), meta as (
+  update okm_meta m set catalog_hash = p.startup from pairs p
+   where m.id = 'head' and m.migration_id in (p.id, p.mark) and m.catalog_hash = p.legacy
+     and m.migration_id in (select migration_id from history)
+  returning m.id
+)
+select distinct id from history order by id`;
 function joinMigrations(cwd, migrations) {
   return join(cwd, migrations ?? "migrations");
 }

package/dist/shared/{jgxzjzcz.js → xsq7v6wp.js}

@@ -4,12 +4,12 @@ import {
 import {
   withHttp,
   settleCall
-} from "./kkzwp3d2.js";
+} from "./bt9sfq0z.js";
 import {
   rejectKeys,
   isRecord,
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{hqjsxnz7.js → ykv7wh5b.js}

@@ -2,10 +2,11 @@ import {
   assertAuthorDrift2,
   catalogQuery2,
   managedRoleOptions2
-} from "./xghkt7a9.js";
-import"./n5y9zyj1.js";
-import"./41kv2xdm.js";
-import"./8jb4ymh2.js";
+} from "./wxn4b7pp.js";
+import"./fancm5pt.js";
+import"./ayz64vzj.js";
+import"./8xsbagad.js";
+import"./8bwbwy8h.js";
 export {
   assertAuthorDrift2 as assertAuthorDrift,
   catalogQuery2 as catalogQuery,

package/dist/shared/{q795afwa.js → z2rnngj4.js}

@@ -11,7 +11,7 @@ async function assertCompatible(pool, schema, recordedHash, source, options) {
   if (code.artifact !== undefined) {
     const artifact = code.artifact;
     await loadOnce(`text\x00${artifact.hash}`, async () => {
-      const { loadTrustedCatalog } = await import("./6693j9rs.js");
+      const { loadTrustedCatalog } = await import("./5fqx9yh4.js");
       loadTrustedCatalog(artifact.text, artifact.hash);
     });
   } else if (code.fromFile) {
@@ -25,7 +25,7 @@ async function assertCompatible(pool, schema, recordedHash, source, options) {
           }
         });
       }
-      const { loadTrustedCatalog } = await import("./6693j9rs.js");
+      const { loadTrustedCatalog } = await import("./5fqx9yh4.js");
       loadTrustedCatalog(text, code.hash);
     });
   }
@@ -39,7 +39,7 @@ async function codeHash(schema, source) {
   const listed = await readHashFile(source.catalogDir);
   if (listed !== undefined)
     return { hash: listed, fromFile: true };
-  const { catalogHash } = await import("./6693j9rs.js");
+  const { catalogHash } = await import("./5fqx9yh4.js");
   return { hash: catalogHash(schemaCatalog(schema)), fromFile: false };
 }
 function schemaCatalog(schema) {

package/dist/tooling/cli.js

@@ -1,4 +1,4 @@
-import"../shared/8jb4ymh2.js";
+import"../shared/8bwbwy8h.js";
 import"../shared/n442h54c.js";
 import"../shared/wqem4jed.js";
 import {
@@ -9,9 +9,9 @@ import {
   generateProject,
   planProject,
   checkProject
-} from "../shared/q6zsyh31.js";
-import"../shared/n5y9zyj1.js";
-import"../shared/41kv2xdm.js";
+} from "../shared/xdpj5kkm.js";
+import"../shared/ayz64vzj.js";
+import"../shared/8xsbagad.js";
 import {
   OkmError2
 } from "../shared/52szzakm.js";
@@ -57,12 +57,12 @@ async function run(argv, io) {
     return;
   }
   if (command === "dev") {
-    const { devProject } = await import("../shared/yjw02enp.js");
+    const { devProject } = await import("../shared/fyqkk1m0.js");
     stdout(await devProject(cwd));
     return;
   }
   if (command === "push") {
-    const { pushProject } = await import("../shared/kj680nxv.js");
+    const { pushProject } = await import("../shared/rasvvzgz.js");
     stdout(await pushProject(cwd, invoke(splitFlags(rest))));
     return;
   }
@@ -81,17 +81,17 @@ async function run(argv, io) {
       return;
     }
     if (sub === "apply") {
-      const { applyProject } = await import("../shared/kj680nxv.js");
+      const { applyProject } = await import("../shared/rasvvzgz.js");
       stdout(await applyProject(cwd, invoke(parsed), stdout));
       return;
     }
     if (sub === "status") {
-      const { statusProject } = await import("../shared/c5g81ngb.js");
+      const { statusProject } = await import("../shared/bzsjtd7c.js");
       stdout(await statusProject(cwd, invoke(parsed)));
       return;
     }
     if (sub === "check") {
-      const { checkMigrations } = await import("../shared/2321avmn.js");
+      const { checkMigrations } = await import("../shared/r73pt594.js");
       const provision = parsed.flags.includes("--provision") || rest.slice(1).includes("--provision");
       stdout(await checkMigrations(cwd, invoke(parsed), { provision }));
       return;
@@ -104,13 +104,13 @@ async function run(argv, io) {
         fix: { summary: "Pass okm seed <file>." }
       });
     }
-    const { seedProject } = await import("../shared/ady1ms74.js");
+    const { seedProject } = await import("../shared/jdgqqx31.js");
     stdout(await seedProject(cwd, parsed.name, invoke(parsed)));
     return;
   }
   if (command === "doctor") {
     const parsed = splitFlags(rest);
-    const { doctorProject } = await import("../shared/84ptn35q.js");
+    const { doctorProject } = await import("../shared/qy9rdq0g.js");
     stdout(await doctorProject(cwd, parsed.name, invoke(parsed)));
     return;
   }
@@ -122,7 +122,7 @@ async function run(argv, io) {
       });
     }
     if (sub === "list" || sub === "check") {
-      const { extProject } = await import("../shared/tny2t3sm.js");
+      const { extProject } = await import("../shared/990a291j.js");
       stdout(await extProject(cwd, sub, invoke(splitFlags(rest.slice(1)))));
       return;
     }

package/dist/tooling/migrate/apply.d.ts

@@ -90,6 +90,8 @@ export type ApplyRequest = {
 export type ApplyReport = {
     readonly target: string;
     readonly applied: readonly string[];
+    /** Migrations whose stored hash moved from the pre-D208 hash to the startup hash. */
+    readonly restamped?: readonly string[];
     /** Set when the runner issued `SET ROLE` at session start. */
     readonly setRole?: string;
 };

package/dist/tooling/migrate/files.d.ts

@@ -7,6 +7,13 @@ import { type PlanStep } from "./plan.js";
 export type StoredMigration = {
     readonly id: string;
     readonly catalogHash: string;
+    /**
+     * The hash written before D208, which counted roles and grants.
+     *
+     * Set only when the catalog has them. Apply moves a stored copy of it to
+     * {@link StoredMigration.catalogHash}.
+     */
+    readonly legacyHash?: string;
     readonly steps: readonly PlanStep[];
 };
 /**

package/dist/tooling/migrate/index.js

@@ -1,23 +1,25 @@
 import"../../shared/wqem4jed.js";
-import"../../shared/8jb4ymh2.js";
+import"../../shared/8bwbwy8h.js";
 import"../../shared/n442h54c.js";
 import {
   applyTarget2,
   backfillTiming2
-} from "../../shared/s4mb6a4b.js";
+} from "../../shared/xhh1srw3.js";
 import {
   loadMigrations,
   loadHeadSnapshot,
   readReference
-} from "../../shared/7nk68fj8.js";
+} from "../../shared/kdkxh3kb.js";
+import"../../shared/szm0cksa.js";
+import"../../shared/fancm5pt.js";
 import {
   assertTargetPolicy,
   selectTarget,
   loadBuiltSchema,
   loadConfig
-} from "../../shared/q6zsyh31.js";
-import"../../shared/n5y9zyj1.js";
-import"../../shared/41kv2xdm.js";
+} from "../../shared/xdpj5kkm.js";
+import"../../shared/ayz64vzj.js";
+import"../../shared/8xsbagad.js";
 import {
   OkmError2
 } from "../../shared/52szzakm.js";

package/dist/tooling/testing/facts.d.ts

@@ -56,6 +56,9 @@ export declare const tenantProbe = "00000000-0000-4000-8000-000000000001";
 /**
  * Reads every table in declaration order.
  *
+ * Views and materialized views are in the query model too. They have no rows
+ * of their own to insert, so they are left out.
+ *
  * @param schema - Compiled schema
  * @returns One facts object per table
  */

package/dist/tooling/testing/index.js

@@ -1,8 +1,8 @@
 import {
   testing2
-} from "../../shared/ygem90rn.js";
-import"../../shared/41kv2xdm.js";
-import"../../shared/8jb4ymh2.js";
+} from "../../shared/g516zdsb.js";
+import"../../shared/8xsbagad.js";
+import"../../shared/8bwbwy8h.js";
 export {
   testing2 as testing
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "okmodel",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "okmodel is a catalog-first TypeScript ORM, PostgreSQL first.",
   "keywords": [
     "migrations",