okmodel 0.9.0 → 0.9.1

package/dist/shared/{dd5pmnky.js → jvxcp1qk.js}

@@ -36,41 +36,29 @@ class PoolSockets {
       this.park();
     });
   }
-  busyGate() {
+  gate(key) {
     return {
       enter: () => {
-        this.busy += 1;
+        this[key] += 1;
         this.wake();
       },
       leave: () => {
-        this.busy -= 1;
-        this.park();
-      }
-    };
-  }
-  listenerGate() {
-    return {
-      enter: () => {
-        this.listeners += 1;
-        this.wake();
-      },
-      leave: () => {
-        this.listeners -= 1;
+        this[key] -= 1;
         this.park();
       }
     };
   }
   wake() {
-    for (const socket of this.held)
-      if (socket.writable)
-        socket.ref();
+    for (const s of this.held)
+      if (s.writable)
+        s.ref();
   }
   park() {
     if (this.busy > 0 || this.listeners > 0)
       return;
-    for (const socket of this.held)
-      if (socket.writable)
-        socket.unref();
+    for (const s of this.held)
+      if (s.writable)
+        s.unref();
   }
 }
 function driverOptions(config, state) {
@@ -80,6 +68,7 @@ function driverOptions(config, state) {
     idle_timeout: state.plain ? 0 : 30,
     ...state.plain ? { max_lifetime: null } : {},
     connect_timeout: 5,
+    backoff: () => 0.05 + Math.random() * 0.2,
     types: WIRE_TYPES,
     ...state.plain ? { socket: (options) => state.sockets.connect(options) } : {},
     ...config.ssl !== undefined ? { ssl: config.ssl } : {},
@@ -92,9 +81,24 @@ function driverOptions(config, state) {
     }
   };
 }
+var lives = [];
+process.on("uncaughtException", (e) => {
+  if (e instanceof TypeError && /socket\.write|reading 'write'/.test(e.message)) {
+    for (const x of lives) {
+      if (!x.on)
+        continue;
+      const prev = x.sql;
+      x.m();
+      prev.end({ timeout: 0 }).catch(() => {});
+    }
+    return;
+  }
+  console.error(e);
+  process.exitCode = 1;
+});
 function open2(config) {
   const max = config.max ?? 10;
-  const acquireMs = config.timeouts?.acquire;
+  const acquireMs = config.timeouts?.acquire ?? 1e4;
   const counters = { reserved: 0, busy: 0, reservedBusy: 0, waiting: 0 };
   const poolInflight = new Set;
   const notices = noticeBuffer();
@@ -103,48 +107,56 @@ function open2(config) {
   const named = config.prepared === "named";
   const plain = config.ssl === undefined;
   const sockets = new PoolSockets;
-  const sql = postgres(config.url, driverOptions(config, {
-    max,
-    named,
-    plain,
+  const opts = { max, named, plain, notices, sockets };
+  const make = () => postgres(config.url, driverOptions(config, opts));
+  const root = new PgSession(make(), counters, "pool", poolInflight, isClosed, undefined, notices, named);
+  const held = {
+    on: true,
+    m: () => root.sql = make(),
+    get sql() {
+      return root.sql;
+    },
+    acquireMs,
+    counters,
+    isClosed,
     notices,
-    sockets
-  }));
-  const root = new PgSession(sql, counters, "pool", poolInflight, isClosed, undefined, notices, named);
-  const held = { sql, acquireMs, counters, isClosed, notices, named, poolInflight };
+    named,
+    poolInflight
+  };
+  lives.push(held);
   return {
     capabilities: POSTGRESJS_CAPABILITIES,
     execute(text, params, options) {
       return sockets.occupy(() => runCall(closed, options, (watch) => root.query(text, params, watch)));
     },
     batch(statements, options) {
-      return sockets.occupy(() => import("./fdsz3w80.js").then((mod) => mod.runBatch(held, statements, options)));
+      return sockets.occupy(() => import("./hgt69zjf.js").then((mod) => mod.runBatch(held, statements, options)));
     },
     reserve() {
-      const gate = sockets.busyGate();
+      const gate = sockets.gate("busy");
       gate.enter();
-      return import("./fdsz3w80.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
+      return import("./hgt69zjf.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
         gate.leave();
         throw error;
       });
     },
-    describe: (text, params) => sockets.occupy(() => import("./fdsz3w80.js").then((mod) => mod.describe(sql, text, params))),
+    describe: (text, params) => sockets.occupy(() => import("./hgt69zjf.js").then((mod) => mod.describe(root.sql, text, params))),
     stream(text, params) {
-      const gate = sockets.busyGate();
+      const gate = sockets.gate("busy");
       return async function* () {
         gate.enter();
         try {
-          yield* loadStream(sql, text, params);
+          yield* (await import("./hgt69zjf.js")).stream(root.sql, text, params);
         } finally {
           gate.leave();
         }
       }();
     },
     listen(channel, onNotify) {
-      const gate = sockets.listenerGate();
+      const gate = sockets.gate("listeners");
       gate.enter();
-      return import("./fdsz3w80.js").then((mod) => mod.holdListener(gate, async () => {
-        const listening = await sql.listen(channel, onNotify);
+      return import("./hgt69zjf.js").then((mod) => mod.holdListener(gate, async () => {
+        const listening = await root.sql.listen(channel, onNotify);
         return async () => {
           await listening.unlisten();
         };
@@ -160,7 +172,8 @@ function open2(config) {
     stats: () => statsOf(counters, max),
     async close() {
       closed = true;
-      await sql.end({ timeout: 5 });
+      held.on = false;
+      await root.sql.end({ timeout: 5 });
     }
   };
 }
@@ -213,7 +226,7 @@ class PgSession {
       onAbort();
     else
       watch.signal.addEventListener("abort", onAbort, { once: true });
-    return import("./fdsz3w80.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
+    return import("./hgt69zjf.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
       start,
       text,
       notices: this.notices,
@@ -252,67 +265,38 @@ class PgSession {
     this.transactionDepth = nextTransactionDepth(this.transactionDepth, text);
   }
   enter() {
-    if (this.scope === "pool")
-      this.counters.busy += 1;
-    else
-      this.counters.reservedBusy += 1;
+    this.counters[this.scope === "pool" ? "busy" : "reservedBusy"] += 1;
   }
   leave() {
-    if (this.scope === "pool")
-      this.counters.busy = Math.max(0, this.counters.busy - 1);
-    else
-      this.counters.reservedBusy = Math.max(0, this.counters.reservedBusy - 1);
+    const k = this.scope === "pool" ? "busy" : "reservedBusy";
+    this.counters[k] = Math.max(0, this.counters[k] - 1);
   }
 }
-async function* loadStream(sql, text, params) {
-  const { stream } = await import("./fdsz3w80.js");
-  yield* stream(sql, text, params);
-}
 function send(sql, text, params, named) {
-  if (!named && (params === undefined || params.length === 0))
-    return sql.unsafe(text).raw();
-  return sql.unsafe(text, asParams(params), { prepare: named }).raw();
-}
-function asParams(params) {
-  if (params === undefined)
-    return [];
-  return params;
-}
-function statsOf(counters, size) {
-  return {
-    size,
-    idle: Math.max(0, size - counters.reserved - counters.busy),
-    inflight: counters.busy + counters.reservedBusy,
-    waiting: counters.waiting
-  };
+  return !named && (params === undefined || params.length === 0) ? sql.unsafe(text).raw() : sql.unsafe(text, asParams(params), { prepare: named }).raw();
 }
+var asParams = (params) => params ?? [];
+var statsOf = (c, size) => ({
+  size,
+  idle: Math.max(0, size - c.reserved - c.busy),
+  inflight: c.busy + c.reservedBusy,
+  waiting: c.waiting
+});
 function noticeBuffer() {
   let notices;
   return {
     push(notice) {
       const severity = typeof notice.severity === "string" ? notice.severity : "";
       const message = typeof notice.message === "string" ? notice.message : "";
-      const code = typeof notice.code === "string" && notice.code.length > 0 ? notice.code : undefined;
-      const entry = code === undefined ? { severity, message } : { severity, message, code };
-      (notices ??= []).push(entry);
-    },
-    start() {
-      return notices?.length ?? 0;
+      const code = typeof notice.code === "string" && notice.code ? notice.code : undefined;
+      (notices ??= []).push(code ? { severity, message, code } : { severity, message });
     },
-    since(start) {
-      if (notices === undefined || notices.length === start)
-        return EMPTY_NOTICES;
-      return notices.slice(start);
-    }
+    start: () => notices?.length ?? 0,
+    since: (start) => notices === undefined || notices.length === start ? EMPTY_NOTICES : notices.slice(start)
   };
 }
 function wire(to, from) {
-  return {
-    to,
-    from: [...from],
-    serialize: (value) => value,
-    parse: (value) => value
-  };
+  return { to, from, serialize: String, parse: String };
 }
 var WIRE_TYPES = {
   number: wire(0, [21, 23, 26, 700, 701]),

package/dist/shared/{yybhre6n.js → k73e8n9d.js}

@@ -8,7 +8,7 @@ import {
   withHttp,
   attachHttp,
   mapOptions
-} from "./npdftanb.js";
+} from "./xbvz446k.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -75,7 +75,7 @@ async function acceptServer2(pool, schema, http, requireMeta, options, source) {
     const result = await pool.execute(await versionSql(namespace), undefined, options);
     rows = result.rows;
   } catch (error) {
-    const { mapPostgresError } = await import("./63qtkrca.js");
+    const { mapPostgresError } = await import("./vy47ryqa.js");
     throw mapPostgresError(error, mapOptions(http, false, schema));
   }
   for (const name in schema.model) {
@@ -100,7 +100,7 @@ async function acceptServer2(pool, schema, http, requireMeta, options, source) {
       }));
     }
   } else {
-    const { assertCompatible } = await import("./pg4ezgyf.js");
+    const { assertCompatible } = await import("./xbd9xs6p.js");
     try {
       await assertCompatible(pool, schema, recorded, source, options, namespace);
     } catch (error) {

package/dist/shared/{mgaq2sd3.js → kzgrcy8s.js}

@@ -1,6 +1,6 @@
 import {
   open2
-} from "./dd5pmnky.js";
+} from "./jvxcp1qk.js";
 import"./12z7aznj.js";
 import"./fk9vef30.js";
 import"./n442h54c.js";
@@ -15,21 +15,22 @@ import {
 import {
   expandProvisioned,
   provisionHistoryIsKnown
-} from "./3456242y.js";
-import"./jpybhf98.js";
-import"./myk8fswx.js";
+} from "./8p2bgye0.js";
+import"./6xqvesa5.js";
+import"./mz48rs74.js";
 import {
   projectPath,
   catalogNamespace,
   loadMigrations,
   loadConfig
-} from "./2zdxkt7b.js";
+} from "./wp7y8q3y.js";
 import {
+  driverUrl,
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   listTargets
-} from "./6nae0spm.js";
+} from "./bdekbvmt.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -83,7 +84,7 @@ function describeStatus(migrations, history, recorded) {
 async function readTargetStatus(input) {
   assertTargetPolicy({ name: input.target, protected: input.protected }, "status");
   const pool = open2({
-    url: input.url,
+    url: driverUrl(input.url),
     max: 1,
     ...input.searchPath !== undefined ? { searchPath: input.searchPath } : {}
   });

package/dist/shared/{myk8fswx.js → mz48rs74.js}

@@ -14,7 +14,7 @@ import {
 } from "./fk9vef30.js";
 import {
   columnPrivilege
-} from "./6nae0spm.js";
+} from "./bdekbvmt.js";
 import {
   policyObject
 } from "./bdk4sty6.js";
@@ -373,7 +373,7 @@ async function introspectSchema(runner, concrete, logical = "public", options) {
       events: triggerEvents(bits),
       level: (bits & 1) === 1 ? "row" : "statement",
       calls: {
-        namespace: staticNamespace2(text(row, "function_schema")),
+        namespace: referencedNamespace(text(row, "function_schema"), concrete, namespace),
         name: text(row, "function"),
         argTypes
       },
@@ -741,6 +741,17 @@ function indexExpression(row, columns) {
   }).join(", ");
   return `using ${method} (${body.length > 0 ? body : stored})`;
 }
+async function reprintDomainCheck(runner, base, expression) {
+  await runner.query("drop domain if exists okm_expr_domain");
+  await runner.query(`create domain okm_expr_domain as ${base} check (${expression})`);
+  const rows = await runner.query(`select pg_get_constraintdef(c.oid) as definition
+     from pg_constraint c
+     join pg_type t on t.oid = c.contypid
+     join pg_namespace n on n.oid = t.typnamespace
+     where t.typname = 'okm_expr_domain' and n.nspname = current_schema()`);
+  await runner.query("drop domain okm_expr_domain");
+  return checkExpression(text(rows[0] ?? {}, "definition"));
+}
 var CHILD = "not exists (select 1 from pg_inherits i where i.inhrelid = c.oid)";
 var TABLES = `
   select c.relname as name, pt.partstrat as partstrat,
@@ -1082,4 +1093,4 @@ function flag(row, key) {
   return value === true || value === "true" || value === "t";
 }
 
-export { cellText, VIEW_DEPENDENCIES, viewDependencyEdges, PUBLIC, introspectSchema, FUNCTION_ARG_TYPES, atomicBody };
+export { cellText, VIEW_DEPENDENCIES, viewDependencyEdges, PUBLIC, introspectSchema, FUNCTION_ARG_TYPES, atomicBody, reprintDomainCheck };

package/dist/shared/{62b603gr.js → n6je5b28.js}

@@ -30,7 +30,6 @@ function open5(config) {
   let closed = false;
   const isClosed = () => closed;
   const named = config.prepared === "named";
-  const parked = [];
   let dropped = 0;
   let closures = 0;
   const sql = new BunSQL(config.url, {
@@ -57,7 +56,6 @@ function open5(config) {
   });
   const held = {
     sql,
-    parked,
     acquireMs,
     counters,
     notices,
@@ -66,26 +64,26 @@ function open5(config) {
   };
   const run = (text, params, watch) => {
     const sent = dropped;
-    return root.query(text, params, watch).catch((error) => import("./cf8zdz5p.js").then((mod) => mod.recover(sql, error, text, root.depth(), clientPools.has(pool), dropped > sent, () => root.query(text, params, watch))));
+    return root.query(text, params, watch).catch((error) => import("./rcjm0yn7.js").then((mod) => mod.recover(sql, error, text, root.depth(), clientPools.has(pool), dropped > sent, () => root.query(text, params, watch))));
   };
   const afterDrop = (text, params, watch) => {
     if (dropped === 0)
       return run(text, params, watch);
     const seen = dropped;
-    return import("./cf8zdz5p.js").then((mod) => mod.drainClosed(sql).then(() => {
+    return import("./rcjm0yn7.js").then((mod) => mod.drainClosed(sql).then(() => {
       if (dropped === seen)
         dropped = 0;
       return run(text, params, watch);
     }));
   };
-  const checkout = () => closed ? rejectClosed() : import("./cf8zdz5p.js").then((mod) => mod.checkout(held));
+  const checkout = () => closed ? rejectClosed() : import("./rcjm0yn7.js").then((mod) => mod.checkout(held));
   const pool = {
     capabilities: BUNSQL_CAPABILITIES,
     execute(text, params, options) {
       const refused = noTimeout(options);
       if (refused !== undefined)
         return refused;
-      return runCall(closed, options, (watch) => releaseParked(parked).then(() => afterDrop(text, params, watch)));
+      return runCall(closed, options, (watch) => afterDrop(text, params, watch));
     },
     async batch(statements, options) {
       const refused = noTimeout(options);
@@ -101,17 +99,16 @@ function open5(config) {
     reserve: () => checkout(),
     stream(text, params) {
       return async function* () {
-        const { streamRows } = await import("./cf8zdz5p.js");
+        const { streamRows } = await import("./rcjm0yn7.js");
         yield* streamRows(checkout, text, params);
       }();
     },
     listen(channel, onNotify) {
-      return import("./cf8zdz5p.js").then((mod) => mod.listen(sql, parked, closed, channel, onNotify));
+      return import("./rcjm0yn7.js").then((mod) => mod.listen(sql, closed, channel, onNotify));
     },
     stats: () => statsOf(counters, max),
     async close() {
       closed = true;
-      await releaseParked(parked);
       await sql.close();
     }
   };
@@ -149,24 +146,14 @@ async function reserve(sql, acquireMs, counters) {
       const errors = await driverErrors();
       throw errors.acquireTimeout();
     }
+    if (error instanceof Error && (error.message === "Connection closed" || error.message === "connection must be a PostgresSQLConnection")) {
+      throw new DriverError2(error.message, { cause: error, sqlstate: "08006" });
+    }
     throw await mapFailure(error);
   } finally {
     counters.waiting = Math.max(0, counters.waiting - 1);
   }
 }
-async function park(parked, reserved) {
-  parked.push(reserved);
-  while (parked.length > 1) {
-    const extra = parked.shift();
-    if (extra !== undefined)
-      await releaseReserved(extra);
-  }
-}
-async function releaseParked(parked) {
-  const pending = parked.splice(0);
-  for (const reserved of pending)
-    await releaseReserved(reserved);
-}
 function releaseReserved(reserved) {
   const done = reserved.release();
   return done instanceof Promise ? done.then(() => {
@@ -187,4 +174,4 @@ function statsOf(counters, size) {
   };
 }
 
-export { markClientPool, open5, send2, reserve, park };
+export { markClientPool, open5, send2, reserve, releaseReserved };