okmodel 0.6.0 → 0.8.0

package/dist/tooling/shared/zvnhh1n0.js

@@ -0,0 +1,198 @@
+import {
+  decodeRows,
+  readHandle,
+  readCall,
+  attachHttp
+} from "./mtrqn2hn.js";
+import {
+  OkmError,
+  throwNamed,
+  selectedColumns,
+  parseOrder,
+  rejectKeys,
+  readLimit,
+  indexes,
+  quote,
+  list,
+  isRecord,
+  registerFailFix,
+  fail2
+} from "./f9mphxej.js";
+
+// src/runtime/page.ts
+registerFailFix("OKM1130", "Request the next page with the same orderBy and the exact next value the previous page returned. The cursor encodes that order.");
+var OPTIONS = [
+  "where",
+  "select",
+  "orderBy",
+  "limit",
+  "include",
+  "after",
+  "route",
+  "signal",
+  "timeout"
+];
+function build3(session, table, options, mods, view, pin) {
+  try {
+    return plan(session, table, options, mods, view, pin);
+  } catch (error) {
+    throw error instanceof OkmError ? attachHttp(session.http, error) : error;
+  }
+}
+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)
+    fail2("OKM1120", `Table ${table} is not in the schema.`);
+  if (record.limit === undefined)
+    fail2("OKM1101", "page() needs a limit.");
+  const size = readLimit(record.limit);
+  if (size < 1) {
+    throw new OkmError("invalid", "page() limit must be at least 1.", { kind: "invalid" });
+  }
+  const keys = orderKeys(indexed, record.orderBy);
+  const signature = `${table}:${keys.map((key) => `${key.column.field}.${key.dir}.${key.nulls}`).join(",")}`;
+  const after = record.after === undefined || record.after === null ? undefined : keyset(keys, signature, record.after);
+  const wanted = selectedColumns(indexed, record.select);
+  const extra = keys.filter((key) => !wanted.includes(key.column)).map((key) => key.column.field);
+  const select = extra.length === 0 ? record.select : [...wanted.map((column) => column.field), ...extra];
+  const orderBy = {};
+  for (const key of keys)
+    orderBy[key.column.field] = { dir: key.dir, nulls: key.nulls };
+  const call = {
+    ...readCall("find", table, {
+      where: record.where,
+      select,
+      orderBy,
+      limit: size + 1,
+      include: record.include,
+      signal: record.signal,
+      timeout: record.timeout,
+      route: record.route
+    }, undefined, session.scope, session.schema.model[table], session.schema, view),
+    ...after !== undefined ? { after } : {},
+    ...pin !== undefined ? { pin } : {}
+  };
+  return readHandle(session, table, call, mods, async (compiled, rows) => {
+    const items = await decodeRows(compiled, rows, table);
+    const more = items.length > size;
+    const kept = more ? items.slice(0, size) : items;
+    const last = rows[size - 1];
+    const next = more && last !== undefined ? makeCursor(compiled, last, keys, signature) : null;
+    if (extra.length > 0) {
+      for (const item of kept) {
+        for (const field of extra)
+          delete item[field];
+      }
+    }
+    return { items: kept, next };
+  });
+}
+function orderKeys(table, orderBy) {
+  if (orderBy !== undefined && !isRecord(orderBy)) {
+    fail2("OKM1120", "orderBy must be an object of fields.");
+  }
+  const keys = [];
+  for (const field of Object.keys(orderBy ?? {})) {
+    const column = table.columns.get(field);
+    if (column === undefined) {
+      throwNamed("OKM1120", field, table.names, `Field ${field} is not on ${table.model.name}. Accepted names: ${list(table.names)}.`);
+    }
+    keys.push({ column, ...parseOrder(field, orderBy?.[field]) });
+  }
+  if (table.model.primary.length === 0) {
+    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);
+    if (column === undefined || keys.some((key) => key.column === column))
+      continue;
+    keys.push({ column, dir: "asc", nulls: "last" });
+  }
+  return keys;
+}
+function keyset(keys, signature, token) {
+  const values = readCursor(token, signature, keys.length);
+  return (sink, alias) => {
+    sink.mark(`k:${signature}:${values.map((value) => value === null ? "n" : "v").join("")}`);
+    let wrote = false;
+    for (let index = 0;index < keys.length; index += 1) {
+      const key = keys[index];
+      const value = values[index];
+      if (key === undefined || value === undefined)
+        continue;
+      if (value === null && key.nulls === "last")
+        continue;
+      sink.text(wrote ? " or (" : "(");
+      wrote = true;
+      for (let before = 0;before < index; before += 1) {
+        const prior = keys[before];
+        const held = values[before];
+        if (prior === undefined || held === undefined)
+          continue;
+        const ref = `${alias}.${quote(prior.column.sql)}`;
+        if (held === null) {
+          sink.text(`${ref} is null and `);
+        } else {
+          sink.text(`${ref} = `);
+          sink.param(held);
+          sink.text(" and ");
+        }
+      }
+      const ref = `${alias}.${quote(key.column.sql)}`;
+      if (value === null) {
+        sink.text(`${ref} is not null`);
+      } else {
+        sink.text(key.nulls === "last" ? `(${ref} ${compare(key)} ` : `${ref} ${compare(key)} `);
+        sink.param(value);
+        sink.text(key.nulls === "last" ? ` or ${ref} is null)` : "");
+      }
+      sink.text(")");
+    }
+    if (!wrote)
+      sink.text("false");
+  };
+}
+function compare(key) {
+  return key.dir === "asc" ? ">" : "<";
+}
+function makeCursor(plan, row, keys, signature) {
+  const values = keys.map((key) => {
+    const at = plan.outputs.fields.find((field) => field.key === key.column.field)?.at;
+    return at === undefined ? null : row[at] ?? null;
+  });
+  const bytes = new TextEncoder().encode(JSON.stringify([signature, ...values]));
+  let binary = "";
+  for (const byte of bytes)
+    binary += String.fromCharCode(byte);
+  return btoa(binary).replaceAll("+", "-").replaceAll("/", "_").replaceAll("=", "");
+}
+function readCursor(token, signature, count) {
+  let parsed;
+  if (typeof token === "string") {
+    try {
+      const binary = atob(token.replaceAll("-", "+").replaceAll("_", "/"));
+      const bytes = Uint8Array.from(binary, (char) => char.charCodeAt(0));
+      parsed = JSON.parse(new TextDecoder().decode(bytes));
+    } catch {
+      parsed = undefined;
+    }
+  }
+  if (!Array.isArray(parsed) || typeof parsed[0] !== "string") {
+    fail2("OKM1130", "after is not a cursor that page() returned.");
+  }
+  if (parsed[0] !== 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")) {
+    fail2("OKM1130", "after is not a cursor that page() returned.");
+  }
+  return values;
+}
+
+export { build3 };

package/dist/tooling/testing/index.js

@@ -1,8 +1,8 @@
 import {
   testing2
-} from "../../shared/8x72s86k.js";
-import"../../shared/9s0ypp87.js";
-import"../../shared/qq3899ht.js";
+} from "../../shared/b6d6p0zc.js";
+import"../../shared/sjk86yrx.js";
+import"../../shared/12z7aznj.js";
 export {
   testing2 as testing
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "okmodel",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "okmodel is a catalog-first TypeScript ORM, PostgreSQL first.",
   "keywords": [
     "migrations",
@@ -63,6 +63,10 @@
       "types": "./dist/runtime/pg/bun.d.ts",
       "import": "./dist/runtime/pg/bun.js"
     },
+    "./pg/neon": {
+      "types": "./dist/runtime/pg/neon.d.ts",
+      "import": "./dist/runtime/pg/neon.js"
+    },
     "./ids": {
       "types": "./dist/runtime/ids/index.d.ts",
       "import": "./dist/runtime/ids/index.js"
@@ -87,6 +91,10 @@
       "types": "./dist/runtime/validate/index.d.ts",
       "import": "./dist/runtime/validate/index.js"
     },
+    "./otel": {
+      "types": "./dist/runtime/otel.d.ts",
+      "import": "./dist/runtime/otel.js"
+    },
     "./ext": {
       "types": "./dist/dialects/pg/ext/index.d.ts",
       "import": "./dist/dialects/pg/ext/index.js"
@@ -109,7 +117,7 @@
     }
   },
   "scripts": {
-    "build": "rm -rf dist && bun build ./src/contracts/index.ts ./src/contracts/internal.ts ./src/dialects/pg/index.ts ./src/runtime/pg/postgresjs.ts ./src/runtime/pg/pglite.ts ./src/runtime/pg/pg.ts ./src/runtime/pg/bun.ts ./src/runtime/ids/index.ts ./src/runtime/safety/index.ts ./src/runtime/traits/index.ts ./src/runtime/tenancy/index.ts ./src/runtime/validate/index.ts ./src/dialects/pg/ext/index.ts ./src/dialects/pg/fn/index.ts ./src/dialects/pg/view/index.ts ./src/dialects/pg/ext/citext.ts ./src/dialects/pg/ext/pg-trgm.ts ./src/tooling/migrate/index.ts ./src/tooling/testing/index.ts ./src/tooling/cli.ts --outdir ./dist --root ./src --format esm --target node --splitting --chunk-naming=shared/[hash].js --external postgres --external @electric-sql/pglite --external pg --external bun && bunx tsc -p tsconfig.build.json && rm -f ./dist/dialects/pg/temporal.local.d.ts && bun ./scripts/write-bin-wrappers.ts",
+    "build": "rm -rf dist && bun build ./src/contracts/index.ts ./src/contracts/internal.ts ./src/dialects/pg/index.ts ./src/runtime/pg/postgresjs.ts ./src/runtime/pg/pglite.ts ./src/runtime/pg/pg.ts ./src/runtime/pg/bun.ts ./src/runtime/pg/neon.ts ./src/runtime/ids/index.ts ./src/runtime/safety/index.ts ./src/runtime/traits/index.ts ./src/runtime/tenancy/index.ts ./src/runtime/validate/index.ts ./src/runtime/otel.ts ./src/dialects/pg/ext/index.ts ./src/dialects/pg/fn/index.ts ./src/dialects/pg/view/index.ts ./src/dialects/pg/ext/citext.ts ./src/dialects/pg/ext/pg-trgm.ts ./src/tooling/migrate/index.ts ./src/tooling/testing/index.ts ./src/tooling/cli.ts --outdir ./dist --root ./src --format esm --target node --splitting --chunk-naming=shared/[hash].js --external postgres --external @electric-sql/pglite --external pg --external bun --external @neondatabase/serverless && bunx tsc -p tsconfig.build.json && rm -f ./dist/dialects/pg/temporal.local.d.ts && bun build ./packages/harness/src/driver-run.ts --outdir ./dist/tooling --format esm --target node --splitting --chunk-naming=shared/[hash].js --external postgres --external @electric-sql/pglite --external pg --external bun --external @neondatabase/serverless && bun ./scripts/write-bin-wrappers.ts",
     "driver-bench": "bun ./scripts/driver-bench.ts",
     "typecheck": "bunx tsc --noEmit -p tsconfig.json",
     "editor-check": "bun ./scripts/editor-check.ts",
@@ -126,6 +134,7 @@
     "compiler-api": "bun ./scripts/compiler-api.ts",
     "publint": "publint run . --strict --pack bun",
     "attw": "bun ./scripts/attw.ts",
+    "pack-tracked": "bun ./scripts/pack-tracked.ts",
     "prepack": "bun ./scripts/strip-workspaces.ts strip",
     "postpack": "bun ./scripts/strip-workspaces.ts restore",
     "size": "bun ./scripts/size.ts",
@@ -134,7 +143,7 @@
     "test:postgres": "bun ./scripts/postgres-suite.ts",
     "test:tarball": "bun ./scripts/tarball-smoke.ts",
     "verify": "bun ./scripts/verify.ts",
-    "check": "bun run format:check && bun run lint && bun run typecheck && bun run editor-check && bun run type-cost && bun run layers-check && bun run core-purity && bun run okid-drift && bun run docs:check && bun run readme:check && bun run compiler-api && bun run bundle-purity && bun run build && bun test && bun run test:runtimes && bun run publint && bun run attw && bun run size",
+    "check": "bun run format:check && bun run lint && bun run typecheck && bun run editor-check && bun run type-cost && bun run layers-check && bun run core-purity && bun run okid-drift && bun run docs:check && bun run readme:check && bun run compiler-api && bun run bundle-purity && bun run build && bun test && bun run test:runtimes && bun run publint && bun run attw && bun run pack-tracked && bun run size",
     "bump": "bun ./scripts/bump-version.ts",
     "release-check": "bun ./scripts/release-check.ts",
     "db:up": "bun ./packages/harness/src/docker-cli.ts up",
@@ -142,6 +151,7 @@
     "bench": "bun ./packages/bench/src/run.ts",
     "catalog-bench": "bun ./scripts/catalog-bench.ts",
     "attest": "ATTEST_shouldFormat=0 ATTEST_updateSnapshots=0 bun ./packages/attest/src/measure.bench.ts",
+    "dev": "bun run site:dev",
     "site:dev": "bun --cwd site dev",
     "site:build": "bun --cwd site build",
     "site:check": "bun --cwd site check",
@@ -166,6 +176,7 @@
   },
   "peerDependencies": {
     "@electric-sql/pglite": "^0.5.8",
+    "@neondatabase/serverless": "^1.2.0",
     "pg": "^8.16.0",
     "postgres": "^3.4.9"
   },
@@ -173,6 +184,9 @@
     "@electric-sql/pglite": {
       "optional": true
     },
+    "@neondatabase/serverless": {
+      "optional": true
+    },
     "pg": {
       "optional": true
     },

package/dist/shared/3qnhc7w5.js

@@ -1,38 +0,0 @@
-import {
-  mapPostgresError2
-} from "./c58secgj.js";
-import {
-  withHttp
-} from "./j60w0dvr.js";
-import {
-  decodeResult
-} from "./2z7wv5tj.js";
-import {
-  OkmError2
-} from "./52szzakm.js";
-
-// src/runtime/read-stream.ts
-async function* streamRows(session, call, prepare, log) {
-  await session.connected;
-  if (session.pool.capabilities.stream !== true || session.pool.stream === undefined) {
-    throw log(new OkmError2("OKM1111", "stream needs a driver with stream: true. This driver does not have it.", withHttp(session.http, {
-      fix: { summary: "Use a driver that sets stream, or read with find." }
-    })));
-  }
-  const { plan, params } = await prepare();
-  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 {
-  streamRows
-};

package/dist/shared/7m88x3e9.js

@@ -1,45 +0,0 @@
-// src/runtime/trait-read.ts
-function touchFields(model) {
-  const traits = model.traits;
-  if (traits === undefined)
-    return;
-  const names = [];
-  for (const trait of traits) {
-    const touch = trait.touch;
-    if (touch === undefined)
-      continue;
-    for (const field of touch)
-      names.push(field);
-  }
-  return names.length === 0 ? undefined : names;
-}
-function fieldSealed(model, field) {
-  const traits = model.traits;
-  if (traits === undefined)
-    return false;
-  for (const trait of traits) {
-    const sealed = trait.sealed;
-    if (sealed === undefined)
-      continue;
-    for (const name of sealed)
-      if (name === field)
-        return true;
-  }
-  return false;
-}
-function sealingTrait(model, field) {
-  const traits = model.traits;
-  if (traits === undefined)
-    return;
-  for (const trait of traits) {
-    const sealed = trait.sealed;
-    if (sealed === undefined)
-      continue;
-    for (const name of sealed)
-      if (name === field)
-        return trait.name;
-  }
-  return;
-}
-
-export { touchFields, fieldSealed, sealingTrait };

package/dist/shared/8dqhth8c.js

@@ -1,12 +0,0 @@
-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/j3rkk835.js

@@ -1,99 +0,0 @@
-import {
-  DriverError2
-} from "./31vm914h.js";
-import {
-  noTimeout2
-} from "./8dqhth8c.js";
-import {
-  send2,
-  reserve,
-  park
-} from "./32cnm7kn.js";
-import {
-  isConnectionLost
-} from "./gwn6v667.js";
-import {
-  WireSession
-} from "./4az561fn.js";
-import {
-  rejectClosed,
-  runCall
-} from "./cgbamx3e.js";
-
-// src/adapters/pg/bunsql-extra.ts
-async function checkout(held) {
-  const { counters, isClosed } = held;
-  if (isClosed())
-    return rejectClosed();
-  const reserved = held.parked.pop() ?? await reserve(held.sql, held.acquireMs, counters);
-  counters.reserved += 1;
-  const session = new WireSession((text, params) => send2(reserved, text, params), held.notices, isClosed, false, () => {
-    counters.reservedBusy += 1;
-  }, () => {
-    counters.reservedBusy = Math.max(0, counters.reservedBusy - 1);
-  });
-  let lost = false;
-  const guard = (run) => lost ? rejectClosed("CONNECTION_CLOSED") : run().catch((error) => {
-    if (isConnectionLost(error))
-      lost = true;
-    if (error instanceof Error && bunClosed(error.message)) {
-      lost = true;
-      throw new DriverError2("CONNECTION_CLOSED", { cause: error });
-    }
-    throw error;
-  });
-  let released = false;
-  return {
-    execute: (text, params, options) => {
-      noTimeout2(options);
-      return guard(() => runCall(isClosed(), options, (watch) => session.query(text, params, watch)));
-    },
-    batch: (statements, options) => {
-      noTimeout2(options);
-      return guard(() => runCall(isClosed(), options, async (watch) => {
-        const { runAtomicBatch } = await import("./ag4c7516.js");
-        return runAtomicBatch(session, statements, watch);
-      }));
-    },
-    async release() {
-      if (released)
-        return;
-      released = true;
-      try {
-        if (!lost)
-          await reset(session, reserved);
-      } finally {
-        counters.reserved = Math.max(0, counters.reserved - 1);
-        if (lost)
-          await held.sql.unsafe("select 1").catch(() => {
-            return;
-          });
-        else
-          await park(held.parked, reserved);
-      }
-    }
-  };
-}
-function bunClosed(message) {
-  return message === "Connection closed" || message === "connection must be a PostgresSQLConnection";
-}
-async function reset(session, sql) {
-  const run = (text) => sql.unsafe(text);
-  if (session.depth() > 0)
-    await run("ROLLBACK").catch(() => {
-      return;
-    });
-  try {
-    await run("RESET ALL");
-    await run("SELECT pg_advisory_unlock_all()");
-  } catch {
-    await run("ROLLBACK").catch(() => {
-      return;
-    });
-    await run("RESET ALL");
-    await run("SELECT pg_advisory_unlock_all()");
-  }
-}
-export {
-  checkout
-};

package/dist/shared/k68eedmy.js

@@ -1,85 +0,0 @@
-import {
-  catalogError2,
-  throwNamed2
-} from "./52szzakm.js";
-
-// src/dialects/pg/through.ts
-var emit = (planner, schema, relation, child, sink, parent, alias, depth) => {
-  const through = relation.through;
-  const join = through === undefined ? undefined : planner.indexes(schema).get(through.table);
-  if (through === undefined || join === undefined) {
-    return catalogError2("OKM1020", `Relation ${relation.name} names a join table that is not in the schema.`);
-  }
-  const { quote } = planner;
-  const joinAlias = `j${alias}`;
-  sink.mark(`via:${through.table}`);
-  sink.text(`${quote(join.model.sql)} ${joinAlias} join ${quote(child.model.sql)} ${alias} on `);
-  for (let index = 0;index < through.local.length; index += 1) {
-    const local = through.local[index];
-    const remote = through.remote[index];
-    if (local === undefined || remote === undefined)
-      continue;
-    if (index > 0)
-      sink.text(" and ");
-    sink.text(`${alias}.${quote(remote)} = ${joinAlias}.${quote(local)}`);
-  }
-  sink.text(" where ");
-  planner.join(sink, parent, joinAlias, relation);
-  planner.where(schema, join, undefined, sink, joinAlias, depth + 1, true);
-};
-function resolveThrough(scope, table, through, from, to) {
-  for (const name of [table, through]) {
-    if (!scope.tables.includes(name)) {
-      throwNamed2("OKM1020", name, scope.tables, `Relation ${scope.owner}.${scope.name} names ${name}, which is not in the schema. Accepted names: ${scope.tables.join(", ")}.`);
-    }
-  }
-  const toOwner = pick(scope, through, scope.owner, from, `${scope.owner}.${scope.name}`, "from");
-  const toTable = pick(scope, through, table, to, `${scope.owner}.${scope.name}`, "to");
-  if (toOwner === toTable) {
-    catalogError2("OKM1021", `Relation ${scope.owner}.${scope.name} uses ${toOwner.fromField} on ${through} for both ends. Pass from and to.`);
-  }
-  return {
-    name: scope.name,
-    kind: "many",
-    table,
-    local: toOwner.remote,
-    remote: toOwner.local,
-    through: { table: through, local: toTable.local, remote: toTable.remote, emit }
-  };
-}
-function pick(scope, through, target, field, label, end) {
-  const matches = scope.edges.filter((edge) => edge.fromTable === through && edge.toTable === target && (field === undefined || edge.fromField === field));
-  const [only] = matches;
-  if (matches.length === 1 && only !== undefined)
-    return only;
-  const fields = matches.map((edge) => edge.fromField).sort();
-  catalogError2("OKM1021", `Relation ${label} through ${through} is ambiguous at ${end}. Accepted columns: ${fields.length === 0 ? "(none)" : fields.join(", ")}.`);
-}
-
-// src/dialects/pg/relations.ts
-function one2(table, field) {
-  return { kind: "one", table, field };
-}
-function many2(table, field) {
-  return { kind: "many", table, field };
-}
-function isRelationCall(value) {
-  if (typeof value !== "object" || value === null)
-    return false;
-  if (!("kind" in value) || !("table" in value))
-    return false;
-  const kind = value.kind;
-  return (kind === "one" || kind === "many") && typeof value.table === "string";
-}
-function manyThrough2(table, options) {
-  const { through, from, to } = options;
-  return {
-    kind: "many",
-    table,
-    field: undefined,
-    through,
-    resolve: (scope) => resolveThrough(scope, table, through, from, to)
-  };
-}
-
-export { one2, many2, isRelationCall, manyThrough2 };