okmodel 0.4.0 → 0.5.1

package/dist/shared/{kkzwp3d2.js → hf22e0wt.js}

@@ -7,7 +7,7 @@ import {
   decodeResult,
   logicalIntent,
   appliedRules
-} from "./xrfnq5k8.js";
+} from "./gbtcc2d7.js";
 import {
   OkmError2,
   safe2,
@@ -22,10 +22,22 @@ var SINGLE_ENDPOINT = {
   reason: "single-endpoint"
 };
 function createClient(schema, pool, options) {
-  const connected = checkServer(pool, schema, options.http, options.requireMeta === true, callOptions(options), {
+  const closing = {
+    current: undefined,
+    early: false
+  };
+  const checked = checkServer(pool, schema, options.http, options.requireMeta === true, callOptions(options), {
     ...options.catalog !== undefined ? { catalog: options.catalog } : {},
     ...options.catalogDir !== undefined ? { catalogDir: options.catalogDir } : {}
   });
+  const connected = checked.catch((error) => {
+    if (!closing.early)
+      throw error;
+    throw new OkmError2("unavailable", "The client was closed before it connected. Await connected before close(), or do not close it before use.", { kind: "unavailable", fix: { summary: "Await client.connected before calling close()." } });
+  });
+  connected.catch(() => {
+    return;
+  });
   const session = {
     schema,
     pool,
@@ -38,7 +50,7 @@ function createClient(schema, pool, options) {
     generators: options.generators,
     timeouts: options.timeouts,
     hookm: options.hookm,
-    closing: { current: undefined }
+    closing
   };
   return openClient(session);
 }
@@ -50,6 +62,7 @@ function openClient(session) {
   const close = () => {
     if (!session.ownsPool)
       return Promise.resolve();
+    session.closing.early = true;
     session.closing.current ??= session.pool.close();
     return session.closing.current;
   };
@@ -72,7 +85,7 @@ function openClient(session) {
     },
     close,
     connected: session.connected,
-    tx: (...args) => import("./kafaa5zv.js").then((mod) => mod.tx(session, args)),
+    tx: (...args) => import("./r2sp8hrc.js").then((mod) => mod.tx(session, args)),
     batch: (ops, options) => batchHandle(session, ops, options),
     ...session.tx?.extras
   };
@@ -107,7 +120,7 @@ function tableApi(session, table, view, uses) {
   const api = {
     find(options = {}) {
       if ("lock" in options) {
-        return lazyRead(session, () => import("./zg24x0hm.js"), table, options, base, view);
+        return lazyRead(session, () => import("./tm5ab8we.js"), table, options, base, view);
       }
       return start(session, "find", table, options, base, view);
     },
@@ -121,10 +134,10 @@ function tableApi(session, table, view, uses) {
       return start(session, "exists", table, options, base, view);
     },
     page(options) {
-      return lazyRead(session, () => import("./v7tpnhnz.js"), table, options, base, view);
+      return lazyRead(session, () => import("./6rk2gen5.js"), table, options, base, view);
     },
     aggregate(options = {}) {
-      return lazyRead(session, () => import("./qn0srwwq.js"), table, options, base, view);
+      return lazyRead(session, () => import("./kfjp0gck.js"), table, options, base, view);
     },
     insert(data, options = {}) {
       return writeHandle(session, "insert", table, data, options, mods);
@@ -154,13 +167,13 @@ function tableApi(session, table, view, uses) {
   return api;
 }
 function batchHandle(session, ops, options, replica) {
-  return queryHandle(() => import("./jgxzjzcz.js").then((mod) => mod.batch(session, ops, options, replica)), {
+  return queryHandle(() => import("./aj2qxyhj.js").then((mod) => mod.batch(session, ops, options, replica)), {
     replica: () => batchHandle(session, ops, options, true)
   });
 }
 var writers;
 function loadWrite() {
-  writers ??= import("./awrsqrn7.js");
+  writers ??= import("./qm7cdtvr.js");
   return writers;
 }
 function queryHandle(run, extra) {
@@ -215,9 +228,30 @@ async function runWrite(session, op, table, input, options, mods, plan) {
     throw logged(session, await mapError(session, error));
   }
 }
+function rejectedRead(error) {
+  const fail = () => Promise.reject(error);
+  return queryHandle(fail, {
+    all: () => rejectedRead(error),
+    required: () => rejectedRead(error),
+    inspect: fail,
+    sql: fail,
+    stream() {
+      return {
+        [Symbol.asyncIterator]() {
+          return { next: fail };
+        }
+      };
+    }
+  });
+}
 function start(session, op, table, options, mods, view) {
   const model = session.schema.model[table];
-  const call = readCall(op, table, options, mods.all, session.scope, model, session.schema, view);
+  let call;
+  try {
+    call = readCall(op, table, options, mods.all, session.scope, model, session.schema, view);
+  } catch (error) {
+    return rejectedRead(error instanceof OkmError2 ? attachHttp(session.http, error) : error);
+  }
   return readHandle(session, table, call, mods, async (plan, rows) => {
     const value = await decodeRows(plan, rows, table);
     if (mods.required === true && value === null) {
@@ -245,7 +279,7 @@ function lazyRead(session, load, table, options, mods, view) {
   });
 }
 async function decodeRows(plan, rows, table) {
-  return plan.outputs.includes.length === 0 ? decodeResult(plan, rows, table) : (await import("./edwqqryd.js")).decodeIncluded(plan, rows, table);
+  return plan.outputs.includes.length === 0 ? decodeResult(plan, rows, table) : (await import("./nkaxvt9q.js")).decodeIncluded(plan, rows, table);
 }
 function readHandle(session, table, call, mods, decode, extra) {
   let prepared;
@@ -320,7 +354,7 @@ function readHandle(session, table, call, mods, decode, extra) {
 }
 function streamLazy(session, call, prepare) {
   return async function* () {
-    const { streamRows } = await import("./sr5ms7b3.js");
+    const { streamRows } = await import("./zqrnhwsq.js");
     yield* streamRows(session, call, prepare, (error) => logged(session, error));
   }();
 }
@@ -357,13 +391,13 @@ function readCall(op, table, options, all, scope, model, schema, view) {
   };
 }
 async function checkServer(pool, schema, http, requireMeta, options, source) {
-  const server = await import("./nxb42q7h.js");
+  const server = await import("./47x8x9ze.js");
   let rows;
   try {
     const result = await pool.execute(server.versionQuery, undefined, options);
     rows = result.rows;
   } catch (error) {
-    const { mapPostgresError } = await import("./s6gqfn5j.js");
+    const { mapPostgresError } = await import("./51mvgj8w.js");
     throw mapPostgresError(error, mapOptions(http, false));
   }
   await server.acceptServer(pool, schema, rows, http, requireMeta, options, source);
@@ -372,7 +406,7 @@ async function mapError(session, error) {
   if (error instanceof OkmError2) {
     return session.http === undefined ? error : new OkmError2(error.code, error.message, { ...errorFields(error), http: session.http });
   }
-  const { mapPostgresError } = await import("./s6gqfn5j.js");
+  const { mapPostgresError } = await import("./51mvgj8w.js");
   return mapPostgresError(error, mapOptions(session.http, session.includeValues));
 }
 function errorFields(error) {
@@ -386,7 +420,7 @@ function errorFields(error) {
 var includeHooks;
 var operatorSql;
 function loadOperatorSql() {
-  operatorSql ??= import("./axhk06q1.js").then(() => {
+  operatorSql ??= import("./cr74e96e.js").then(() => {
     return;
   });
   return operatorSql;
@@ -394,7 +428,7 @@ function loadOperatorSql() {
 function hooksFor(call) {
   if (call.include === undefined)
     return Promise.resolve(undefined);
-  includeHooks ??= import("./edwqqryd.js").then((mod) => mod.includeHooks);
+  includeHooks ??= import("./nkaxvt9q.js").then((mod) => mod.includeHooks);
   return includeHooks;
 }
 function bindNow(schema, call) {
@@ -426,11 +460,13 @@ function attachHttp(http, error) {
 }
 function callOptions(input, statement) {
   const timeout = input.timeout ?? statement;
-  if (input.signal === undefined && timeout === undefined)
+  const route = input.route;
+  if (input.signal === undefined && timeout === undefined && route === undefined)
     return;
   return {
     ...input.signal !== undefined ? { signal: input.signal } : {},
-    ...timeout !== undefined ? { timeout } : {}
+    ...timeout !== undefined ? { timeout } : {},
+    ...route !== undefined ? { route } : {}
   };
 }
 function mapOptions(http, includeValues) {

package/dist/shared/{tny2t3sm.js → janx09m5.js}

@@ -1,15 +1,16 @@
 import {
   open2
-} from "./wqem4jed.js";
-import"./8jb4ymh2.js";
+} from "./krxx77g0.js";
+import"./8bwbwy8h.js";
 import"./n442h54c.js";
 import {
-  assertTargetPolicy,
-  selectTarget,
   openProject
-} from "./q6zsyh31.js";
-import"./n5y9zyj1.js";
-import"./41kv2xdm.js";
+} from "./qv2ydck9.js";
+import {
+  assertTargetPolicy,
+  selectTarget
+} from "./ga3sfy93.js";
+import"./8xsbagad.js";
 import {
   isExactVersion,
   compareExtensionVersions

package/dist/shared/{4ef7mmqf.js → jwtxdj06.js}

@@ -2,17 +2,17 @@ import {
   send2,
   reserve,
   park
-} from "./sf8m6tfy.js";
+} from "./k8v5v5wj.js";
 import {
   isConnectionLost
-} from "./tbszx8mz.js";
+} from "./pf0d8f77.js";
 import {
   WireSession
-} from "./zvbjc949.js";
+} from "./4az561fn.js";
 import {
   rejectClosed,
   runCall
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 
 // src/adapters/pg/bunsql-extra.ts
 async function checkout(held) {
@@ -36,7 +36,7 @@ async function checkout(held) {
   return {
     execute: (text, params, options) => guard(() => runCall(isClosed(), options, (watch) => session.query(text, params, watch))),
     batch: (statements, options) => guard(() => runCall(isClosed(), options, async (watch) => {
-      const { runAtomicBatch } = await import("./b066g80h.js");
+      const { runAtomicBatch } = await import("./efmy2gcg.js");
       return runAtomicBatch(session, statements, watch);
     })),
     async release() {

package/dist/shared/{sf8m6tfy.js → k8v5v5wj.js}

@@ -2,14 +2,14 @@ import {
   noticeBuffer,
   WireSession,
   cursorStream
-} from "./zvbjc949.js";
+} from "./4az561fn.js";
 import {
   BUNSQL_CAPABILITIES,
   driverErrors,
   rejectClosed,
   mapFailure,
   runCall
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 
 // src/adapters/pg/bunsql.ts
 import { SQL } from "bun";
@@ -41,7 +41,7 @@ function open5(config) {
     counters.busy = Math.max(0, counters.busy - 1);
   });
   const held = { sql, parked, acquireMs, counters, notices, isClosed };
-  const checkout = () => closed ? rejectClosed() : import("./4ef7mmqf.js").then((mod) => mod.checkout(held));
+  const checkout = () => closed ? rejectClosed() : import("./jwtxdj06.js").then((mod) => mod.checkout(held));
   return {
     capabilities: BUNSQL_CAPABILITIES,
     execute(text, params, options) {

package/dist/shared/{qn0srwwq.js → kfjp0gck.js}

@@ -2,7 +2,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./kkzwp3d2.js";
+} from "./hf22e0wt.js";
 import {
   emitWhere,
   emitOrder,
@@ -15,7 +15,7 @@ import {
   list,
   isRecord,
   fail
-} from "./xrfnq5k8.js";
+} from "./gbtcc2d7.js";
 import {
   OkmError2,
   throwNamed2
@@ -32,6 +32,7 @@ var OPTIONS = [
   "max",
   "orderBy",
   "limit",
+  "route",
   "signal",
   "timeout"
 ];
@@ -79,7 +80,8 @@ function plan(session, table, options, mods, view) {
     orderBy,
     limit: record.limit,
     signal: record.signal,
-    timeout: record.timeout
+    timeout: record.timeout,
+    route: record.route
   }, mods.all, session.scope, session.schema.model[table], session.schema, view);
   const call = { ...base, op: "aggregate", build: statement(spec) };
   return readHandle(session, table, call, mods, (compiled, rows) => decode(compiled, rows));

package/dist/shared/{wqem4jed.js → krxx77g0.js}

@@ -6,7 +6,7 @@ import {
   runCall,
   EMPTY_NOTICES,
   resultFrom
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 
 // src/adapters/pg/postgresjs.ts
 import net from "node:net";
@@ -117,7 +117,7 @@ function open2(config) {
     },
     async batch(statements, options) {
       return sockets.occupy(async () => {
-        const { checkout } = await import("./5vdm4sgp.js");
+        const { checkout } = await import("./caw8b9d8.js");
         const connection = await checkout(held);
         try {
           return await connection.batch(statements, options);
@@ -129,12 +129,12 @@ function open2(config) {
     reserve() {
       const gate = sockets.busyGate();
       gate.enter();
-      return import("./5vdm4sgp.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
+      return import("./caw8b9d8.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
         gate.leave();
         throw error;
       });
     },
-    describe: (text, params) => sockets.occupy(() => import("./5vdm4sgp.js").then((mod) => mod.describe(sql, text, params))),
+    describe: (text, params) => sockets.occupy(() => import("./caw8b9d8.js").then((mod) => mod.describe(sql, text, params))),
     stream(text, params) {
       const gate = sockets.busyGate();
       return async function* () {
@@ -149,7 +149,7 @@ function open2(config) {
     listen(channel, onNotify) {
       const gate = sockets.listenerGate();
       gate.enter();
-      return import("./5vdm4sgp.js").then((mod) => mod.holdListener(gate, async () => {
+      return import("./caw8b9d8.js").then((mod) => mod.holdListener(gate, async () => {
         const listening = await sql.listen(channel, onNotify);
         return async () => {
           await listening.unlisten();
@@ -219,7 +219,7 @@ class PgSession {
       onAbort();
     else
       watch.signal.addEventListener("abort", onAbort, { once: true });
-    return import("./5vdm4sgp.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
+    return import("./caw8b9d8.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
       start,
       text,
       notices: this.notices,
@@ -271,7 +271,7 @@ class PgSession {
   }
 }
 async function* loadStream(sql, text, params) {
-  const { stream } = await import("./5vdm4sgp.js");
+  const { stream } = await import("./caw8b9d8.js");
   yield* stream(sql, text, params);
 }
 function send(sql, text, params, named) {

package/dist/shared/{edwqqryd.js → nkaxvt9q.js}

@@ -17,7 +17,7 @@ import {
   isRecord,
   registerFailFix,
   fail
-} from "./xrfnq5k8.js";
+} from "./gbtcc2d7.js";
 import {
   throwNamed2
 } from "./52szzakm.js";

package/dist/shared/{jsd07prz.js → ntneex2a.js}

@@ -29,7 +29,7 @@ function openFilters(table, relations, spec, hiddenFields) {
   }
   return {
     parse(query) {
-      return import("./0v1g424p.js").then((mod) => mod.parseQuery(allow, sort, query));
+      return import("./wq9n6pwr.js").then((mod) => mod.parseQuery(allow, sort, query));
     }
   };
 }