okmodel 0.6.0 → 0.8.0

package/dist/shared/{t3g0k88x.js → f4jy1j7x.js}

@@ -11,10 +11,10 @@ import {
   startupCatalog2,
   catalogFileText2,
   parseCatalog2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
 import {
   open2
-} from "./wkme6tep.js";
+} from "./35q0n9tz.js";
 import {
   sqlStatements,
   transactionControl,
@@ -35,29 +35,33 @@ import {
   assertTargetAlias,
   listTargets,
   selectTarget
-} from "./ttmg09vd.js";
+} from "./dpc2r7rb.js";
 import {
   contributedFields
 } from "./n0dgs0pb.js";
 import {
   assertValidation,
   writeWouldValidate
-} from "./ze4hxsmy.js";
+} from "./w9ejzaqf.js";
 import {
   tableOwner,
   stampOwnership
 } from "./xqve9598.js";
 import {
-  catalog,
-  isDomain
-} from "./ywspezzx.js";
+  POSTGRES_FLOOR,
+  uuidv7NeedsPostgres
+} from "./ga9j92qj.js";
 import {
   snakeCase,
   emittedTypeName
-} from "./rpycarcr.js";
+} from "./gcefca6p.js";
 import {
   ColumnBuilder2
-} from "./ywr8hmey.js";
+} from "./606g0nbf.js";
+import {
+  catalog,
+  isDomain
+} from "./ywspezzx.js";
 import {
   staticNamespace2
 } from "./358zsv4r.js";
@@ -193,8 +197,8 @@ var ERROR_DOCS = [
   {
     code: "OKM1110",
     title: "Engine version",
-    summary: "The feature needs a newer engine than schema({ requires }) allows.",
-    fix: "Raise requires, or stop using the feature. The error names both versions."
+    summary: "A feature needs a newer PostgreSQL than minPostgres allows. The message names the feature, the version it needs, and this schema's minimum.",
+    fix: "Raise minPostgres, or stop using the feature. The error names both versions."
   },
   {
     code: "OKM1111",
@@ -230,7 +234,13 @@ var ERROR_DOCS = [
     code: "OKM1124",
     title: "Operator mismatch",
     summary: "An operator does not apply to the column type.",
-    fix: "Use an operator the error lists for that column type. Text search needs a tsvector column."
+    fix: "Use an operator the error lists for that column type. Search needs a column built for search, not a plain text column."
+  },
+  {
+    code: "OKM1125",
+    title: "Bad SQL fragment",
+    summary: "A composed fragment is empty, unbalanced, or interpolates a value it cannot bind. A select fragment that is not a number is the same code.",
+    fix: "Interpolate a string, number, boolean, null, ident(name), fragment.column, or another fragment. Keep parentheses and quotes balanced. A select fragment is a numeric expression named with as()."
   },
   {
     code: "OKM1130",
@@ -532,6 +542,12 @@ var ERROR_DOCS = [
     summary: "A typed SQL signature no longer matches the database.",
     fix: "Regenerate the typed SQL and commit the new signature."
   },
+  {
+    code: "OKM1602",
+    title: "Bad typed SQL",
+    summary: "A raw statement is missing its class, is not one select or one write, or the result class has no column initializers.",
+    fix: 'Pass "read" or "write", a fragment`...`, and a class with an initializer on every column. Identifiers are ident(name).'
+  },
   {
     code: "OKM1701",
     title: "Tenant context missing",
@@ -541,8 +557,8 @@ var ERROR_DOCS = [
   {
     code: "OKM1702",
     title: "Unverifiable tenant SQL",
-    summary: "Raw SQL touches a tenant table and the tenant predicate cannot be proved.",
-    fix: "Use the query builder, or mark the fragment trusted with a reason if it is reviewed."
+    summary: "Raw SQL on a tenant table cannot prove the tenant predicate. A raw write is this. A raw read that does not select the primary key with ident is this.",
+    fix: 'Use update or delete, or select the primary key with ident(name). unscoped("reason") is the reviewed hatch.'
   },
   {
     code: "OKM1704",
@@ -583,14 +599,14 @@ var ERROR_DOCS = [
   {
     code: "OKM1802",
     title: "Server version",
-    summary: "The connected server does not satisfy schema({ requires }).",
-    fix: "Upgrade the server, or lower requires to a version the server meets."
+    summary: "The connected server is older than this schema's minPostgres.",
+    fix: "Upgrade the server, or lower minPostgres to a major the server meets."
   },
   {
     code: "OKM1803",
     title: "Postgres floor",
-    summary: "The connected server is older than PostgreSQL 15, and the schema does not set requires to that older major.",
-    fix: "Upgrade the server to PostgreSQL 15 or newer, or set schema({ requires }) to the older major on purpose."
+    summary: `The connected server is older than PostgreSQL ${String(POSTGRES_FLOOR)}.`,
+    fix: `Upgrade the server to PostgreSQL ${String(POSTGRES_FLOOR)} or higher.`
   },
   {
     code: "OKM1810",
@@ -607,8 +623,8 @@ var ERROR_DOCS = [
   {
     code: "OKM1812",
     title: "Feature version",
-    summary: "A feature needs a newer Postgres or extension version than the one declared or connected.",
-    fix: 'Raise the declared version, or avoid the feature. uuidv7() below 18 can use t.id({ default: "uuidv4" }), defaults.id set to "uuidv4", or a client generator. Core features are never gated on an extension.'
+    summary: "A feature needs a newer PostgreSQL than minPostgres, or an extension version the server does not have. The message names the feature and the version.",
+    fix: `Raise minPostgres, or avoid the feature. ${uuidv7NeedsPostgres()} An extension pin names the version to install. Core features are never gated on an extension.`
   },
   {
     code: "OKM1813",
@@ -2382,12 +2398,13 @@ 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("./1f0xa3cb.js");
+  const { assertAuthorDrift } = await import("./3449rcae.js");
   const allowPooler = flags?.allowPooler === true || opened.config.allowPooler === true;
   await assertAuthorDrift(target.url, opened.built.catalog, opened.config.roles, allowPooler);
   return findings;
 }
 function unlistedTableFiles(schemaSource, fileNames) {
+  const folded = schemaSource.toLowerCase();
   const missing = [];
   for (const file of fileNames) {
     if (!file.endsWith(".ts"))
@@ -2395,7 +2412,7 @@ function unlistedTableFiles(schemaSource, fileNames) {
     const stem = basename(file, ".ts");
     if (stem.length === 0 || stem.startsWith("."))
       continue;
-    if (!schemaSource.includes(stem))
+    if (!folded.includes(stem.toLowerCase()))
       missing.push(file);
   }
   return missing;

package/dist/shared/{y2t3jktd.js → fjpnhqan.js}

@@ -1,7 +1,13 @@
+import {
+  POSTGRES_FLOOR,
+  isPostgresMajor,
+  parsePostgresFloor,
+  serverNeedsPostgres
+} from "./ga9j92qj.js";
 import {
   withHttp,
   attachHttp
-} from "./j60w0dvr.js";
+} from "./bah9nbg3.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -11,7 +17,7 @@ var versionQuery = "select current_setting('server_version_num'), version(), (se
 async function acceptServer(pool, schema, rows, http, requireMeta, options, source) {
   for (const name in schema.model) {
     if (schema.model[name]?.presets !== undefined) {
-      (await import("./r6nwkxnt.js")).checkSchema(schema);
+      (await import("./m7n9h2a5.js")).checkSchema(schema);
       break;
     }
   }
@@ -31,7 +37,7 @@ async function acceptServer(pool, schema, rows, http, requireMeta, options, sour
       }));
     }
   } else {
-    const { assertCompatible } = await import("./ek2wt2dz.js");
+    const { assertCompatible } = await import("./16kvjebh.js");
     try {
       await assertCompatible(pool, schema, recorded, source, options);
     } catch (error) {
@@ -41,20 +47,21 @@ async function acceptServer(pool, schema, rows, http, requireMeta, options, sour
     }
   }
   const major = Math.floor(Number(rows[0]?.[0] ?? "0") / 1e4);
-  const requires = schema.requires?.postgres;
-  if (requires === undefined) {
-    if (major < 15) {
-      throw new OkmError2("OKM1803", `The server is PostgreSQL ${String(major)}. PostgreSQL 15 is the oldest supported.`, withHttp(http, {
-        fix: { summary: "Upgrade to PostgreSQL 15, or set schema({ requires }) to this major." }
+  const raw = schema.requires?.postgres;
+  if (raw === undefined) {
+    if (major < POSTGRES_FLOOR) {
+      throw new OkmError2("OKM1803", serverNeedsPostgres(major, POSTGRES_FLOOR), withHttp(http, {
+        fix: {
+          summary: `Upgrade to PostgreSQL ${String(POSTGRES_FLOOR)} or higher.`
+        }
       }));
     }
     return;
   }
-  const match = /^>=(\d+)$/.exec(requires.trim());
-  const need = match?.[1] === undefined ? undefined : Number(match[1]);
-  if (need === undefined || major < need) {
-    throw new OkmError2("OKM1802", `The server is PostgreSQL ${String(major)}. schema({ requires }) asks for ${requires}.`, withHttp(http, {
-      fix: { summary: "Upgrade the server, or lower requires to a version the server meets." }
+  const need = parsePostgresFloor(raw);
+  if (!isPostgresMajor(need) || major < need) {
+    throw new OkmError2("OKM1802", serverNeedsPostgres(major, isPostgresMajor(need) ? need : POSTGRES_FLOOR), withHttp(http, {
+      fix: { summary: "Upgrade the server, or lower minPostgres to a major the server meets." }
     }));
   }
 }

package/dist/shared/g5yc06ka.js

@@ -0,0 +1,272 @@
+import {
+  readHandle,
+  readCall,
+  attachHttp
+} from "./bah9nbg3.js";
+import {
+  decodeResult,
+  emitWhere,
+  emitOrder,
+  selectedColumns,
+  rejectKeys,
+  projectExpr,
+  indexes,
+  quote,
+  list,
+  isRecord,
+  fail2
+} from "./kgwp4jdd.js";
+import {
+  OkmError2,
+  throwNamed2
+} from "./52szzakm.js";
+
+// src/runtime/tree.ts
+var OPTIONS = [
+  "where",
+  "select",
+  "orderBy",
+  "depth",
+  "self",
+  "relation",
+  "route",
+  "signal",
+  "timeout"
+];
+function build2(session, table, options, mods, view) {
+  try {
+    return open(session, table, options, mods, view);
+  } catch (error) {
+    throw error instanceof OkmError2 ? attachHttp(session.http, error) : error;
+  }
+}
+function open(session, table, options, mods, view) {
+  const packed = readPacked(options);
+  const user = packed.user;
+  rejectKeys(user, OPTIONS, packed.walk);
+  const indexed = indexes(session.schema).get(table);
+  if (indexed === undefined)
+    fail2("OKM1120", `Table ${table} is not in the schema.`);
+  const edge = pickEdge(indexed, user.relation);
+  const identity = identityColumn2(session, indexed);
+  const depth = readDepth(user.depth);
+  const self = readSelf(user.self);
+  const id = userId(identity, packed.id);
+  const shared = {
+    ...user.where !== undefined ? { where: user.where } : {},
+    ...user.select !== undefined ? { select: user.select } : {},
+    ...user.orderBy !== undefined ? { orderBy: user.orderBy } : {},
+    ...user.signal !== undefined ? { signal: user.signal } : {},
+    ...user.timeout !== undefined ? { timeout: user.timeout } : {},
+    ...user.route !== undefined ? { route: user.route } : {}
+  };
+  const base = readCall("find", table, shared, mods.all, session.scope, session.schema.model[table], session.schema, view);
+  const spec = { direction: packed.walk, edge, identity, depth, self, id };
+  const call = {
+    ...base,
+    op: packed.walk,
+    build: (schema, planned, sink, outputs, source) => {
+      emitTree(schema, planned, sink, outputs, source, spec);
+    }
+  };
+  return readHandle(session, table, call, mods, (compiled, rows) => decodeResult(compiled, rows, table));
+}
+function emitTree(schema, table, sink, outputs, call, spec) {
+  const { direction, edge, identity, depth, self, id } = spec;
+  sink.mark(`walk:${direction}|rel:${edge.name}|self:${self ? "1" : "0"}|depth:${depth === undefined ? "all" : String(depth)}|`);
+  const selected = selectedColumns(table, call.select);
+  sink.text("with recursive walk as (select ");
+  emitKeyList(sink, "s", edge.parent, "k");
+  emitKeyList(sink, "s", edge.child, "f");
+  sink.text(", 0 as depth, array[s.");
+  sink.text(quote(identity.sql));
+  sink.text("] as seen from ");
+  sink.text(quote(table.model.sql));
+  sink.text(" s where s.");
+  sink.text(quote(identity.sql));
+  sink.text(" = ");
+  sink.param(identity.encode(id));
+  emitWhere(schema, table, undefined, sink, "s", 0, true);
+  sink.text(" union all select ");
+  let started = emitBare(sink, "c", edge.parent, false);
+  emitBare(sink, "c", edge.child, started);
+  sink.text(", w.depth + 1, w.seen || c.");
+  sink.text(quote(identity.sql));
+  sink.text(" from ");
+  sink.text(quote(table.model.sql));
+  sink.text(" c join walk w on ");
+  if (direction === "descendants")
+    emitStep(sink, "c", edge.child, edge.parent, "k");
+  else
+    emitStep(sink, "c", edge.parent, edge.child, "f");
+  sink.text(" where c.");
+  sink.text(quote(identity.sql));
+  sink.text(" <> all(w.seen)");
+  if (depth !== undefined) {
+    sink.text(" and w.depth < ");
+    sink.text(String(depth));
+  }
+  emitWhere(schema, table, undefined, sink, "c", 0, true);
+  sink.text(") select ");
+  let column = 0;
+  for (let index = 0;index < selected.length; index += 1) {
+    const item = selected[index];
+    if (item === undefined)
+      continue;
+    if (column > 0)
+      sink.text(", ");
+    sink.text(projectExpr(`t.${quote(item.sql)}`, item.dataType));
+    sink.mark(`s:${item.field}`);
+    outputs?.fields.push({ key: item.field, at: column, decode: item.decode });
+    column += 1;
+  }
+  if (column === 0)
+    sink.text("1");
+  sink.text(" from ");
+  sink.text(quote(table.model.sql));
+  sink.text(" t join walk w on ");
+  emitStep(sink, "t", edge.parent, edge.parent, "k");
+  if (self)
+    emitWhere(schema, table, call.where, sink, "t", 0, false);
+  else {
+    sink.text(" where w.depth > 0");
+    emitWhere(schema, table, call.where, sink, "t", 0, true);
+  }
+  if (call.orderBy !== undefined) {
+    emitOrder(table, call.orderBy, sink, "t");
+    return;
+  }
+  sink.text(" order by w.depth asc");
+  sink.mark("order:depth");
+  for (const field of table.model.primary) {
+    const item = table.columns.get(field);
+    if (item === undefined)
+      continue;
+    sink.text(", t.");
+    sink.text(quote(item.sql));
+    sink.text(" asc");
+  }
+}
+function emitKeyList(sink, alias, columns, prefix) {
+  for (let index = 0;index < columns.length; index += 1) {
+    const name = columns[index];
+    if (name === undefined)
+      continue;
+    if (index > 0 || prefix === "f")
+      sink.text(", ");
+    sink.text(alias);
+    sink.text(".");
+    sink.text(quote(name));
+    sink.text(" as ");
+    sink.text(prefix);
+    sink.text(String(index));
+  }
+}
+function emitBare(sink, alias, columns, lead) {
+  let started = lead;
+  for (const name of columns) {
+    if (started)
+      sink.text(", ");
+    started = true;
+    sink.text(alias);
+    sink.text(".");
+    sink.text(quote(name));
+  }
+  return started;
+}
+function emitStep(sink, alias, columns, against, prefix) {
+  for (let index = 0;index < columns.length; index += 1) {
+    const name = columns[index];
+    if (name === undefined || against[index] === undefined)
+      continue;
+    if (index > 0)
+      sink.text(" and ");
+    sink.text(alias);
+    sink.text(".");
+    sink.text(quote(name));
+    sink.text(" = w.");
+    sink.text(prefix);
+    sink.text(String(index));
+  }
+}
+function readPacked(options) {
+  if (!isRecord(options) || options.walk !== "descendants" && options.walk !== "ancestors") {
+    fail2("OKM1120", "descendants and ancestors are table methods.");
+  }
+  const user = options.options;
+  if (user === undefined)
+    return { id: options.id, walk: options.walk, user: {} };
+  if (!isRecord(user))
+    fail2("OKM1120", `${options.walk} options must be an object.`);
+  return { id: options.id, walk: options.walk, user };
+}
+function pickEdge(table, relation) {
+  const edges = selfEdges(table);
+  if (edges.length === 0) {
+    fail2("OKM1120", `${table.model.name} has no relation to itself.`, `Declare children: many("${table.model.name}") or parent: one("${table.model.name}").`);
+  }
+  const groups = new Set(edges.map((edge) => edge.child.join("\x00")));
+  if (relation === undefined) {
+    if (groups.size !== 1) {
+      fail2("OKM1120", `${table.model.name} has more than one relation to itself. Pass relation.`, `Accepted names: ${edges.map((edge) => edge.name).join(", ")}.`);
+    }
+    const only = edges[0];
+    if (only === undefined)
+      fail2("OKM1120", `${table.model.name} has no relation to itself.`);
+    return only;
+  }
+  if (typeof relation !== "string" || relation.length === 0) {
+    fail2("OKM1120", "relation must be a name.");
+  }
+  const found = edges.find((edge) => edge.name === relation);
+  if (found === undefined) {
+    throwNamed2("OKM1120", relation, edges.map((edge) => edge.name), `Relation ${relation} is not a self-relation of ${table.model.name}. Accepted names: ${list(edges.map((edge) => edge.name))}.`);
+  }
+  return found;
+}
+function selfEdges(table) {
+  const edges = [];
+  for (const relation of table.model.relations) {
+    if (relation.table !== table.model.name || relation.through !== undefined)
+      continue;
+    edges.push(relation.kind === "many" ? { name: relation.name, parent: relation.local, child: relation.remote } : { name: relation.name, parent: relation.remote, child: relation.local });
+  }
+  return edges;
+}
+function identityColumn2(session, table) {
+  const tenancy = session.schema.tenancy;
+  const keys = tenancy === undefined ? [] : tenancy.keys ?? [tenancy.key];
+  const fields = table.model.primary.filter((field) => !keys.includes(field));
+  if (fields.length !== 1) {
+    fail2("OKM1120", `${table.model.name} needs one primary key column besides the tenant key.`, "Use a single-column primary key.");
+  }
+  const field = fields[0];
+  const column = field === undefined ? undefined : table.columns.get(field);
+  if (column === undefined) {
+    fail2("OKM1120", `${table.model.name} needs one primary key column besides the tenant key.`);
+  }
+  return column;
+}
+function readDepth(value) {
+  if (value === undefined)
+    return;
+  if (typeof value !== "number" || !Number.isInteger(value) || value < 0) {
+    fail2("OKM1120", "depth must be an integer from 0 up.");
+  }
+  return value;
+}
+function readSelf(value) {
+  if (value === undefined)
+    return false;
+  if (typeof value !== "boolean")
+    fail2("OKM1120", "self must be true or false.");
+  return value;
+}
+function userId(column, id) {
+  if (id === undefined || id === null) {
+    fail2("OKM1121", `${column.field} needs a value.`);
+  }
+  return id;
+}
+
+export { build2, identityColumn2 };

package/dist/shared/ga9j92qj.js

@@ -0,0 +1,25 @@
+// src/dialects/pg/floor.ts
+var POSTGRES_FLOOR = 15;
+var UUIDV7_POSTGRES = 18;
+function isPostgresMajor(value) {
+  return typeof value === "number" && (value | 0) === value && value >= 15 && value <= 18;
+}
+var FLOOR_TEXT = /^>=(\d+)$/;
+function parsePostgresFloor(postgres) {
+  return Number(FLOOR_TEXT.exec(postgres ?? "")?.[1]);
+}
+function formatPostgresFloor(major) {
+  return `>=${major}`;
+}
+function minPostgresDefinition() {
+  return "minPostgres: 15-18.";
+}
+function uuidv7NeedsPostgres() {
+  const need = UUIDV7_POSTGRES;
+  return `uuidv7() needs PostgreSQL ${need} or higher. minPostgres: ${need}.`;
+}
+function serverNeedsPostgres(server, need) {
+  return `The server is PostgreSQL ${server}. This schema needs PostgreSQL ${need} or higher (minPostgres: ${need}).`;
+}
+
+export { POSTGRES_FLOOR, UUIDV7_POSTGRES, isPostgresMajor, parsePostgresFloor, formatPostgresFloor, minPostgresDefinition, uuidv7NeedsPostgres, serverNeedsPostgres };

package/dist/shared/{3fqwmr09.js → hfqmpasr.js}

@@ -1,17 +1,17 @@
 import {
   open2
-} from "./wkme6tep.js";
-import"./qq3899ht.js";
+} from "./35q0n9tz.js";
+import"./12z7aznj.js";
 import {
   createdOf,
   testing2
-} from "./8x72s86k.js";
+} from "./b6d6p0zc.js";
 import"./n442h54c.js";
 import {
   projectPath,
   loadConfig,
   loadSchema
-} from "./t3g0k88x.js";
+} from "./f4jy1j7x.js";
 import {
   sessionFailure,
   finishQuiet,
@@ -19,8 +19,8 @@ import {
   assertDirectConnection,
   assertStableBackend,
   selectTarget
-} from "./ttmg09vd.js";
-import"./9s0ypp87.js";
+} from "./dpc2r7rb.js";
+import"./sjk86yrx.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{wt5rzv1h.js → hm5f8jby.js}

@@ -1,24 +1,24 @@
 import {
   open2
-} from "./wkme6tep.js";
-import"./qq3899ht.js";
+} from "./35q0n9tz.js";
+import"./12z7aznj.js";
 import"./n442h54c.js";
 import {
   assertRoleHealth
-} from "./knmes2kh.js";
-import"./vjpnzwjz.js";
+} from "./kj9d8maq.js";
+import"./p3xbdcvt.js";
 import {
   errorDoc,
   openProject
-} from "./t3g0k88x.js";
+} from "./f4jy1j7x.js";
 import {
   omitManagedObjects,
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   selectTarget
-} from "./ttmg09vd.js";
-import"./9s0ypp87.js";
+} from "./dpc2r7rb.js";
+import"./sjk86yrx.js";
 import {
   OkmError2
 } from "./52szzakm.js";