okmodel 0.8.0 → 0.9.1

package/dist/tooling/shared/{3m1hkg7z.js → 4tg2bn41.js}

@@ -2,10 +2,10 @@ import {
   DriverError2,
   timedOut2,
   isConnectionLost
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 import {
   PgSession2
-} from "./p7f08ktn.js";
+} from "./vms9dta5.js";
 import {
   driverErrors,
   rejectClosed,
@@ -13,7 +13,7 @@ import {
   runCall,
   rowsFrom,
   resultFrom
-} from "./xhrnjch9.js";
+} from "./ry2f3w8p.js";
 
 // src/adapters/pg/postgres-extra.ts
 var RESET_ALL = "RESET ALL";
@@ -48,7 +48,7 @@ async function checkout(pool, timeoutMs) {
     batch: (statements, options) => {
       remember(options?.timeout);
       return guard(() => runCall(pool.isClosed(), options, async (watch) => {
-        const { runAtomicBatch } = await import("./3rrw5w8f.js");
+        const { runAtomicBatch } = await import("./xchpnbdv.js");
         return runAtomicBatch(session, statements, watch);
       }));
     },
@@ -78,18 +78,12 @@ async function checkout(pool, timeoutMs) {
   };
 }
 async function describe(sql, text, params) {
-  const pending = sql.unsafe(text, asParams(params), { prepare: true });
-  const described = await pending.describe();
-  return {
-    columns: described.columns.map((column) => column.name),
-    parameterCount: described.types.length
-  };
+  const d = await sql.unsafe(text, asParams(params), { prepare: true }).describe();
+  return { columns: d.columns.map((c) => c.name), parameterCount: d.types.length };
 }
 async function* stream(sql, text, params) {
-  const pending = sql.unsafe(text, asParams(params));
-  for await (const chunk of pending.cursor(64)) {
+  for await (const chunk of sql.unsafe(text, asParams(params)).cursor(64))
     yield rowsFrom(chunk);
-  }
 }
 function poolWaits(sql) {
   const options = sql.options;
@@ -103,14 +97,14 @@ function poolWaits(sql) {
     n.add(id);
     if (n.size < options.max) {
       queueMicrotask(() => {
-        for (const wait of q)
-          wait.a();
+        for (const w of q)
+          w.a();
       });
       return;
     }
     n.clear();
-    for (const wait of q)
-      wait.s();
+    for (const w of q)
+      w.s();
     q.clear();
   };
   return options;
@@ -192,41 +186,40 @@ function reserveConnection(sql, acquireMs, counters, callMs) {
     counters.waiting = Math.max(0, counters.waiting - 1);
   };
   return new Promise((resolve, reject) => {
-    let timer;
-    if (acquireMs !== undefined) {
-      timer = setTimeout(() => {
-        if (settled)
-          return;
-        settled = true;
-        finish();
-        driverErrors().then((errors) => {
-          reject(errors.acquireTimeout());
-        });
-      }, acquireMs);
-    }
-    const ms = callMs !== undefined && callMs > 0 ? callMs : 0;
-    deadline(ms, () => sql.reserve(), sql).then((connection) => {
-      if (settled) {
-        resetConnection(connection, 0).catch(() => {
-          return;
-        }).finally(() => {
-          connection.release();
-        });
+    const timer = acquireMs === undefined ? undefined : setTimeout(() => {
+      if (settled)
         return;
-      }
       settled = true;
-      if (timer !== undefined)
-        clearTimeout(timer);
       finish();
-      resolve(connection);
-    }, (error) => {
+      driverErrors().then((errors) => {
+        reject(errors.acquireTimeout());
+      });
+    }, acquireMs);
+    const done = (fn) => {
       if (settled)
         return;
       settled = true;
       if (timer !== undefined)
         clearTimeout(timer);
       finish();
-      mapFailure(error).then(reject);
+      fn();
+    };
+    deadline(callMs !== undefined && callMs > 0 ? callMs : 0, () => sql.reserve(), sql).then((connection) => {
+      if (settled) {
+        resetConnection(connection, 0).catch(() => {
+          return;
+        }).finally(() => {
+          connection.release();
+        });
+        return;
+      }
+      done(() => {
+        resolve(connection);
+      });
+    }, (error) => {
+      done(() => {
+        mapFailure(error).then(reject);
+      });
     });
   });
 }
@@ -235,22 +228,20 @@ async function resetConnection(sql, depth) {
     await sql.unsafe("ROLLBACK").catch(() => {
       return;
     });
-  try {
+  const clear = async () => {
     await sql.unsafe(RESET_ALL);
     await sql.unsafe(UNLOCK);
+  };
+  try {
+    await clear();
   } catch {
     await sql.unsafe("ROLLBACK").catch(() => {
       return;
     });
-    await sql.unsafe(RESET_ALL);
-    await sql.unsafe(UNLOCK);
+    await clear();
   }
 }
-function asParams(params) {
-  if (params === undefined)
-    return [];
-  return params;
-}
+var asParams = (params) => params ?? [];
 function arm(sql, lost) {
   const unsafe = sql.unsafe.bind(sql);
   sql.unsafe = (text, params, options) => unsafe(text, params, {
@@ -268,14 +259,7 @@ async function holdCheckout(gate, checkout) {
     const connection = await checkout();
     let released = false;
     const release = connection.release.bind(connection);
-    connection.release = () => {
-      if (released)
-        return Promise.resolve();
-      released = true;
-      return release().finally(() => {
-        gate.leave();
-      });
-    };
+    connection.release = () => released ? Promise.resolve() : (released = true, release().finally(() => gate.leave()));
     return connection;
   } catch (error) {
     gate.leave();
@@ -290,11 +274,9 @@ async function holdListener(gate, start) {
       if (stopped)
         return;
       stopped = true;
-      try {
-        await stop();
-      } finally {
+      await stop().finally(() => {
         gate.leave();
-      }
+      });
     };
   } catch (error) {
     gate.leave();
@@ -302,36 +284,35 @@ async function holdListener(gate, start) {
   }
 }
 function watchQuery(pending, watch, onAbort, ctx) {
+  const done = () => {
+    ctx.leave();
+    ctx.untrack(pending);
+    watch.signal.removeEventListener("abort", onAbort);
+  };
   return pending.then((value) => {
-    finishWatch(pending, watch, onAbort, ctx);
+    done();
     const why = watch.reason();
     if (why === "timeout" || why === "cancelled")
       return classify(why, watch);
     ctx.note(ctx.text);
     return resultFrom(value, ctx.notices.since(ctx.start));
   }, (error) => {
-    finishWatch(pending, watch, onAbort, ctx);
+    done();
     return classify(error, watch);
   });
 }
-function finishWatch(pending, watch, onAbort, ctx) {
-  ctx.leave();
-  ctx.untrack(pending);
-  watch.signal.removeEventListener("abort", onAbort);
-}
 async function classify(error, watch) {
   const errors = await driverErrors();
   if (error instanceof errors.DriverError)
-    return Promise.reject(error);
+    throw error;
   const why = typeof error === "string" ? error : watch.reason();
-  if (why === "timeout") {
-    return Promise.reject(errors.timedOut(typeof error === "string" ? undefined : error));
-  }
-  const code = errors.errorField(error, "code");
-  if (why === "cancelled" || code === "57014") {
-    return Promise.reject(errors.cancelled(typeof error === "string" ? undefined : error));
+  const cause = typeof error === "string" ? undefined : error;
+  if (why === "timeout")
+    throw errors.timedOut(cause);
+  if (why === "cancelled" || errors.errorField(error, "code") === "57014") {
+    throw errors.cancelled(cause);
   }
-  return Promise.reject(errors.mapDriverError(error));
+  throw errors.mapDriverError(error);
 }
 export {
   checkout,

package/dist/tooling/shared/{zvnhh1n0.js → 5rah55z0.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./mtrqn2hn.js";
+} from "./gjj71hfh.js";
 import {
   OkmError,
   throwNamed,
@@ -17,7 +17,7 @@ import {
   isRecord,
   registerFailFix,
   fail2
-} from "./f9mphxej.js";
+} from "./2jdn09e2.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.");

package/dist/tooling/shared/{pqy21k24.js → 804w1t69.js}

@@ -2,11 +2,11 @@ import {
   readSelectFragment,
   emitSqlSelect,
   decodeSqlNumber
-} from "./gmcf9cxf.js";
-import"./3tq8pnb8.js";
+} from "./ckq4z5ax.js";
+import"./fdsek6pa.js";
 import {
   refusePrototypeKey
-} from "./ppnnnvj8.js";
+} from "./09a6vsys.js";
 import {
   throwNamed,
   emitWhere,
@@ -20,7 +20,7 @@ import {
   list,
   isRecord,
   fail2
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/dialects/pg/ops/window.ts
 var RUNTIME = Symbol.for("okmodel.window");

package/dist/tooling/shared/8g0m0rvd.js

@@ -0,0 +1,134 @@
+import {
+  withHttp,
+  attachHttp,
+  mapOptions
+} from "./gjj71hfh.js";
+import {
+  OkmError,
+  POSTGRES_FLOOR,
+  isPostgresMajor,
+  parsePostgresFloor,
+  serverNeedsPostgres
+} from "./2jdn09e2.js";
+
+// src/runtime/artifact-file.ts
+function artifactDir(catalogDir) {
+  if (catalogDir !== undefined)
+    return catalogDir.replace(/[/\\]+$/, "");
+  const cwd = globalThis.process?.cwd?.() ?? ".";
+  return `${cwd}/.okm`;
+}
+async function readText(path) {
+  const bun = globalThis.Bun;
+  if (bun !== undefined) {
+    const file = bun.file(path);
+    if (!await file.exists())
+      return;
+    return file.text();
+  }
+  const loader = globalThis.process?.getBuiltinModule;
+  if (loader === undefined)
+    return;
+  try {
+    return await loader("node:fs/promises").readFile(path, "utf8");
+  } catch {
+    return;
+  }
+}
+
+// src/runtime/server-check.ts
+var versionQuery = "select current_setting('server_version_num'), version(), (select (xpath('//catalog_hash/text()', query_to_xml('select catalog_hash from okm_meta where id = ''head''', true, false, '')))[1]::text where to_regclass('okm_meta') is not null)";
+var historyQuery = "select migration_id, class, catalog_hash from okm_history order by migration_id, step_index";
+async function versionSql(namespace) {
+  if (namespace === "public")
+    return versionQuery;
+  const relation = await qualified("okm_meta", namespace);
+  const literal = relation.replaceAll("'", "''");
+  return `select current_setting('server_version_num'), version(), (select (xpath('//catalog_hash/text()', query_to_xml('select catalog_hash from ${literal} where id = ''head''', true, false, '')))[1]::text where to_regclass('${literal}') is not null)`;
+}
+async function historySql2(namespace) {
+  if (namespace === "public")
+    return historyQuery;
+  return `select migration_id, class, catalog_hash from ${await qualified("okm_history", namespace)} order by migration_id, step_index`;
+}
+async function recordedNamespace(catalogDir) {
+  const text = await readText(`${artifactDir(catalogDir)}/namespace`);
+  if (text === undefined)
+    return "public";
+  const line = text.trim();
+  if (line === "" || line === "public")
+    return "public";
+  if (line.includes("\x00") || line.includes(`
+`) || line.includes("\r")) {
+    throw new OkmError("OKM1122", "The catalog namespace file is not one identifier.", {
+      fix: { summary: "Run okm build so .okm/namespace is the schema from defineConfig." }
+    });
+  }
+  return line;
+}
+async function acceptServer2(pool, schema, http, requireMeta, options, source) {
+  const namespace = await recordedNamespace(source.catalogDir);
+  let rows;
+  try {
+    const result = await pool.execute(await versionSql(namespace), undefined, options);
+    rows = result.rows;
+  } catch (error) {
+    const { mapPostgresError } = await import("./xx3gmq94.js");
+    throw mapPostgresError(error, mapOptions(http, false, schema));
+  }
+  for (const name in schema.model) {
+    if (schema.model[name]?.presets !== undefined) {
+      (await import("./bj1kyqc8.js")).checkSchema(schema);
+      break;
+    }
+  }
+  const version = rows[0]?.[1];
+  if (version === null || version === undefined || !version.startsWith("PostgreSQL")) {
+    throw new OkmError("OKM1801", "The server is not PostgreSQL. The schema dialect is postgres.", withHttp(http, {
+      fix: { summary: "Open the schema with the Postgres driver that matches it." }
+    }));
+  }
+  const recorded = rows[0]?.[2];
+  if (recorded === null || recorded === undefined || recorded.length === 0) {
+    if (requireMeta) {
+      throw new OkmError("OKM1520", "okm_meta has no catalog hash.", withHttp(http, {
+        fix: {
+          summary: "Apply migrations so okm_meta records the catalog, or omit requireMeta to adopt this database."
+        }
+      }));
+    }
+  } else {
+    const { assertCompatible } = await import("./0wtzps9p.js");
+    try {
+      await assertCompatible(pool, schema, recorded, source, options, namespace);
+    } catch (error) {
+      if (error instanceof OkmError)
+        throw attachHttp(http, error);
+      throw error;
+    }
+  }
+  const major = Math.floor(Number(rows[0]?.[0] ?? "0") / 1e4);
+  const raw = schema.requires?.postgres;
+  if (raw === undefined) {
+    if (major < POSTGRES_FLOOR) {
+      throw new OkmError("OKM1803", serverNeedsPostgres(major, POSTGRES_FLOOR), withHttp(http, {
+        fix: {
+          summary: `Upgrade to PostgreSQL ${String(POSTGRES_FLOOR)} or higher.`
+        }
+      }));
+    }
+    return;
+  }
+  const need = parsePostgresFloor(raw);
+  if (!isPostgresMajor(need) || major < need) {
+    throw new OkmError("OKM1802", serverNeedsPostgres(major, isPostgresMajor(need) ? need : POSTGRES_FLOOR), withHttp(http, {
+      fix: { summary: "Upgrade the server, or lower minPostgres to a major the server meets." }
+    }));
+  }
+}
+async function qualified(table, namespace) {
+  const { quoteIdent } = await import("./8msbtw5s.js");
+  return `${quoteIdent(namespace)}.${table}`;
+}
+
+export { artifactDir, readText, historySql2, acceptServer2 };

package/dist/tooling/shared/8msbtw5s.js

@@ -0,0 +1,8 @@
+import {
+  quoteIdent2,
+  renderCatalog2
+} from "./2jdn09e2.js";
+export {
+  quoteIdent2 as quoteIdent,
+  renderCatalog2 as renderCatalog
+};

package/dist/tooling/shared/{4d2w25vw.js → 8t22h3h7.js}

@@ -1,9 +1,9 @@
 import {
   rejectClosed
-} from "./xhrnjch9.js";
+} from "./ry2f3w8p.js";
 import {
   isConnectionLost
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/adapters/pg/reserved.ts
 var RESET_ALL = "RESET ALL";

package/dist/tooling/shared/{smn6kz1p.js → 91c59b7b.js}

@@ -1,6 +1,6 @@
 import {
   assertNoControl
-} from "./3tq8pnb8.js";
+} from "./fdsek6pa.js";
 import {
   throwNamed,
   isOperator,
@@ -12,7 +12,7 @@ import {
   list,
   isRecord,
   fail2
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/dialects/pg/ops/search-query.ts
 function searchValue(query, options) {

package/dist/tooling/shared/{aftb2mwr.js → adk9k6va.js}

@@ -6,7 +6,7 @@ import {
   acquireTimeout2,
   errorField2,
   mapDriverError2
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 export {
   DriverError2 as DriverError,
   acquireTimeout2 as acquireTimeout,

package/dist/tooling/shared/{j9t5s12a.js → ajjd5cwz.js}

@@ -1,7 +1,7 @@
 import {
   build3
-} from "./zvnhh1n0.js";
-import"./mtrqn2hn.js";
+} from "./5rah55z0.js";
+import"./gjj71hfh.js";
 export {
   build3 as build
 };

package/dist/tooling/shared/{cmptmb4f.js → angjck01.js}

@@ -1,6 +1,6 @@
 import {
   tag
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/runtime/preset-stack.ts
 function stack2(where, presets) {

package/dist/tooling/shared/{yw30vnq2.js → asnnc3v5.js}

@@ -4,7 +4,7 @@ import {
   nextTransactionDepth,
   EMPTY_NOTICES,
   resultFrom
-} from "./xhrnjch9.js";
+} from "./ry2f3w8p.js";
 
 // src/adapters/pg/session.ts
 function noticeBuffer() {

package/dist/tooling/shared/{ma2340rx.js → bj1kyqc8.js}

@@ -1,11 +1,11 @@
 import {
   stack2
-} from "./cmptmb4f.js";
+} from "./angjck01.js";
 import {
   OkmError,
   isOperator,
   operatorValue
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/dialects/pg/preset.ts
 var RESERVED_PRESETS = new Set([

package/dist/tooling/shared/{2wtvc7rw.js → bt3tjemb.js}

@@ -1,11 +1,11 @@
 import {
   createClient
-} from "./mtrqn2hn.js";
+} from "./gjj71hfh.js";
 import {
   OkmError,
   isConnectionSqlstate,
   isConnectionErrno
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/runtime/topology.ts
 var CIRCUIT_AT = 2;
@@ -1166,7 +1166,15 @@ function fromSelect(handle, select, candidates) {
       lag: byteLagNumber(handle, endpoint)
     });
   }
-  const returned = select(offered, { op: "read" });
+  let returned;
+  try {
+    returned = select(offered, { op: "read" });
+  } catch (error) {
+    if (error instanceof OkmError)
+      throw error;
+    const message = error instanceof Error ? error.message : "routing.select threw.";
+    throw new OkmError("invalid", message, { kind: "invalid", cause: error });
+  }
   if (typeof returned === "string") {
     const endpoint = endpoints.find((item) => item.name === returned);
     if (endpoint !== undefined)

package/dist/tooling/shared/{ec71zqgt.js → chk2bh4f.js}

@@ -2,7 +2,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./mtrqn2hn.js";
+} from "./gjj71hfh.js";
 import {
   OkmError,
   throwNamed,
@@ -17,7 +17,7 @@ import {
   list,
   isRecord,
   fail2
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/runtime/tree.ts
 var OPTIONS = [

package/dist/tooling/shared/{gmcf9cxf.js → ckq4z5ax.js}

@@ -1,6 +1,6 @@
 import {
   assertNoControl
-} from "./3tq8pnb8.js";
+} from "./fdsek6pa.js";
 import {
   OkmError,
   throwNamed,
@@ -12,7 +12,7 @@ import {
   quote,
   list,
   fail2
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/dialects/pg/ops/fragment.ts
 var IDENT = Symbol("okmodel.sql.ident");
@@ -57,6 +57,9 @@ function scanLiteral(literal, state) {
   for (let index = 0;index < literal.length; index += 1) {
     const char = literal[index] ?? "";
     const code = literal.charCodeAt(index);
+    if (char === "\\") {
+      fragmentError("A fragment cannot include a backslash.", "Pass the value as an interpolation.");
+    }
     if (state.quote !== undefined) {
       if (char !== state.quote)
         continue;

package/dist/tooling/shared/{w7qe8sj1.js → d3rhb24q.js}

@@ -1,7 +1,7 @@
 import {
   quote,
   fail2
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/runtime/sort.ts
 function insertAtEnd(table, columns, rows, group, tenantFields) {

package/dist/tooling/shared/{y031jct9.js → d8q00vxg.js}

@@ -1,16 +1,16 @@
 import {
-  open3,
+  open4,
   PgSession2
-} from "./p7f08ktn.js";
+} from "./vms9dta5.js";
 import {
   POSTGRESJS_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "./xhrnjch9.js";
+} from "./ry2f3w8p.js";
 export {
   PgSession2 as PgSession,
   POSTGRESJS_CAPABILITIES as capabilities,
   hasCapability2 as hasCapability,
-  open3 as open,
+  open4 as open,
   readCapability2 as readCapability
 };

package/dist/tooling/shared/{vs0t6qt8.js → dx188rxs.js}

@@ -3,12 +3,12 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./mtrqn2hn.js";
+} from "./gjj71hfh.js";
 import {
   OkmError,
   throwNamed,
   fail2
-} from "./f9mphxej.js";
+} from "./2jdn09e2.js";
 
 // src/runtime/lock.ts
 var LOCKS = ["update", "share"];