okmodel 0.7.0 → 0.9.0

package/dist/shared/mazpbcdj.js

@@ -0,0 +1,233 @@
+import {
+  outcomeUnknown2
+} from "./cm3w0ywp.js";
+import {
+  noTimeout
+} from "./tr64w5p0.js";
+import {
+  noticeBuffer,
+  WireSession
+} from "./e275q7sd.js";
+import {
+  NEON_WEBSOCKET_CAPABILITIES,
+  NEON_HTTP_CAPABILITIES,
+  driverErrors,
+  rejectClosed,
+  mapFailure,
+  runCall,
+  EMPTY_NOTICES,
+  resultFrom
+} from "./mfvx6kjx.js";
+
+// src/adapters/pg/neon.ts
+import {
+  Pool,
+  neon,
+  neonConfig
+} from "@neondatabase/serverless";
+var CONNECT_MS = 30000;
+var WIRE = {
+  getTypeParser() {
+    return (value) => value;
+  }
+};
+var names = new Map;
+async function open6(config) {
+  if (config.mode === "http")
+    return openHttp(config);
+  return openWebSocket(config);
+}
+function connectClient2(pool, acquireMs, counters) {
+  counters.waiting += 1;
+  let settled = false;
+  return new Promise((resolve, reject) => {
+    let timer;
+    if (acquireMs !== undefined) {
+      timer = setTimeout(() => {
+        settled = true;
+        counters.waiting = Math.max(0, counters.waiting - 1);
+        driverErrors().then((errors) => {
+          reject(errors.acquireTimeout());
+        });
+      }, acquireMs);
+    }
+    take(pool).then((client) => {
+      if (settled) {
+        client.release();
+        return;
+      }
+      if (timer !== undefined)
+        clearTimeout(timer);
+      counters.waiting = Math.max(0, counters.waiting - 1);
+      resolve(client);
+    }, (error) => {
+      if (settled)
+        return;
+      if (timer !== undefined)
+        clearTimeout(timer);
+      counters.waiting = Math.max(0, counters.waiting - 1);
+      mapFailure(error).then(reject);
+    });
+  });
+}
+function send3(runner, text, params, named) {
+  const query = {
+    text,
+    rowMode: "array",
+    types: WIRE,
+    ...params !== undefined && params.length > 0 ? { values: params } : {},
+    ...named ? { name: statementName(text) } : {}
+  };
+  return runner.query(query);
+}
+async function openWebSocket(config) {
+  ensureWebSocket();
+  const max = config.max ?? 10;
+  const acquireMs = config.timeouts?.acquire;
+  const counters = { reserved: 0, busy: 0, reservedBusy: 0, waiting: 0 };
+  const notices = noticeBuffer();
+  let closed = false;
+  const isClosed = () => closed;
+  const named = config.prepared === "named";
+  const pool = new Pool({
+    connectionString: config.url,
+    max,
+    idleTimeoutMillis: 0,
+    allowExitOnIdle: true,
+    connectionTimeoutMillis: CONNECT_MS,
+    application_name: "okmodel",
+    types: WIRE,
+    ...config.searchPath !== undefined ? { options: `-c search_path=${config.searchPath}` } : {}
+  });
+  pool.on("error", () => {
+    return;
+  });
+  try {
+    const warmed = await take(pool);
+    warmed.release();
+  } catch (error) {
+    await pool.end().catch(() => {
+      return;
+    });
+    throw await mapFailure(error);
+  }
+  const root = new WireSession((text, params) => send3(pool, text, params, named), notices, isClosed, false, () => {
+    counters.busy += 1;
+  }, () => {
+    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));
+  return {
+    capabilities: NEON_WEBSOCKET_CAPABILITIES,
+    execute(text, params, options) {
+      const refused = noTimeout(options);
+      if (refused !== undefined)
+        return refused;
+      return runCall(closed, options, (watch) => root.query(text, params, watch));
+    },
+    async batch(statements, options) {
+      const refused = noTimeout(options);
+      if (refused !== undefined)
+        return refused;
+      const connection = await checkout();
+      try {
+        return await connection.batch(statements, options);
+      } finally {
+        await connection.release();
+      }
+    },
+    reserve: () => checkout(),
+    stats: () => statsOf(counters, max),
+    async close() {
+      closed = true;
+      await pool.end();
+    }
+  };
+}
+function openHttp(config) {
+  const max = config.max ?? 10;
+  const counters = { reserved: 0, busy: 0, reservedBusy: 0, waiting: 0 };
+  let closed = false;
+  const sql = neon(config.url, { arrayMode: true, fullResults: true });
+  const run = async (text, params) => {
+    counters.busy += 1;
+    try {
+      const result = await sql.query(text, params === undefined ? [] : [...params]);
+      return resultFrom(result, EMPTY_NOTICES);
+    } finally {
+      counters.busy = Math.max(0, counters.busy - 1);
+    }
+  };
+  return {
+    capabilities: NEON_HTTP_CAPABILITIES,
+    execute(text, params, options) {
+      const refused = noTimeout(options);
+      if (refused !== undefined)
+        return refused;
+      if (closed)
+        return rejectClosed();
+      return runCall(closed, options, () => run(text, params).catch((error) => mapFailure(error).then((mapped) => Promise.reject(mapped))));
+    },
+    async batch(statements, options) {
+      const refused = noTimeout(options);
+      if (refused !== undefined)
+        return refused;
+      if (closed)
+        return rejectClosed();
+      counters.busy += 1;
+      try {
+        const queries = statements.map((statement) => sql.query(statement.text, statement.params === undefined ? [] : [...statement.params]));
+        const results = await sql.transaction(queries, httpOptions());
+        return results.map((result) => resultFrom(result, EMPTY_NOTICES));
+      } catch (error) {
+        if (!isDatabaseError(error))
+          throw outcomeUnknown2(error);
+        throw await mapFailure(error);
+      } finally {
+        counters.busy = Math.max(0, counters.busy - 1);
+      }
+    },
+    stats: () => statsOf(counters, max),
+    close() {
+      closed = true;
+      return Promise.resolve();
+    }
+  };
+}
+function httpOptions() {
+  return { arrayMode: true, fullResults: true };
+}
+function isDatabaseError(error) {
+  if (typeof error !== "object" || error === null)
+    return false;
+  const code = Reflect.get(error, "code");
+  return typeof code === "string" && /^[0-9A-Z]{5}$/.test(code);
+}
+function take(pool) {
+  const connect = pool.connect.bind(pool);
+  return connect();
+}
+function ensureWebSocket() {
+  if (neonConfig.webSocketConstructor === undefined && typeof WebSocket === "function") {
+    neonConfig.webSocketConstructor = WebSocket;
+  }
+}
+function statementName(text) {
+  const existing = names.get(text);
+  if (existing !== undefined)
+    return existing;
+  const name = `okm_${String(names.size)}`;
+  names.set(text, name);
+  return name;
+}
+function statsOf(counters, size) {
+  return {
+    size,
+    idle: Math.max(0, size - counters.reserved - counters.busy),
+    inflight: counters.busy + counters.reservedBusy,
+    waiting: counters.waiting
+  };
+}
+
+export { open6, connectClient2, send3 };

package/dist/shared/{kb2sdhfb.js → mfvx6kjx.js}

@@ -31,6 +31,22 @@ var BUNSQL_CAPABILITIES = {
   prepared: "unnamed",
   describe: false
 };
+var NEON_WEBSOCKET_CAPABILITIES = {
+  transactions: "interactive",
+  stream: false,
+  listen: false,
+  cancel: false,
+  prepared: "unnamed",
+  describe: false
+};
+var NEON_HTTP_CAPABILITIES = {
+  transactions: "batch",
+  stream: false,
+  listen: false,
+  cancel: false,
+  prepared: "none",
+  describe: false
+};
 function readCapability2(flags, name) {
   return flags[name];
 }
@@ -166,4 +182,4 @@ function countFrom(value, rows) {
   return rows;
 }
 
-export { POSTGRESJS_CAPABILITIES, PGLITE_CAPABILITIES, NODE_POSTGRES_CAPABILITIES, BUNSQL_CAPABILITIES, readCapability2, hasCapability2, driverErrors, rejectClosed, rejectUncancellable, rejectCancelled, rejectTimedOut, mapFailure, nextTransactionDepth, runCall, EMPTY_NOTICES, rowsFrom, resultFrom };
+export { POSTGRESJS_CAPABILITIES, PGLITE_CAPABILITIES, NODE_POSTGRES_CAPABILITIES, BUNSQL_CAPABILITIES, NEON_WEBSOCKET_CAPABILITIES, NEON_HTTP_CAPABILITIES, readCapability2, hasCapability2, driverErrors, rejectClosed, rejectUncancellable, rejectCancelled, rejectTimedOut, mapFailure, nextTransactionDepth, runCall, EMPTY_NOTICES, rowsFrom, resultFrom };

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

@@ -1,7 +1,8 @@
 import {
   open2
-} from "./14vx95q4.js";
-import"./qq3899ht.js";
+} from "./dd5pmnky.js";
+import"./12z7aznj.js";
+import"./fk9vef30.js";
 import"./n442h54c.js";
 import {
   CURRENT,
@@ -14,21 +15,21 @@ import {
 import {
   expandProvisioned,
   provisionHistoryIsKnown
-} from "./m6p12kbr.js";
-import"./8skf0cam.js";
-import"./b5pftnn2.js";
+} from "./3456242y.js";
+import"./jpybhf98.js";
+import"./myk8fswx.js";
 import {
   projectPath,
+  catalogNamespace,
   loadMigrations,
   loadConfig
-} from "./gs74dbj5.js";
+} from "./2zdxkt7b.js";
 import {
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   listTargets
-} from "./tsvww22q.js";
-import"./9s0ypp87.js";
+} from "./6nae0spm.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -109,6 +110,7 @@ async function readTargetStatus(input) {
 }
 async function statusProject(cwd, flags) {
   const config = await loadConfig(cwd);
+  const namespace = catalogNamespace(config);
   const targets = chosen(listTargets(config), flags.target);
   const migrations = loadMigrations(projectPath(cwd, config.migrations ?? "migrations"));
   const rows = [];
@@ -117,6 +119,7 @@ async function statusProject(cwd, flags) {
       url: target.url,
       target: target.name,
       protected: target.protected,
+      ...namespace === "public" ? {} : { searchPath: namespace },
       migrations
     }));
   }

package/dist/shared/{5mtf6cj3.js → mvmm3xpb.js}

@@ -1,3 +1,6 @@
+import {
+  historySql2
+} from "./yybhre6n.js";
 import {
   BEHIND_EXPAND,
   BEHIND_CONTRACT,
@@ -37,10 +40,10 @@ function driftVerdict(codeHash, recordedHash, migrations) {
   const last = migrations.at(-1);
   return { state: "behind", migrationId: last?.id ?? "" };
 }
-async function assertDrift(pool, codeHash, recordedHash, options) {
+async function assertDrift(pool, codeHash, recordedHash, options, namespace = "public") {
   let rows;
   try {
-    const result = await pool.execute("select migration_id, class, catalog_hash from okm_history order by migration_id, step_index", undefined, options);
+    const result = await pool.execute(await historySql2(namespace), undefined, options);
     rows = result.rows;
   } catch (error) {
     throw gapError({ state: "behind", migrationId: "" }, error);

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

@@ -1,35 +1,31 @@
 import {
   roleObject,
   grantObject,
-  defaultPrivilegeObject
-} from "./qq3899ht.js";
-import {
-  columnPrivilege
-} from "./tsvww22q.js";
-import {
-  quoteIdent
-} from "./9s0ypp87.js";
-import {
-  policyObject
-} from "./bdk4sty6.js";
-import {
+  defaultPrivilegeObject,
   functionObject,
-  triggerObject
-} from "./y34a8714.js";
-import {
+  triggerObject,
   normaliseViewQuery,
   viewObject,
   materializedViewObject,
   materializedViewIndex
-} from "./zy8r7qvz.js";
+} from "./12z7aznj.js";
 import {
-  extensionObject
-} from "./r3j8s5y0.js";
+  quoteIdent2
+} from "./fk9vef30.js";
+import {
+  columnPrivilege
+} from "./6nae0spm.js";
+import {
+  policyObject
+} from "./bdk4sty6.js";
 import {
   catalog,
   enumType,
   domainType
 } from "./ywspezzx.js";
+import {
+  extensionObject
+} from "./r3j8s5y0.js";
 import {
   staticNamespace2,
   identityKey2,
@@ -269,7 +265,10 @@ async function introspectSchema(runner, concrete, logical = "public", options) {
       ...expression.length > 0 ? { expression } : {},
       ...refTable.length > 0 ? {
         references: {
-          parent: { namespace, name: refTable },
+          parent: {
+            namespace: referencedNamespace(text(row, "ref_schema"), concrete, namespace),
+            name: refTable
+          },
           columns: refColumns,
           ...onDelete !== undefined ? { onDelete } : {},
           ...onUpdate !== undefined ? { onUpdate } : {}
@@ -450,8 +449,38 @@ async function introspectSchema(runner, concrete, logical = "public", options) {
   if (options?.managedRoles !== undefined) {
     objects.push(...await readPrivileges(runner, concrete, logical, namespace, provenance, objects, options.managedRoles, options.reportingRole));
   }
+  await includeOutsideReferences(runner, logical, provenance, objects);
   return catalog(objects);
 }
+async function includeOutsideReferences(runner, logical, provenance, objects) {
+  const wanted = new Map;
+  for (const object of objects) {
+    if (object.kind !== "constraint" || object.definition.references === undefined)
+      continue;
+    const parent = object.definition.references.parent;
+    if (parent.namespace.form !== "static" || parent.namespace.name === logical)
+      continue;
+    wanted.set(`${parent.namespace.name}.${parent.name}`, {
+      schema: parent.namespace.name,
+      name: parent.name
+    });
+  }
+  for (const target of wanted.values()) {
+    const namespace = staticNamespace2(target.schema);
+    const parent = { namespace, name: target.name };
+    objects.push(table3({ namespace, name: target.name, provenance }));
+    const rows = await runner.query(OUTSIDE_COLUMNS, [target.schema, target.name]);
+    for (const row of rows) {
+      objects.push(column2({
+        parent,
+        name: text(row, "name"),
+        dataType: text(row, "type"),
+        nullable: !flag(row, "not_null"),
+        provenance
+      }));
+    }
+  }
+}
 var EMITTED = new Set(["SELECT", "INSERT", "UPDATE", "DELETE", "EXECUTE", "USAGE"]);
 var ROLES = `select rolname, rolcanlogin, rolinherit from pg_roles where rolname !~ '^pg_'`;
 var RELATION_GRANTS = `select c.relname as name,
@@ -708,7 +737,7 @@ function indexExpression(row, columns) {
   const opclasses = list(text(row, "opc"));
   const body = columns.map((name, index) => {
     const opclass = opclasses[index];
-    return opclass === undefined ? quoteIdent(name) : `${quoteIdent(name)} ${opclass}`;
+    return opclass === undefined ? quoteIdent2(name) : `${quoteIdent2(name)} ${opclass}`;
   }).join(", ");
   return `using ${method} (${body.length > 0 ? body : stored})`;
 }
@@ -765,6 +794,20 @@ var COLUMNS = `
     and ${CHILD}
     and ${member("c.oid", "pg_class")}
 `;
+function referencedNamespace(refSchema, concrete, logical) {
+  if (refSchema.length > 0 && refSchema !== concrete)
+    return staticNamespace2(refSchema);
+  return logical;
+}
+var OUTSIDE_COLUMNS = `
+  select a.attname as name, format_type(a.atttypid, a.atttypmod) as type, a.attnotnull as not_null
+  from pg_attribute a
+  join pg_class c on c.oid = a.attrelid
+  join pg_namespace n on n.oid = c.relnamespace
+  where n.nspname = $1 and c.relname = $2
+    and a.attnum > 0 and not a.attisdropped
+  order by a.attnum
+`;
 var CONSTRAINTS = `
   select rel.relname as parent, con.conname as name, con.contype as contype,
     con.condeferrable as deferrable, con.condeferred as deferred,
@@ -775,6 +818,7 @@ var CONSTRAINTS = `
       join pg_attribute a on a.attrelid = con.conrelid and a.attnum = cols.attnum
     ) as columns,
     ref.relname as ref_table,
+    refn.nspname as ref_schema,
     (
       select coalesce(string_agg(a.attname, ',' order by cols.ord), '')
       from unnest(con.confkey) with ordinality as cols(attnum, ord)
@@ -784,6 +828,7 @@ var CONSTRAINTS = `
   join pg_class rel on rel.oid = con.conrelid
   join pg_namespace n on n.oid = rel.relnamespace
   left join pg_class ref on ref.oid = con.confrelid
+  left join pg_namespace refn on refn.oid = ref.relnamespace
   where n.nspname = $1
     and con.contype in ('p', 'u', 'f', 'c')
     and not exists (select 1 from pg_inherits i where i.inhrelid = rel.oid)
@@ -1037,4 +1082,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 };

package/dist/shared/{2shdbn8q.js → n306gqkd.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 "./ccsmhv9r.js";
+import"./3456242y.js";
+import"./jpybhf98.js";
+import"./myk8fswx.js";
+import"./2zdxkt7b.js";
+import"./6nae0spm.js";
 import"./n442h54c.js";
-import"./9s0ypp87.js";
-import"./qq3899ht.js";
-import"./14vx95q4.js";
+import"./fk9vef30.js";
+import"./12z7aznj.js";
+import"./dd5pmnky.js";
 export {
   applyProject2 as applyProject,
   applyTarget2 as applyTarget,

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

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