okmodel 0.7.0 → 0.9.0

package/dist/shared/{1w508jbr.js → 9dtgn1z2.js}

@@ -3,21 +3,21 @@ import {
 } from "./mss6ctgv.js";
 import {
   effectivePredicate
-} from "./n816peh1.js";
-import {
-  assertOperatorFits,
-  textArray,
-  arrayElementType
-} from "./zchaghkf.js";
+} from "./n454kcnw.js";
 import {
   runWrite
 } from "./n4jqhpqz.js";
 import {
   writeWouldValidate
-} from "./ze4hxsmy.js";
+} from "./w9ejzaqf.js";
 import {
   encodeJson
-} from "./9628a9xt.js";
+} from "./vk7rag46.js";
+import {
+  assertOperatorFits,
+  textArray,
+  arrayElementType
+} from "./zchaghkf.js";
 import {
   withRowFilters,
   archiveRules,
@@ -32,7 +32,7 @@ import {
   isRecord,
   registerFailFix,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   safetyInstalled,
   runSafety
@@ -198,7 +198,7 @@ async function planWrite(schema, generators, op, tableName, input, options, mods
   }
   if (op === "update") {
     if (traitNamed(table, "versioned")) {
-      const { planVersioned } = await import("./y6njgyda.js");
+      const { planVersioned } = await import("./3t6kw83m.js");
       return withRowFilters(scope, mods.archive, () => {
         noteArchive(table, mods.archive);
         const planned = planVersioned(schema, table, input, record, mods);
@@ -244,12 +244,12 @@ async function planInsert(table, input, options, mods, generators, scope, tenanc
       keyColumns: undefined
     };
   }
-  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./bg3rym3g.js");
+  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./xwhdcrm4.js");
   const conflict = conflictMod?.readConflict(table, options.onConflict, allow, tenantKeyList(tenancy));
   if (conflict?.kind === "update" && traitNamed(table, "versioned")) {
     fail2("OKM1120", `onConflict update on ${table.model.name} does not check the version you read.`, "Read the row and update. ignore and return do not change the existing row.");
   }
-  const sortMod = sorting ? await import("./9y3mmmh1.js") : undefined;
+  const sortMod = sorting ? await import("./xfhe73sb.js") : undefined;
   const chunks = chunkRows(rows.map((row) => cellsFor(columns, row)));
   const statements = [];
   const quiet = [];
@@ -1086,7 +1086,7 @@ function insertRow(table, value, allow, tenancy) {
     if (column === undefined)
       continue;
     tenancy?.guard(table.model.name, key, "insert");
-    if (!writable(table, column, allow))
+    if (!writable(table, column, allow, "insert"))
       refuse(table, column);
     if (value[key] !== undefined)
       row[key] = value[key];
@@ -1142,7 +1142,7 @@ function writtenColumns(table, rows, allow, tenantKeys) {
   }
   const columns = [];
   for (const column of table.model.columns) {
-    if (present.has(column.field) && (writable(table, column, allow) || column.fill !== undefined || tenantKeys?.includes(column.field) === true)) {
+    if (present.has(column.field) && (writable(table, column, allow, "insert") || column.fill !== undefined || tenantKeys?.includes(column.field) === true)) {
       columns.push(column);
     }
   }
@@ -1206,7 +1206,7 @@ function writeSet2(table, value, allow, tenancy) {
     if (column === undefined)
       continue;
     tenancy?.guard(table.model.name, key, "update");
-    if (column.guardUpdate || !writable(table, column, allow))
+    if (column.guardUpdate || !writable(table, column, allow, "update"))
       refuse(table, column);
     set[key] = value[key];
   }
@@ -1475,12 +1475,16 @@ function refuse(table, column) {
   }
   fail2("OKM1120", `Field ${table.model.name}.${column.field} cannot be written.`);
 }
-function writable(table, column, allow) {
+function writable(table, column, allow, op) {
   if (fieldSealed(table.model, column.field))
     return false;
   if (column.writable)
     return true;
-  return column.guarded && allow.has(column.field);
+  if (!column.guarded || !allow.has(column.field))
+    return false;
+  if (!table.model.primary.includes(column.field))
+    return true;
+  return op === "insert" && column.fill !== undefined;
 }
 function allowSet2(table, value) {
   if (value === undefined)

package/dist/shared/{h15jx9bc.js → 9dvh1dr6.js}

@@ -1,6 +1,6 @@
 import {
   validationGate
-} from "./ze4hxsmy.js";
+} from "./w9ejzaqf.js";
 import {
   isOperator
 } from "./cn0n68ft.js";

package/dist/shared/{q5c6ngn3.js → a62rb2da.js}

@@ -1,6 +1,6 @@
 import {
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 
 // src/runtime/result-name.ts
 var PROTOTYPE_KEYS = ",__proto__,constructor,toString,hasOwnProperty,valueOf,isPrototypeOf,propertyIsEnumerable,toLocaleString,__defineGetter__,__defineSetter__,__lookupGetter__,__lookupSetter__,then,";

package/dist/shared/{te5as7z7.js → aksb89mn.js}

@@ -1,13 +1,13 @@
 import {
   identityColumn2
-} from "./xjk7hnn5.js";
+} from "./s7he5e5d.js";
 import {
   runWrite
 } from "./n4jqhpqz.js";
 import {
   queryHandle,
   settleCall
-} from "./tbrvgw6z.js";
+} from "./npdftanb.js";
 import {
   withRowFilters,
   archiveRules,
@@ -18,7 +18,7 @@ import {
   list,
   isRecord,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   safetyInstalled,
   runSafety

package/dist/shared/{bz84tkzm.js → bphrgwz9.js}

@@ -4,7 +4,7 @@ import {
 } from "./cm3w0ywp.js";
 import {
   PgSession
-} from "./14vx95q4.js";
+} from "./dd5pmnky.js";
 import {
   isConnectionLost
 } from "./cnkky55j.js";
@@ -15,7 +15,7 @@ import {
   runCall,
   rowsFrom,
   resultFrom
-} from "./kb2sdhfb.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/postgres-extra.ts
 var RESET_ALL = "RESET ALL";

package/dist/shared/bsek72fg.js

@@ -0,0 +1,225 @@
+import {
+  assertNoControl
+} from "./zchaghkf.js";
+import {
+  isOperator,
+  operatorName,
+  operatorValue,
+  tag
+} from "./cn0n68ft.js";
+import {
+  OkmError2
+} from "./52szzakm.js";
+
+// src/dialects/pg/ops/fragment.ts
+var IDENT = Symbol("okmodel.sql.ident");
+var COLUMN = Symbol("okmodel.sql.column");
+function fragmentError(message, fix) {
+  throw new OkmError2("OKM1125", message, { fix: { summary: fix } });
+}
+function isFragmentParts(value) {
+  return Array.isArray(value) && value.every(isPart);
+}
+function isPart(value) {
+  if (typeof value !== "object" || value === null || !("k" in value))
+    return false;
+  const kind = value.k;
+  if (kind === "t")
+    return "s" in value && typeof value.s === "string";
+  if (kind === "p")
+    return "v" in value && typeof value.v === "string";
+  if (kind === "n" || kind === "c")
+    return true;
+  if (kind === "i")
+    return "n" in value && typeof value.n === "string";
+  if (kind === "f")
+    return "parts" in value && isFragmentParts(value.parts);
+  return false;
+}
+function readSelectFragment(value) {
+  if (!isOperator(value) || operatorName(value) !== "sql")
+    return;
+  const named = value;
+  if (typeof named.as !== "string") {
+    fragmentError("A select fragment needs as(name).", 'Call .as("len") and pass that value in select.');
+  }
+  const stored = operatorValue(value);
+  if (!isFragmentParts(stored)) {
+    fragmentError("A fragment was not created by fragment``.", "Call fragment`...`.");
+  }
+  const textual = named.text === true;
+  return textual ? { as: named.as, parts: stored, textual: true } : { as: named.as, parts: stored };
+}
+function scanLiteral(literal, state) {
+  for (let index = 0;index < literal.length; index += 1) {
+    const char = literal[index] ?? "";
+    const code = literal.charCodeAt(index);
+    if (state.quote !== undefined) {
+      if (char !== state.quote)
+        continue;
+      if (literal[index + 1] === state.quote) {
+        index += 1;
+        continue;
+      }
+      state.quote = undefined;
+      continue;
+    }
+    if (code <= 31 && code !== 9 && code !== 10 && code !== 13 || code === 127) {
+      fragmentError("A fragment literal contains a control character.", "Remove NUL and other control characters. A newline, tab, or return is allowed.");
+    }
+    if (char === "'" || char === '"') {
+      state.quote = char;
+      continue;
+    }
+    if (char === "(") {
+      state.paren += 1;
+      continue;
+    }
+    if (char === ")") {
+      state.paren -= 1;
+      if (state.paren < 0) {
+        fragmentError("A fragment has unbalanced SQL.", "Keep parentheses and quotes balanced. A fragment cannot close the surrounding predicate.");
+      }
+      continue;
+    }
+    if (char === ";") {
+      fragmentError("A fragment cannot include a semicolon.", "Pass the value as an interpolation. The fragment is one expression.");
+    }
+    if (char === "$") {
+      fragmentError("A fragment cannot include a dollar quote or a parameter marker.", "Interpolate the value. The planner numbers parameters.");
+    }
+    if (char === "-" && literal[index + 1] === "-" || char === "/" && literal[index + 1] === "*") {
+      fragmentError("A fragment cannot include a comment.", "Remove the comment. A comment can hide the rest of the predicate.");
+    }
+  }
+}
+function appendText(parts, literal) {
+  if (literal.length === 0)
+    return;
+  parts.push({ k: "t", s: literal });
+}
+function appendValue(parts, value) {
+  if (value === null) {
+    parts.push({ k: "n" });
+    return;
+  }
+  if (typeof value === "string") {
+    parts.push({ k: "p", v: value });
+    return;
+  }
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      fragmentError("A fragment needs a finite number.", "Pass a finite number, or leave it out.");
+    }
+    parts.push({ k: "p", v: String(value) });
+    return;
+  }
+  if (typeof value === "boolean") {
+    parts.push({ k: "p", v: value ? "true" : "false" });
+    return;
+  }
+  if (typeof value === "bigint") {
+    parts.push({ k: "p", v: String(value) });
+    return;
+  }
+  if (typeof value === "object") {
+    if (COLUMN in value) {
+      parts.push({ k: "c" });
+      return;
+    }
+    if (IDENT in value) {
+      const name = value[IDENT];
+      if (typeof name === "string") {
+        parts.push({ k: "i", n: name });
+        return;
+      }
+    }
+    if (isOperator(value) && operatorName(value) === "sql") {
+      const nested = operatorValue(value);
+      if (!isFragmentParts(nested)) {
+        fragmentError("A fragment was not created by fragment``.", "Call fragment`...`.");
+      }
+      parts.push({ k: "f", parts: nested });
+      return;
+    }
+  }
+  fragmentError("A fragment cannot interpolate that value.", "Interpolate a string, number, boolean, null, ident(name), fragment.column, or another fragment.");
+}
+function hasSql(parts) {
+  for (const part of parts) {
+    if (part.k === "t") {
+      if (part.s.trim().length > 0)
+        return true;
+      continue;
+    }
+    return true;
+  }
+  return false;
+}
+function compile(strings, values) {
+  const state = { quote: undefined, paren: 0 };
+  const parts = [];
+  for (let index = 0;index < values.length + 1; index += 1) {
+    const literal = strings[index] ?? "";
+    scanLiteral(literal, state);
+    appendText(parts, literal);
+    if (index === values.length)
+      continue;
+    if (state.quote !== undefined) {
+      fragmentError("A fragment cannot interpolate inside quotes.", "Do not put an interpolation inside quotes. Write title = ${name}.");
+    }
+    appendValue(parts, values[index]);
+  }
+  if (state.quote !== undefined || state.paren !== 0) {
+    fragmentError("A fragment has unbalanced SQL.", "Keep parentheses and quotes balanced. A fragment cannot close the surrounding predicate.");
+  }
+  if (!hasSql(parts)) {
+    fragmentError("A fragment needs SQL text.", "Write an expression, or interpolate a value.");
+  }
+  return parts;
+}
+function isTemplate(value) {
+  return Array.isArray(value) && "raw" in value;
+}
+function bind(parts, textual = false) {
+  const tagged = tag("sql", parts);
+  return Object.assign(tagged, {
+    as(name) {
+      if (typeof name !== "string" || name.length === 0) {
+        fragmentError("as(name) needs a result name.", 'Call .as("len") with a name that is not a column.');
+      }
+      assertNoControl(name, "fragment as");
+      const selected = Object.assign(tag("sql", parts), { as: name });
+      return textual ? Object.assign(selected, { text: true }) : selected;
+    }
+  });
+}
+function sqlExpression(parts, textual = false) {
+  return bind(parts, textual);
+}
+function identName(value) {
+  if (typeof value !== "object" || value === null || !(IDENT in value))
+    return;
+  const stored = value[IDENT];
+  return typeof stored === "string" ? stored : undefined;
+}
+function fragmentTag(strings, ...values) {
+  if (!isTemplate(strings)) {
+    fragmentError("Call fragment as a template: fragment`...`.", "Write fragment`length(${fragment.column}) > ${1}`.");
+  }
+  return bind(compile(strings, values));
+}
+var fragment2 = Object.assign(fragmentTag, {
+  column: { [COLUMN]: true }
+});
+function ident2(name) {
+  if (typeof name !== "string" || name.length === 0) {
+    throw new OkmError2("OKM1122", "ident needs a name.", {
+      fix: { summary: "Pass the field name, such as title." }
+    });
+  }
+  assertNoControl(name, "ident");
+  return { [IDENT]: name };
+}
+
+export { isFragmentParts, readSelectFragment, sqlExpression, identName, fragment2, ident2 };

package/dist/shared/{7mnme5tn.js → c3mvnq7a.js}

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

package/dist/shared/{p6qc5gcp.js → ccsmhv9r.js}

@@ -1,9 +1,12 @@
 import {
   open2
-} from "./14vx95q4.js";
+} from "./dd5pmnky.js";
 import {
   startupHash2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
+import {
+  quoteIdent2
+} from "./fk9vef30.js";
 import {
   runTarget,
   assumeRole,
@@ -14,12 +17,12 @@ import {
   provisionMark,
   expandProvisioned,
   installSnapshot
-} from "./m6p12kbr.js";
+} from "./3456242y.js";
 import {
   assertCreateRole,
   currentUser,
   roleExists
-} from "./8skf0cam.js";
+} from "./jpybhf98.js";
 import {
   projectPath,
   loadMigrations,
@@ -30,7 +33,7 @@ import {
   projectHead,
   loadBuiltSchema,
   loadConfig
-} from "./gs74dbj5.js";
+} from "./2zdxkt7b.js";
 import {
   changesRole,
   batchSizeField,
@@ -41,7 +44,7 @@ import {
   assertDirectConnection,
   assertStableBackend,
   selectTarget
-} from "./tsvww22q.js";
+} from "./6nae0spm.js";
 import {
   UUIDV7_POSTGRES,
   uuidv7NeedsPostgres
@@ -198,6 +201,7 @@ async function applyTarget2(request) {
     await prepareMigrationRole(connection, request, session);
     await assertExtensionsAvailable(connection, request.migrations);
     await assertUuidV7Available(connection, request.migrations);
+    await enterCatalogSchema(connection, request.schema ?? "public");
     const state = request.snapshot === undefined ? undefined : await targetState(connection);
     if (request.snapshot !== undefined && state !== undefined) {
       if (state.kind === "empty") {
@@ -273,6 +277,7 @@ nothing to apply
       reference: built === undefined ? [] : readReference(built.tables, built.casing, head.catalog)
     },
     ...config.roles !== undefined ? { migrationRole: config.roles.migration, appRole: config.roles.app } : {},
+    ...catalogSchema(config.namespace),
     lintDirectory: directory,
     onProgress: (line) => {
       if (write !== undefined)
@@ -299,6 +304,7 @@ async function pushProject2(cwd, flags) {
     after: head.catalog,
     renames: head.renames,
     name: "push",
+    ...catalogSchema(config.namespace),
     ...batchSizeField(config.backfill?.batchSize)
   });
   if (plan.steps.length === 0)
@@ -319,7 +325,8 @@ no changes
         steps: plan.steps
       }
     ],
-    ...config.roles !== undefined ? { migrationRole: config.roles.migration, appRole: config.roles.app } : {}
+    ...config.roles !== undefined ? { migrationRole: config.roles.migration, appRole: config.roles.app } : {},
+    ...catalogSchema(config.namespace)
   });
   return formatReport(report);
 }
@@ -514,6 +521,17 @@ async function insertReference(connection, request) {
 function concreteSchema(request) {
   return request.searchPath ?? request.schema ?? "public";
 }
+function catalogSchema(namespace) {
+  if (namespace === undefined || namespace === "public")
+    return;
+  return { schema: namespace };
+}
+async function enterCatalogSchema(connection, schema) {
+  if (schema === "public")
+    return;
+  await connection.execute(`create schema if not exists ${quoteIdent2(schema)}`);
+  await connection.execute(`set search_path to ${quoteIdent2(schema)}`);
+}
 async function targetState(connection) {
   const meta = await connection.execute(`select to_regclass('okm_meta') is not null
          or to_regclass('okm_history') is not null

package/dist/shared/{pbp1ss85.js → cexb7z6b.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./tbrvgw6z.js";
+} from "./npdftanb.js";
 import {
   selectedColumns,
   parseOrder,
@@ -15,7 +15,7 @@ import {
   isRecord,
   registerFailFix,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   OkmError2,
   throwNamed2

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

@@ -5,11 +5,11 @@ import {
   send2,
   reserve,
   park
-} from "./x933k9a3.js";
+} from "./62b603gr.js";
 import {
   resetSession2,
   refuseWhenLost2
-} from "./zm0ptry0.js";
+} from "./99qp9vtg.js";
 import {
   cursorStream
 } from "./7kms6fvj.js";
@@ -18,14 +18,14 @@ import {
 } from "./cnkky55j.js";
 import {
   noTimeout
-} from "./79dt02vc.js";
+} from "./tr64w5p0.js";
 import {
   WireSession
-} from "./1qa0qajz.js";
+} from "./e275q7sd.js";
 import {
   rejectClosed,
   runCall
-} from "./kb2sdhfb.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/bunsql-extra.ts
 async function recover(sql, error, text, depth, clientRead, closedDuring, again) {

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

@@ -2,11 +2,11 @@ import {
   assertAuthorDrift2,
   catalogQuery2,
   managedRoleOptions2
-} from "./ax7qv55k.js";
-import"./b5pftnn2.js";
-import"./tsvww22q.js";
-import"./9s0ypp87.js";
-import"./qq3899ht.js";
+} from "./90sg0w5a.js";
+import"./myk8fswx.js";
+import"./6nae0spm.js";
+import"./fk9vef30.js";
+import"./12z7aznj.js";
 export {
   assertAuthorDrift2 as assertAuthorDrift,
   catalogQuery2 as catalogQuery,

package/dist/shared/{dk8v79p3.js → d5nmj7vv.js}

@@ -9,7 +9,7 @@ import {
   loadTrustedCatalog2,
   catalogFileText2,
   parseCatalog2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
 export {
   catalogFileText2 as catalogFileText,
   catalogHash2 as catalogHash,

package/dist/shared/{14vx95q4.js → dd5pmnky.js}

@@ -6,7 +6,7 @@ import {
   runCall,
   EMPTY_NOTICES,
   resultFrom
-} from "./kb2sdhfb.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/postgresjs.ts
 import net from "node:net";
@@ -118,17 +118,17 @@ function open2(config) {
       return sockets.occupy(() => runCall(closed, options, (watch) => root.query(text, params, watch)));
     },
     batch(statements, options) {
-      return sockets.occupy(() => import("./je4axnm8.js").then((mod) => mod.runBatch(held, statements, options)));
+      return sockets.occupy(() => import("./fdsz3w80.js").then((mod) => mod.runBatch(held, statements, options)));
     },
     reserve() {
       const gate = sockets.busyGate();
       gate.enter();
-      return import("./je4axnm8.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
+      return import("./fdsz3w80.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
         gate.leave();
         throw error;
       });
     },
-    describe: (text, params) => sockets.occupy(() => import("./je4axnm8.js").then((mod) => mod.describe(sql, text, params))),
+    describe: (text, params) => sockets.occupy(() => import("./fdsz3w80.js").then((mod) => mod.describe(sql, text, params))),
     stream(text, params) {
       const gate = sockets.busyGate();
       return async function* () {
@@ -143,7 +143,7 @@ function open2(config) {
     listen(channel, onNotify) {
       const gate = sockets.listenerGate();
       gate.enter();
-      return import("./je4axnm8.js").then((mod) => mod.holdListener(gate, async () => {
+      return import("./fdsz3w80.js").then((mod) => mod.holdListener(gate, async () => {
         const listening = await sql.listen(channel, onNotify);
         return async () => {
           await listening.unlisten();
@@ -213,7 +213,7 @@ class PgSession {
       onAbort();
     else
       watch.signal.addEventListener("abort", onAbort, { once: true });
-    return import("./je4axnm8.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
+    return import("./fdsz3w80.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
       start,
       text,
       notices: this.notices,
@@ -265,7 +265,7 @@ class PgSession {
   }
 }
 async function* loadStream(sql, text, params) {
-  const { stream } = await import("./je4axnm8.js");
+  const { stream } = await import("./fdsz3w80.js");
   yield* stream(sql, text, params);
 }
 function send(sql, text, params, named) {

package/dist/shared/{vb6qfyve.js → ds229x4r.js}

@@ -7,12 +7,12 @@ import {
 import {
   withHttp,
   settleCall
-} from "./tbrvgw6z.js";
+} from "./npdftanb.js";
 import {
   rejectKeys,
   isRecord,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{1qa0qajz.js → e275q7sd.js}

@@ -4,7 +4,7 @@ import {
   nextTransactionDepth,
   EMPTY_NOTICES,
   resultFrom
-} from "./kb2sdhfb.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/session.ts
 function noticeBuffer() {