okmodel 0.9.0 → 0.9.1

package/dist/shared/{rbxt795q.js → c7dqd3gk.js}

@@ -13,18 +13,19 @@ import {
 import {
   cellText,
   introspectSchema
-} from "./myk8fswx.js";
+} from "./mz48rs74.js";
 import {
   projectPath,
   loadConfig
-} from "./2zdxkt7b.js";
+} from "./wp7y8q3y.js";
 import {
+  driverUrl,
   sqlIdentifiers,
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   selectTarget
-} from "./6nae0spm.js";
+} from "./bdekbvmt.js";
 import {
   dependencyOrder,
   catalog,
@@ -41,7 +42,7 @@ import {
 // src/tooling/migrate/pull.ts
 import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { dirname as dirname2, join } from "node:path";
+import { delimiter, dirname as dirname2, join } from "node:path";
 import postgres from "postgres";
 
 // src/tooling/migrate/pull-emit.ts
@@ -545,20 +546,29 @@ function emitPull(source, layout, review) {
   const files = [];
   const imports = [];
   const usedFiles = new Set;
+  const usedExports = new Set;
   const identitySequences = new Set;
   const tableExports = new Map;
+  for (const table of tables) {
+    if (table.definition.partition !== undefined)
+      continue;
+    const exportName = freshIdent(declaredIdent(table.provenance.source, table.identity.name), usedExports);
+    tableExports.set(table.identity.name, exportName);
+  }
   for (const table of tables) {
     if (table.definition.partition !== undefined) {
       skipped.push(skip2(table, "table", table.identity.name, "table() has no partition option", statementFor(statements, table.identity.name)));
       skipChildren(table.identity.name, byParent, statements, skipped);
       continue;
     }
-    const planned = planTable(table, byParent, enums, domains, statements, skipped);
+    const exportName = tableExports.get(table.identity.name);
+    if (exportName === undefined)
+      continue;
+    const planned = planTable(table, byParent, enums, domains, statements, skipped, exportName, tableExports);
     if (planned === undefined)
       continue;
     if (planned.identitySequence !== undefined)
       identitySequences.add(planned.identitySequence);
-    tableExports.set(table.identity.name, planned.exportName);
     const fileName = uniqueFile(planned.exportName, usedFiles);
     const path = `${layout.tablesDir}/${fileName}.ts`;
     files.push({ path, text: planned.text });
@@ -666,7 +676,7 @@ function formatPullReport(counts, skipped, verdicts = [], unexpressed = [], verb
 `)}
 `;
 }
-function planTable(table, byParent, enums, domains, statements, skipped) {
+function planTable(table, byParent, enums, domains, statements, skipped, exportName, tableExports) {
   const bag = byParent.get(table.identity.name) ?? {
     columns: [],
     constraints: [],
@@ -684,8 +694,8 @@ function planTable(table, byParent, enums, domains, statements, skipped) {
     const field = freshIdent(declaredIdent(column.provenance.source, column.identity.name), names);
     fields.set(column.identity.name, field);
     if (column === identityColumn) {
-      const renamed = column.provenance.source !== undefined && field !== column.identity.name ? `.sqlName(${JSON.stringify(column.identity.name)})` : "";
-      columnLines.push(`    ${field}: t.identity()${renamed},`);
+      const renamed = field !== column.identity.name ? `.sqlName(${JSON.stringify(column.identity.name)})` : "";
+      columnLines.push(`    ${jsKey(field)}: t.identity()${renamed},`);
       emitted.add(column.identity.name);
       continue;
     }
@@ -694,11 +704,10 @@ function planTable(table, byParent, enums, domains, statements, skipped) {
       skipped.push(skip2(column, "column", `${table.identity.name}.${column.identity.name}`, columnReason(column), ""));
       continue;
     }
-    columnLines.push(`    ${field}: ${built},`);
+    columnLines.push(`    ${jsKey(field)}: ${built},`);
     emitted.add(column.identity.name);
   }
   const options = [];
-  const exportName = table.provenance.source === undefined ? exportNameOf(table.identity.name) : freshIdent(declaredIdent(table.provenance.source, table.identity.name), new Set);
   if (exportName !== table.identity.name) {
     options.push(`    sqlName: ${JSON.stringify(table.identity.name)},`);
   }
@@ -751,7 +760,7 @@ function planTable(table, byParent, enums, domains, statements, skipped) {
       }
       if (field === undefined)
         continue;
-      foreign.set(field, referenceCall(references));
+      foreign.set(field, referenceCall(references, tableExports));
       continue;
     }
     skipped.push(skip2(constraint, "constraint", label, "table() cannot store this constraint", statementFor(statements, constraint.identity.name)));
@@ -976,17 +985,18 @@ function columnReason(column) {
 }
 function rewriteForeign(lines, foreign) {
   return lines.map((line) => {
-    const match = /^    ([A-Za-z_$][A-Za-z0-9_$]*): (.+),$/.exec(line);
-    if (match === null)
-      return line;
-    const field = match[1] ?? "";
-    const call = foreign.get(field);
-    if (call === undefined)
-      return line;
-    return `    ${field}: ${match[2] ?? ""}${call},`;
+    for (const [field, call] of foreign) {
+      const key = jsKey(field);
+      const prefix = `    ${key}: `;
+      if (!line.startsWith(prefix) || !line.endsWith(","))
+        continue;
+      const body = line.slice(prefix.length, -1);
+      return `${prefix}${body}${call},`;
+    }
+    return line;
   });
 }
-function referenceCall(references) {
+function referenceCall(references, tableExports) {
   const options = [];
   if (references.columns.length > 0) {
     options.push(`columns: [${references.columns.map((name) => JSON.stringify(name)).join(", ")}]`);
@@ -996,7 +1006,8 @@ function referenceCall(references) {
   if (references.onUpdate !== undefined)
     options.push(`onUpdate: ${JSON.stringify(references.onUpdate)}`);
   const optionText = options.length === 0 ? "" : `, { ${options.join(", ")} }`;
-  return `.references(${JSON.stringify(references.parent.name)}${optionText})`;
+  const parent = tableExports.get(references.parent.name) ?? exportNameOf(references.parent.name);
+  return `.references(${JSON.stringify(parent)}${optionText})`;
 }
 function indexCall(index, fields) {
   const columns = index.definition.columns.map((name) => `columns.${fields.get(name) ?? name}`).join(", ");
@@ -1222,29 +1233,55 @@ function objectName(object) {
     return object.identity.name;
   return "";
 }
+var WINDOWS_RESERVED = new Set([
+  "con",
+  "prn",
+  "aux",
+  "nul",
+  "com1",
+  "com2",
+  "com3",
+  "com4",
+  "com5",
+  "com6",
+  "com7",
+  "com8",
+  "com9",
+  "lpt1",
+  "lpt2",
+  "lpt3",
+  "lpt4",
+  "lpt5",
+  "lpt6",
+  "lpt7",
+  "lpt8",
+  "lpt9"
+]);
 function uniqueFile(name, used) {
-  let file = name;
+  const base = reservedFileStem(name);
+  let file = base;
   let salt = 2;
-  while (used.has(file)) {
-    file = `${name}_${String(salt)}`;
+  while (used.has(file.toLowerCase())) {
+    file = `${base}_${String(salt)}`;
     salt += 1;
   }
-  used.add(file);
+  used.add(file.toLowerCase());
   return file;
 }
+function reservedFileStem(name) {
+  return WINDOWS_RESERVED.has(name.toLowerCase()) ? `_${name}` : name;
+}
 function tableExportNames(source) {
   const names = new Map;
+  const used = new Set;
   for (const object of source.objects) {
     if (object.kind !== "table" || object.definition.partition !== undefined)
       continue;
-    names.set(object.identity.name, exportNameOf(object.identity.name));
+    names.set(object.identity.name, freshIdent(declaredIdent(object.provenance.source, object.identity.name), used));
   }
   return names;
 }
 function exportNameOf(name) {
-  const sqlName = jsIdent(name);
-  if (sqlName === name)
-    return name;
   return freshIdent(name, new Set);
 }
 function declaredIdent(source, fallback) {
@@ -1268,12 +1305,13 @@ function freshIdent(sql, used) {
   let name = jsIdent(sql);
   if (name === "table" || name === "columns")
     name = `${name}Name`;
+  const base = name;
   let salt = 2;
-  while (used.has(name)) {
-    name = `${jsIdent(sql)}_${String(salt)}`;
+  while (used.has(name.toLowerCase())) {
+    name = `${base}_${String(salt)}`;
     salt += 1;
   }
-  used.add(name);
+  used.add(name.toLowerCase());
   return name;
 }
 function jsIdent(sql) {
@@ -1292,6 +1330,8 @@ function jsIdent(sql) {
   return out;
 }
 function jsKey(name) {
+  if (name === "__proto__")
+    return '["__proto__"]';
   if (/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name) && !RESERVED.has(name))
     return name;
   return JSON.stringify(name);
@@ -1524,7 +1564,7 @@ async function pullProject2(cwd, argv) {
   const target = selectTarget(config, flags.target);
   assertTargetPolicy(target, "pull", flags.allowProtected);
   const layout = layoutOf(cwd, config.schema, config.tables, flags.out);
-  const sql = postgres(target.url, {
+  const sql = postgres(driverUrl(target.url), {
     max: 1,
     connect_timeout: 5,
     idle_timeout: 1,
@@ -1722,16 +1762,16 @@ function formatFiles(files) {
   if (files.length === 0)
     return;
   const root = formatterRoot(dirname2(files[0] ?? "."));
-  const binary = join(root, "node_modules", ".bin", "oxfmt");
-  const result = spawnSync(binary, ["--write", ...files], {
+  const pathEnv = [join(root, "node_modules", ".bin"), process.env.PATH ?? ""].join(delimiter);
+  const result = spawnSync("oxfmt", ["--write", ...files], {
     cwd: root,
-    encoding: "utf8"
+    encoding: "utf8",
+    env: { ...process.env, PATH: pathEnv }
   });
   if (result.error !== undefined || result.status !== 0) {
-    const detail = result.stderr || result.stdout || "oxfmt failed";
-    throw new OkmError2("invalid", `The pulled files were not formatted. ${detail.trim()}`, {
-      fix: { summary: "Run oxfmt on the pulled files, or fix the formatter settings." }
-    });
+    const detail = (result.stderr || result.stdout || result.error?.message || "oxfmt failed").trim();
+    process.stderr.write(`notice: oxfmt missing or failed; wrote unformatted files. ${detail}
+`);
   }
 }
 function formatterRoot(start) {

package/dist/shared/ddh72ym5.js

@@ -0,0 +1,20 @@
+import {
+  OkmError2
+} from "./52szzakm.js";
+
+// src/runtime/param-limit.ts
+var PG_PARAM_LIMIT = 65535;
+function refuseParamLimit2(count) {
+  throw new OkmError2("OKM1126", `${String(count)} parameters (max ${String(PG_PARAM_LIMIT)}).`, {
+    kind: "invalid",
+    retryable: false,
+    fix: { summary: "Chunk the work, or use = any(array)." }
+  });
+}
+function assertParamCount2(count) {
+  if (count <= PG_PARAM_LIMIT)
+    return;
+  refuseParamLimit2(count);
+}
+
+export { refuseParamLimit2, assertParamCount2 };

package/dist/shared/e1c55v04.js

@@ -0,0 +1,10 @@
+import {
+  assertStableBackend
+} from "./bdekbvmt.js";
+
+// src/tooling/migrate/pooler-probe.ts
+async function probeStableBackend(_url, readPid, allowPooler, options) {
+  await assertStableBackend(readPid, allowPooler, options);
+}
+
+export { probeStableBackend };

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

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./npdftanb.js";
+} from "./xbvz446k.js";
 import {
   fail2
 } from "./kgwp4jdd.js";

package/dist/shared/{7ba5h6pb.js → esy4dyxe.js}

@@ -2,14 +2,14 @@ import {
   pullProject2,
   pullLayout2,
   commitPullFiles2
-} from "./rbxt795q.js";
-import"./myk8fswx.js";
-import"./2zdxkt7b.js";
-import"./6nae0spm.js";
+} from "./c7dqd3gk.js";
+import"./mz48rs74.js";
+import"./wp7y8q3y.js";
+import"./bdekbvmt.js";
 import"./n442h54c.js";
 import"./fk9vef30.js";
 import"./12z7aznj.js";
-import"./dd5pmnky.js";
+import"./jvxcp1qk.js";
 export {
   commitPullFiles2 as commitPullFiles,
   pullLayout2 as pullLayout,

package/dist/shared/{gcefca6p.js → f9t9g54z.js}

@@ -12,19 +12,19 @@ import {
 } from "./52szzakm.js";
 
 // src/dialects/pg/filters.ts
-function openFilters(table, relations, spec, hiddenFields) {
+function openFilters(table, relations, spec, isHidden) {
   const allow = spec.allow ?? {};
   const sort = spec.sort ?? [];
   for (const field of Object.keys(allow))
-    deny(hiddenFields, table, field);
+    deny(isHidden, table, field);
   for (const field of sort)
-    deny(hiddenFields, table, field);
+    deny(isHidden, table, field);
   const nested = spec.relations;
   if (nested !== undefined) {
     for (const name of Object.keys(nested)) {
       const target = relationTable(relations, name);
       for (const field of nested[name] ?? [])
-        deny(hiddenFields, target, field);
+        deny(isHidden, target, field);
     }
   }
   return {
@@ -33,8 +33,8 @@ function openFilters(table, relations, spec, hiddenFields) {
     }
   };
 }
-function deny(hiddenFields, table, field) {
-  if (!hiddenFields.has(`${table}.${field}`))
+function deny(isHidden, table, field) {
+  if (!isHidden(table, field))
     return;
   throw new OkmError2("OKM1123", `Field ${table}.${field} is hidden.`, {
     fix: {
@@ -87,7 +87,8 @@ function table2(name, columns, options) {
     name,
     columns,
     filters(spec) {
-      return openFilters(name, options?.relations, spec, hiddenFields);
+      const ownHidden = hiddenColumnFields(columns);
+      return openFilters(name, options?.relations, spec, (tableName, field) => tableName === name ? ownHidden.has(field) : hiddenFields.has(`${tableName}.${field}`));
     },
     ...options !== undefined ? { options } : {},
     ...source !== undefined ? { source } : {}
@@ -190,11 +191,23 @@ function sqlValue(value) {
   definition("sql accepts a column, a string, a number, a boolean, or null.");
 }
 var hiddenFields = new Set;
-function remember(name, columns) {
+function hiddenColumnFields(columns) {
+  const fields = new Set;
   for (const field of Object.keys(columns)) {
     const column = columns[field];
     if (column?.state?.hidden === true)
-      hiddenFields.add(`${name}.${field}`);
+      fields.add(field);
+  }
+  return fields;
+}
+function remember(name, columns) {
+  const prefix = `${name}.`;
+  for (const key of hiddenFields) {
+    if (key.startsWith(prefix))
+      hiddenFields.delete(key);
+  }
+  for (const field of hiddenColumnFields(columns)) {
+    hiddenFields.add(`${name}.${field}`);
   }
 }
 

package/dist/shared/fkjne6gx.js

@@ -0,0 +1,8 @@
+import {
+  refuseParamLimit2,
+  assertParamCount2
+} from "./ddh72ym5.js";
+export {
+  assertParamCount2 as assertParamCount,
+  refuseParamLimit2 as refuseParamLimit
+};

package/dist/shared/{ds229x4r.js → fne90dvz.js}

@@ -7,7 +7,7 @@ import {
 import {
   withHttp,
   settleCall
-} from "./npdftanb.js";
+} from "./xbvz446k.js";
 import {
   rejectKeys,
   isRecord,
@@ -47,6 +47,9 @@ async function batch(session, ops, options, replica) {
       if (item.checked === "parent") {
         throw new OkmError2("OKM1705", "batch does not take an update that sets a path column. The parent is checked in the statement, and a batch cannot report that after it commits. Use update({ where, set }) inside tx().", { fix: { summary: "Use update({ where, set }) inside tx()." } });
       }
+      if (item.checked === "tree") {
+        fail2("OKM1121", "batch does not take an update that sets a tree parent. The cycle is checked in the statement, and a batch cannot report that after it commits. Use update({ where, set }) inside tx().");
+      }
       if (item.checked !== undefined) {
         fail2("OKM1121", item.checked === "restore" ? "batch does not take restore: it is refused while its parent is archived, and a batch cannot report that after it commits. Use tx()." : "batch does not take a write with expect: the count is checked after the statement ran, and a batch cannot report that after it commits. Use tx().");
       }

package/dist/shared/{cexb7z6b.js → gr9sn4za.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./npdftanb.js";
+} from "./xbvz446k.js";
 import {
   selectedColumns,
   parseOrder,

package/dist/shared/{mvmm3xpb.js → gzgfsspx.js}

@@ -1,6 +1,6 @@
 import {
   historySql2
-} from "./yybhre6n.js";
+} from "./k73e8n9d.js";
 import {
   BEHIND_EXPAND,
   BEHIND_CONTRACT,

package/dist/shared/{fdsz3w80.js → hgt69zjf.js}

@@ -7,8 +7,8 @@ import {
   holdCheckout2,
   holdListener2,
   watchQuery2
-} from "./bphrgwz9.js";
-import"./dd5pmnky.js";
+} from "./3dr444ny.js";
+import"./jvxcp1qk.js";
 import"./cm3w0ywp.js";
 export {
   checkout2 as checkout,