okmodel 0.7.0 → 0.8.0

package/dist/runtime/pg/pg.js

@@ -3,20 +3,20 @@ import {
 } from "../../shared/cm3w0ywp.js";
 import {
   open4
-} from "../../shared/w79hsckn.js";
+} from "../../shared/14x60fbf.js";
 import {
   NODE_POSTGRES_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "../../shared/kb2sdhfb.js";
+} from "../../shared/ae4j5f42.js";
 import {
   createClient
-} from "../../shared/tbrvgw6z.js";
+} from "../../shared/bah9nbg3.js";
 
 // src/runtime/pg/pg.ts
 function connect(target, options) {
   if (typeof target === "object" && !isPool(target)) {
-    return import("../../shared/mtaszv5a.js").then((mod) => mod.default(target, options, open4));
+    return import("../../shared/0wrea3jq.js").then((mod) => mod.default(target, options, open4));
   }
   const owned = !isPool(target);
   const pool = isPool(target) ? target : open4({

package/dist/runtime/pg/pglite.js

@@ -4,20 +4,20 @@ import {
 import {
   open3,
   seal2
-} from "../../shared/81ebdx9p.js";
+} from "../../shared/4m6hskg8.js";
 import {
   PGLITE_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "../../shared/kb2sdhfb.js";
+} from "../../shared/ae4j5f42.js";
 import {
   createClient
-} from "../../shared/tbrvgw6z.js";
+} from "../../shared/bah9nbg3.js";
 
 // src/runtime/pg/pglite.ts
 async function connect(target, options) {
   if (typeof target === "object" && !isPool(target)) {
-    return import("../../shared/mtaszv5a.js").then((mod) => mod.default(target, options, open3));
+    return import("../../shared/0wrea3jq.js").then((mod) => mod.default(target, options, open3));
   }
   const pool = isPool(target) ? seal2(target) : await open3({
     ...target !== undefined ? { dataDir: target } : {},

package/dist/runtime/pg/postgresjs.js

@@ -3,20 +3,20 @@ import {
 } from "../../shared/cm3w0ywp.js";
 import {
   open2
-} from "../../shared/14vx95q4.js";
+} from "../../shared/35q0n9tz.js";
 import {
   POSTGRESJS_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "../../shared/kb2sdhfb.js";
+} from "../../shared/ae4j5f42.js";
 import {
   createClient
-} from "../../shared/tbrvgw6z.js";
+} from "../../shared/bah9nbg3.js";
 
 // src/runtime/pg/postgresjs.ts
 function connect(target, options) {
   if (typeof target === "object" && !isPool(target)) {
-    return import("../../shared/mtaszv5a.js").then((mod) => mod.default(target, options, open2));
+    return import("../../shared/0wrea3jq.js").then((mod) => mod.default(target, options, open2));
   }
   const owned = !isPool(target);
   const pool = isPool(target) ? target : open2({

package/dist/runtime/plan.d.ts

@@ -195,7 +195,7 @@ export declare function readOptionNames(op: ReadOp): readonly string[];
  * `order` is set when the operator is an `orderBy` value. `relevance` writes
  * its direction there; the same operator in `where` is refused by that module.
  */
-type OperatorEmit = (column: ColumnModel, ref: string, name: OperatorName, value: unknown, sink: Sink, order?: true) => void;
+type OperatorEmit = (table: Indexed, column: ColumnModel, ref: string, name: OperatorName, value: unknown, sink: Sink, order?: true) => void;
 /**
  * Installs the 0.2 operator compiler.
  *

package/dist/runtime/sql-fragment.d.ts

@@ -0,0 +1,43 @@
+/**
+ * SQL for a composed fragment.
+ *
+ * Loaded with the operator compiler and with a `select` that contains a
+ * fragment. A featureless read does not import it. Parameters are bound.
+ * `ident` names the TypeScript field, the same name `where` uses. The compiler
+ * quotes that column's SQL name. A hidden field is refused. The fragment is
+ * parenthesized so it cannot remove the tenant predicate.
+ */
+import { type FragmentPart } from "../dialects/pg/ops/fragment.js";
+import { type Indexed, type Sink } from "./plan.js";
+/**
+ * Writes a where fragment.
+ *
+ * `ref` is the field the fragment is attached to, already quoted and aliased.
+ * `fragment.column` emits that reference.
+ *
+ * @param table - The table the where field belongs to
+ * @param ref - `alias."column"`
+ * @param value - Parts the template stored
+ * @param sink - Statement builder
+ */
+export declare function emitSqlValue(table: Indexed, ref: string, value: unknown, sink: Sink): void;
+/**
+ * Writes a select fragment.
+ *
+ * There is no where field, so `fragment.column` is OKM1125.
+ *
+ * @param table - The read table
+ * @param parts - Parts the template stored
+ * @param sink - Statement builder
+ * @param alias - Table alias, `t` on a root read
+ */
+export declare function emitSqlSelect(table: Indexed, parts: readonly FragmentPart[], sink: Sink, alias: string): void;
+/**
+ * Reads a select fragment as a number.
+ *
+ * The wire is text. A value that is not a finite number is OKM1125.
+ *
+ * @param wire - Driver text
+ * @returns The number
+ */
+export declare function decodeSqlNumber(wire: string): number;

package/dist/runtime/tenancy/index.js

@@ -2,24 +2,24 @@ import {
   markPathEndpoint
 } from "../../shared/rhs3xe4k.js";
 import {
-  tenantPolicyExpression,
-  unscopedPolicyExpression,
-  policyObject
-} from "../../shared/bdk4sty6.js";
+  uuid2
+} from "../../shared/ecn8mfdq.js";
 import {
   isRelationCall
 } from "../../shared/exn3sd90.js";
-import {
-  uuid2
-} from "../../shared/hyh73qk6.js";
 import {
   index2,
   snakeCase
-} from "../../shared/rpycarcr.js";
+} from "../../shared/gcefca6p.js";
 import {
   ColumnBuilder2,
   retarget
-} from "../../shared/ywr8hmey.js";
+} from "../../shared/606g0nbf.js";
+import {
+  tenantPolicyExpression,
+  unscopedPolicyExpression,
+  policyObject
+} from "../../shared/bdk4sty6.js";
 import {
   definition
 } from "../../shared/tmbdywx0.js";
@@ -28,7 +28,7 @@ import {
 } from "../../shared/94ez8kzh.js";
 import {
   quote
-} from "../../shared/67txcrcw.js";
+} from "../../shared/kgwp4jdd.js";
 import {
   assertIdentifier2
 } from "../../shared/nfzc5z0w.js";

package/dist/runtime/topology.d.ts

@@ -14,7 +14,7 @@ export type RouteName = "primary" | "replica";
 /**
  * One routing choice.
  *
- * `onRoute` receives this. `inspect()` does not, until the dev inspector (M2).
+ * `onRoute` receives this. `inspect()` on a topology client shows the same reason.
  */
 export type RouteEvent = {
     /** What the statement was classified as. */

package/dist/runtime/traits/index.js

@@ -1,4 +1,7 @@
-import"../../shared/qq3899ht.js";
+import {
+  functionObject,
+  triggerObject
+} from "../../shared/12z7aznj.js";
 import {
   checkPresetNames,
   duplicatePreset
@@ -6,30 +9,26 @@ import {
 import {
   checkTrait
 } from "../../shared/n0dgs0pb.js";
-import {
-  quoteIdent
-} from "../../shared/9s0ypp87.js";
 import {
   pathEndpoint
 } from "../../shared/rhs3xe4k.js";
-import {
-  functionObject,
-  triggerObject
-} from "../../shared/y34a8714.js";
 import {
   integer2,
   timestamptz2
-} from "../../shared/vqrjpcqn.js";
+} from "../../shared/nmnsgj7x.js";
 import {
   uuid2
-} from "../../shared/hyh73qk6.js";
+} from "../../shared/ecn8mfdq.js";
 import {
   snakeCase
-} from "../../shared/rpycarcr.js";
+} from "../../shared/gcefca6p.js";
 import {
   ColumnBuilder2,
   retarget
-} from "../../shared/ywr8hmey.js";
+} from "../../shared/606g0nbf.js";
+import {
+  quoteIdent
+} from "../../shared/sjk86yrx.js";
 import {
   definition,
   unavailable
@@ -42,12 +41,12 @@ import {
   queryHandle,
   attachHttp,
   settleCall
-} from "../../shared/tbrvgw6z.js";
+} from "../../shared/bah9nbg3.js";
 import {
   installArchiveInspect,
   indexes,
   isRecord
-} from "../../shared/67txcrcw.js";
+} from "../../shared/kgwp4jdd.js";
 import {
   fitIdentifier2
 } from "../../shared/nfzc5z0w.js";
@@ -468,7 +467,7 @@ function refuse(host, table) {
 }
 var archiveMod;
 function loadArchive() {
-  archiveMod ??= import("../../shared/bm22fvzr.js");
+  archiveMod ??= import("../../shared/qfw14tna.js");
   return archiveMod;
 }
 async function settle(host, table, mods) {
@@ -736,7 +735,7 @@ function attachSort(target, ctx) {
   wrapOrder(target, "find", order);
   wrapOrder(target, "page", order);
   const view = ctx.view;
-  target.move = (id, place) => import("../../shared/9y3mmmh1.js").then((mod) => mod.move(host, tableName, id, place, view));
+  target.move = (id, place) => import("../../shared/xfhe73sb.js").then((mod) => mod.move(host, tableName, id, place, view));
 }
 function wrapOrder(target, key, order) {
   const previous = target[key];

package/dist/runtime/types.d.ts

@@ -120,7 +120,7 @@ export type Selected<Row, Sel> = [Sel] extends [readonly (infer P)[]] ? [P] exte
 type HasWindow<P> = P extends Window<string, string | number> ? true : false;
 /** Result keys a window helper adds. A field name contributes nothing. */
 type WindowFields<Row, P> = Intersect<P extends Window<infer A, infer V> ? {
-    readonly [K in A]: V extends keyof Row ? NonNullable<Row[V]> | null : number;
+    readonly [K in A]: V extends keyof Row ? NonNullable<Row[V]> | null : V extends number ? number : string;
 } : {}>;
 type IncludeRows<S extends QuerySchema, K extends keyof S["~byName"], Inc> = [Inc] extends [
     Record<string, unknown>
@@ -637,6 +637,20 @@ export type TableApi<S extends QuerySchema, K extends keyof S["~byName"] & strin
         readonly allow: Allow;
     }): Write<Show<RowOf<S, K>>>;
     insert(data: RequiredInsert<InsertOf<S, K>> & OptionalInsert<InsertOf<S, K>>, options?: InsertOptions<S, K>): Write<Show<RowOf<S, K>>>;
+    /**
+     * Inserts a list in one transaction. Unknown keys are dropped.
+     *
+     * `{ allow: ["id"] }` may set `id` on a client-generator primary key.
+     * A row that omits `id` still takes the generator. A longer `allow` list
+     * does not open `id` in this type.
+     *
+     * @param data - Rows. `id` is optional when `allow` is exactly `["id"]`
+     * @param options - Must set `allow` to `["id"]`
+     * @returns The inserted rows
+     */
+    insert(data: readonly (RequiredInsert<InsertOf<S, K>> & OptionalInsert<InsertOf<S, K>> & Partial<Pick<RowOf<S, K>, "id" & keyof RowOf<S, K>>>)[], options: InsertOptions<S, K> & {
+        readonly allow: readonly ["id"];
+    }): Write<readonly Show<RowOf<S, K>>[]>;
     /**
      * Inserts a list in one transaction. Unknown keys are dropped.
      *

package/dist/runtime/validate/index.js

@@ -1,12 +1,12 @@
 import {
   validationGate
-} from "../../shared/ze4hxsmy.js";
+} from "../../shared/w9ejzaqf.js";
 import {
   addSchemaHook
-} from "../../shared/xnxsed62.js";
+} from "../../shared/9dr2qnx7.js";
 import {
   queryHandle
-} from "../../shared/tbrvgw6z.js";
+} from "../../shared/bah9nbg3.js";
 import {
   OkmError2
 } from "../../shared/52szzakm.js";
@@ -14,7 +14,7 @@ import {
 // src/runtime/validate/load.ts
 var engine;
 function loadEngine() {
-  engine ??= import("../../shared/h15jx9bc.js");
+  engine ??= import("../../shared/9dvh1dr6.js");
   return engine;
 }
 

package/dist/shared/{mtaszv5a.js → 0wrea3jq.js}

@@ -4,7 +4,7 @@ import {
 } from "./cnkky55j.js";
 import {
   createClient
-} from "./tbrvgw6z.js";
+} from "./bah9nbg3.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -96,8 +96,7 @@ async function connectTopology(target, options, open) {
     const client = createClient(options.schema, router, { ownsPool: true, ...shared });
     const routed = client;
     routed.using = (route) => derive(options.schema, handle, router, shared, route);
-    handles.set(routed, handle);
-    return routed;
+    return instrument(routed, handle);
   } catch (error) {
     for (const endpoint of opened) {
       if (endpoint.timer !== undefined)
@@ -108,6 +107,105 @@ async function connectTopology(target, options, open) {
     throw error;
   }
 }
+function instrument(client, handle, forced) {
+  const proxy = new Proxy(client, {
+    get(target, key, receiver) {
+      if (key === "using")
+        return Reflect.get(target, key, receiver);
+      const value = Reflect.get(target, key, receiver);
+      if (typeof value !== "function")
+        return retarget(value, handle, forced);
+      if (key === "tx") {
+        return (...args) => {
+          const index = typeof args[0] === "function" ? 0 : 1;
+          const fn = args[index];
+          if (typeof fn === "function") {
+            args[index] = (inner, ...rest) => fn(typeof inner === "object" && inner !== null ? instrument(inner, handle, "primary") : inner, ...rest);
+          }
+          return value.apply(target, args);
+        };
+      }
+      return (...args) => retarget(value.apply(target, args), handle, forced);
+    }
+  });
+  handles.set(proxy, handle);
+  return proxy;
+}
+function wrapTable(table, handle, forced) {
+  return new Proxy(table, {
+    get(target, key, receiver) {
+      const value = Reflect.get(target, key, receiver);
+      if (typeof value !== "function")
+        return value;
+      return (...args) => {
+        const route = forced ?? readCallRoute(args[0]);
+        return retarget(value.apply(target, args), handle, route);
+      };
+    }
+  });
+}
+function retarget(value, handle, route) {
+  if (typeof value !== "object" || value === null)
+    return value;
+  if (typeof Reflect.get(value, "inspect") === "function" && typeof Reflect.get(value, "then") === "function") {
+    return showReason(value, handle, route);
+  }
+  if (typeof Reflect.get(value, "find") === "function")
+    return wrapTable(value, handle, route);
+  if (typeof Reflect.get(value, "table") === "function")
+    return instrument(value, handle, route);
+  return value;
+}
+function showReason(query, handle, route) {
+  return new Proxy(query, {
+    get(target, key, receiver) {
+      const value = Reflect.get(target, key, receiver);
+      if (key === "inspect" && typeof value === "function") {
+        const inspect = value;
+        return () => Promise.resolve(inspect.call(target)).then(async (view) => {
+          if (typeof view !== "object" || view === null)
+            return view;
+          const sql = Reflect.get(view, "sql");
+          const text = typeof sql === "object" && sql !== null && typeof Reflect.get(sql, "text") === "string" ? Reflect.get(sql, "text") : "";
+          const choice = await preview(handle, text, route);
+          return {
+            ...view,
+            routing: {
+              endpoint: choice.endpoint.name,
+              role: choice.endpoint.role,
+              reason: choice.reason
+            }
+          };
+        });
+      }
+      if ((key === "all" || key === "required") && typeof value === "function") {
+        const method = value;
+        return (...args) => retarget(method.apply(target, args), handle, route);
+      }
+      return typeof value === "function" ? value.bind(target) : value;
+    }
+  });
+}
+function readCallRoute(value) {
+  if (typeof value !== "object" || value === null)
+    return;
+  const route = Reflect.get(value, "route");
+  return route === "primary" || route === "replica" ? route : undefined;
+}
+async function preview(handle, text, route) {
+  const currents = handle.endpoints.map((endpoint) => endpoint.current);
+  const rrLast = handle.rrLast;
+  try {
+    return await choose(handle, text, route);
+  } finally {
+    for (let index = 0;index < handle.endpoints.length; index += 1) {
+      const endpoint = handle.endpoints[index];
+      if (endpoint !== undefined)
+        endpoint.current = currents[index] ?? 0;
+    }
+    handle.rrLast = rrLast;
+  }
+}
 function refuseRouting(routing) {
   if (routing === undefined)
     return;
@@ -574,7 +672,7 @@ function derive(schema, handle, router, shared, route) {
   const name = readRoute(route);
   const client = createClient(schema, force(handle, router, name), { ...shared, ownsPool: false });
   delete client.close;
-  return client;
+  return instrument(client, handle, name);
 }
 function force(handle, router, route) {
   const pool = {