okmodel 0.7.0 → 0.8.0

package/dist/shared/bsek72fg.js

@@ -0,0 +1,225 @@
+import {
+  assertNoControl
+} from "./zchaghkf.js";
+import {
+  isOperator,
+  operatorName,
+  operatorValue,
+  tag
+} from "./cn0n68ft.js";
+import {
+  OkmError2
+} from "./52szzakm.js";
+
+// src/dialects/pg/ops/fragment.ts
+var IDENT = Symbol("okmodel.sql.ident");
+var COLUMN = Symbol("okmodel.sql.column");
+function fragmentError(message, fix) {
+  throw new OkmError2("OKM1125", message, { fix: { summary: fix } });
+}
+function isFragmentParts(value) {
+  return Array.isArray(value) && value.every(isPart);
+}
+function isPart(value) {
+  if (typeof value !== "object" || value === null || !("k" in value))
+    return false;
+  const kind = value.k;
+  if (kind === "t")
+    return "s" in value && typeof value.s === "string";
+  if (kind === "p")
+    return "v" in value && typeof value.v === "string";
+  if (kind === "n" || kind === "c")
+    return true;
+  if (kind === "i")
+    return "n" in value && typeof value.n === "string";
+  if (kind === "f")
+    return "parts" in value && isFragmentParts(value.parts);
+  return false;
+}
+function readSelectFragment(value) {
+  if (!isOperator(value) || operatorName(value) !== "sql")
+    return;
+  const named = value;
+  if (typeof named.as !== "string") {
+    fragmentError("A select fragment needs as(name).", 'Call .as("len") and pass that value in select.');
+  }
+  const stored = operatorValue(value);
+  if (!isFragmentParts(stored)) {
+    fragmentError("A fragment was not created by fragment``.", "Call fragment`...`.");
+  }
+  const textual = named.text === true;
+  return textual ? { as: named.as, parts: stored, textual: true } : { as: named.as, parts: stored };
+}
+function scanLiteral(literal, state) {
+  for (let index = 0;index < literal.length; index += 1) {
+    const char = literal[index] ?? "";
+    const code = literal.charCodeAt(index);
+    if (state.quote !== undefined) {
+      if (char !== state.quote)
+        continue;
+      if (literal[index + 1] === state.quote) {
+        index += 1;
+        continue;
+      }
+      state.quote = undefined;
+      continue;
+    }
+    if (code <= 31 && code !== 9 && code !== 10 && code !== 13 || code === 127) {
+      fragmentError("A fragment literal contains a control character.", "Remove NUL and other control characters. A newline, tab, or return is allowed.");
+    }
+    if (char === "'" || char === '"') {
+      state.quote = char;
+      continue;
+    }
+    if (char === "(") {
+      state.paren += 1;
+      continue;
+    }
+    if (char === ")") {
+      state.paren -= 1;
+      if (state.paren < 0) {
+        fragmentError("A fragment has unbalanced SQL.", "Keep parentheses and quotes balanced. A fragment cannot close the surrounding predicate.");
+      }
+      continue;
+    }
+    if (char === ";") {
+      fragmentError("A fragment cannot include a semicolon.", "Pass the value as an interpolation. The fragment is one expression.");
+    }
+    if (char === "$") {
+      fragmentError("A fragment cannot include a dollar quote or a parameter marker.", "Interpolate the value. The planner numbers parameters.");
+    }
+    if (char === "-" && literal[index + 1] === "-" || char === "/" && literal[index + 1] === "*") {
+      fragmentError("A fragment cannot include a comment.", "Remove the comment. A comment can hide the rest of the predicate.");
+    }
+  }
+}
+function appendText(parts, literal) {
+  if (literal.length === 0)
+    return;
+  parts.push({ k: "t", s: literal });
+}
+function appendValue(parts, value) {
+  if (value === null) {
+    parts.push({ k: "n" });
+    return;
+  }
+  if (typeof value === "string") {
+    parts.push({ k: "p", v: value });
+    return;
+  }
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      fragmentError("A fragment needs a finite number.", "Pass a finite number, or leave it out.");
+    }
+    parts.push({ k: "p", v: String(value) });
+    return;
+  }
+  if (typeof value === "boolean") {
+    parts.push({ k: "p", v: value ? "true" : "false" });
+    return;
+  }
+  if (typeof value === "bigint") {
+    parts.push({ k: "p", v: String(value) });
+    return;
+  }
+  if (typeof value === "object") {
+    if (COLUMN in value) {
+      parts.push({ k: "c" });
+      return;
+    }
+    if (IDENT in value) {
+      const name = value[IDENT];
+      if (typeof name === "string") {
+        parts.push({ k: "i", n: name });
+        return;
+      }
+    }
+    if (isOperator(value) && operatorName(value) === "sql") {
+      const nested = operatorValue(value);
+      if (!isFragmentParts(nested)) {
+        fragmentError("A fragment was not created by fragment``.", "Call fragment`...`.");
+      }
+      parts.push({ k: "f", parts: nested });
+      return;
+    }
+  }
+  fragmentError("A fragment cannot interpolate that value.", "Interpolate a string, number, boolean, null, ident(name), fragment.column, or another fragment.");
+}
+function hasSql(parts) {
+  for (const part of parts) {
+    if (part.k === "t") {
+      if (part.s.trim().length > 0)
+        return true;
+      continue;
+    }
+    return true;
+  }
+  return false;
+}
+function compile(strings, values) {
+  const state = { quote: undefined, paren: 0 };
+  const parts = [];
+  for (let index = 0;index < values.length + 1; index += 1) {
+    const literal = strings[index] ?? "";
+    scanLiteral(literal, state);
+    appendText(parts, literal);
+    if (index === values.length)
+      continue;
+    if (state.quote !== undefined) {
+      fragmentError("A fragment cannot interpolate inside quotes.", "Do not put an interpolation inside quotes. Write title = ${name}.");
+    }
+    appendValue(parts, values[index]);
+  }
+  if (state.quote !== undefined || state.paren !== 0) {
+    fragmentError("A fragment has unbalanced SQL.", "Keep parentheses and quotes balanced. A fragment cannot close the surrounding predicate.");
+  }
+  if (!hasSql(parts)) {
+    fragmentError("A fragment needs SQL text.", "Write an expression, or interpolate a value.");
+  }
+  return parts;
+}
+function isTemplate(value) {
+  return Array.isArray(value) && "raw" in value;
+}
+function bind(parts, textual = false) {
+  const tagged = tag("sql", parts);
+  return Object.assign(tagged, {
+    as(name) {
+      if (typeof name !== "string" || name.length === 0) {
+        fragmentError("as(name) needs a result name.", 'Call .as("len") with a name that is not a column.');
+      }
+      assertNoControl(name, "fragment as");
+      const selected = Object.assign(tag("sql", parts), { as: name });
+      return textual ? Object.assign(selected, { text: true }) : selected;
+    }
+  });
+}
+function sqlExpression(parts, textual = false) {
+  return bind(parts, textual);
+}
+function identName(value) {
+  if (typeof value !== "object" || value === null || !(IDENT in value))
+    return;
+  const stored = value[IDENT];
+  return typeof stored === "string" ? stored : undefined;
+}
+function fragmentTag(strings, ...values) {
+  if (!isTemplate(strings)) {
+    fragmentError("Call fragment as a template: fragment`...`.", "Write fragment`length(${fragment.column}) > ${1}`.");
+  }
+  return bind(compile(strings, values));
+}
+var fragment2 = Object.assign(fragmentTag, {
+  column: { [COLUMN]: true }
+});
+function ident2(name) {
+  if (typeof name !== "string" || name.length === 0) {
+    throw new OkmError2("OKM1122", "ident needs a name.", {
+      fix: { summary: "Pass the field name, such as title." }
+    });
+  }
+  assertNoControl(name, "ident");
+  return { [IDENT]: name };
+}
+
+export { isFragmentParts, readSelectFragment, sqlExpression, identName, fragment2, ident2 };

package/dist/shared/{1w508jbr.js → bxas03mq.js}

@@ -3,21 +3,21 @@ import {
 } from "./mss6ctgv.js";
 import {
   effectivePredicate
-} from "./n816peh1.js";
-import {
-  assertOperatorFits,
-  textArray,
-  arrayElementType
-} from "./zchaghkf.js";
+} from "./n454kcnw.js";
 import {
   runWrite
 } from "./n4jqhpqz.js";
 import {
   writeWouldValidate
-} from "./ze4hxsmy.js";
+} from "./w9ejzaqf.js";
 import {
   encodeJson
-} from "./9628a9xt.js";
+} from "./vk7rag46.js";
+import {
+  assertOperatorFits,
+  textArray,
+  arrayElementType
+} from "./zchaghkf.js";
 import {
   withRowFilters,
   archiveRules,
@@ -32,7 +32,7 @@ import {
   isRecord,
   registerFailFix,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   safetyInstalled,
   runSafety
@@ -198,7 +198,7 @@ async function planWrite(schema, generators, op, tableName, input, options, mods
   }
   if (op === "update") {
     if (traitNamed(table, "versioned")) {
-      const { planVersioned } = await import("./y6njgyda.js");
+      const { planVersioned } = await import("./3t6kw83m.js");
       return withRowFilters(scope, mods.archive, () => {
         noteArchive(table, mods.archive);
         const planned = planVersioned(schema, table, input, record, mods);
@@ -244,12 +244,12 @@ async function planInsert(table, input, options, mods, generators, scope, tenanc
       keyColumns: undefined
     };
   }
-  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./bg3rym3g.js");
+  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./63f4ksbz.js");
   const conflict = conflictMod?.readConflict(table, options.onConflict, allow, tenantKeyList(tenancy));
   if (conflict?.kind === "update" && traitNamed(table, "versioned")) {
     fail2("OKM1120", `onConflict update on ${table.model.name} does not check the version you read.`, "Read the row and update. ignore and return do not change the existing row.");
   }
-  const sortMod = sorting ? await import("./9y3mmmh1.js") : undefined;
+  const sortMod = sorting ? await import("./xfhe73sb.js") : undefined;
   const chunks = chunkRows(rows.map((row) => cellsFor(columns, row)));
   const statements = [];
   const quiet = [];
@@ -1086,7 +1086,7 @@ function insertRow(table, value, allow, tenancy) {
     if (column === undefined)
       continue;
     tenancy?.guard(table.model.name, key, "insert");
-    if (!writable(table, column, allow))
+    if (!writable(table, column, allow, "insert"))
       refuse(table, column);
     if (value[key] !== undefined)
       row[key] = value[key];
@@ -1142,7 +1142,7 @@ function writtenColumns(table, rows, allow, tenantKeys) {
   }
   const columns = [];
   for (const column of table.model.columns) {
-    if (present.has(column.field) && (writable(table, column, allow) || column.fill !== undefined || tenantKeys?.includes(column.field) === true)) {
+    if (present.has(column.field) && (writable(table, column, allow, "insert") || column.fill !== undefined || tenantKeys?.includes(column.field) === true)) {
       columns.push(column);
     }
   }
@@ -1206,7 +1206,7 @@ function writeSet2(table, value, allow, tenancy) {
     if (column === undefined)
       continue;
     tenancy?.guard(table.model.name, key, "update");
-    if (column.guardUpdate || !writable(table, column, allow))
+    if (column.guardUpdate || !writable(table, column, allow, "update"))
       refuse(table, column);
     set[key] = value[key];
   }
@@ -1475,12 +1475,16 @@ function refuse(table, column) {
   }
   fail2("OKM1120", `Field ${table.model.name}.${column.field} cannot be written.`);
 }
-function writable(table, column, allow) {
+function writable(table, column, allow, op) {
   if (fieldSealed(table.model, column.field))
     return false;
   if (column.writable)
     return true;
-  return column.guarded && allow.has(column.field);
+  if (!column.guarded || !allow.has(column.field))
+    return false;
+  if (!table.model.primary.includes(column.field))
+    return true;
+  return op === "insert" && column.fill !== undefined;
 }
 function allowSet2(table, value) {
   if (value === undefined)

package/dist/shared/{dk8v79p3.js → d5nmj7vv.js}

@@ -9,7 +9,7 @@ import {
   loadTrustedCatalog2,
   catalogFileText2,
   parseCatalog2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
 export {
   catalogFileText2 as catalogFileText,
   catalogHash2 as catalogHash,

package/dist/shared/{tsvww22q.js → dpc2r7rb.js}

@@ -2,7 +2,7 @@ import {
   creationOrder2,
   renameColumn2,
   renameTable2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
 import {
   isConnectionLost
 } from "./cnkky55j.js";
@@ -21,12 +21,7 @@ import {
   identitySequence,
   createTableSql,
   qualify
-} from "./9s0ypp87.js";
-import {
-  isExactVersion,
-  compareExtensionVersions,
-  sameExtensionDefinition
-} from "./r3j8s5y0.js";
+} from "./sjk86yrx.js";
 import {
   isDomain,
   sameEnumLabels
@@ -34,6 +29,11 @@ import {
 import {
   quoteLiteral
 } from "./94ez8kzh.js";
+import {
+  isExactVersion,
+  compareExtensionVersions,
+  sameExtensionDefinition
+} from "./r3j8s5y0.js";
 import {
   staticNamespace2,
   identityKey2,

package/dist/shared/{vb6qfyve.js → e8zyaqvj.js}

@@ -7,12 +7,12 @@ import {
 import {
   withHttp,
   settleCall
-} from "./tbrvgw6z.js";
+} from "./bah9nbg3.js";
 import {
   rejectKeys,
   isRecord,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{hyh73qk6.js → ecn8mfdq.js}

@@ -1,18 +1,18 @@
 import {
   encodeText,
   decodeText
-} from "./ed0b8k4s.js";
+} from "./typ3vy7t.js";
 import {
   required,
   openColumn
-} from "./ywr8hmey.js";
+} from "./606g0nbf.js";
+import {
+  readClientGenerator
+} from "./rwmrejjz.js";
 import {
   definition,
   rejected
 } from "./tmbdywx0.js";
-import {
-  readClientGenerator
-} from "./rwmrejjz.js";
 
 // src/dialects/pg/keys.ts
 function id2(options) {

package/dist/shared/{gs74dbj5.js → f4jy1j7x.js}

@@ -11,10 +11,10 @@ import {
   startupCatalog2,
   catalogFileText2,
   parseCatalog2
-} from "./qq3899ht.js";
+} from "./12z7aznj.js";
 import {
   open2
-} from "./14vx95q4.js";
+} from "./35q0n9tz.js";
 import {
   sqlStatements,
   transactionControl,
@@ -35,14 +35,14 @@ import {
   assertTargetAlias,
   listTargets,
   selectTarget
-} from "./tsvww22q.js";
+} from "./dpc2r7rb.js";
 import {
   contributedFields
 } from "./n0dgs0pb.js";
 import {
   assertValidation,
   writeWouldValidate
-} from "./ze4hxsmy.js";
+} from "./w9ejzaqf.js";
 import {
   tableOwner,
   stampOwnership
@@ -51,17 +51,17 @@ import {
   POSTGRES_FLOOR,
   uuidv7NeedsPostgres
 } from "./ga9j92qj.js";
-import {
-  catalog,
-  isDomain
-} from "./ywspezzx.js";
 import {
   snakeCase,
   emittedTypeName
-} from "./rpycarcr.js";
+} from "./gcefca6p.js";
 import {
   ColumnBuilder2
-} from "./ywr8hmey.js";
+} from "./606g0nbf.js";
+import {
+  catalog,
+  isDomain
+} from "./ywspezzx.js";
 import {
   staticNamespace2
 } from "./358zsv4r.js";
@@ -236,6 +236,12 @@ var ERROR_DOCS = [
     summary: "An operator does not apply to the column type.",
     fix: "Use an operator the error lists for that column type. Search needs a column built for search, not a plain text column."
   },
+  {
+    code: "OKM1125",
+    title: "Bad SQL fragment",
+    summary: "A composed fragment is empty, unbalanced, or interpolates a value it cannot bind. A select fragment that is not a number is the same code.",
+    fix: "Interpolate a string, number, boolean, null, ident(name), fragment.column, or another fragment. Keep parentheses and quotes balanced. A select fragment is a numeric expression named with as()."
+  },
   {
     code: "OKM1130",
     title: "Cursor order",
@@ -536,6 +542,12 @@ var ERROR_DOCS = [
     summary: "A typed SQL signature no longer matches the database.",
     fix: "Regenerate the typed SQL and commit the new signature."
   },
+  {
+    code: "OKM1602",
+    title: "Bad typed SQL",
+    summary: "A raw statement is missing its class, is not one select or one write, or the result class has no column initializers.",
+    fix: 'Pass "read" or "write", a fragment`...`, and a class with an initializer on every column. Identifiers are ident(name).'
+  },
   {
     code: "OKM1701",
     title: "Tenant context missing",
@@ -545,8 +557,8 @@ var ERROR_DOCS = [
   {
     code: "OKM1702",
     title: "Unverifiable tenant SQL",
-    summary: "Raw SQL touches a tenant table and the tenant predicate cannot be proved.",
-    fix: "Use the query builder, or mark the fragment trusted with a reason if it is reviewed."
+    summary: "Raw SQL on a tenant table cannot prove the tenant predicate. A raw write is this. A raw read that does not select the primary key with ident is this.",
+    fix: 'Use update or delete, or select the primary key with ident(name). unscoped("reason") is the reviewed hatch.'
   },
   {
     code: "OKM1704",
@@ -2386,12 +2398,13 @@ async function checkProject(cwd, flags) {
   const target = selectTarget(opened.config, named);
   assertTargetPolicy(target, "check", flags?.allowProtected ?? false);
   assertTargetPolicy(target, "drift", flags?.allowProtected ?? false);
-  const { assertAuthorDrift } = await import("./jvd0mqag.js");
+  const { assertAuthorDrift } = await import("./3449rcae.js");
   const allowPooler = flags?.allowPooler === true || opened.config.allowPooler === true;
   await assertAuthorDrift(target.url, opened.built.catalog, opened.config.roles, allowPooler);
   return findings;
 }
 function unlistedTableFiles(schemaSource, fileNames) {
+  const folded = schemaSource.toLowerCase();
   const missing = [];
   for (const file of fileNames) {
     if (!file.endsWith(".ts"))
@@ -2399,7 +2412,7 @@ function unlistedTableFiles(schemaSource, fileNames) {
     const stem = basename(file, ".ts");
     if (stem.length === 0 || stem.startsWith("."))
       continue;
-    if (!schemaSource.includes(stem))
+    if (!folded.includes(stem.toLowerCase()))
       missing.push(file);
   }
   return missing;

package/dist/shared/{ttsqgp4p.js → fjpnhqan.js}

@@ -7,7 +7,7 @@ import {
 import {
   withHttp,
   attachHttp
-} from "./tbrvgw6z.js";
+} from "./bah9nbg3.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -37,7 +37,7 @@ async function acceptServer(pool, schema, rows, http, requireMeta, options, sour
       }));
     }
   } else {
-    const { assertCompatible } = await import("./ek2wt2dz.js");
+    const { assertCompatible } = await import("./16kvjebh.js");
     try {
       await assertCompatible(pool, schema, recorded, source, options);
     } catch (error) {

package/dist/shared/{xjk7hnn5.js → g5yc06ka.js}

@@ -2,7 +2,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./tbrvgw6z.js";
+} from "./bah9nbg3.js";
 import {
   decodeResult,
   emitWhere,
@@ -15,7 +15,7 @@ import {
   list,
   isRecord,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   OkmError2,
   throwNamed2

package/dist/shared/{w72kgg4q.js → hfqmpasr.js}

@@ -1,17 +1,17 @@
 import {
   open2
-} from "./14vx95q4.js";
-import"./qq3899ht.js";
+} from "./35q0n9tz.js";
+import"./12z7aznj.js";
 import {
   createdOf,
   testing2
-} from "./7k9grvf6.js";
+} from "./b6d6p0zc.js";
 import"./n442h54c.js";
 import {
   projectPath,
   loadConfig,
   loadSchema
-} from "./gs74dbj5.js";
+} from "./f4jy1j7x.js";
 import {
   sessionFailure,
   finishQuiet,
@@ -19,8 +19,8 @@ import {
   assertDirectConnection,
   assertStableBackend,
   selectTarget
-} from "./tsvww22q.js";
-import"./9s0ypp87.js";
+} from "./dpc2r7rb.js";
+import"./sjk86yrx.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{kr0jzbw2.js → hm5f8jby.js}

@@ -1,24 +1,24 @@
 import {
   open2
-} from "./14vx95q4.js";
-import"./qq3899ht.js";
+} from "./35q0n9tz.js";
+import"./12z7aznj.js";
 import"./n442h54c.js";
 import {
   assertRoleHealth
-} from "./8skf0cam.js";
-import"./b5pftnn2.js";
+} from "./kj9d8maq.js";
+import"./p3xbdcvt.js";
 import {
   errorDoc,
   openProject
-} from "./gs74dbj5.js";
+} from "./f4jy1j7x.js";
 import {
   omitManagedObjects,
   sessionFailure,
   finishQuiet,
   assertTargetPolicy,
   selectTarget
-} from "./tsvww22q.js";
-import"./9s0ypp87.js";
+} from "./dpc2r7rb.js";
+import"./sjk86yrx.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{dkxgzaqd.js → hqpxf4a4.js}

@@ -20,7 +20,7 @@ import {
   isRecord,
   registerFailFix,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   throwNamed2
 } from "./52szzakm.js";

package/dist/shared/{cn957f8d.js → jebgrkeq.js}

@@ -1,16 +1,16 @@
 import {
   build3
-} from "./pbp1ss85.js";
+} from "./n0jmpgj1.js";
 import {
   attachHttp
-} from "./tbrvgw6z.js";
+} from "./bah9nbg3.js";
 import {
   rejectKeys,
   readLimit,
   indexes,
   isRecord,
   fail2
-} from "./67txcrcw.js";
+} from "./kgwp4jdd.js";
 import {
   OkmError2
 } from "./52szzakm.js";