okmodel 0.5.1 → 0.6.0

package/dist/shared/{gbtcc2d7.js → 2z7wv5tj.js}

@@ -416,6 +416,7 @@ function emitPredicate(schema, table, key, value, sink, alias, depth) {
   if (column === undefined) {
     throwNamed2("OKM1120", key, table.names, `Field ${key} is not on ${table.model.name}. Accepted names: ${list(table.names)}.`);
   }
+  refuseHidden(column);
   sink.mark(`w:${key}`);
   emitOperand(schema, table, column, value, sink, alias, depth);
 }
@@ -614,6 +615,7 @@ function emitOrder(table, orderBy, sink, alias) {
     if (column === undefined) {
       throwNamed2("OKM1120", key, table.names, `Field ${key} is not on ${table.model.name}. Accepted names: ${list(table.names)}.`);
     }
+    refuseHidden(column);
     const parsed = parseOrder(key, orderBy[key]);
     if (index > 0)
       sink.text(", ");
@@ -642,6 +644,11 @@ function emitPrimaryOrder(table, sink, alias) {
     sink.text(" asc");
   }
 }
+function refuseHidden(column) {
+  if (column.hidden !== true)
+    return;
+  fail("OKM1120", `Field ${column.field} is hidden.`, "Call hidden({ filterable: true }).");
+}
 function emitLimit(call, sink) {
   if (call.op === "one") {
     const ordered = call.orderBy !== undefined && isRecord(call.orderBy) && Object.keys(call.orderBy).length > 0;
@@ -846,38 +853,6 @@ function list(names) {
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) && !isOperator(value);
 }
-function effectivePredicate(where) {
-  if (where === undefined)
-    return false;
-  if (isOperator(where)) {
-    const name = operatorName(where);
-    const value = operatorValue(where);
-    if (name === "or") {
-      if (!Array.isArray(value))
-        orFail(false);
-      if (value.length === 0)
-        return true;
-      for (const branch of value) {
-        if (!effectivePredicate(branch))
-          orFail(true);
-      }
-      return true;
-    }
-    if (name === "and") {
-      return Array.isArray(value) && value.some((part) => effectivePredicate(part));
-    }
-    if (name === "not")
-      return effectivePredicate(value);
-    return true;
-  }
-  if (!isRecord(where))
-    return true;
-  for (const key of Object.keys(where)) {
-    if (where[key] !== undefined)
-      return true;
-  }
-  return false;
-}
 function orFail(empty) {
   throw new OkmError2("OKM1121", empty ? "or() branch is empty." : "Pass an array: or([a, b]).", {
     fix: {
@@ -892,8 +867,8 @@ var FAIL_FIX = {
 function registerFailFix(code, summary) {
   FAIL_FIX[code] = summary;
 }
-function fail(code, message) {
-  const summary = FAIL_FIX[code];
+function fail(code, message, fix) {
+  const summary = fix ?? FAIL_FIX[code];
   throw new OkmError2(code, message, summary === undefined ? undefined : { fix: { summary } });
 }
 function plain(value) {
@@ -916,4 +891,4 @@ function hasMany(include) {
   return Object.keys(include).length > 0;
 }
 
-export { withRowFilters, installArchiveInspect, archiveRules, readOptionNames, installOperatorSql, readNeedsOperatorSql, emitRelationFrom, bindCall, compileCall, decodeResult, logicalIntent, appliedRules, emitJoin, emitWhere, emitOrder, emitPrimaryOrder, selectedColumns, parseOrder, rejectKeys, readLimit, takeObject, projectExpr, jsonExpr, decodeRow, cell, indexes, quote, list, isRecord, effectivePredicate, registerFailFix, fail };
+export { withRowFilters, installArchiveInspect, archiveRules, readOptionNames, installOperatorSql, readNeedsOperatorSql, emitRelationFrom, bindCall, compileCall, decodeResult, logicalIntent, appliedRules, emitJoin, emitWhere, emitOrder, emitPrimaryOrder, refuseHidden, selectedColumns, parseOrder, rejectKeys, readLimit, takeObject, projectExpr, jsonExpr, decodeRow, cell, indexes, quote, list, isRecord, orFail, registerFailFix, fail };

package/dist/shared/{k8v5v5wj.js → 32cnm7kn.js}

@@ -1,3 +1,6 @@
+import {
+  noTimeout2
+} from "./8dqhth8c.js";
 import {
   noticeBuffer,
   WireSession,
@@ -41,16 +44,18 @@ function open5(config) {
     counters.busy = Math.max(0, counters.busy - 1);
   });
   const held = { sql, parked, acquireMs, counters, notices, isClosed };
-  const checkout = () => closed ? rejectClosed() : import("./jwtxdj06.js").then((mod) => mod.checkout(held));
+  const checkout = () => closed ? rejectClosed() : import("./j3rkk835.js").then((mod) => mod.checkout(held));
   return {
     capabilities: BUNSQL_CAPABILITIES,
     execute(text, params, options) {
+      noTimeout2(options);
       return runCall(closed, options, async (watch) => {
         await releaseParked(parked);
         return root.query(text, params, watch);
       });
     },
     async batch(statements, options) {
+      noTimeout2(options);
       const connection = await checkout();
       try {
         return await connection.batch(statements, options);

package/dist/shared/{t4tbsy9h.js → 358zsv4r.js}

@@ -503,7 +503,7 @@ function constraint2(input) {
   const name = input.name === undefined ? deterministicName2({
     parent: input.parent.name,
     purpose: input.constraintKind,
-    nameKey
+    nameKey: input.constraintKind === "check" ? nameKey : defaultNameKey(input.constraintKind, columns)
   }) : fitIdentifier2(input.name);
   const identity = {
     kind: "constraint",

package/dist/shared/{2pqx26h8.js → 3fqwmr09.js}

@@ -1,36 +1,38 @@
 import {
   open2
-} from "./krxx77g0.js";
-import"./8bwbwy8h.js";
+} from "./wkme6tep.js";
+import"./qq3899ht.js";
 import {
   createdOf,
   testing2
-} from "./v36c5g6p.js";
+} from "./8x72s86k.js";
 import"./n442h54c.js";
 import {
+  projectPath,
   loadConfig,
   loadSchema
-} from "./qv2ydck9.js";
+} from "./t3g0k88x.js";
 import {
+  sessionFailure,
+  finishQuiet,
   assertTargetPolicy,
   assertDirectConnection,
   assertStableBackend,
   selectTarget
-} from "./ga3sfy93.js";
-import"./8xsbagad.js";
+} from "./ttmg09vd.js";
+import"./9s0ypp87.js";
 import {
   OkmError2
 } from "./52szzakm.js";
 
 // src/tooling/migrate/seed.ts
 import { existsSync } from "node:fs";
-import { join } from "node:path";
 import { pathToFileURL } from "node:url";
 async function seedProject(cwd, file, flags) {
   const config = await loadConfig(cwd);
   const target = selectTarget(config, flags.target);
   assertTargetPolicy(target, "seed", flags.allowProtected);
-  const path = join(cwd, file);
+  const path = projectPath(cwd, file);
   if (!existsSync(path)) {
     throw new OkmError2("invalid", `Seed file ${file} was not found.`, {
       fix: { summary: "Pass okm seed <file> a module in this project." }
@@ -40,20 +42,21 @@ async function seedProject(cwd, file, flags) {
   assertDirectConnection(target.url, allowPooler);
   const schema = await loadSchema(cwd, config.schema);
   const pool = open2({ url: target.url, max: 1 });
-  const held = await pool.reserve?.();
-  if (held !== undefined) {
-    try {
-      await assertStableBackend(async () => {
-        const result = await held.execute("select pg_backend_pid()::text");
-        const cell = result.rows[0]?.[0];
-        return cell === null || cell === undefined ? "" : String(cell);
-      }, allowPooler);
-    } finally {
-      await held.release();
-    }
-  }
-  const harness = await testing2(schema, { driver: pool, migrate: false });
+  let harness;
   try {
+    const held = await pool.reserve?.();
+    if (held !== undefined) {
+      try {
+        await assertStableBackend(async () => {
+          const result = await held.execute("select pg_backend_pid()::text");
+          const cell = result.rows[0]?.[0];
+          return cell === null || cell === undefined ? "" : String(cell);
+        }, allowPooler);
+      } finally {
+        await finishQuiet(() => held.release());
+      }
+    }
+    harness = await testing2(schema, { driver: pool, migrate: false });
     const imported = await import(`${pathToFileURL(path).href}?okm=${Date.now()}`);
     const seed = isRecord(imported) ? imported.default : undefined;
     if (typeof seed !== "function") {
@@ -63,8 +66,14 @@ async function seedProject(cwd, file, flags) {
     }
     await seed(harness);
     return formatCreated(target.name, createdOf(harness));
+  } catch (error) {
+    throw sessionFailure(error) ?? error;
   } finally {
-    await harness.close();
+    const opened = harness;
+    if (opened !== undefined)
+      await finishQuiet(() => opened.close());
+    else
+      await finishQuiet(() => pool.close());
   }
 }
 function formatCreated(target, counts) {

package/dist/shared/{zqrnhwsq.js → 3qnhc7w5.js}

@@ -1,9 +1,12 @@
+import {
+  mapPostgresError2
+} from "./c58secgj.js";
 import {
   withHttp
-} from "./hf22e0wt.js";
+} from "./j60w0dvr.js";
 import {
   decodeResult
-} from "./gbtcc2d7.js";
+} from "./2z7wv5tj.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -17,13 +20,17 @@ async function* streamRows(session, call, prepare, log) {
     })));
   }
   const { plan, params } = await prepare();
-  const decode = plan.outputs.includes.length === 0 ? decodeResult : (await import("./nkaxvt9q.js")).decodeIncluded;
-  for await (const chunk of session.pool.stream(plan.text, params)) {
-    const decoded = decode(plan, chunk, call.table);
-    if (!Array.isArray(decoded))
-      continue;
-    for (const row of decoded)
-      yield row;
+  const decode = plan.outputs.includes.length === 0 ? decodeResult : (await import("./ys0xzyaj.js")).decodeIncluded;
+  try {
+    for await (const chunk of session.pool.stream(plan.text, params)) {
+      const decoded = decode(plan, chunk, call.table);
+      if (!Array.isArray(decoded))
+        continue;
+      for (const row of decoded)
+        yield row;
+    }
+  } catch (error) {
+    throw log(session.http === undefined ? mapPostgresError2(error) : mapPostgresError2(error, { http: session.http }));
   }
 }
 export {

package/dist/shared/{r2sp8hrc.js → 5d8t84hg.js}

@@ -1,16 +1,19 @@
+import {
+  refuseUncancellableTimeout
+} from "./b4v57v3x.js";
 import {
   isConnectionLost
-} from "./pf0d8f77.js";
+} from "./gwn6v667.js";
 import {
   openClient,
   withHttp,
   settleCall
-} from "./hf22e0wt.js";
+} from "./j60w0dvr.js";
 import {
   rejectKeys,
   isRecord,
   fail
-} from "./gbtcc2d7.js";
+} from "./2z7wv5tj.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -105,6 +108,7 @@ async function tx(session, args) {
     rejectKeys(given, ["isolation", "retry", "signal", "timeout"], "tx");
     const options = given;
     check(options);
+    await refuseUncancellableTimeout(session.pool, options.timeout);
     const call = fn;
     return session.tx === undefined ? await outer(session, call, options) : await nested(session, call, options);
   } catch (error) {
@@ -275,6 +279,10 @@ async function nested(session, fn, options) {
   const saved = frame.failed;
   const after = [];
   let released = false;
+  const hooks = session.pool;
+  const pending = hooks.okmScopePending?.();
+  if (pending !== undefined)
+    await pending;
   try {
     await step(session, frame, `SAVEPOINT ${name}`);
     hear?.phase(session.hookm, "start", depth + 1);
@@ -293,6 +301,7 @@ async function nested(session, fn, options) {
       await frame.conn.execute(`ROLLBACK TO SAVEPOINT ${name}`).catch(() => {
         return;
       });
+      hooks.okmForgetScope?.();
       frame.failed = saved;
       hear?.phase(session.hookm, "rollback", depth + 1);
     }

package/dist/shared/{87jvvhnt.js → 5j36z8dn.js}

@@ -1,3 +1,6 @@
+import {
+  noTimeout2
+} from "./8dqhth8c.js";
 import {
   PGLITE_CAPABILITIES,
   driverErrors,
@@ -46,11 +49,17 @@ async function open3(config = {}) {
     await slot.acquire(acquireMs);
     let released = false;
     return {
-      execute: (text, params, options) => runCall(closed, options, (watch) => session.query(text, params, watch)),
-      batch: (statements, options) => runCall(closed, options, async (watch) => {
-        const { runAtomicBatch } = await import("./efmy2gcg.js");
-        return runAtomicBatch(session, statements, watch);
-      }),
+      execute: (text, params, options) => {
+        noTimeout2(options);
+        return runCall(closed, options, (watch) => session.query(text, params, watch));
+      },
+      batch: (statements, options) => {
+        noTimeout2(options);
+        return runCall(closed, options, async (watch) => {
+          const { runAtomicBatch } = await import("./ag4c7516.js");
+          return runAtomicBatch(session, statements, watch);
+        });
+      },
       async release() {
         if (released)
           return;
@@ -66,6 +75,7 @@ async function open3(config = {}) {
   return {
     capabilities: PGLITE_CAPABILITIES,
     execute(text, params, options) {
+      noTimeout2(options);
       return runCall(closed, options, async (watch) => {
         await slot.acquire(acquireMs);
         try {
@@ -76,6 +86,7 @@ async function open3(config = {}) {
       });
     },
     async batch(statements, options) {
+      noTimeout2(options);
       const connection = await lease();
       try {
         return await connection.batch(statements, options);

package/dist/shared/{1g0drakv.js → 5yv4k6a6.js}

@@ -1,6 +1,6 @@
 import {
   required
-} from "./c9z5g0fm.js";
+} from "./ywr8hmey.js";
 import {
   definition,
   rejected

package/dist/shared/8dqhth8c.js

@@ -0,0 +1,12 @@
+import {
+  OkmError2
+} from "./52szzakm.js";
+
+// src/adapters/pg/no-inflight-timeout.ts
+function noTimeout2(options) {
+  if ((options?.timeout ?? 0) <= 0)
+    return;
+  throw new OkmError2("OKM1120", "timeout");
+}
+
+export { noTimeout2 };

package/dist/shared/8etn7d8w.js

@@ -0,0 +1,62 @@
+import {
+  OkmError2
+} from "./52szzakm.js";
+
+// src/dialects/pg/view/refresh.ts
+async function refreshView(session, name, concurrently) {
+  const host = asHost(session);
+  await host.connected;
+  const timeout = host.timeouts?.statement;
+  const options = timeout === undefined ? undefined : { timeout };
+  const text = `refresh materialized view${concurrently ? " concurrently" : ""} ${quote(name)}`;
+  const connection = await host.pool.reserve?.();
+  if (connection === undefined) {
+    throw new OkmError2("OKM1111", "Refresh needs a driver that can reserve a connection.", {
+      fix: { summary: "Use a Postgres driver that supports interactive transactions." }
+    });
+  }
+  try {
+    if (concurrently) {
+      await connection.execute("select set_config('app.unscoped', 'on', false)");
+      try {
+        await connection.execute(text, undefined, options);
+      } finally {
+        await connection.execute("select set_config('app.unscoped', '', false)").catch(() => {
+          return;
+        });
+      }
+      return;
+    }
+    await connection.execute("begin");
+    try {
+      await connection.execute("select set_config('app.unscoped', 'on', true)");
+      await connection.execute(text, undefined, options);
+      await connection.execute("commit");
+    } catch (error) {
+      await connection.execute("rollback").catch(() => {
+        return;
+      });
+      throw error;
+    }
+  } catch (error) {
+    const { mapPostgresError } = await import("./d5azex6s.js");
+    const mapped = mapPostgresError(error, {
+      ...host.http !== undefined ? { http: host.http } : {},
+      ...host.includeValues === true ? { includeValues: true } : {},
+      ...host.schema !== undefined ? { schema: host.schema } : {}
+    });
+    host.logger?.error?.({ code: mapped.code, summary: mapped.summary });
+    throw mapped;
+  } finally {
+    await connection.release();
+  }
+}
+function asHost(session) {
+  return session;
+}
+function quote(name) {
+  return `"${name.replaceAll('"', '""')}"`;
+}
+export {
+  refreshView
+};