okmodel 0.8.0 → 0.9.1

package/dist/shared/{bxas03mq.js → 63qjmhnp.js}

@@ -1,3 +1,6 @@
+import {
+  assertParamCount2
+} from "./ddh72ym5.js";
 import {
   stack2
 } from "./mss6ctgv.js";
@@ -29,6 +32,7 @@ import {
   decodeRow,
   indexes,
   quote,
+  list,
   isRecord,
   registerFailFix,
   fail2
@@ -163,7 +167,7 @@ async function prepareWrite(host, op, table, input, options, mods, scope) {
     return {
       statements: planned.statements,
       options: callOptions(options),
-      ...planned.parentGuard === true ? { checked: "parent" } : planned.expect !== undefined ? { checked: "expect" } : {},
+      ...planned.parentGuard === true ? { checked: "parent" } : planned.treeGuard === true ? { checked: "tree" } : planned.expect !== undefined ? { checked: "expect" } : {},
       ...planned.recover === undefined ? {} : {
         follow: (results) => planned.recover?.(decodePlanned(withoutQuiet(results, planned.quiet), planned.outputs)) ?? []
       },
@@ -198,7 +202,7 @@ async function planWrite(schema, generators, op, tableName, input, options, mods
   }
   if (op === "update") {
     if (traitNamed(table, "versioned")) {
-      const { planVersioned } = await import("./3t6kw83m.js");
+      const { planVersioned } = await import("./zm2rzqba.js");
       return withRowFilters(scope, mods.archive, () => {
         noteArchive(table, mods.archive);
         const planned = planVersioned(schema, table, input, record, mods);
@@ -244,7 +248,7 @@ async function planInsert(table, input, options, mods, generators, scope, tenanc
       keyColumns: undefined
     };
   }
-  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./63f4ksbz.js");
+  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./60y4ahmw.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.");
@@ -308,7 +312,7 @@ function planUpdate(schema, table, input, options, mods, scope) {
     rejectDuplicateTargets2(table, rows);
     rejectMixedSets2(rows);
     for (const row of rows)
-      refuseTreeCycle(table, row.where, row.set, schema.tenancy?.key);
+      refuseTreeCycle(table, row.where, row.set, tenantKeys(schema.tenancy));
     const moves = rows.some((row) => pathField(schema.tenancy, table.model.name, row.set) !== undefined);
     if (moves) {
       return {
@@ -338,7 +342,8 @@ function planUpdate(schema, table, input, options, mods, scope) {
   requireFilter2(table, input.where, mods, "update");
   if (Object.keys(set).length === 0)
     fail2("OKM1120", "update set is empty.");
-  refuseTreeCycle(table, input.where, set, schema.tenancy?.key);
+  const keys = tenantKeys(schema.tenancy);
+  const cycle = refuseTreeCycle(table, input.where, set, keys);
   const where = stack2(input.where, mods.presets);
   const moved = pathAssignment(schema.tenancy, table.model.name, set, scope);
   if (moved !== undefined && claim !== undefined) {
@@ -365,6 +370,17 @@ function planUpdate(schema, table, input, options, mods, scope) {
       keyColumns: undefined
     };
   }
+  if (cycle !== undefined) {
+    return {
+      statements: [treeSetUpdate(schema, table, where, set, cycle, returning)],
+      outputs: parentOutputs(returning),
+      shape: returning === undefined ? "count" : "rows",
+      expect,
+      keys: undefined,
+      keyColumns: undefined,
+      treeGuard: true
+    };
+  }
   const sql = new Sql2;
   sql.text("update ");
   sql.text(quote(table.model.sql));
@@ -411,6 +427,8 @@ function finish(results, planned, table) {
     return finishVersioned(results, planned, table);
   if (planned.parentGuard === true)
     return finishParent(results, planned, table);
+  if (planned.treeGuard === true)
+    return finishTree(results, planned, table);
   if (planned.shape === "count") {
     let count = 0;
     for (const result of results)
@@ -439,6 +457,18 @@ function finishParent(results, planned, table) {
       fix: { summary: "Point the foreign key at a parent in this tenant." }
     });
   }
+  return finishGuarded(results, planned, table, updated);
+}
+function finishTree(results, planned, table) {
+  const row = results[0]?.rows[0];
+  const matched = countCell(row?.[0]);
+  const updated = countCell(row?.[1]);
+  if (updated < matched) {
+    fail2("OKM1120", `update on ${table} cannot point a tree row at itself or its descendant.`, "Set the parent to another row that is not under this one. A filter that is not the primary key is not checked.");
+  }
+  return finishGuarded(results, planned, table, updated);
+}
+function finishGuarded(results, planned, table, updated) {
   if (planned.shape === "count") {
     checkExpect(updated, planned.expect, table, "write");
     return { count: updated };
@@ -1074,6 +1104,7 @@ class Sql2 {
     };
   }
   statement() {
+    assertParamCount2(this.params.length);
     return this.params.length === 0 ? { text: this.parts.join("") } : { text: this.parts.join(""), params: this.params };
   }
 }
@@ -1084,7 +1115,7 @@ function insertRow(table, value, allow, tenancy) {
   for (const key of Object.keys(value)) {
     const column = table.columns.get(key);
     if (column === undefined)
-      continue;
+      refuseUnknownField(table, key);
     tenancy?.guard(table.model.name, key, "insert");
     if (!writable(table, column, allow, "insert"))
       refuse(table, column);
@@ -1094,6 +1125,9 @@ function insertRow(table, value, allow, tenancy) {
   refuseHalfMorph(table, row);
   return row;
 }
+function refuseUnknownField(table, key) {
+  throwNamed2("OKM1120", key, table.names, `Field ${key} is not on ${table.model.name}. Accepted names: ${list(table.names)}.`);
+}
 function cellsFor(columns, row) {
   return columns.map((column) => {
     if (!Object.hasOwn(row, column.field))
@@ -1200,10 +1234,10 @@ function writeSet2(table, value, allow, tenancy) {
   }
   const set = {};
   for (const key of Object.keys(value)) {
-    if (value[key] === undefined)
-      continue;
     const column = table.columns.get(key);
     if (column === undefined)
+      refuseUnknownField(table, key);
+    if (value[key] === undefined)
       continue;
     tenancy?.guard(table.model.name, key, "update");
     if (column.guardUpdate || !writable(table, column, allow, "update"))
@@ -1213,10 +1247,11 @@ function writeSet2(table, value, allow, tenancy) {
   refuseHalfMorph(table, set);
   return set;
 }
-function refuseTreeCycle(table, where, set, scopeKey) {
-  const own = keyedId(table, where, scopeKey);
-  if (own === undefined)
+function refuseTreeCycle(table, where, set, scopeKeys) {
+  const keyed = keyedId(table, where, scopeKeys);
+  if (keyed === undefined)
     return;
+  let found;
   for (const relation of table.model.relations) {
     if (relation.kind !== "many" || relation.through !== undefined || relation.morph !== undefined) {
       continue;
@@ -1231,17 +1266,20 @@ function refuseTreeCycle(table, where, set, scopeKey) {
       if (typeof value !== "string" && typeof value !== "number" && typeof value !== "bigint") {
         continue;
       }
-      if ((typeof value === "string" ? value : value.toString()) !== own)
-        continue;
-      fail2("OKM1120", `update on ${table.model.name}.${column.field} cannot point a tree row at itself.`, "Set the parent to another row. A filter that is not the primary key is not checked.");
+      const parent = typeof value === "string" ? value : value.toString();
+      if (parent === keyed.own) {
+        fail2("OKM1120", `update on ${table.model.name}.${column.field} cannot point a tree row at itself.`, "Set the parent to another row. A filter that is not the primary key is not checked.");
+      }
+      found = { own: keyed.own, parent, column, identity: keyed.identity };
     }
   }
+  return found;
 }
-function keyedId(table, where, scopeKey) {
+function keyedId(table, where, scopeKeys) {
   if (!isRecord(where))
     return;
   const primary = table.model.primary;
-  const required = primary.filter((field) => field !== scopeKey);
+  const required = primary.filter((field) => !scopeKeys.includes(field));
   const field = required.length === 1 ? required[0] : undefined;
   if (field === undefined || !Object.hasOwn(where, field))
     return;
@@ -1253,7 +1291,51 @@ function keyedId(table, where, scopeKey) {
   if (typeof value !== "string" && typeof value !== "number" && typeof value !== "bigint") {
     return;
   }
-  return String(value);
+  const identity = table.columns.get(field);
+  if (identity === undefined)
+    return;
+  return { own: String(value), identity };
+}
+function tenantKeys(tenancy) {
+  if (tenancy === undefined)
+    return [];
+  if (tenancy.keys !== undefined && tenancy.keys.length > 0)
+    return tenancy.keys;
+  return [tenancy.key];
+}
+function treeSetUpdate(schema, table, where, set, cycle, returning) {
+  const sql = new Sql2;
+  sql.text("with matched as (select ");
+  sql.text(rowId("t"));
+  sql.text(" from ");
+  sql.text(quote(table.model.sql));
+  sql.text(" as t");
+  emitFilter(schema, table, where, sql, "t");
+  sql.text("), updated as (update ");
+  sql.text(quote(table.model.sql));
+  sql.text(" as t set ");
+  emitSet2(sql, table, set, "t");
+  sql.text(" where (");
+  sql.text(rowId("t"));
+  sql.text(") in (select tableoid, ctid from matched) and not exists (with recursive d as (select ");
+  sql.text(quote(cycle.identity.sql));
+  sql.text(" as k from ");
+  sql.text(quote(table.model.sql));
+  sql.text(" where ");
+  sql.text(quote(cycle.column.sql));
+  sql.text(" = ");
+  sql.param(cycle.own, cycle.identity.dataType);
+  sql.text(" union all select c.");
+  sql.text(quote(cycle.identity.sql));
+  sql.text(" from ");
+  sql.text(quote(table.model.sql));
+  sql.text(" c join d on c.");
+  sql.text(quote(cycle.column.sql));
+  sql.text(" = d.k) select 1 from d where d.k = ");
+  sql.param(cycle.parent, cycle.identity.dataType);
+  sql.text(")");
+  endParent(sql, returning);
+  return sql.statement();
 }
 function columnBySql(table, sql) {
   for (const column of table.model.columns) {
@@ -1362,6 +1444,7 @@ function chunkRows(rows) {
 function withParams(text, params) {
   if (params === undefined || params.length === 0)
     return { text };
+  assertParamCount2(params.length);
   return { text, params };
 }
 function keyWire(columns, row) {

package/dist/shared/{g5yc06ka.js → 67w3kn71.js}

@@ -2,7 +2,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./bah9nbg3.js";
+} from "./xbvz446k.js";
 import {
   decodeResult,
   emitWhere,

package/dist/shared/{jgqj11w4.js → 6f0z3hzh.js}

@@ -10,6 +10,8 @@ function extension2(name, options = {}) {
   const schema = options.schema ?? "public";
   const relocatable = options.relocatable ?? true;
   const version = options.version;
+  const requires = options.requires;
+  const provides = options.provides;
   const record = extensionObject({
     name,
     schema,
@@ -22,6 +24,8 @@ function extension2(name, options = {}) {
     schema,
     relocatable,
     ...version !== undefined ? { version } : {},
+    ...requires !== undefined ? { requires } : {},
+    ...provides !== undefined ? { provides } : {},
     contribute(peers, built) {
       const names = peerNames(peers);
       assertDeclared(names, built);

package/dist/shared/{njga14v4.js → 6vfvsdkt.js}

@@ -4,16 +4,18 @@ import {
   applyProject2,
   pushProject2,
   backfillTiming2
-} from "./pan0370z.js";
-import"./mnvjvqyp.js";
-import"./kj9d8maq.js";
-import"./p3xbdcvt.js";
-import"./f4jy1j7x.js";
-import"./dpc2r7rb.js";
+} from "./8ma6drzr.js";
+import"./8p2bgye0.js";
+import"./6xqvesa5.js";
+import"./4pkz5nvw.js";
+import"./e1c55v04.js";
+import"./mz48rs74.js";
+import"./wp7y8q3y.js";
+import"./bdekbvmt.js";
 import"./n442h54c.js";
-import"./sjk86yrx.js";
+import"./fk9vef30.js";
 import"./12z7aznj.js";
-import"./35q0n9tz.js";
+import"./jvxcp1qk.js";
 export {
   applyProject2 as applyProject,
   applyTarget2 as applyTarget,

package/dist/shared/{kj9d8maq.js → 6xqvesa5.js}

@@ -1,6 +1,6 @@
 import {
   FUNCTION_ARG_TYPES
-} from "./p3xbdcvt.js";
+} from "./mz48rs74.js";
 import {
   OkmError2
 } from "./52szzakm.js";