okmodel 0.5.1 → 0.7.0

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

@@ -1,51 +1,55 @@
 import {
   open2
-} from "./krxx77g0.js";
+} from "./14vx95q4.js";
 import {
   startupHash2
-} from "./8bwbwy8h.js";
+} from "./qq3899ht.js";
 import {
   runTarget,
   assumeRole,
+  grantAppMeta,
   statementOutsideTransaction,
-  loadMigrations,
-  loadHeadSnapshot,
   readReference,
   referenceInserts,
   provisionMark,
   expandProvisioned,
   installSnapshot
-} from "./gde73es6.js";
+} from "./m6p12kbr.js";
 import {
   assertCreateRole,
   currentUser,
   roleExists
-} from "./szm0cksa.js";
+} from "./8skf0cam.js";
 import {
+  projectPath,
+  loadMigrations,
+  loadHeadSnapshot,
   lintMigrationDirectory,
   hasError,
   lintRefusal,
   projectHead,
   loadBuiltSchema,
   loadConfig
-} from "./qv2ydck9.js";
+} from "./gs74dbj5.js";
 import {
   changesRole,
   batchSizeField,
   assertExtensionsAvailable,
   planMigration,
+  finishQuiet,
   assertTargetPolicy,
   assertDirectConnection,
   assertStableBackend,
   selectTarget
-} from "./ga3sfy93.js";
+} from "./tsvww22q.js";
+import {
+  UUIDV7_POSTGRES,
+  uuidv7NeedsPostgres
+} from "./ga9j92qj.js";
 import {
   OkmError2
 } from "./52szzakm.js";
 
-// src/tooling/migrate/apply.ts
-import { join } from "node:path";
-
 // src/tooling/migrate/engine.ts
 var IDENT = String.raw`"(?:[^"]|"")+"|[A-Za-z_][\w$]*`;
 var DEFAULT_UUIDV7 = /\bdefault\s+uuidv7\s*\(\s*\)/i;
@@ -70,14 +74,11 @@ async function assertUuidV7Available(connection, migrations) {
   const row = result.rows[0];
   const major = Math.floor(Number(row?.[0] ?? "0") / 1e4);
   const defined = row?.[1] !== null && row?.[1] !== undefined;
-  if (major >= 18 || defined)
+  if (major >= UUIDV7_POSTGRES || defined)
     return;
   const where = found.column === undefined ? "A column" : `Column ${found.column}`;
-  throw new OkmError2("OKM1812", `${where} has a uuidv7() default (migration ${found.migrationId}, step ${String(found.stepIndex)}), and the server is PostgreSQL ${String(major)}. uuidv7() arrives in PostgreSQL 18. Nothing was changed.`, {
-    fix: {
-      summary: 'Either run PostgreSQL 18 and declare schema({ requires: { postgres: ">=18" } }), or use t.id({ default: "uuidv4" }) (or schema({ defaults: { id: "uuidv4" } })), which uses gen_random_uuid() and works on PostgreSQL 13 and newer. Then delete the migration that was not applied and generate it again.'
-    }
-  });
+  const message = `${where} has a uuidv7() default (migration ${found.migrationId}, step ${String(found.stepIndex)}), and the server is PostgreSQL ${String(major)}. ${uuidv7NeedsPostgres()} Nothing was changed.`;
+  throw new OkmError2("OKM1812", message, { fix: { summary: uuidv7NeedsPostgres() } });
 }
 function columnOf(sql) {
   const table = TABLE.exec(sql)?.[1];
@@ -121,6 +122,11 @@ var BACKFILL = `create table if not exists okm_backfill (
   updated_at timestamptz not null default now(),
   primary key (migration_id, step_index)
 )`;
+async function ensureMigrationTables2(execute) {
+  await execute(META);
+  await execute(HISTORY);
+  await execute(BACKFILL);
+}
 function applyUnits(migration, done) {
   const pending = [];
   for (let index = 0;index < migration.steps.length; index += 1) {
@@ -175,7 +181,8 @@ async function applyTarget2(request) {
       fix: { summary: "Apply needs a driver with interactive transactions." }
     });
   }
-  const connection = await pool.reserve();
+  const reserved = await pool.reserve();
+  const connection = reserved;
   let locked = false;
   try {
     await assertStableBackend(() => backendPid(connection), request.allowPooler === true);
@@ -202,9 +209,7 @@ async function applyTarget2(request) {
         throw notEmpty(request.target, state.kind === "occupied" ? state.object : "okm_meta");
       }
     }
-    await connection.execute(META);
-    await connection.execute(HISTORY);
-    await connection.execute(BACKFILL);
+    await ensureMigrationTables2((sql) => connection.execute(sql));
     const restamped = await restampLegacy(connection, request);
     const history = await readHistory(connection);
     const done = expandProvisioned(request.migrations, history.done, history.ids);
@@ -225,14 +230,14 @@ async function applyTarget2(request) {
     if (request.snapshot !== undefined) {
       await insertReference(connection, request);
     }
+    await grantAppMeta(connection, request.appRole, session);
     return restamped.length === 0 ? report : { ...report, restamped };
   } finally {
-    if (locked)
-      await connection.execute("select pg_advisory_unlock(hashtext($1))", [
-        lockKey(request.target)
-      ]);
-    await connection.release();
-    await pool.close();
+    if (locked) {
+      await finishQuiet(() => connection.execute("select pg_advisory_unlock(hashtext($1))", [lockKey(request.target)]));
+    }
+    await finishQuiet(() => connection.release());
+    await finishQuiet(() => pool.close());
   }
 }
 async function applyProject2(cwd, flags, write) {
@@ -267,7 +272,7 @@ nothing to apply
       catalogHash: head.catalogHash,
       reference: built === undefined ? [] : readReference(built.tables, built.casing, head.catalog)
     },
-    ...config.roles !== undefined ? { migrationRole: config.roles.migration } : {},
+    ...config.roles !== undefined ? { migrationRole: config.roles.migration, appRole: config.roles.app } : {},
     lintDirectory: directory,
     onProgress: (line) => {
       if (write !== undefined)
@@ -314,7 +319,7 @@ no changes
         steps: plan.steps
       }
     ],
-    ...config.roles !== undefined ? { migrationRole: config.roles.migration } : {}
+    ...config.roles !== undefined ? { migrationRole: config.roles.migration, appRole: config.roles.app } : {}
   });
   return formatReport(report);
 }
@@ -380,7 +385,7 @@ var RESTAMP = `with pairs as (
 )
 select distinct id from history order by id`;
 function joinMigrations(cwd, migrations) {
-  return join(cwd, migrations ?? "migrations");
+  return projectPath(cwd, migrations ?? "migrations");
 }
 async function backendPid(connection) {
   const result = await connection.execute("select pg_backend_pid()::text");
@@ -464,10 +469,9 @@ async function provisionEmpty(connection, request, session) {
     assertTargetPolicy({ name: request.target, protected: request.protected }, "reference", request.allowProtected === true);
   }
   const schema = concreteSchema(request);
-  await connection.execute(META);
-  await connection.execute(HISTORY);
-  await connection.execute(BACKFILL);
+  await ensureMigrationTables2((sql) => connection.execute(sql));
   await installSnapshot(connection, snapshot.catalog, schema, snapshot.reference, session, request.migrationRole);
+  await grantAppMeta(connection, request.appRole, session);
   const mark = provisionMark(snapshot.migrationId);
   await connection.execute("begin");
   try {
@@ -601,4 +605,4 @@ function wireTrue(value) {
   return value === "t" || value === "true";
 }
 
-export { applyTarget2, applyProject2, pushProject2, backfillTiming2 };
+export { ensureMigrationTables2, applyTarget2, applyProject2, pushProject2, backfillTiming2 };

package/dist/shared/{6rk2gen5.js → pbp1ss85.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./hf22e0wt.js";
+} from "./tbrvgw6z.js";
 import {
   selectedColumns,
   parseOrder,
@@ -14,8 +14,8 @@ import {
   list,
   isRecord,
   registerFailFix,
-  fail
-} from "./gbtcc2d7.js";
+  fail2
+} from "./67txcrcw.js";
 import {
   OkmError2,
   throwNamed2
@@ -34,21 +34,24 @@ var OPTIONS = [
   "signal",
   "timeout"
 ];
-function build(session, table, options, mods, view) {
+function build3(session, table, options, mods, view, pin) {
   try {
-    return plan(session, table, options, mods, view);
+    return plan(session, table, options, mods, view, pin);
   } catch (error) {
     throw error instanceof OkmError2 ? attachHttp(session.http, error) : error;
   }
 }
-function plan(session, table, options, mods, view) {
+function plan(session, table, options, mods, view, pin) {
   const record = isRecord(options) ? options : {};
+  if (Object.hasOwn(record, "search")) {
+    fail2("OKM1120", "page() does not take search in this version. Use find({ search, limit }) for a ranked list.", "Ranked pages are later. find({ search, limit }) returns one ranked list.");
+  }
   rejectKeys(record, OPTIONS, "page");
   const indexed = indexes(session.schema).get(table);
   if (indexed === undefined)
-    fail("OKM1120", `Table ${table} is not in the schema.`);
+    fail2("OKM1120", `Table ${table} is not in the schema.`);
   if (record.limit === undefined)
-    fail("OKM1101", "page() needs a limit.");
+    fail2("OKM1101", "page() needs a limit.");
   const size = readLimit(record.limit);
   if (size < 1) {
     throw new OkmError2("invalid", "page() limit must be at least 1.", { kind: "invalid" });
@@ -73,7 +76,8 @@ function plan(session, table, options, mods, view) {
       timeout: record.timeout,
       route: record.route
     }, undefined, session.scope, session.schema.model[table], session.schema, view),
-    ...after !== undefined ? { after } : {}
+    ...after !== undefined ? { after } : {},
+    ...pin !== undefined ? { pin } : {}
   };
   return readHandle(session, table, call, mods, async (compiled, rows) => {
     const items = await decodeRows(compiled, rows, table);
@@ -92,7 +96,7 @@ function plan(session, table, options, mods, view) {
 }
 function orderKeys(table, orderBy) {
   if (orderBy !== undefined && !isRecord(orderBy)) {
-    fail("OKM1120", "orderBy must be an object of fields.");
+    fail2("OKM1120", "orderBy must be an object of fields.");
   }
   const keys = [];
   for (const field of Object.keys(orderBy ?? {})) {
@@ -103,7 +107,7 @@ function orderKeys(table, orderBy) {
     keys.push({ column, ...parseOrder(field, orderBy?.[field]) });
   }
   if (table.model.primary.length === 0) {
-    fail("OKM1120", `page() needs a primary key on ${table.model.name} to break ties.`);
+    fail2("OKM1120", `page() needs a primary key on ${table.model.name} to break ties.`);
   }
   for (const field of table.model.primary) {
     const column = table.columns.get(field);
@@ -181,17 +185,16 @@ function readCursor(token, signature, count) {
     }
   }
   if (!Array.isArray(parsed) || typeof parsed[0] !== "string") {
-    fail("OKM1130", "after is not a cursor that page() returned.");
+    fail2("OKM1130", "after is not a cursor that page() returned.");
   }
   if (parsed[0] !== signature) {
-    fail("OKM1130", `The cursor was made for another order: ${parsed[0]}. This page orders by ${signature}.`);
+    fail2("OKM1130", `The cursor was made for another order: ${parsed[0]}. This page orders by ${signature}.`);
   }
   const values = parsed.slice(1);
   if (values.length !== count || !values.every((value) => value === null || typeof value === "string")) {
-    fail("OKM1130", "after is not a cursor that page() returned.");
+    fail2("OKM1130", "after is not a cursor that page() returned.");
   }
   return values;
 }
-export {
-  build
-};
+
+export { build3 };

package/dist/shared/pt94kz7f.js

@@ -0,0 +1,6 @@
+import {
+  build3
+} from "./pbp1ss85.js";
+export {
+  build3 as build
+};

package/dist/shared/{wq9n6pwr.js → pz6rj8ay.js}

@@ -6,9 +6,30 @@ import {
 } from "./52szzakm.js";
 
 // src/dialects/pg/filter-parse.ts
-var PARSED_OPS = ",eq,in,inList,notIn,lt,lte,gt,gte,between,startsWith,endsWith,contains,like,ilike,";
-var PARSED_FIX = "Use eq, in, notIn, lt, lte, gt, gte, between, startsWith, endsWith, contains, like, or ilike.";
-function parseQuery(allow, sort, query) {
+var PARSED = [
+  "eq",
+  "in",
+  "inList",
+  "notIn",
+  "lt",
+  "lte",
+  "gt",
+  "gte",
+  "between",
+  "startsWith",
+  "endsWith",
+  "contains",
+  "like",
+  "ilike",
+  "not",
+  "containedBy",
+  "overlaps",
+  "hasKey",
+  "hasAnyKey"
+];
+var PARSED_OPS = `,${PARSED.join(",")},`;
+var PARSED_FIX = "Use eq, in, notIn, lt, lte, gt, gte, between, startsWith, endsWith, contains, like, ilike, not, containedBy, overlaps, hasKey, or hasAnyKey.";
+function parseQuery(allow, sort, query, relations) {
   if (typeof query !== "object" || query === null || Array.isArray(query)) {
     throw new OkmError2("OKM1121", "filters parse expects an object of fields.");
   }
@@ -21,6 +42,7 @@ function parseQuery(allow, sort, query) {
       });
     }
   }
+  const nested = relations ?? {};
   const whereParts = [];
   let orderBy;
   for (const key of Object.keys(query)) {
@@ -29,13 +51,17 @@ function parseQuery(allow, sort, query) {
       orderBy = { [value]: "asc" };
       continue;
     }
-    if (!Object.hasOwn(allow, key)) {
-      throw new OkmError2("OKM1123", `Field ${key} is not in the allow list.`, {
-        fix: { summary: "Remove the field, or add it to filters({ allow })." }
-      });
+    if (Object.hasOwn(allow, key)) {
+      whereParts.push(...clauses(key, allow[key] ?? [], value));
+      continue;
     }
-    const ops = allow[key] ?? [];
-    whereParts.push(...clauses(key, ops, value));
+    if (Object.hasOwn(nested, key)) {
+      whereParts.push(relationClause(key, nested[key] ?? [], value));
+      continue;
+    }
+    throw new OkmError2("OKM1123", `Field ${key} is not in the allow list.`, {
+      fix: { summary: "Remove the field, or add it to filters({ allow }) or relations." }
+    });
   }
   const where = combine(whereParts);
   return orderBy === undefined ? { where } : { where, orderBy };
@@ -100,6 +126,21 @@ function one(field, op, value) {
       return { [field]: tag("endsWith", text(value, op)) };
     case "contains":
       return { [field]: tag("contains", value) };
+    case "not":
+      if (value !== null && typeof value === "object") {
+        throw new OkmError2("OKM1120", `not on ${field} takes a scalar.`, {
+          fix: { summary: "Send not a scalar or null. Nested operators are not accepted." }
+        });
+      }
+      return { [field]: tag("not", value) };
+    case "containedBy":
+      return { [field]: tag("containedBy", value) };
+    case "overlaps":
+      return { [field]: tag("overlaps", value) };
+    case "hasKey":
+      return { [field]: tag("hasKey", text(value, "hasKey")) };
+    case "hasAnyKey":
+      return { [field]: tag("hasAnyKey", strings(value, field)) };
     case "like":
       return { [field]: tag("like", text(value, op)) };
     case "ilike":
@@ -110,6 +151,30 @@ function one(field, op, value) {
       });
   }
 }
+function relationClause(name, fields, value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    throw new OkmError2("OKM1120", `filters() cannot apply a value on ${name}.`, {
+      fix: { summary: "Send the relation an object of allowlisted fields." }
+    });
+  }
+  const parts = [];
+  for (const field of Object.keys(value)) {
+    if (!Object.hasOwn(value, field))
+      continue;
+    if (!fields.includes(field)) {
+      throw new OkmError2("OKM1123", `Field ${field} is not in the allow list.`, {
+        fix: { summary: "Remove the field, or add it to filters({ relations })." }
+      });
+    }
+    parts.push(...clauses(field, PARSED, value[field]));
+  }
+  if (parts.length === 0) {
+    throw new OkmError2("OKM1120", `filters() cannot apply a value on ${name}.`, {
+      fix: { summary: "Send the relation an object of allowlisted fields." }
+    });
+  }
+  return { [name]: tag("has", combine(parts)) };
+}
 function combine(parts) {
   const first = parts[0];
   if (first === undefined)
@@ -126,6 +191,14 @@ function list(value, op) {
   }
   return value;
 }
+function strings(value, field) {
+  if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) {
+    throw new OkmError2("OKM1120", `hasAnyKey on ${field} needs an array of strings.`, {
+      fix: { summary: "Send hasAnyKey an array of strings." }
+    });
+  }
+  return value;
+}
 function text(value, op) {
   if (typeof value !== "string") {
     throw new OkmError2("OKM1120", `${op} needs a string.`, {

package/dist/shared/q5c6ngn3.js

@@ -0,0 +1,13 @@
+import {
+  fail2
+} from "./67txcrcw.js";
+
+// src/runtime/result-name.ts
+var PROTOTYPE_KEYS = ",__proto__,constructor,toString,hasOwnProperty,valueOf,isPrototypeOf,propertyIsEnumerable,toLocaleString,__defineGetter__,__defineSetter__,__lookupGetter__,__lookupSetter__,then,";
+function refusePrototypeKey(name, where) {
+  if (!PROTOTYPE_KEYS.includes(`,${name},`))
+    return;
+  fail2("OKM1120", `${where} ${name} is a prototype key. Use another name for the result.`);
+}
+
+export { refusePrototypeKey };