okmodel 0.7.0 → 0.9.0

package/dist/shared/{m6p12kbr.js → 3456242y.js}

@@ -1,9 +1,13 @@
 import {
   serializeCatalog2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
+import {
+  quoteIdent2,
+  qualify2
+} from "./fk9vef30.js";
 import {
   roleExists
-} from "./8skf0cam.js";
+} from "./jpybhf98.js";
 import {
   canonicalTypeName,
   createdRoleName,
@@ -16,24 +20,20 @@ import {
   planMigration,
   sessionFailure,
   assertTargetPolicy
-} from "./tsvww22q.js";
-import {
-  quoteIdent,
-  qualify
-} from "./9s0ypp87.js";
+} from "./6nae0spm.js";
 import {
-  alignExtensionVersions
-} from "./r3j8s5y0.js";
+  snakeCase
+} from "./gcefca6p.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
@@ -70,7 +70,7 @@ async function runTarget(connection, run, session) {
 async function assumeRole(connection, role, session) {
   if (session.setRole === role)
     return;
-  await connection.execute(`set role ${quoteIdent(role)}`);
+  await connection.execute(`set role ${quoteIdent2(role)}`);
   session.setRole = role;
 }
 async function grantAppMeta(connection, role, session) {
@@ -79,12 +79,12 @@ async function grantAppMeta(connection, role, session) {
   const previous = session.setRole;
   if (previous !== undefined)
     await connection.execute("reset role");
-  await connection.execute(`grant select on okm_meta to ${quoteIdent(role)}`);
+  await connection.execute(`grant select on okm_meta to ${quoteIdent2(role)}`);
   if (previous !== undefined)
-    await connection.execute(`set role ${quoteIdent(previous)}`);
+    await connection.execute(`set role ${quoteIdent2(previous)}`);
 }
 async function grantSchema(connection, schema, role) {
-  await connection.execute(`grant usage, create on schema ${quoteIdent(schema)} to ${quoteIdent(role)}`);
+  await connection.execute(`grant usage, create on schema ${quoteIdent2(schema)} to ${quoteIdent2(role)}`);
 }
 async function runUnit(connection, unit, run, session) {
   const only = unit.steps.length === 1 ? unit.steps[0] : undefined;
@@ -113,7 +113,7 @@ async function runUnit(connection, unit, run, session) {
         if (created !== undefined && created === run.migrationRole) {
           if (!existed) {
             await grantSchema(connection, run.schema ?? "public", created);
-            await connection.execute(`grant select, insert, update on okm_meta, okm_history, okm_backfill to ${quoteIdent(created)}`);
+            await connection.execute(`grant select, insert, update on okm_meta, okm_history, okm_backfill to ${quoteIdent2(created)}`);
           }
           await assumeRole(connection, created, session);
         }
@@ -305,7 +305,7 @@ async function rebuildInvalidIndex(connection, sql) {
   const valid = found.rows[0]?.[0];
   if (valid === undefined || wireTrue(valid))
     return;
-  await connection.execute(`drop index concurrently if exists ${quoteIdent(name)}`);
+  await connection.execute(`drop index concurrently if exists ${quoteIdent2(name)}`);
 }
 function concurrentIndexName(sql) {
   const match = /^create\s+(?:unique\s+)?index\s+concurrently\s+(?:if\s+not\s+exists\s+)?(?:"([^"]+)"|([A-Za-z_][\w$]*))/i.exec(sql.trim());
@@ -331,7 +331,7 @@ async function assertSchemaUsageLanded(connection, sql) {
   throw new OkmError2("OKM1825", `Grant usage on schema ${schema} to ${role} did not take effect.`, {
     kind: "forbidden",
     fix: {
-      summary: `Make the migration role the owner of schema ${schema}. ALTER SCHEMA ${quoteIdent(schema)} OWNER TO <migration role>.`
+      summary: `Make the migration role the owner of schema ${schema}. ALTER SCHEMA ${quoteIdent2(schema)} OWNER TO <migration role>.`
     }
   });
 }
@@ -423,11 +423,11 @@ function readReference(tables, casing, head) {
 function referenceInserts(tables, schema) {
   const statements = [];
   for (const item of tables) {
-    const conflict = item.key.map((name) => quoteIdent(name)).join(", ");
+    const conflict = item.key.map((name) => quoteIdent2(name)).join(", ");
     for (const row of item.rows) {
-      const columns = row.map(([name]) => quoteIdent(name)).join(", ");
+      const columns = row.map(([name]) => quoteIdent2(name)).join(", ");
       const values = row.map(([, value]) => literal(value)).join(", ");
-      statements.push(`insert into ${qualify(schema, item.table)} (${columns}) values (${values}) on conflict (${conflict}) do nothing`);
+      statements.push(`insert into ${qualify2(schema, item.table)} (${columns}) values (${values}) on conflict (${conflict}) do nothing`);
     }
   }
   return statements;
@@ -616,7 +616,7 @@ async function installSnapshot(connection, head, schema, reference, session, mig
       if (created !== undefined && created === migrationRole) {
         await flush();
         await grantSchema(connection, schema, created);
-        await connection.execute(`grant select, insert, update on okm_meta, okm_history, okm_backfill to ${quoteIdent(created)}`);
+        await connection.execute(`grant select, insert, update on okm_meta, okm_history, okm_backfill to ${quoteIdent2(created)}`);
         await assumeRole(connection, created, session);
       }
     }

package/dist/shared/3bb7wsqt.js

@@ -0,0 +1,99 @@
+import {
+  isFragmentParts
+} from "./bsek72fg.js";
+import {
+  refuseHidden,
+  quote,
+  list,
+  fail2
+} from "./kgwp4jdd.js";
+import {
+  OkmError2,
+  throwNamed2
+} from "./52szzakm.js";
+
+// src/runtime/sql-fragment.ts
+function emitSqlValue(table, ref, value, sink) {
+  const dot = ref.indexOf(".");
+  const alias = dot < 0 ? ref : ref.slice(0, dot);
+  writeFragment(requireParts(value), sink, alias, ref, table, "where");
+}
+function emitSqlSelect(table, parts, sink, alias) {
+  writeFragment(parts, sink, alias, undefined, table, "select");
+}
+function decodeSqlNumber(wire) {
+  const parsed = Number(wire);
+  if (!Number.isFinite(parsed)) {
+    throw new OkmError2("OKM1125", "A select fragment must be a number.", {
+      fix: { summary: "Use a numeric expression, such as length(title). Text stays in where." }
+    });
+  }
+  return parsed;
+}
+function requireParts(value) {
+  if (!isFragmentParts(value)) {
+    throw new OkmError2("OKM1125", "A fragment was not created by fragment``.", {
+      fix: { summary: "Call fragment`...`." }
+    });
+  }
+  return value;
+}
+function writeFragment(parts, sink, alias, ref, table, place) {
+  sink.mark(":g");
+  sink.text("(");
+  for (const part of parts)
+    writePart(part, sink, alias, ref, table, place);
+  sink.mark(":g");
+  sink.text(")");
+}
+function writePart(part, sink, alias, ref, table, place) {
+  if (part.k === "t") {
+    sink.mark(`:t:${String(part.s.length)}:${part.s}`);
+    sink.text(part.s);
+    return;
+  }
+  if (part.k === "p") {
+    sink.mark(":p");
+    sink.param(part.v);
+    return;
+  }
+  if (part.k === "n") {
+    sink.mark(":n");
+    sink.text("null");
+    return;
+  }
+  if (part.k === "i") {
+    writeIdent(part.n, table, sink, alias, place);
+    return;
+  }
+  if (part.k === "c") {
+    if (ref === undefined) {
+      throw new OkmError2("OKM1125", "fragment.column belongs on a where field.", {
+        fix: { summary: "Use ident(name) in select, or put fragment.column on a where field." }
+      });
+    }
+    sink.mark(":c");
+    sink.text(ref);
+    return;
+  }
+  writeFragment(part.parts, sink, alias, ref, table, place);
+}
+function writeIdent(name, table, sink, alias, place) {
+  const column = table.columns.get(name);
+  if (column === undefined) {
+    throwNamed2("OKM1120", name, table.names, `Field ${name} is not on ${table.model.name}. Accepted names: ${list(table.names)}.`);
+  }
+  if (place === "select") {
+    if (column.hidden) {
+      fail2("OKM1120", `Field ${column.field} is hidden.`, "A select fragment cannot name a hidden field.");
+    }
+  } else {
+    refuseHidden(column);
+  }
+  sink.mark(`:i:${String(column.field.length)}:${column.field}`);
+  sink.text(alias);
+  sink.text(".");
+  sink.text(quote(column.sql));
+}
+
+export { emitSqlValue, emitSqlSelect, decodeSqlNumber };

package/dist/shared/{y6njgyda.js → 3t6kw83m.js}

@@ -15,14 +15,14 @@ import {
   expectOf2,
   allowSet2,
   noteGuarded2
-} from "./1w508jbr.js";
+} from "./9dtgn1z2.js";
 import {
   emitWhere,
   projectExpr,
   quote,
   isRecord,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 
 // src/runtime/version.ts
 function planVersioned(schema, table, input, options, mods) {

package/dist/shared/{xhfsfkgk.js → 4vbf83xx.js}

@@ -1,3 +1,6 @@
+import {
+  emitSqlValue
+} from "./3bb7wsqt.js";
 import {
   assertOperatorFits,
   sqlType,
@@ -11,7 +14,7 @@ import {
   quote,
   isRecord,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   isOperator,
   operatorName,
@@ -19,7 +22,11 @@ import {
 } from "./cn0n68ft.js";
 
 // src/runtime/operator-sql.ts
-function emitStructured(column, ref, name, value, sink, order) {
+function emitStructured(table, column, ref, name, value, sink, order) {
+  if (name === "sql") {
+    emitSqlValue(table, ref, value, sink);
+    return;
+  }
   if (name === "contains" || name === "containedBy" || name === "overlaps") {
     emitContainment(column, ref, name, value, sink);
     return;

package/dist/shared/{pt94kz7f.js → 5kyb3tqx.js}

@@ -1,6 +1,6 @@
 import {
   build3
-} from "./pbp1ss85.js";
+} from "./cexb7z6b.js";
 export {
   build3 as build
 };

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
+};

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

@@ -3,21 +3,21 @@ import {
 } from "./cm3w0ywp.js";
 import {
   noTimeout
-} from "./79dt02vc.js";
+} from "./tr64w5p0.js";
 import {
   noticeBuffer,
   WireSession
-} from "./1qa0qajz.js";
+} from "./e275q7sd.js";
 import {
   BUNSQL_CAPABILITIES,
   driverErrors,
   rejectClosed,
   mapFailure,
   runCall
-} from "./kb2sdhfb.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/bunsql.ts
-import { SQL } from "bun";
+import { SQL as BunSQL } from "bun";
 var clientPools = new WeakSet;
 function markClientPool(pool) {
   clientPools.add(pool);
@@ -33,7 +33,7 @@ function open5(config) {
   const parked = [];
   let dropped = 0;
   let closures = 0;
-  const sql = new SQL(config.url, {
+  const sql = new BunSQL(config.url, {
     max,
     idleTimeout: 0,
     maxLifetime: 0,
@@ -66,19 +66,19 @@ function open5(config) {
   };
   const run = (text, params, watch) => {
     const sent = dropped;
-    return root.query(text, params, watch).catch((error) => import("./ab9gmbwy.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("./cf8zdz5p.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("./ab9gmbwy.js").then((mod) => mod.drainClosed(sql).then(() => {
+    return import("./cf8zdz5p.js").then((mod) => mod.drainClosed(sql).then(() => {
       if (dropped === seen)
         dropped = 0;
       return run(text, params, watch);
     }));
   };
-  const checkout = () => closed ? rejectClosed() : import("./ab9gmbwy.js").then((mod) => mod.checkout(held));
+  const checkout = () => closed ? rejectClosed() : import("./cf8zdz5p.js").then((mod) => mod.checkout(held));
   const pool = {
     capabilities: BUNSQL_CAPABILITIES,
     execute(text, params, options) {
@@ -101,12 +101,12 @@ function open5(config) {
     reserve: () => checkout(),
     stream(text, params) {
       return async function* () {
-        const { streamRows } = await import("./ab9gmbwy.js");
+        const { streamRows } = await import("./cf8zdz5p.js");
         yield* streamRows(checkout, text, params);
       }();
     },
     listen(channel, onNotify) {
-      return import("./ab9gmbwy.js").then((mod) => mod.listen(sql, parked, closed, channel, onNotify));
+      return import("./cf8zdz5p.js").then((mod) => mod.listen(sql, parked, closed, channel, onNotify));
     },
     stats: () => statsOf(counters, max),
     async close() {

package/dist/shared/{jgqj11w4.js → 6f0z3hzh.js}

@@ -10,6 +10,8 @@ function extension2(name, options = {}) {
   const schema = options.schema ?? "public";
   const relocatable = options.relocatable ?? true;
   const version = options.version;
+  const requires = options.requires;
+  const provides = options.provides;
   const record = extensionObject({
     name,
     schema,
@@ -22,6 +24,8 @@ function extension2(name, options = {}) {
     schema,
     relocatable,
     ...version !== undefined ? { version } : {},
+    ...requires !== undefined ? { requires } : {},
+    ...provides !== undefined ? { provides } : {},
     contribute(peers, built) {
       const names = peerNames(peers);
       assertDeclared(names, built);