okmodel 0.7.0 → 0.9.0

package/dist/shared/{mtaszv5a.js → 71n0jmhc.js}

@@ -4,7 +4,7 @@ import {
 } from "./cnkky55j.js";
 import {
   createClient
-} from "./tbrvgw6z.js";
+} from "./npdftanb.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -96,8 +96,7 @@ async function connectTopology(target, options, open) {
     const client = createClient(options.schema, router, { ownsPool: true, ...shared });
     const routed = client;
     routed.using = (route) => derive(options.schema, handle, router, shared, route);
-    handles.set(routed, handle);
-    return routed;
+    return instrument(routed, handle);
   } catch (error) {
     for (const endpoint of opened) {
       if (endpoint.timer !== undefined)
@@ -108,6 +107,105 @@ async function connectTopology(target, options, open) {
     throw error;
   }
 }
+function instrument(client, handle, forced) {
+  const proxy = new Proxy(client, {
+    get(target, key, receiver) {
+      if (key === "using")
+        return Reflect.get(target, key, receiver);
+      const value = Reflect.get(target, key, receiver);
+      if (typeof value !== "function")
+        return retarget(value, handle, forced);
+      if (key === "tx") {
+        return (...args) => {
+          const index = typeof args[0] === "function" ? 0 : 1;
+          const fn = args[index];
+          if (typeof fn === "function") {
+            args[index] = (inner, ...rest) => fn(typeof inner === "object" && inner !== null ? instrument(inner, handle, "primary") : inner, ...rest);
+          }
+          return value.apply(target, args);
+        };
+      }
+      return (...args) => retarget(value.apply(target, args), handle, forced);
+    }
+  });
+  handles.set(proxy, handle);
+  return proxy;
+}
+function wrapTable(table, handle, forced) {
+  return new Proxy(table, {
+    get(target, key, receiver) {
+      const value = Reflect.get(target, key, receiver);
+      if (typeof value !== "function")
+        return value;
+      return (...args) => {
+        const route = forced ?? readCallRoute(args[0]);
+        return retarget(value.apply(target, args), handle, route);
+      };
+    }
+  });
+}
+function retarget(value, handle, route) {
+  if (typeof value !== "object" || value === null)
+    return value;
+  if (typeof Reflect.get(value, "inspect") === "function" && typeof Reflect.get(value, "then") === "function") {
+    return showReason(value, handle, route);
+  }
+  if (typeof Reflect.get(value, "find") === "function")
+    return wrapTable(value, handle, route);
+  if (typeof Reflect.get(value, "table") === "function")
+    return instrument(value, handle, route);
+  return value;
+}
+function showReason(query, handle, route) {
+  return new Proxy(query, {
+    get(target, key, receiver) {
+      const value = Reflect.get(target, key, receiver);
+      if (key === "inspect" && typeof value === "function") {
+        const inspect = value;
+        return () => Promise.resolve(inspect.call(target)).then(async (view) => {
+          if (typeof view !== "object" || view === null)
+            return view;
+          const sql = Reflect.get(view, "sql");
+          const text = typeof sql === "object" && sql !== null && typeof Reflect.get(sql, "text") === "string" ? Reflect.get(sql, "text") : "";
+          const choice = await preview(handle, text, route);
+          return {
+            ...view,
+            routing: {
+              endpoint: choice.endpoint.name,
+              role: choice.endpoint.role,
+              reason: choice.reason
+            }
+          };
+        });
+      }
+      if ((key === "all" || key === "required") && typeof value === "function") {
+        const method = value;
+        return (...args) => retarget(method.apply(target, args), handle, route);
+      }
+      return typeof value === "function" ? value.bind(target) : value;
+    }
+  });
+}
+function readCallRoute(value) {
+  if (typeof value !== "object" || value === null)
+    return;
+  const route = Reflect.get(value, "route");
+  return route === "primary" || route === "replica" ? route : undefined;
+}
+async function preview(handle, text, route) {
+  const currents = handle.endpoints.map((endpoint) => endpoint.current);
+  const rrLast = handle.rrLast;
+  try {
+    return await choose(handle, text, route);
+  } finally {
+    for (let index = 0;index < handle.endpoints.length; index += 1) {
+      const endpoint = handle.endpoints[index];
+      if (endpoint !== undefined)
+        endpoint.current = currents[index] ?? 0;
+    }
+    handle.rrLast = rrLast;
+  }
+}
 function refuseRouting(routing) {
   if (routing === undefined)
     return;
@@ -574,7 +672,7 @@ function derive(schema, handle, router, shared, route) {
   const name = readRoute(route);
   const client = createClient(schema, force(handle, router, name), { ...shared, ownsPool: false });
   delete client.close;
-  return client;
+  return instrument(client, handle, name);
 }
 function force(handle, router, route) {
   const pool = {

package/dist/shared/{5e3tf63j.js → 760ppr76.js}

@@ -1,14 +1,14 @@
 import {
   encodeUuid,
   decodeUuid
-} from "./hyh73qk6.js";
+} from "./ecn8mfdq.js";
 import {
   encodeText,
   decodeText
-} from "./ed0b8k4s.js";
+} from "./typ3vy7t.js";
 import {
   snakeCase
-} from "./rpycarcr.js";
+} from "./gcefca6p.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -28,19 +28,27 @@ function viewMentions(query, name) {
   pattern += '"?(?![A-Za-z0-9_])';
   return new RegExp(pattern).test(query);
 }
+function readColumns(source) {
+  return typeof source === "function" ? source() : source;
+}
+function readQuery(source) {
+  return typeof source === "function" ? source() : source;
+}
 function viewClient(name, columns, query, tenancy, refresh = "plain") {
   const field = camelCase(name);
   const marked = readGlobal(name, tenancy);
   return {
     field,
     install(model, scope, tables, casing, scoped) {
+      const listed = readColumns(columns);
+      const text = readQuery(query);
       if (Object.hasOwn(model, field)) {
         throw new OkmError2("OKM1023", `View ${name} uses the client name ${field}.`, {
           fix: { summary: "Give the view a name that no table uses." }
         });
       }
-      const exposes = exposesKey(columns, scope);
-      if (scope !== undefined && readsTenant(query, tables, casing, scoped)) {
+      const exposes = exposesKey(listed, scope);
+      if (scope !== undefined && readsTenant(text, tables, casing, scoped)) {
         if (!exposes && marked === undefined) {
           throw new OkmError2("OKM1820", `View ${name} reads a tenant table and does not expose ${scope.key}.`, {
             fix: {
@@ -58,7 +66,7 @@ function viewClient(name, columns, query, tenancy, refresh = "plain") {
         sql: name,
         primary: [],
         uniques: [],
-        columns: columnModels(columns, scope),
+        columns: columnModels(listed, scope),
         relations: []
       };
       if (marked !== undefined)

package/dist/shared/7ba5h6pb.js

@@ -0,0 +1,17 @@
+import {
+  pullProject2,
+  pullLayout2,
+  commitPullFiles2
+} from "./rbxt795q.js";
+import"./myk8fswx.js";
+import"./2zdxkt7b.js";
+import"./6nae0spm.js";
+import"./n442h54c.js";
+import"./fk9vef30.js";
+import"./12z7aznj.js";
+import"./dd5pmnky.js";
+export {
+  commitPullFiles2 as commitPullFiles,
+  pullLayout2 as pullLayout,
+  pullProject2 as pullProject
+};

package/dist/shared/{sfz1ksn6.js → 8jesqsrk.js}

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

package/dist/shared/{5v3xf80k.js → 8n688yjg.js}

@@ -15,7 +15,7 @@ import {
   expectOf2,
   allowSet2,
   noteGuarded2
-} from "./1w508jbr.js";
+} from "./9dtgn1z2.js";
 import"./mss6ctgv.js";
 export {
   Sql2 as Sql,

package/dist/shared/{rs73fca9.js → 8qzkd9f3.js}

@@ -1,14 +1,14 @@
-import"./qq3899ht.js";
+import"./12z7aznj.js";
 import"./n442h54c.js";
-import"./14vx95q4.js";
+import"./fk9vef30.js";
+import"./dd5pmnky.js";
 import {
   projectPath,
   loadConfig
-} from "./gs74dbj5.js";
+} from "./2zdxkt7b.js";
 import {
   listTargets
-} from "./tsvww22q.js";
-import"./9s0ypp87.js";
+} from "./6nae0spm.js";
 
 // src/tooling/migrate/dev.ts
 import { mkdirSync } from "node:fs";
@@ -20,7 +20,7 @@ async function devProject(cwd) {
 `;
   const directory = projectPath(cwd, config.out ?? ".okm", "dev-db");
   mkdirSync(directory, { recursive: true });
-  const { open } = await import("./aytqh5y2.js");
+  const { open } = await import("./ghqzdp94.js");
   const pool = await open({ dataDir: directory });
   try {
     await pool.execute("select 1");

package/dist/shared/{ax7qv55k.js → 90sg0w5a.js}

@@ -1,26 +1,27 @@
+import {
+  normaliseViewQuery,
+  viewObject,
+  materializedViewObject
+} from "./12z7aznj.js";
+import {
+  quoteIdent2,
+  createObjectSql2
+} from "./fk9vef30.js";
 import {
   cellText,
   VIEW_DEPENDENCIES,
   viewDependencyEdges,
   PUBLIC,
-  introspectSchema
-} from "./b5pftnn2.js";
+  introspectSchema,
+  atomicBody
+} from "./myk8fswx.js";
 import {
   planMigration,
   sessionFailure,
   finishQuiet,
   assertDirectConnection,
   assertStableBackend
-} from "./tsvww22q.js";
-import {
-  quoteIdent,
-  createObjectSql
-} from "./9s0ypp87.js";
-import {
-  normaliseViewQuery,
-  viewObject,
-  materializedViewObject
-} from "./zy8r7qvz.js";
+} from "./6nae0spm.js";
 import {
   catalog
 } from "./ywspezzx.js";
@@ -49,10 +50,11 @@ 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)}`);
+  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);
@@ -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);
@@ -136,17 +141,165 @@ 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);
   }
 }
+var FUNCTION_DEFS = `
+  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'
+`;
+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]);
+  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" || object.definition.atomic !== true)
+      return 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;
+    return { ...object, definition: { ...object.definition, body } };
+  });
+  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 = "";
@@ -154,7 +307,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;
@@ -174,8 +327,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(`
@@ -210,21 +363,31 @@ 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) {
       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 ${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
@@ -241,14 +404,15 @@ async function assertAuthorDrift2(url, author, roles, allowPooler = false) {
       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 live = await introspectSchema(runner, schema, schema, managedRoleOptions2(roles));
     const plan = planMigration({ before: live, after: authorOnServer, name: "check" });
     if (plan.steps.length === 0)
       return;
@@ -285,6 +449,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;

package/dist/shared/{zm0ptry0.js → 99qp9vtg.js}

@@ -3,7 +3,7 @@ import {
 } from "./cnkky55j.js";
 import {
   rejectClosed
-} from "./kb2sdhfb.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/reserved.ts
 var RESET_ALL = "RESET ALL";

package/dist/shared/{xnxsed62.js → 9dr2qnx7.js}

@@ -6,27 +6,33 @@ import {
   minPostgresDefinition,
   uuidv7NeedsPostgres
 } from "./ga9j92qj.js";
-import {
-  catalog,
-  enumType,
-  sameEnumLabels
-} from "./ywspezzx.js";
 import {
   isRelationCall
 } from "./exn3sd90.js";
 import {
   encodeText,
   decodeText
-} from "./ed0b8k4s.js";
+} from "./typ3vy7t.js";
 import {
   snakeCase,
   emittedTypeName,
   rejectLater
-} from "./rpycarcr.js";
+} from "./gcefca6p.js";
 import {
   ColumnBuilder2,
   formatType
-} from "./ywr8hmey.js";
+} from "./606g0nbf.js";
+import {
+  readClientGenerator
+} from "./rwmrejjz.js";
+import {
+  withLocation
+} from "./y6jdds7g.js";
+import {
+  catalog,
+  enumType,
+  sameEnumLabels
+} from "./ywspezzx.js";
 import {
   definition,
   unavailable
@@ -34,9 +40,6 @@ import {
 import {
   quoteLiteral
 } from "./94ez8kzh.js";
-import {
-  withLocation
-} from "./y6jdds7g.js";
 import {
   staticNamespace2,
   table3,
@@ -56,9 +59,6 @@ import {
   catalogError2,
   throwNamed2
 } from "./52szzakm.js";
-import {
-  readClientGenerator
-} from "./rwmrejjz.js";
 
 // src/dialects/pg/compile.ts
 function compileColumn(builder, input) {