okmodel 0.9.0 → 0.9.1

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

@@ -4,7 +4,7 @@ import {
 } from "./cm3w0ywp.js";
 import {
   PgSession
-} from "./dd5pmnky.js";
+} from "./jvxcp1qk.js";
 import {
   isConnectionLost
 } from "./cnkky55j.js";
@@ -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/{yvabyg9k.js → 3vvpcphd.js}

@@ -1,24 +1,25 @@
 import {
   open2
-} from "./dd5pmnky.js";
+} from "./jvxcp1qk.js";
 import"./12z7aznj.js";
 import"./fk9vef30.js";
 import"./n442h54c.js";
 import {
   assertRoleHealth
-} from "./jpybhf98.js";
-import"./myk8fswx.js";
+} from "./6xqvesa5.js";
+import"./mz48rs74.js";
 import {
   errorDoc,
   openProject
-} from "./2zdxkt7b.js";
+} from "./wp7y8q3y.js";
 import {
+  driverUrl,
   omitManagedObjects,
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   selectTarget
-} from "./6nae0spm.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;

package/dist/shared/{90sg0w5a.js → 4pkz5nvw.js}

@@ -7,23 +7,28 @@ import {
   quoteIdent2,
   createObjectSql2
 } from "./fk9vef30.js";
+import {
+  probeStableBackend
+} from "./e1c55v04.js";
 import {
   cellText,
   VIEW_DEPENDENCIES,
   viewDependencyEdges,
   PUBLIC,
   introspectSchema,
-  atomicBody
-} from "./myk8fswx.js";
+  atomicBody,
+  reprintDomainCheck
+} from "./mz48rs74.js";
 import {
+  driverUrl,
   planMigration,
   sessionFailure,
   finishQuiet,
-  assertDirectConnection,
-  assertStableBackend
-} from "./6nae0spm.js";
+  assertDirectConnection
+} from "./bdekbvmt.js";
 import {
-  catalog
+  catalog,
+  isDomain
 } from "./ywspezzx.js";
 import {
   OkmError2
@@ -58,8 +63,10 @@ async function sealViews(runner, source) {
   const previous = await runner.query(`select current_setting('search_path') as path`);
   const saved = cellText(previous[0]?.path);
   const path = await scratchSearchPath(runner, source);
+  let installed = [];
   try {
     await runner.query(`select set_config('search_path', $1, false)`, [path]);
+    installed = await createExtensions(runner, source);
     await createObjects(runner, source, "type");
     for (const object of source.objects) {
       if (object.kind !== "table")
@@ -116,6 +123,7 @@ async function sealViews(runner, source) {
       return;
     });
     await dropScratch(runner);
+    await dropInstalledExtensions(runner, installed);
   }
 }
 async function scratchSearchPath(runner, source) {
@@ -152,6 +160,32 @@ async function createObjects(runner, source, kind) {
       await runner.query(statement);
   }
 }
+async function createExtensions(runner, source) {
+  const installed = [];
+  for (const object of source.objects) {
+    if (object.kind !== "extension")
+      continue;
+    const name = object.identity.name;
+    const present = await runner.query(`select 1 as ok from pg_extension where extname = $1`, [
+      name
+    ]);
+    if (present.length > 0)
+      continue;
+    const statement = createObjectSql2(object, SCRATCH);
+    if (statement === undefined)
+      continue;
+    await runner.query(statement);
+    installed.push(name);
+  }
+  return installed;
+}
+async function dropInstalledExtensions(runner, names) {
+  for (const name of names) {
+    await runner.query(`drop extension if exists ${quoteIdent2(name)}`).catch(() => {
+      return;
+    });
+  }
+}
 var FUNCTION_DEFS = `
   select p.proname as name,
     pg_get_function_identity_arguments(p.oid) as args,
@@ -393,14 +427,14 @@ async function dropScratch(runner) {
 // src/tooling/migrate/drift.ts
 async function assertAuthorDrift2(url, author, roles, allowPooler = false) {
   assertDirectConnection(url, allowPooler);
-  const sql = postgres(url, {
+  const sql = postgres(driverUrl(url), {
     max: 1,
     connect_timeout: 5,
     idle_timeout: 1,
     onnotice: () => {}
   });
   try {
-    await assertStableBackend(async () => {
+    await probeStableBackend(url, async () => {
       const rows = await sql`select pg_backend_pid()::text as pid`;
       return rows[0]?.pid ?? "";
     }, allowPooler);
@@ -411,7 +445,7 @@ async function assertAuthorDrift2(url, author, roles, allowPooler = false) {
     if (present[0]?.reg == null)
       return;
     const runner = catalogQuery2(sql);
-    const authorOnServer = await sealViews(runner, author);
+    const authorOnServer = await sealDomainChecks2(runner, await sealViews(runner, author));
     const live = await introspectSchema(runner, schema, schema, managedRoleOptions2(roles));
     const plan = planMigration({ before: live, after: authorOnServer, name: "check" });
     if (plan.steps.length === 0)
@@ -429,6 +463,27 @@ ${plan.steps.map((step) => step.sql).join(`
     await finishQuiet(() => sql.end({ timeout: 5 }));
   }
 }
+async function sealDomainChecks2(runner, source) {
+  const objects = [];
+  let changed = false;
+  for (const object of source.objects) {
+    if (object.kind !== "type" || !isDomain(object.definition)) {
+      objects.push(object);
+      continue;
+    }
+    const reprinted = await reprintDomainCheck(runner, object.definition.base, object.definition.check);
+    if (reprinted === object.definition.check) {
+      objects.push(object);
+      continue;
+    }
+    changed = true;
+    objects.push({
+      ...object,
+      definition: { ...object.definition, check: reprinted }
+    });
+  }
+  return changed ? { version: source.version, objects } : source;
+}
 function catalogQuery2(sql) {
   return {
     async query(text, params) {
@@ -473,4 +528,4 @@ function managedRoleNames(roles) {
   return [...names];
 }
 
-export { sealViews, assertAuthorDrift2, catalogQuery2, managedRoleOptions2 };
+export { sealViews, assertAuthorDrift2, sealDomainChecks2, catalogQuery2, managedRoleOptions2 };

package/dist/shared/{mazpbcdj.js → 4te76xc5.js}

@@ -117,7 +117,7 @@ async function openWebSocket(config) {
     counters.busy = Math.max(0, counters.busy - 1);
   });
   const held = { pool, acquireMs, counters, notices, named, isClosed };
-  const checkout = () => closed ? rejectClosed() : import("./xv8qj97g.js").then((mod) => mod.checkout(held));
+  const checkout = () => closed ? rejectClosed() : import("./wbdh9qbg.js").then((mod) => mod.checkout(held));
   return {
     capabilities: NEON_WEBSOCKET_CAPABILITIES,
     execute(text, params, options) {

package/dist/shared/{xwhdcrm4.js → 60y4ahmw.js}

@@ -1,7 +1,7 @@
 import {
   touchFields,
   fieldSealed
-} from "./9dtgn1z2.js";
+} from "./63qjmhnp.js";
 import {
   projectExpr,
   quote,