okmodel 0.5.1 → 0.7.0

package/dist/shared/{8bwbwy8h.js → qq3899ht.js}

@@ -1,22 +1,25 @@
+import {
+  policyObject
+} from "./bdk4sty6.js";
 import {
   functionObject,
   triggerObject
-} from "./9x25fxhc.js";
+} from "./y34a8714.js";
 import {
   viewObject,
   materializedViewObject,
   materializedViewIndex
-} from "./y005b761.js";
+} from "./zy8r7qvz.js";
 import {
   extensionObject
-} from "./8ktwd3rh.js";
+} from "./r3j8s5y0.js";
 import {
   dependencyOrder,
   catalog,
   enumType,
   domainType,
   isDomain
-} from "./g7ez901n.js";
+} from "./ywspezzx.js";
 import {
   canonicalJson,
   staticNamespace2,
@@ -35,7 +38,7 @@ import {
   normaliseEdges,
   compareText,
   assertProvenance
-} from "./t4tbsy9h.js";
+} from "./358zsv4r.js";
 import {
   OWNERS2,
   BUILT_KINDS2,
@@ -230,9 +233,28 @@ function catalogHash2(source) {
   return hash;
 }
 function startupCatalog2(source) {
-  if (!source.objects.some(isPrivilege))
+  let privileges = false;
+  let foreign = false;
+  for (const object of source.objects) {
+    if (isPrivilege(object))
+      privileges = true;
+    else if (object.owner !== "managed")
+      foreign = true;
+    if (privileges && foreign)
+      break;
+  }
+  if (!privileges && !foreign)
     return source;
-  return { version: source.version, objects: source.objects.filter((item) => !isPrivilege(item)) };
+  return {
+    version: source.version,
+    objects: source.objects.flatMap((item) => {
+      if (isPrivilege(item))
+        return [];
+      if (item.owner === "managed")
+        return [item];
+      return [{ ...item, owner: "managed" }];
+    })
+  };
 }
 function startupHash2(source) {
   return catalogHash2(startupCatalog2(source));
@@ -241,12 +263,13 @@ function isPrivilege(object) {
   return object.kind === "role" || object.kind === "grant" || object.kind === "defaultPrivilege";
 }
 function loadTrustedCatalog2(text, hash) {
-  if (sha2562(text) !== hash) {
+  const canonical = catalogFileText2(text);
+  if (sha2562(canonical) !== hash) {
     catalogError2("OKM1027", "Catalog hash does not match the build artifact.");
   }
   let parsed;
   try {
-    parsed = JSON.parse(text);
+    parsed = JSON.parse(canonical);
   } catch {
     catalogError2("OKM1027", "Catalog text is not valid JSON.");
   }
@@ -260,14 +283,25 @@ function loadTrustedCatalog2(text, hash) {
     version: CATALOG_VERSION2,
     objects: parsed.objects
   };
-  serializedText.set(loaded, text);
+  serializedText.set(loaded, canonical);
   serializedHash.set(loaded, hash);
   return loaded;
 }
+function catalogFileText2(text, label = "Catalog text") {
+  if (text.includes("\x00")) {
+    catalogError2("OKM1027", `${label} is UTF-16. Save the file as UTF-8.`, {
+      fieldReason: "utf16",
+      fix: { summary: "Save the file as UTF-8. This version does not read UTF-16." }
+    });
+  }
+  const withoutBom = text.charCodeAt(0) === 65279 ? text.slice(1) : text;
+  return withoutBom.replaceAll("\r", "");
+}
 function parseCatalog2(text) {
+  const canonical = catalogFileText2(text);
   let parsed;
   try {
-    parsed = JSON.parse(text);
+    parsed = JSON.parse(canonical);
   } catch {
     catalogError2("OKM1027", "Catalog text is not valid JSON.");
   }
@@ -331,6 +365,8 @@ function rewriteRenamed(object, change, fromKey, toIdentity) {
     case "grant":
     case "defaultPrivilege":
       return retargeted(object, dependencies);
+    case "policy":
+      return rewritePolicyColumn(object, change, dependencies);
     case "trigger": {
       const local = sameRef2(object.identity.parent, change.parent);
       return triggerObject({
@@ -476,7 +512,23 @@ function rewriteView(object, dependencies, query) {
       ...object.definition.refresh !== undefined ? { refresh: object.definition.refresh } : {}
     });
   }
-  return viewObject(input);
+  return viewObject({
+    ...input,
+    ...object.definition.securityInvoker === true ? { securityInvoker: true } : {}
+  });
+}
+function rewritePolicyColumn(object, change, dependencies) {
+  const local = sameRef2(object.identity.parent, change.parent);
+  return policyObject({
+    parent: object.identity.parent,
+    name: object.identity.name,
+    command: object.definition.command,
+    expression: rewriteExpr(object.definition.expression, change, local),
+    force: object.definition.force,
+    owner: object.owner,
+    provenance: object.provenance,
+    dependencies
+  });
 }
 function rewriteExpr(text, change, active) {
   if (!active)
@@ -619,6 +671,20 @@ function rewriteTableName(object, change, fromKey, toIdentity, source) {
       ...object.definition.when !== undefined ? { when: rewriteExpr(object.definition.when, { from: change.from, to: change.to }, local) } : {}
     });
   }
+  if (object.kind === "policy") {
+    const parent = movedParent(object.identity.parent, change);
+    const local = parent.name !== object.identity.parent.name;
+    return policyObject({
+      parent,
+      name: object.identity.name,
+      command: object.definition.command,
+      expression: rewriteExpr(object.definition.expression, { from: change.from, to: change.to }, local),
+      force: object.definition.force,
+      owner: object.owner,
+      provenance: object.provenance,
+      dependencies
+    });
+  }
   return assertNever(object);
 }
 function movedParent(parent, change) {
@@ -837,7 +903,14 @@ function definitionToJson(object) {
           dataType: column.dataType,
           name: column.name
         })),
-        query: object.definition.query
+        query: object.definition.query,
+        ...object.definition.securityInvoker === true ? { securityInvoker: true } : {}
+      };
+    case "policy":
+      return {
+        command: object.definition.command,
+        expression: object.definition.expression,
+        force: object.definition.force
       };
     case "materializedView":
       return {
@@ -861,6 +934,8 @@ function parseObject(value) {
   const record = requireRecord(value, "catalog object");
   rejectUnknown(record, ["definition", "dependencies", "identity", "kind", "owner", "provenance"], "catalog object");
   const kind = requireString(record.kind, "kind");
+  if (kind === "policy")
+    return parsePolicy(record);
   if (!isBuiltKind(kind)) {
     catalogError2("OKM1020", `Kind ${kind} is not built yet. Built kinds are ${BUILT_KINDS2.join(", ")}.`);
   }
@@ -945,7 +1020,7 @@ function parseIndex(identity, definition, owner, provenance, dependencies) {
     catalogError2("OKM1020", `Index object identity is ${identity.kind}, not an index.`);
   }
   rejectUnknown(definition, ["columns", "expression", "nameKey", "predicate", "unique"], "index definition");
-  return index3({
+  const shared = {
     parent: identity.parent,
     name: identity.name,
     nameKey: requireString(definition.nameKey, "name key"),
@@ -956,7 +1031,11 @@ function parseIndex(identity, definition, owner, provenance, dependencies) {
     dependencies,
     ...definition.predicate === undefined ? {} : { predicate: requireString(definition.predicate, "predicate") },
     ...definition.expression === undefined ? {} : { expression: requireString(definition.expression, "expression") }
-  });
+  };
+  const onView = dependencies.some((edge) => edge.kind === "view" || edge.kind === "materializedView");
+  if (onView)
+    return materializedViewIndex(shared);
+  return index3(shared);
 }
 function parseConstraint(identity, definition, owner, provenance, dependencies) {
   if (identity.kind !== "constraint") {
@@ -1140,7 +1219,7 @@ function parseView(kind, identity, definition, owner, provenance, dependencies)
   if (identity.kind !== kind) {
     catalogError2("OKM1020", `View object identity is ${identity.kind}, not a ${kind}.`);
   }
-  const fields = kind === "view" ? ["columns", "query"] : ["columns", "query", "refresh"];
+  const fields = kind === "view" ? ["columns", "query", "securityInvoker"] : ["columns", "query", "refresh"];
   rejectUnknown(definition, fields, "view definition");
   const columns = parseViewColumns(definition.columns);
   const query = requireString(definition.query, "view query");
@@ -1163,7 +1242,38 @@ function parseView(kind, identity, definition, owner, provenance, dependencies)
       ...refresh === "concurrently" ? { refresh: "concurrently" } : {}
     });
   }
-  return viewObject(input);
+  if (definition.securityInvoker !== undefined && definition.securityInvoker !== true) {
+    catalogError2("OKM1020", `View ${identity.name} securityInvoker must be true when set.`);
+  }
+  return viewObject({
+    ...input,
+    ...definition.securityInvoker === true ? { securityInvoker: true } : {}
+  });
+}
+function parsePolicy(record) {
+  const identity = parseIdentity(record.identity);
+  if (identity.kind !== "policy") {
+    catalogError2("OKM1020", `Policy object identity is ${identity.kind}, not a policy.`);
+  }
+  const owner = parseOwner(record.owner);
+  const provenance = parseProvenance(record.provenance);
+  const dependencies = parseDependencies(record.dependencies);
+  const definition = requireRecord(record.definition, "definition");
+  rejectUnknown(definition, ["command", "expression", "force"], "policy definition");
+  const command = requireString(definition.command, "policy command");
+  if (command !== "all" && command !== "select") {
+    catalogError2("OKM1020", `Policy ${identity.name} command is not supported.`);
+  }
+  return policyObject({
+    parent: identity.parent,
+    name: identity.name,
+    command,
+    expression: requireString(definition.expression, "policy expression"),
+    force: requireBoolean(definition.force, "policy force"),
+    owner,
+    provenance,
+    dependencies
+  });
 }
 function parseViewColumns(value) {
   if (!Array.isArray(value))
@@ -1455,4 +1565,4 @@ function assertNeverKind(value) {
   return catalogError2("OKM1020", `Unexpected kind ${JSON.stringify(value)}.`);
 }
 
-export { roleObject, grantObject, defaultPrivilegeObject, creationOrder2, renameColumn2, renameTable2, serializeCatalog2, catalogHash2, startupCatalog2, startupHash2, loadTrustedCatalog2, parseCatalog2 };
+export { roleObject, grantObject, defaultPrivilegeObject, creationOrder2, renameColumn2, renameTable2, serializeCatalog2, catalogHash2, startupCatalog2, startupHash2, loadTrustedCatalog2, catalogFileText2, parseCatalog2 };

package/dist/shared/{8ktwd3rh.js → r3j8s5y0.js}

@@ -1,7 +1,7 @@
 import {
   normaliseEdges,
   assertProvenance
-} from "./t4tbsy9h.js";
+} from "./358zsv4r.js";
 import {
   assertIdentifier2
 } from "./nfzc5z0w.js";

package/dist/shared/rhs3xe4k.js

@@ -0,0 +1,7 @@
+// src/dialects/pg/path-endpoint.ts
+var pathEndpoint = Symbol("okmodel.pathEndpoint");
+function markPathEndpoint(table) {
+  return Object.assign(table, { [pathEndpoint]: true });
+}
+
+export { pathEndpoint, markPathEndpoint };

package/dist/shared/{ntneex2a.js → rpycarcr.js}

@@ -1,11 +1,11 @@
-import {
-  callerLocation,
-  withLocation
-} from "./k7dwkhvq.js";
 import {
   definition,
   unavailable
 } from "./tmbdywx0.js";
+import {
+  callerLocation,
+  withLocation
+} from "./y6jdds7g.js";
 import {
   OkmError2,
   throwNamed2
@@ -29,7 +29,7 @@ function openFilters(table, relations, spec, hiddenFields) {
   }
   return {
     parse(query) {
-      return import("./wq9n6pwr.js").then((mod) => mod.parseQuery(allow, sort, query));
+      return import("./pz6rj8ay.js").then((mod) => mod.parseQuery(allow, sort, query, nested));
     }
   };
 }
@@ -38,7 +38,7 @@ function deny(hiddenFields, table, field) {
     return;
   throw new OkmError2("OKM1123", `Field ${table}.${field} is hidden.`, {
     fix: {
-      summary: "Remove the hidden field from the allowlist. Hidden fields stay out of caller filters and sorts."
+      summary: "Remove this hidden field from the allowlist. Hidden fields stay out of caller filter or sort."
     }
   });
 }

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

@@ -1,26 +1,26 @@
-import"./8bwbwy8h.js";
+import"./qq3899ht.js";
 import"./n442h54c.js";
-import"./krxx77g0.js";
+import"./14vx95q4.js";
 import {
+  projectPath,
   loadConfig
-} from "./qv2ydck9.js";
+} from "./gs74dbj5.js";
 import {
   listTargets
-} from "./ga3sfy93.js";
-import"./8xsbagad.js";
+} from "./tsvww22q.js";
+import"./9s0ypp87.js";
 
 // src/tooling/migrate/dev.ts
 import { mkdirSync } from "node:fs";
-import { join } from "node:path";
 async function devProject(cwd) {
   const config = await loadConfig(cwd);
   const named = listTargets(config).find((target) => target.name === "dev");
   if (named !== undefined)
     return `target ${named.name}
 `;
-  const directory = join(cwd, config.out ?? ".okm", "dev-db");
+  const directory = projectPath(cwd, config.out ?? ".okm", "dev-db");
   mkdirSync(directory, { recursive: true });
-  const { open } = await import("./f5cw5q5r.js");
+  const { open } = await import("./aytqh5y2.js");
   const pool = await open({ dataDir: directory });
   try {
     await pool.execute("select 1");

package/dist/shared/{tm5ab8we.js → sfz1ksn6.js}

@@ -3,10 +3,10 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./hf22e0wt.js";
+} from "./tbrvgw6z.js";
 import {
-  fail
-} from "./gbtcc2d7.js";
+  fail2
+} from "./67txcrcw.js";
 import {
   OkmError2,
   throwNamed2
@@ -35,13 +35,16 @@ function plan(session, table, options, mods, view) {
       }
     });
   }
+  if (lock === "skip") {
+    fail2("OKM1120", 'lock: "skip" claims rows on update. A read uses lock: "update" and wait: "skip".', 'Pass lock: "update" and wait: "skip" inside tx(). An update can claim rows on its own.');
+  }
   if (session.tx === undefined) {
     throw new OkmError2("OKM1830", "A row lock needs a transaction. find was called outside tx().", {
       fix: { summary: "Move the find into tx(): the lock lasts until the transaction ends." }
     });
   }
   if (lock === undefined)
-    fail("OKM1121", "wait needs lock: pass lock: update or lock: share.");
+    fail2("OKM1121", "wait needs lock: pass lock: update or lock: share.");
   if (typeof lock !== "string" || !LOCKS.includes(lock)) {
     throwNamed2("OKM1120", shown(lock), LOCKS, `lock must be one of: ${LOCKS.join(", ")}.`);
   }

package/dist/shared/{6mnp99hx.js → svncdeh5.js}

@@ -1,7 +1,7 @@
 import {
   open2
-} from "./krxx77g0.js";
-import"./8bwbwy8h.js";
+} from "./14vx95q4.js";
+import"./qq3899ht.js";
 import"./n442h54c.js";
 import {
   CURRENT,
@@ -12,26 +12,28 @@ import {
   failedAt
 } from "./9yn6a2vd.js";
 import {
-  loadMigrations,
   expandProvisioned,
   provisionHistoryIsKnown
-} from "./gde73es6.js";
-import"./szm0cksa.js";
-import"./fancm5pt.js";
+} from "./m6p12kbr.js";
+import"./8skf0cam.js";
+import"./b5pftnn2.js";
 import {
+  projectPath,
+  loadMigrations,
   loadConfig
-} from "./qv2ydck9.js";
+} from "./gs74dbj5.js";
 import {
+  sessionFailure,
+  finishQuiet,
   assertTargetPolicy,
   listTargets
-} from "./ga3sfy93.js";
-import"./8xsbagad.js";
+} from "./tsvww22q.js";
+import"./9s0ypp87.js";
 import {
   OkmError2
 } from "./52szzakm.js";
 
 // src/tooling/migrate/status.ts
-import { join } from "node:path";
 function describeStatus(migrations, history, recorded) {
   const known = new Set(migrations.map((migration) => migration.id));
   const done = expandProvisioned(migrations, new Set(history.map((row) => `${row.migrationId}:${String(row.stepIndex)}`)), history.map((row) => row.migrationId));
@@ -99,14 +101,16 @@ async function readTargetStatus(input) {
       protected: input.protected,
       backfills: await readBackfills(pool)
     };
+  } catch (error) {
+    throw sessionFailure(error) ?? error;
   } finally {
-    await pool.close();
+    await finishQuiet(() => pool.close());
   }
 }
 async function statusProject(cwd, flags) {
   const config = await loadConfig(cwd);
   const targets = chosen(listTargets(config), flags.target);
-  const migrations = loadMigrations(join(cwd, config.migrations ?? "migrations"));
+  const migrations = loadMigrations(projectPath(cwd, config.migrations ?? "migrations"));
   const rows = [];
   for (const target of targets) {
     rows.push(await readTargetStatus({