okmodel 0.7.0 → 0.8.0

package/dist/shared/{wa07eas9.js → jp36k7dp.js}

@@ -1,33 +1,33 @@
 import {
   parseCatalog2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
 import"./n442h54c.js";
 import"./cm3w0ywp.js";
-import"./14vx95q4.js";
+import"./35q0n9tz.js";
 import {
   watchReserved2
-} from "./bz84tkzm.js";
+} from "./wcrheftc.js";
 import {
   ensureMigrationTables2
-} from "./p6qc5gcp.js";
+} from "./pan0370z.js";
 import {
   sealViews,
   catalogQuery2,
   managedRoleOptions2
-} from "./ax7qv55k.js";
+} from "./mkrn359n.js";
 import {
   assumeRole,
   grantSchema,
   assertSchemaUsageLanded,
   catalogsEqual,
   snapshotDifference
-} from "./m6p12kbr.js";
+} from "./mnvjvqyp.js";
 import {
   roleExists
-} from "./8skf0cam.js";
+} from "./kj9d8maq.js";
 import {
   introspectSchema
-} from "./b5pftnn2.js";
+} from "./p3xbdcvt.js";
 import {
   projectPath,
   loadMigrations,
@@ -36,7 +36,7 @@ import {
   hasError,
   lintRefusal,
   openProject
-} from "./gs74dbj5.js";
+} from "./f4jy1j7x.js";
 import {
   sqlStatements,
   transactionControl,
@@ -51,13 +51,13 @@ import {
   assertDirectConnection,
   assertStableBackend,
   selectTarget
-} from "./tsvww22q.js";
+} from "./dpc2r7rb.js";
 import {
   isConnectionLost
 } from "./cnkky55j.js";
 import {
   quoteIdent
-} from "./9s0ypp87.js";
+} from "./sjk86yrx.js";
 import {
   catalog,
   isDomain

package/dist/shared/jx2m62cs.js

@@ -0,0 +1,96 @@
+import {
+  DriverError2
+} from "./cm3w0ywp.js";
+import {
+  connectClient2,
+  send3
+} from "./agsfb86s.js";
+import {
+  resetSession2
+} from "./7ghwamrf.js";
+import {
+  isConnectionLost
+} from "./cnkky55j.js";
+import {
+  noTimeout
+} from "./q0cqt2sp.js";
+import {
+  WireSession
+} from "./mtw6jz76.js";
+import {
+  rejectClosed,
+  runCall
+} from "./ae4j5f42.js";
+
+// src/adapters/pg/neon-extra.ts
+async function checkout(held) {
+  const { pool, counters, named, isClosed } = held;
+  if (isClosed())
+    return rejectClosed();
+  const client = await connectClient2(pool, held.acquireMs, counters);
+  counters.reserved += 1;
+  let lost = false;
+  const onError = () => {
+    lost = true;
+  };
+  const events = client;
+  events.on("error", onError);
+  const local = new Set;
+  const session = new WireSession((text, params) => {
+    const pending = send3(client, text, params, named);
+    const guarded = pending.catch((error) => {
+      if (isConnectionLost(error) || lost) {
+        lost = true;
+        if (isConnectionLost(error))
+          throw error;
+        throw Object.assign(new DriverError2("CONNECTION_CLOSED", { cause: error }), {
+          code: "CONNECTION_CLOSED"
+        });
+      }
+      throw error;
+    });
+    return guarded;
+  }, held.notices, isClosed, false, () => {
+    counters.reservedBusy += 1;
+  }, () => {
+    counters.reservedBusy = Math.max(0, counters.reservedBusy - 1);
+  }, local);
+  const guard = (run) => lost ? rejectClosed() : run();
+  let released = false;
+  return {
+    execute: (text, params, options) => {
+      const refused = noTimeout(options);
+      if (refused !== undefined)
+        return refused;
+      return guard(() => runCall(isClosed(), options, (watch) => session.query(text, params, watch)));
+    },
+    batch: (statements, options) => {
+      const refused = noTimeout(options);
+      if (refused !== undefined)
+        return refused;
+      return guard(() => runCall(isClosed(), options, async (watch) => {
+        const { runAtomicBatch } = await import("./b76b8d95.js");
+        return runAtomicBatch(session, statements, watch);
+      }));
+    },
+    async release() {
+      if (released)
+        return;
+      released = true;
+      try {
+        if (!lost)
+          await reset(session, client);
+      } finally {
+        counters.reserved = Math.max(0, counters.reserved - 1);
+        events.removeListener("error", onError);
+        client.release(lost);
+      }
+    }
+  };
+}
+async function reset(session, client) {
+  await resetSession2(session.depth(), (text) => client.query(text));
+}
+export {
+  checkout
+};

package/dist/shared/{sfz1ksn6.js → k86n8vq3.js}

@@ -3,10 +3,10 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./tbrvgw6z.js";
+} from "./bah9nbg3.js";
 import {
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   OkmError2,
   throwNamed2

package/dist/shared/{67txcrcw.js → kgwp4jdd.js}

@@ -138,12 +138,12 @@ function needsOperatorSql(table, value, key) {
 function isTextColumn(dataType) {
   return dataType === "text" || dataType === "citext" || dataType.startsWith("varchar(") || dataType.startsWith("char(") || dataType.startsWith("character");
 }
-function emitLazy(column, ref, name, value, sink, order) {
+function emitLazy(table, column, ref, name, value, sink, order) {
   const emit = operatorEmit;
   if (emit === undefined) {
     fail2("OKM1121", `Operator ${name} on ${column.field} is not loaded.`);
   }
-  emit(column, ref, name, value, sink, order);
+  emit(table, column, ref, name, value, sink, order);
 }
 function verifyRead(schema, call) {
   if (!safetyInstalled())
@@ -511,7 +511,7 @@ function emitOperator(schema, table, column, ref, name, value, sink, alias, dept
     sink.text(" escape E'\\\\'");
     return;
   }
-  emitLazy(column, ref, name, value, sink);
+  emitLazy(table, column, ref, name, value, sink);
 }
 function emitNot(schema, table, column, ref, value, sink, alias, depth) {
   if (value === null) {
@@ -636,7 +636,7 @@ function emitOrder(table, orderBy, sink, alias) {
     if (index > 0)
       sink.text(", ");
     if (isOperator(value) && operatorName(value) === "relevance") {
-      emitLazy(column, `${alias}.${quote(column.sql)}`, "relevance", operatorValue(value), sink, true);
+      emitLazy(table, column, `${alias}.${quote(column.sql)}`, "relevance", operatorValue(value), sink, true);
       continue;
     }
     const parsed = parseOrder(key, value);

package/dist/shared/{8skf0cam.js → kj9d8maq.js}

@@ -1,6 +1,6 @@
 import {
   FUNCTION_ARG_TYPES
-} from "./b5pftnn2.js";
+} from "./p3xbdcvt.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{aytqh5y2.js → m4xff2a6.js}

@@ -1,12 +1,12 @@
 import {
   open3,
   seal2
-} from "./81ebdx9p.js";
+} from "./4m6hskg8.js";
 import {
   PGLITE_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "./kb2sdhfb.js";
+} from "./ae4j5f42.js";
 export {
   PGLITE_CAPABILITIES as capabilities,
   hasCapability2 as hasCapability,

package/dist/shared/{zp9fmend.js → mfedzr74.js}

@@ -5,10 +5,10 @@ import {
   armDriverError,
   send,
   connectClient
-} from "./w79hsckn.js";
+} from "./14x60fbf.js";
 import {
   resetSession2
-} from "./zm0ptry0.js";
+} from "./7ghwamrf.js";
 import {
   cursorStream
 } from "./7kms6fvj.js";
@@ -17,11 +17,11 @@ import {
 } from "./cnkky55j.js";
 import {
   WireSession
-} from "./1qa0qajz.js";
+} from "./mtw6jz76.js";
 import {
   rejectClosed,
   runCall
-} from "./kb2sdhfb.js";
+} from "./ae4j5f42.js";
 
 // src/adapters/pg/nodepostgres-extra.ts
 async function checkout(held) {

package/dist/shared/{ax7qv55k.js → mkrn359n.js}

@@ -1,26 +1,27 @@
+import {
+  normaliseViewQuery,
+  viewObject,
+  materializedViewObject
+} from "./12z7aznj.js";
 import {
   cellText,
   VIEW_DEPENDENCIES,
   viewDependencyEdges,
   PUBLIC,
-  introspectSchema
-} from "./b5pftnn2.js";
+  introspectSchema,
+  atomicBody
+} from "./p3xbdcvt.js";
 import {
   planMigration,
   sessionFailure,
   finishQuiet,
   assertDirectConnection,
   assertStableBackend
-} from "./tsvww22q.js";
+} from "./dpc2r7rb.js";
 import {
   quoteIdent,
   createObjectSql
-} from "./9s0ypp87.js";
-import {
-  normaliseViewQuery,
-  viewObject,
-  materializedViewObject
-} from "./zy8r7qvz.js";
+} from "./sjk86yrx.js";
 import {
   catalog
 } from "./ywspezzx.js";
@@ -49,7 +50,8 @@ var VIEW_SHAPE = `
 `;
 async function sealViews(runner, source) {
   const views = source.objects.filter((object) => object.kind === "view" || object.kind === "materializedView");
-  if (views.length === 0)
+  const hasAtomic = source.objects.some((object) => object.kind === "function" && object.definition.atomic === true);
+  if (views.length === 0 && !hasAtomic)
     return source;
   await dropScratch(runner);
   await runner.query(`create schema ${quoteIdent(SCRATCH)}`);
@@ -65,12 +67,15 @@ async function sealViews(runner, source) {
       await runner.query(stubTable(object, source));
     }
     await createObjects(runner, source, "function");
+    const reprinted = await reprintAtomicBodies(runner, source);
+    if (views.length === 0)
+      return reprinted;
     await createViews(runner, views);
     const shapes = await runner.query(VIEW_SHAPE, [SCRATCH]);
     const deps = await runner.query(VIEW_DEPENDENCIES, [SCRATCH]);
     const edges = viewDependencyEdges(deps, PUBLIC, source.objects);
     const byName = new Map(shapes.map((row) => [cellText(row.name), row]));
-    const next = source.objects.map((object) => {
+    const next = reprinted.objects.map((object) => {
       if (object.kind !== "view" && object.kind !== "materializedView")
         return object;
       const row = byName.get(object.identity.name);
@@ -147,6 +152,40 @@ async function createObjects(runner, source, kind) {
       await runner.query(statement);
   }
 }
+var FUNCTION_DEFS = `
+  select pg_get_functiondef(p.oid) as definition
+  from pg_proc p
+  join pg_namespace n on n.oid = p.pronamespace
+  where n.nspname = $1 and p.prokind = 'f'
+  order by p.oid
+`;
+async function reprintAtomicBodies(runner, source) {
+  const created = source.objects.filter((object) => object.kind === "function");
+  if (!created.some((object) => object.definition.atomic === true))
+    return source;
+  const rows = await runner.query(FUNCTION_DEFS, [SCRATCH]);
+  if (rows.length !== created.length) {
+    throw new OkmError2("OKM1020", `Expected ${String(created.length)} functions in the scratch schema and found ${String(rows.length)}.`, { fix: { summary: "The function body has to run against the tables in this schema." } });
+  }
+  const bodies = new Map;
+  for (let index = 0;index < created.length; index += 1) {
+    const object = created[index];
+    if (object === undefined || object.definition.atomic !== true)
+      continue;
+    bodies.set(object, atomicBody(cellText(rows[index]?.definition)));
+  }
+  let changed = false;
+  const objects = source.objects.map((object) => {
+    if (object.kind !== "function")
+      return object;
+    const body = bodies.get(object);
+    if (body === undefined || body === object.definition.body)
+      return object;
+    changed = true;
+    return { ...object, definition: { ...object.definition, body } };
+  });
+  return changed ? catalog(objects) : source;
+}
 async function createViews(runner, views) {
   const pending = [...views];
   let last = "";
@@ -210,6 +249,12 @@ async function dropScratch(runner) {
     join pg_namespace n on n.oid = c.relnamespace
     where n.nspname = $1 and c.relkind in ('v', 'm', 'r')
   `, [SCRATCH]);
+  const routines = await runner.query(`
+    select p.proname as name, pg_get_function_identity_arguments(p.oid) as args
+    from pg_proc p
+    join pg_namespace n on n.oid = p.pronamespace
+    where n.nspname = $1
+  `, [SCRATCH]);
   const views = rows.filter((row) => cellText(row.kind) === "v" || cellText(row.kind) === "m");
   for (let pass = 0;pass < Math.max(views.length, 1); pass += 1) {
     for (const row of views) {
@@ -219,6 +264,10 @@ async function dropScratch(runner) {
       } catch {}
     }
   }
+  for (const row of routines) {
+    const args = cellText(row.args);
+    await runner.query(`drop function if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}(${args})`);
+  }
   for (const row of rows) {
     if (cellText(row.kind) !== "r")
       continue;

package/dist/shared/{m6p12kbr.js → mnvjvqyp.js}

@@ -1,9 +1,9 @@
 import {
   serializeCatalog2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
 import {
   roleExists
-} from "./8skf0cam.js";
+} from "./kj9d8maq.js";
 import {
   canonicalTypeName,
   createdRoleName,
@@ -16,24 +16,24 @@ import {
   planMigration,
   sessionFailure,
   assertTargetPolicy
-} from "./tsvww22q.js";
+} from "./dpc2r7rb.js";
+import {
+  snakeCase
+} from "./gcefca6p.js";
 import {
   quoteIdent,
   qualify
-} from "./9s0ypp87.js";
-import {
-  alignExtensionVersions
-} from "./r3j8s5y0.js";
+} from "./sjk86yrx.js";
 import {
   catalog,
   isDomain
 } from "./ywspezzx.js";
-import {
-  snakeCase
-} from "./rpycarcr.js";
 import {
   quoteLiteral
 } from "./94ez8kzh.js";
+import {
+  alignExtensionVersions
+} from "./r3j8s5y0.js";
 import {
   identityKey2,
   identityLabel2

package/dist/shared/{1qa0qajz.js → mtw6jz76.js}

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

package/dist/shared/{1est4ezg.js → n05z9nwz.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./tbrvgw6z.js";
+} from "./bah9nbg3.js";
 import {
   emitWhere,
   emitOrder,
@@ -17,7 +17,7 @@ import {
   list,
   isRecord,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   OkmError2,
   throwNamed2
@@ -27,7 +27,7 @@ import {
 var BUCKET = Symbol.for("okmodel.bucket");
 var bucketChunk;
 function loadBucketGroup() {
-  return bucketChunk ??= import("./3v7t1yrv.js");
+  return bucketChunk ??= import("./th3be82n.js");
 }
 var OPTIONS = [
   "where",

package/dist/shared/{pbp1ss85.js → n0jmpgj1.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./tbrvgw6z.js";
+} from "./bah9nbg3.js";
 import {
   selectedColumns,
   parseOrder,
@@ -15,7 +15,7 @@ import {
   isRecord,
   registerFailFix,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   OkmError2,
   throwNamed2

package/dist/shared/{ktz42yez.js → n41w4fbz.js}

@@ -1,18 +1,18 @@
 import {
   open2
-} from "./14vx95q4.js";
-import"./qq3899ht.js";
+} from "./35q0n9tz.js";
+import"./12z7aznj.js";
 import"./n442h54c.js";
 import {
   openProject
-} from "./gs74dbj5.js";
+} from "./f4jy1j7x.js";
 import {
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   selectTarget
-} from "./tsvww22q.js";
-import"./9s0ypp87.js";
+} from "./dpc2r7rb.js";
+import"./sjk86yrx.js";
 import {
   isExactVersion,
   compareExtensionVersions

package/dist/shared/{n816peh1.js → n454kcnw.js}

@@ -1,7 +1,7 @@
 import {
   isRecord,
   orFail
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   isOperator,
   operatorName,

package/dist/shared/n7kg8mmx.js

@@ -0,0 +1,61 @@
+import {
+  OkmError2
+} from "./52szzakm.js";
+
+// src/tooling/driver-test.ts
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+async function driverTest(args, stdout) {
+  const runner = driverRunnerPath(dirname(fileURLToPath(import.meta.url)));
+  if (!existsSync(runner)) {
+    throw new OkmError2("invalid", "okm driver test cannot find its runner.", {
+      fix: { summary: "Run bun run build, then retry." }
+    });
+  }
+  const command = runner.endsWith(".ts") ? "bun" : process.execPath;
+  const result = await runProcess(command, [runner, ...args]);
+  if (result.stdout.length > 0)
+    stdout(result.stdout);
+  if (result.code !== 0) {
+    const detail = result.stderr.trim();
+    throw new OkmError2("invalid", detail === "" ? "okm driver test failed." : detail, {
+      fix: { summary: "The report lists each failed case." }
+    });
+  }
+}
+function driverRunnerPath(here) {
+  const source = join(here, "..", "..", "packages", "harness", "src", "driver-run.ts");
+  if (existsSync(source))
+    return source;
+  const beside = join(here, "driver-run.js");
+  if (existsSync(beside))
+    return beside;
+  return join(here, "..", "tooling", "driver-run.js");
+}
+function runProcess(command, args) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, [...args], { stdio: ["ignore", "pipe", "pipe"] });
+    const out = [];
+    const err = [];
+    child.stdout.on("data", (chunk) => {
+      out.push(chunk);
+    });
+    child.stderr.on("data", (chunk) => {
+      err.push(chunk);
+    });
+    const proc = child;
+    proc.on("error", reject);
+    proc.on("close", (code) => {
+      resolve({
+        code: code ?? 1,
+        stdout: Buffer.concat(out).toString("utf8"),
+        stderr: Buffer.concat(err).toString("utf8")
+      });
+    });
+  });
+}
+export {
+  driverTest
+};

package/dist/shared/{g6evj1j3.js → needfe47.js}

@@ -1,6 +1,6 @@
 import {
   mapFailure
-} from "./kb2sdhfb.js";
+} from "./ae4j5f42.js";
 
 // src/adapters/pg/pglite-wire.ts
 var OIDS = [

package/dist/shared/{2shdbn8q.js → njga14v4.js}

@@ -4,16 +4,16 @@ import {
   applyProject2,
   pushProject2,
   backfillTiming2
-} from "./p6qc5gcp.js";
-import"./m6p12kbr.js";
-import"./8skf0cam.js";
-import"./b5pftnn2.js";
-import"./gs74dbj5.js";
-import"./tsvww22q.js";
+} from "./pan0370z.js";
+import"./mnvjvqyp.js";
+import"./kj9d8maq.js";
+import"./p3xbdcvt.js";
+import"./f4jy1j7x.js";
+import"./dpc2r7rb.js";
 import"./n442h54c.js";
-import"./9s0ypp87.js";
-import"./qq3899ht.js";
-import"./14vx95q4.js";
+import"./sjk86yrx.js";
+import"./12z7aznj.js";
+import"./35q0n9tz.js";
 export {
   applyProject2 as applyProject,
   applyTarget2 as applyTarget,

package/dist/shared/{vqrjpcqn.js → nmnsgj7x.js}

@@ -1,7 +1,7 @@
 import {
   required,
   openColumn
-} from "./ywr8hmey.js";
+} from "./606g0nbf.js";
 import {
   definition,
   rejected

package/dist/shared/{b5pftnn2.js → p3xbdcvt.js}

@@ -1,35 +1,31 @@
 import {
   roleObject,
   grantObject,
-  defaultPrivilegeObject
-} from "./qq3899ht.js";
+  defaultPrivilegeObject,
+  functionObject,
+  triggerObject,
+  normaliseViewQuery,
+  viewObject,
+  materializedViewObject,
+  materializedViewIndex
+} from "./12z7aznj.js";
 import {
   columnPrivilege
-} from "./tsvww22q.js";
+} from "./dpc2r7rb.js";
 import {
   quoteIdent
-} from "./9s0ypp87.js";
+} from "./sjk86yrx.js";
 import {
   policyObject
 } from "./bdk4sty6.js";
-import {
-  functionObject,
-  triggerObject
-} from "./y34a8714.js";
-import {
-  normaliseViewQuery,
-  viewObject,
-  materializedViewObject,
-  materializedViewIndex
-} from "./zy8r7qvz.js";
-import {
-  extensionObject
-} from "./r3j8s5y0.js";
 import {
   catalog,
   enumType,
   domainType
 } from "./ywspezzx.js";
+import {
+  extensionObject
+} from "./r3j8s5y0.js";
 import {
   staticNamespace2,
   identityKey2,
@@ -1037,4 +1033,4 @@ function flag(row, key) {
   return value === true || value === "true" || value === "t";
 }
 
-export { cellText, VIEW_DEPENDENCIES, viewDependencyEdges, PUBLIC, introspectSchema, FUNCTION_ARG_TYPES };
+export { cellText, VIEW_DEPENDENCIES, viewDependencyEdges, PUBLIC, introspectSchema, FUNCTION_ARG_TYPES, atomicBody };