okmodel 0.8.0 → 0.9.1

package/dist/runtime/pg/pglite.js

@@ -4,20 +4,20 @@ import {
 import {
   open3,
   seal2
-} from "../../shared/4m6hskg8.js";
+} from "../../shared/0j6qe91y.js";
 import {
   PGLITE_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "../../shared/ae4j5f42.js";
+} from "../../shared/mfvx6kjx.js";
 import {
   createClient
-} from "../../shared/bah9nbg3.js";
+} from "../../shared/xbvz446k.js";
 
 // src/runtime/pg/pglite.ts
 async function connect(target, options) {
   if (typeof target === "object" && !isPool(target)) {
-    return import("../../shared/0wrea3jq.js").then((mod) => mod.default(target, options, open3));
+    return import("../../shared/ysdw2fg3.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,30 +3,30 @@ import {
 } from "../../shared/cm3w0ywp.js";
 import {
   open2
-} from "../../shared/35q0n9tz.js";
+} from "../../shared/jvxcp1qk.js";
 import {
   POSTGRESJS_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "../../shared/ae4j5f42.js";
+} from "../../shared/mfvx6kjx.js";
 import {
   createClient
-} from "../../shared/bah9nbg3.js";
+} from "../../shared/xbvz446k.js";
 
 // src/runtime/pg/postgresjs.ts
 function connect(target, options) {
   if (typeof target === "object" && !isPool(target)) {
-    return import("../../shared/0wrea3jq.js").then((mod) => mod.default(target, options, open2));
+    return import("../../shared/ysdw2fg3.js").then((mod) => mod.default(target, options, open2));
   }
   const owned = !isPool(target);
-  const pool = isPool(target) ? target : open2({
+  const pool = owned ? open2({
     url: target,
-    ...options.max !== undefined ? { max: options.max } : {},
-    ...options.timeouts !== undefined ? { timeouts: options.timeouts } : {},
-    ...options.prepared !== undefined ? { prepared: options.prepared } : {},
-    ...options.searchPath !== undefined ? { searchPath: options.searchPath } : {},
-    ...options.ssl !== undefined ? { ssl: options.ssl } : {}
-  });
+    max: options.max,
+    timeouts: options.timeouts,
+    prepared: options.prepared,
+    searchPath: options.searchPath,
+    ssl: options.ssl
+  }) : target;
   return createClient(options.schema, pool, {
     ownsPool: owned,
     http: options.errors?.http,

package/dist/runtime/server-check.d.ts

@@ -15,20 +15,50 @@ import type { CatalogArtifact } from "./types.js";
  */
 export declare const 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)";
 /**
- * Accepts the `server_version_num` row, or throws OKM1801, OKM1520, OKM1802, or OKM1803.
+ * Startup query for the namespace `okm build` recorded.
  *
- * A declared floor is the minimum. With no floor, the minimum is 15.
- * A major below 15 is refused when the schema is built.
+ * `public` returns {@link versionQuery}, the same string as before.
+ * Another namespace qualifies `okm_meta`. `to_regclass` still lets a
+ * database with no such table plan.
  *
- * @param pool - Connection that ran the version query
+ * @param namespace - Catalog schema. `public` is unqualified
+ * @returns The version, dialect, and hash query
+ */
+export declare function versionSql(namespace: string): Promise<string>;
+/**
+ * History query used when the catalog hashes differ.
+ *
+ * `public` stays unqualified, so a search path still finds that table.
+ *
+ * @param namespace - Catalog schema. `public` is unqualified
+ * @returns The `okm_history` select
+ */
+export declare function historySql(namespace: string): Promise<string>;
+/**
+ * Namespace stored beside the catalog hash.
+ *
+ * A missing file means `public`. `okm build` writes the file only when
+ * `defineConfig({ namespace })` is not `public`.
+ *
+ * @param catalogDir - Directory `connect` was given, or the default `.okm`
+ * @returns The schema name
+ */
+export declare function recordedNamespace(catalogDir: string | undefined): Promise<string>;
+/**
+ * Accepts the server row, or throws OKM1801, OKM1520, OKM1802, or OKM1803.
+ *
+ * The first statement reads `okm_meta` in the catalog namespace. A declared
+ * floor is the minimum. With no floor, the minimum is 15. A major below 15
+ * is refused when the schema is built.
+ *
+ * @param pool - Connection that runs the version query
  * @param schema - Schema whose floor is the declared minimum
- * @param rows - `server_version_num`, `version()`, and the `okm_meta` hash
  * @param http - Status overrides from `connect`
  * @param requireMeta - When true, a missing hash is OKM1520
  * @param options - Signal and timeout for the compatibility read
  * @param source - Trusted catalog used when the hash does not match
  */
-export declare function acceptServer(pool: DriverPool, schema: QuerySchema, rows: readonly (readonly (string | null)[])[], http: ErrorStatuses | undefined, requireMeta: boolean, options: ExecuteOptions | undefined, source: {
+export declare function acceptServer(pool: DriverPool, schema: QuerySchema, http: ErrorStatuses | undefined, requireMeta: boolean, options: ExecuteOptions | undefined, source: {
     readonly catalog?: CatalogArtifact;
     readonly catalogDir?: string;
 }): Promise<void>;

package/dist/runtime/tenancy/index.js

@@ -10,7 +10,7 @@ import {
 import {
   index2,
   snakeCase
-} from "../../shared/gcefca6p.js";
+} from "../../shared/f9t9g54z.js";
 import {
   ColumnBuilder2,
   retarget

package/dist/runtime/traits/index.js

@@ -2,6 +2,9 @@ import {
   functionObject,
   triggerObject
 } from "../../shared/12z7aznj.js";
+import {
+  quoteIdent2
+} from "../../shared/fk9vef30.js";
 import {
   checkPresetNames,
   duplicatePreset
@@ -21,14 +24,11 @@ import {
 } from "../../shared/ecn8mfdq.js";
 import {
   snakeCase
-} from "../../shared/gcefca6p.js";
+} from "../../shared/f9t9g54z.js";
 import {
   ColumnBuilder2,
   retarget
 } from "../../shared/606g0nbf.js";
-import {
-  quoteIdent
-} from "../../shared/sjk86yrx.js";
 import {
   definition,
   unavailable
@@ -41,7 +41,7 @@ import {
   queryHandle,
   attachHttp,
   settleCall
-} from "../../shared/bah9nbg3.js";
+} from "../../shared/xbvz446k.js";
 import {
   installArchiveInspect,
   indexes,
@@ -299,7 +299,7 @@ function timestampRecords(built) {
         returns: "trigger",
         language: "plpgsql",
         volatility: "volatile",
-        body: `begin new.${quoteIdent(column)} = now(); return new; end`,
+        body: `begin new.${quoteIdent2(column)} = now(); return new; end`,
         provenance: { origin: "trait", name: "timestamps" },
         dependencies: []
       }));

package/dist/runtime/validate/index.js

@@ -3,10 +3,10 @@ import {
 } from "../../shared/w9ejzaqf.js";
 import {
   addSchemaHook
-} from "../../shared/9dr2qnx7.js";
+} from "../../shared/qqm3ze6q.js";
 import {
   queryHandle
-} from "../../shared/bah9nbg3.js";
+} from "../../shared/xbvz446k.js";
 import {
   OkmError2
 } from "../../shared/52szzakm.js";

package/dist/runtime/write.d.ts

@@ -39,7 +39,7 @@ export type PreparedWrite = {
     readonly statements: readonly Statement[];
     readonly options: ExecuteOptions | undefined;
     /** Set when `finish` can refuse a statement that already ran. `batch` refuses such a write (D183). */
-    readonly checked?: "restore" | "expect" | "parent";
+    readonly checked?: "restore" | "expect" | "parent" | "tree";
     finish(results: readonly ExecuteResult[]): unknown;
     /**
      * More statements once the planned ones have run.

package/dist/shared/{4m6hskg8.js → 0j6qe91y.js}

@@ -1,6 +1,6 @@
 import {
   noTimeout
-} from "./q0cqt2sp.js";
+} from "./tr64w5p0.js";
 import {
   PGLITE_CAPABILITIES,
   driverErrors,
@@ -11,12 +11,12 @@ import {
   runCall,
   EMPTY_NOTICES,
   resultFrom
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/pglite.ts
 import { PGlite } from "@electric-sql/pglite";
 async function open3(config = {}) {
-  const wire = await import("./needfe47.js");
+  const wire = await import("./g89fmz5s.js");
   const db = new PGlite({
     dataDir: config.dataDir ?? "memory://",
     parsers: wire.parsers,
@@ -67,7 +67,7 @@ async function open3(config = {}) {
           return;
         released = true;
         try {
-          const { resetQueried } = await import("./bnby0esn.js");
+          const { resetQueried } = await import("./pgsak1yw.js");
           await resetQueried(session);
         } finally {
           slot.release();

package/dist/shared/{6m78c8ss.js → 1h5h1rf5.js}

@@ -1,6 +1,6 @@
 import {
   build3
-} from "./n0jmpgj1.js";
+} from "./gr9sn4za.js";
 export {
   build3 as build
 };

package/dist/shared/{4vbf83xx.js → 2vcnpf0n.js}

@@ -1,6 +1,6 @@
 import {
   emitSqlValue
-} from "./3bb7wsqt.js";
+} from "./ycnft340.js";
 import {
   assertOperatorFits,
   sqlType,

package/dist/shared/{qd9hhd8f.js → 3ap5hxvj.js}

@@ -15,7 +15,8 @@ import {
   expectOf2,
   allowSet2,
   noteGuarded2
-} from "./bxas03mq.js";
+} from "./63qjmhnp.js";
+import"./ddh72ym5.js";
 import"./mss6ctgv.js";
 export {
   Sql2 as Sql,

package/dist/shared/{v1wad97q.js → 3d7a80fq.js}

@@ -8,7 +8,7 @@ import {
   openClient,
   withHttp,
   settleCall
-} from "./bah9nbg3.js";
+} from "./xbvz446k.js";
 import {
   rejectKeys,
   isRecord,

package/dist/shared/{wcrheftc.js → 3dr444ny.js}

@@ -4,7 +4,7 @@ import {
 } from "./cm3w0ywp.js";
 import {
   PgSession
-} from "./35q0n9tz.js";
+} from "./jvxcp1qk.js";
 import {
   isConnectionLost
 } from "./cnkky55j.js";
@@ -15,7 +15,7 @@ import {
   runCall,
   rowsFrom,
   resultFrom
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/postgres-extra.ts
 var RESET_ALL = "RESET ALL";
@@ -80,18 +80,12 @@ async function checkout2(pool, timeoutMs) {
   };
 }
 async function describe2(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* stream2(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;
@@ -105,14 +99,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;
@@ -194,41 +188,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);
+      });
     });
   });
 }
@@ -237,25 +230,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;
-}
-function watchReserved2(sql, lost) {
-  arm(sql, lost);
-}
+var asParams = (params) => params ?? [];
 function arm(sql, lost) {
   const unsafe = sql.unsafe.bind(sql);
   sql.unsafe = (text, params, options) => unsafe(text, params, {
@@ -268,19 +256,13 @@ function arm(sql, lost) {
     }
   });
 }
+var watchReserved2 = arm;
 async function holdCheckout2(gate, checkout) {
   try {
     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();
@@ -295,11 +277,9 @@ async function holdListener2(gate, start) {
       if (stopped)
         return;
       stopped = true;
-      try {
-        await stop();
-      } finally {
+      await stop().finally(() => {
         gate.leave();
-      }
+      });
     };
   } catch (error) {
     gate.leave();
@@ -307,36 +287,35 @@ async function holdListener2(gate, start) {
   }
 }
 function watchQuery2(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 { checkout2, describe2, stream2, runBatch2, watchReserved2, holdCheckout2, holdListener2, watchQuery2 };

package/dist/shared/{hm5f8jby.js → 3vvpcphd.js}

@@ -1,24 +1,25 @@
 import {
   open2
-} from "./35q0n9tz.js";
+} from "./jvxcp1qk.js";
 import"./12z7aznj.js";
+import"./fk9vef30.js";
 import"./n442h54c.js";
 import {
   assertRoleHealth
-} from "./kj9d8maq.js";
-import"./p3xbdcvt.js";
+} from "./6xqvesa5.js";
+import"./mz48rs74.js";
 import {
   errorDoc,
   openProject
-} from "./f4jy1j7x.js";
+} from "./wp7y8q3y.js";
 import {
+  driverUrl,
   omitManagedObjects,
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   selectTarget
-} from "./dpc2r7rb.js";
-import"./sjk86yrx.js";
+} from "./bdekbvmt.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -42,7 +43,7 @@ ${doc.fix}
   if (opened.config.roles !== undefined) {
     const target = selectTarget(opened.config, flags?.target);
     assertTargetPolicy(target, "check", flags?.allowProtected ?? false);
-    const pool = open2({ url: target.url, max: 1 });
+    const pool = open2({ url: driverUrl(target.url), max: 1 });
     try {
       await assertRoleHealth(pool, opened.config.roles, objects);
     } catch (error) {

package/dist/shared/{760ppr76.js → 4a3mmhhe.js}

@@ -8,7 +8,7 @@ import {
 } from "./typ3vy7t.js";
 import {
   snakeCase
-} from "./gcefca6p.js";
+} from "./f9t9g54z.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -85,7 +85,7 @@ function viewClient(name, columns, query, tenancy, refresh = "plain") {
 }
 function refreshHandle(session, name, mode) {
   const concurrently = mode === "concurrently";
-  return () => lazyRefresh(() => import("./z7s6fpxv.js").then((mod) => mod.refreshView(session, name, concurrently)));
+  return () => lazyRefresh(() => import("./ymenf259.js").then((mod) => mod.refreshView(session, name, concurrently)));
 }
 function lazyRefresh(run) {
   let pending;