okmodel 0.8.0 → 0.9.1

package/dist/shared/{mkrn359n.js → 4pkz5nvw.js}

@@ -3,27 +3,32 @@ import {
   viewObject,
   materializedViewObject
 } from "./12z7aznj.js";
+import {
+  quoteIdent2,
+  createObjectSql2
+} from "./fk9vef30.js";
+import {
+  probeStableBackend
+} from "./e1c55v04.js";
 import {
   cellText,
   VIEW_DEPENDENCIES,
   viewDependencyEdges,
   PUBLIC,
   introspectSchema,
-  atomicBody
-} from "./p3xbdcvt.js";
+  atomicBody,
+  reprintDomainCheck
+} from "./mz48rs74.js";
 import {
+  driverUrl,
   planMigration,
   sessionFailure,
   finishQuiet,
-  assertDirectConnection,
-  assertStableBackend
-} from "./dpc2r7rb.js";
-import {
-  quoteIdent,
-  createObjectSql
-} from "./sjk86yrx.js";
+  assertDirectConnection
+} from "./bdekbvmt.js";
 import {
-  catalog
+  catalog,
+  isDomain
 } from "./ywspezzx.js";
 import {
   OkmError2
@@ -54,12 +59,14 @@ async function sealViews(runner, source) {
   if (views.length === 0 && !hasAtomic)
     return source;
   await dropScratch(runner);
-  await runner.query(`create schema ${quoteIdent(SCRATCH)}`);
+  await runner.query(`create schema ${quoteIdent2(SCRATCH)}`);
   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) {
@@ -141,44 +149,79 @@ async function scratchSearchPath(runner, source) {
     }
   }
   extra.sort();
-  return [SCRATCH, ...extra, "public"].map((name) => quoteIdent(name)).join(", ");
+  return [SCRATCH, ...extra, "public"].map((name) => quoteIdent2(name)).join(", ");
 }
 async function createObjects(runner, source, kind) {
   for (const object of source.objects) {
     if (object.kind !== kind)
       continue;
-    const statement = createObjectSql(object, SCRATCH);
+    const statement = createObjectSql2(object, SCRATCH);
     if (statement !== undefined)
       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 pg_get_functiondef(p.oid) as definition
+  select p.proname as name,
+    pg_get_function_identity_arguments(p.oid) as args,
+    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)));
+  const printed = rows.map((row) => ({
+    name: cellText(row.name),
+    args: splitIdentityArguments(cellText(row.args)),
+    body: atomicBody(cellText(row.definition))
+  }));
+  const byName = new Map;
+  for (let index = 0;index < printed.length; index += 1) {
+    const name = printed[index]?.name ?? "";
+    const list = byName.get(name);
+    if (list === undefined)
+      byName.set(name, [index]);
+    else
+      list.push(index);
   }
+  const used = new Set;
   let changed = false;
   const objects = source.objects.map((object) => {
-    if (object.kind !== "function")
+    if (object.kind !== "function" || object.definition.atomic !== true)
       return object;
-    const body = bodies.get(object);
+    const named = byName.get(object.identity.name) ?? [];
+    const index = chooseReprint(object, printed, named, used);
+    used.add(index);
+    const body = printed[index]?.body;
     if (body === undefined || body === object.definition.body)
       return object;
     changed = true;
@@ -186,6 +229,111 @@ async function reprintAtomicBodies(runner, source) {
   });
   return changed ? catalog(objects) : source;
 }
+function chooseReprint(object, printed, named, used) {
+  const only = named[0];
+  if (named.length === 1 && only !== undefined && !used.has(only))
+    return only;
+  const matches = named.filter((index) => {
+    const row = printed[index];
+    return row !== undefined && !used.has(index) && identityMatches(object, row.args);
+  });
+  const index = matches[0];
+  if (named.length > 1 && matches.length === 1 && index !== undefined)
+    return index;
+  throw reprintMiss(object, named.map((index) => printed[index]).filter((row) => row !== undefined));
+}
+function reprintMiss(object, rows) {
+  const catalog = object.identity.argTypes.join(", ");
+  const scratch = rows.length === 0 ? "(none)" : rows.map((row) => row.args.length === 0 ? "(no arguments)" : row.args.join(", ")).join("; ");
+  return new OkmError2("OKM1020", `Function ${object.identity.name}(${catalog}) was not created in the scratch schema. Catalog arguments: ${catalog}. Scratch arguments: ${scratch}.`, { fix: { summary: "The function body has to run against the tables in this schema." } });
+}
+function identityMatches(object, args) {
+  if (args.length !== object.identity.argTypes.length)
+    return false;
+  return args.every((printed, index) => printedHasType(object.identity.argTypes[index] ?? "", printed));
+}
+function splitIdentityArguments(args) {
+  const trimmed = args.trim();
+  if (trimmed.length === 0)
+    return [];
+  const parts = [];
+  let current = "";
+  let depth = 0;
+  for (const char of trimmed) {
+    if (char === "(")
+      depth += 1;
+    else if (char === ")" && depth > 0)
+      depth -= 1;
+    if (char === "," && depth === 0) {
+      parts.push(current.trim());
+      current = "";
+      continue;
+    }
+    current += char;
+  }
+  parts.push(current.trim());
+  return parts;
+}
+var ARG_TYPE_ALIASES = {
+  int: "integer",
+  int2: "smallint",
+  int4: "integer",
+  int8: "bigint",
+  bool: "boolean",
+  decimal: "numeric",
+  char: "character",
+  float4: "real",
+  float8: "double precision",
+  varchar: "character varying",
+  time: "time without time zone",
+  timetz: "time with time zone",
+  timestamp: "timestamp without time zone",
+  timestamptz: "timestamp with time zone"
+};
+function printedHasType(author, printed) {
+  const want = canonicalArgType(author);
+  const got = printed.trim().replaceAll(/\s+/g, " ").toLowerCase();
+  if (canonicalArgType(got) === want)
+    return true;
+  const space = got.indexOf(" ");
+  if (space < 0)
+    return false;
+  const name = got.slice(0, space);
+  if (!/^[a-z_][a-z0-9_]*$/.test(name))
+    return false;
+  return canonicalArgType(got.slice(space + 1)) === want;
+}
+function canonicalArgType(type) {
+  let compact = type.trim().replaceAll(/\s+/g, " ").toLowerCase();
+  const dot = compact.lastIndexOf(".");
+  if (dot >= 0)
+    compact = compact.slice(dot + 1);
+  compact = stripTypmods(compact).replaceAll(/\s+/g, " ").trim();
+  let arrays = 0;
+  while (compact.endsWith("[]")) {
+    arrays += 1;
+    compact = compact.slice(0, -2).trim();
+  }
+  const aliased = ARG_TYPE_ALIASES[compact] ?? compact;
+  return arrays === 0 ? aliased : `${aliased}${"[]".repeat(arrays)}`;
+}
+function stripTypmods(type) {
+  let out = "";
+  let depth = 0;
+  for (const char of type) {
+    if (char === "(") {
+      depth += 1;
+      continue;
+    }
+    if (char === ")" && depth > 0) {
+      depth -= 1;
+      continue;
+    }
+    if (depth === 0)
+      out += char;
+  }
+  return out;
+}
 async function createViews(runner, views) {
   const pending = [...views];
   let last = "";
@@ -193,7 +341,7 @@ async function createViews(runner, views) {
     const failed = [];
     let created = 0;
     for (const object of pending) {
-      const sql = object.kind === "materializedView" ? `create materialized view ${quoteIdent(object.identity.name)} as ${object.definition.query} with no data` : `create view ${quoteIdent(object.identity.name)} as ${object.definition.query}`;
+      const sql = object.kind === "materializedView" ? `create materialized view ${quoteIdent2(object.identity.name)} as ${object.definition.query} with no data` : `create view ${quoteIdent2(object.identity.name)} as ${object.definition.query}`;
       try {
         await runner.query(sql);
         created += 1;
@@ -213,8 +361,8 @@ async function createViews(runner, views) {
 }
 function stubTable(object, source) {
   const columns = source.objects.filter((item) => item.kind === "column" && item.identity.parent.name === object.identity.name);
-  const lines = columns.map((column) => `${quoteIdent(column.identity.name)} ${column.definition.dataType}`);
-  return `create table ${quoteIdent(object.identity.name)} (${lines.join(", ")})`;
+  const lines = columns.map((column) => `${quoteIdent2(column.identity.name)} ${column.definition.dataType}`);
+  return `create table ${quoteIdent2(object.identity.name)} (${lines.join(", ")})`;
 }
 function readColumns(object, printed) {
   const live = printed.length === 0 ? [] : printed.split(`
@@ -260,44 +408,45 @@ async function dropScratch(runner) {
     for (const row of views) {
       const kind = cellText(row.kind) === "m" ? "materialized view" : "view";
       try {
-        await runner.query(`drop ${kind} if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}`);
+        await runner.query(`drop ${kind} if exists ${quoteIdent2(SCRATCH)}.${quoteIdent2(cellText(row.name))}`);
       } 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})`);
+    await runner.query(`drop function if exists ${quoteIdent2(SCRATCH)}.${quoteIdent2(cellText(row.name))}(${args})`);
   }
   for (const row of rows) {
     if (cellText(row.kind) !== "r")
       continue;
-    await runner.query(`drop table if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}`);
+    await runner.query(`drop table if exists ${quoteIdent2(SCRATCH)}.${quoteIdent2(cellText(row.name))}`);
   }
-  await runner.query(`drop schema if exists ${quoteIdent(SCRATCH)} cascade`);
+  await runner.query(`drop schema if exists ${quoteIdent2(SCRATCH)} cascade`);
 }
 
 // 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);
+    const schema = authorSchema(author);
     const present = await sql`
-      select to_regclass('public.okm_meta')::text as reg
+      select to_regclass(${metaReg(schema)})::text as reg
     `;
     if (present[0]?.reg == null)
       return;
     const runner = catalogQuery2(sql);
-    const authorOnServer = await sealViews(runner, author);
-    const live = await introspectSchema(runner, "public", "public", managedRoleOptions2(roles));
+    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)
       return;
@@ -314,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) {
@@ -334,6 +504,19 @@ function managedRoleOptions2(roles) {
     ...roles?.reporting !== undefined ? { reportingRole: roles.reporting } : {}
   };
 }
+function authorSchema(author) {
+  for (const object of author.objects) {
+    if (object.kind === "table" && object.owner !== "external" && object.identity.namespace.form === "static") {
+      return object.identity.namespace.name;
+    }
+  }
+  return "public";
+}
+function metaReg(schema) {
+  if (schema === "public")
+    return "public.okm_meta";
+  return `${quoteIdent2(schema)}.okm_meta`;
+}
 function managedRoleNames(roles) {
   if (roles === undefined)
     return;
@@ -345,4 +528,4 @@ function managedRoleNames(roles) {
   return [...names];
 }
 
-export { sealViews, assertAuthorDrift2, catalogQuery2, managedRoleOptions2 };
+export { sealViews, assertAuthorDrift2, sealDomainChecks2, catalogQuery2, managedRoleOptions2 };

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

@@ -3,11 +3,11 @@ import {
 } from "./cm3w0ywp.js";
 import {
   noTimeout
-} from "./q0cqt2sp.js";
+} from "./tr64w5p0.js";
 import {
   noticeBuffer,
   WireSession
-} from "./mtw6jz76.js";
+} from "./e275q7sd.js";
 import {
   NEON_WEBSOCKET_CAPABILITIES,
   NEON_HTTP_CAPABILITIES,
@@ -17,7 +17,7 @@ import {
   runCall,
   EMPTY_NOTICES,
   resultFrom
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/neon.ts
 import {
@@ -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("./jx2m62cs.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/{63f4ksbz.js → 60y4ahmw.js}

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

package/dist/shared/61bmrmhr.js

@@ -0,0 +1,35 @@
+import {
+  quoteIdent2,
+  renderCatalog2,
+  uniqueBeforeForeignKey2,
+  ownedByView2,
+  dropObjectSql2,
+  createObjectSql2,
+  functionSql2,
+  viewSql2,
+  policyCreatePlan2,
+  policyDropPlan2,
+  refreshMaterializedViewSql2,
+  alterColumnSql2,
+  identitySequence2,
+  createTableSql2,
+  qualify2
+} from "./fk9vef30.js";
+import"./12z7aznj.js";
+export {
+  alterColumnSql2 as alterColumnSql,
+  createObjectSql2 as createObjectSql,
+  createTableSql2 as createTableSql,
+  dropObjectSql2 as dropObjectSql,
+  functionSql2 as functionSql,
+  identitySequence2 as identitySequence,
+  ownedByView2 as ownedByView,
+  policyCreatePlan2 as policyCreatePlan,
+  policyDropPlan2 as policyDropPlan,
+  qualify2 as qualify,
+  quoteIdent2 as quoteIdent,
+  refreshMaterializedViewSql2 as refreshMaterializedViewSql,
+  renderCatalog2 as renderCatalog,
+  uniqueBeforeForeignKey2 as uniqueBeforeForeignKey,
+  viewSql2 as viewSql
+};