okmodel 0.1.1 → 0.3.0

package/dist/shared/r6nwkxnt.js

@@ -0,0 +1,86 @@
+import {
+  stack
+} from "./672t5vym.js";
+import {
+  checkPresetNames
+} from "./nsva2a6b.js";
+import {
+  isOperator,
+  operatorValue
+} from "./cn0n68ft.js";
+import {
+  OkmError2
+} from "./52szzakm.js";
+
+// src/runtime/presets.ts
+function checkSchema(schema) {
+  for (const name in schema.model) {
+    const presets = schema.model[name]?.presets;
+    if (presets !== undefined)
+      checkPresetNames(Object.keys(presets), `table ${name}`);
+  }
+}
+function resolve(schema, table, uses) {
+  const model = schema.model[table];
+  const known = model?.presets ?? {};
+  const chain = [];
+  for (let use = uses;use !== undefined; use = use[0])
+    chain.unshift(use);
+  const wheres = [];
+  const rules = [];
+  for (const [, name, args] of chain) {
+    const preset = known[name];
+    if (typeof preset !== "function") {
+      throw new OkmError2("OKM1120", `Table ${table} has no preset ${name}.`, {
+        fix: { summary: `Use one of: ${Object.keys(known).join(", ")}.` }
+      });
+    }
+    const added = [];
+    const q = {
+      where(filter) {
+        added.push(filter);
+        return q;
+      }
+    };
+    if (preset(q, ...args) !== q) {
+      throw new OkmError2("OKM1121", `Preset ${name} on ${table} must return the builder it was given.`, { fix: { summary: "Return q, as in (q) => q.where({ ... })." } });
+    }
+    for (const filter of added)
+      wheres.push(filter);
+    rules.push({
+      rule: "preset",
+      contribution: `${name} filters ${[...new Set(added.flatMap(fieldsOf))].join(", ") || "nothing"}`,
+      provenance: ownerOf(model, name, table),
+      ...model?.source !== undefined ? { source: model.source } : {}
+    });
+  }
+  return { wheres, rules };
+}
+function refine(schema, call, uses) {
+  const { wheres, rules } = resolve(schema, call.table, uses);
+  return {
+    ...call,
+    where: stack(call.where, wheres),
+    ruleLines: [...call.ruleLines ?? [], ...rules]
+  };
+}
+function ownerOf(model, name, table) {
+  for (const trait of model?.traits ?? []) {
+    const presets = trait.presets;
+    if (presets !== undefined && Object.hasOwn(presets, name))
+      return `trait ${trait.name}`;
+  }
+  return `table ${table}`;
+}
+function fieldsOf(filter) {
+  if (isOperator(filter)) {
+    const branches = operatorValue(filter);
+    return Array.isArray(branches) ? branches.flatMap(fieldsOf) : [];
+  }
+  return typeof filter === "object" && filter !== null ? Object.keys(filter) : [];
+}
+export {
+  checkSchema,
+  refine,
+  resolve
+};

package/dist/shared/{xy79j5hq.js → rrstp3kb.js}

@@ -15,6 +15,22 @@ var PGLITE_CAPABILITIES = {
   prepared: "unnamed",
   describe: true
 };
+var NODE_POSTGRES_CAPABILITIES = {
+  transactions: "interactive",
+  stream: true,
+  listen: true,
+  cancel: true,
+  prepared: "unnamed",
+  describe: false
+};
+var BUNSQL_CAPABILITIES = {
+  transactions: "interactive",
+  stream: true,
+  listen: true,
+  cancel: false,
+  prepared: "unnamed",
+  describe: false
+};
 function readCapability2(flags, name) {
   return flags[name];
 }
@@ -25,7 +41,7 @@ function hasCapability2(flags, name) {
 // src/adapters/failure.ts
 var loading;
 function driverErrors() {
-  loading ??= import("./mtkwv8wx.js");
+  loading ??= import("./7p2wbz7f.js");
   return loading;
 }
 function rejectClosed(message = "The pool is closed.") {
@@ -48,9 +64,8 @@ function needsWatch(options) {
 }
 function nextTransactionDepth(depth, text) {
   const command = text.trim().replace(/;\s*$/, "").trim().toLowerCase();
-  if (command === "begin" || command === "begin work" || command === "begin transaction") {
+  if (/^(?:begin|start transaction)(?:\s|$)/.test(command))
     return depth + 1;
-  }
   if (command === "commit" || command === "commit work" || command === "end") {
     return Math.max(0, depth - 1);
   }
@@ -58,35 +73,6 @@ function nextTransactionDepth(depth, text) {
     return 0;
   return depth;
 }
-function openWatch(options) {
-  let kind;
-  const controller = new AbortController;
-  const onAbort = () => {
-    if (kind === undefined)
-      kind = "cancelled";
-    controller.abort();
-  };
-  options.signal?.addEventListener("abort", onAbort, { once: true });
-  let timer;
-  if (options.timeout !== undefined) {
-    timer = setTimeout(() => {
-      if (kind === undefined)
-        kind = "timeout";
-      controller.abort();
-    }, options.timeout);
-  }
-  return {
-    signal: controller.signal,
-    finish() {
-      if (timer !== undefined)
-        clearTimeout(timer);
-      options.signal?.removeEventListener("abort", onAbort);
-    },
-    reason() {
-      return kind;
-    }
-  };
-}
 function runCall(closed, options, fn) {
   if (closed)
     return rejectClosed();
@@ -96,9 +82,12 @@ function runCall(closed, options, fn) {
     return rejectTimedOut();
   if (options === undefined || !needsWatch(options))
     return fn(undefined);
-  const watch = openWatch(options);
-  return fn(watch).finally(() => {
-    watch.finish();
+  const watched = options;
+  return import("./k3ted12y.js").then(({ openWatch }) => {
+    const watch = openWatch(watched);
+    return fn(watch).finally(() => {
+      watch.finish();
+    });
   });
 }
 
@@ -174,4 +163,4 @@ function countFrom(value, rows) {
   return rows;
 }
 
-export { POSTGRESJS_CAPABILITIES, PGLITE_CAPABILITIES, readCapability2, hasCapability2, driverErrors, rejectClosed, rejectCancelled, rejectTimedOut, mapFailure, nextTransactionDepth, runCall, EMPTY_NOTICES, rowsFrom, resultFrom };
+export { POSTGRESJS_CAPABILITIES, PGLITE_CAPABILITIES, NODE_POSTGRES_CAPABILITIES, BUNSQL_CAPABILITIES, readCapability2, hasCapability2, driverErrors, rejectClosed, rejectCancelled, rejectTimedOut, mapFailure, nextTransactionDepth, runCall, EMPTY_NOTICES, rowsFrom, resultFrom };

package/dist/shared/rwmrejjz.js

@@ -0,0 +1,26 @@
+// src/contracts/generator.ts
+var CLIENT_DEFAULT = Symbol.for("okmodel.clientDefault");
+function clientGenerator(call, name, options) {
+  const marked = call;
+  Object.defineProperty(marked, CLIENT_DEFAULT, {
+    value: options === undefined ? { label: "client", name } : { label: "client", name, options },
+    enumerable: false
+  });
+  return marked;
+}
+function readClientGenerator(value) {
+  if (typeof value !== "function")
+    return;
+  const mark = value[CLIENT_DEFAULT];
+  if (isMark(mark))
+    return { label: "client", name: mark.name, call: value };
+  return { label: "client", name: "function", call: value };
+}
+function isMark(value) {
+  if (typeof value !== "object" || value === null)
+    return false;
+  const name = value.name;
+  return value.label === "client" && typeof name === "string" && name !== "function";
+}
+
+export { clientGenerator, readClientGenerator };

package/dist/shared/{zhc5vmgf.js → s6gqfn5j.js}

@@ -1,12 +1,12 @@
 import {
   isConnectionSqlstate,
   isConnectionFailure
-} from "./ngk8gj61.js";
+} from "./tbszx8mz.js";
 import {
   OkmError2,
   stripRowValues,
   matchingParen
-} from "./ycwz42az.js";
+} from "./52szzakm.js";
 
 // src/dialects/pg/errors.ts
 function mapPostgresError(error, options) {

package/dist/shared/{523ft3e8.js → scwxrpx2.js}

@@ -1,18 +1,20 @@
 import {
   open2
-} from "./dkn3y60a.js";
-import"./y9m15dfv.js";
+} from "./xw1d69vd.js";
+import"./t616ynfn.js";
+import"./n442h54c.js";
 import {
   loadMigrations
-} from "./jjb7yht9.js";
+} from "./g4f5kcx9.js";
 import {
   assertTargetPolicy,
   listTargets,
   loadConfig
-} from "./05w44d8g.js";
+} from "./5nmdenb6.js";
+import"./2ssqrv66.js";
 import {
   OkmError2
-} from "./ycwz42az.js";
+} from "./52szzakm.js";
 
 // src/tooling/migrate/status.ts
 import { join } from "node:path";

package/dist/shared/{j5cn2963.js → t4tbsy9h.js}

@@ -1,73 +1,15 @@
+import {
+  referentialAction
+} from "./4e4c6vq2.js";
 import {
   assertIdentifier2,
   fitIdentifier2,
   deterministicName2,
   assertStoredText
-} from "./mkjmqjv4.js";
+} from "./nfzc5z0w.js";
 import {
   catalogError2
-} from "./ycwz42az.js";
-
-// src/contracts/catalog/types.ts
-var OWNERS2 = ["managed", "external", "ignored"];
-var OBJECT_KINDS2 = [
-  "table",
-  "column",
-  "index",
-  "constraint",
-  "sequence",
-  "view",
-  "materializedView",
-  "type",
-  "function",
-  "trigger",
-  "policy",
-  "extension",
-  "role",
-  "grant",
-  "defaultPrivilege"
-];
-var BUILT_KINDS2 = ["table", "column", "index", "constraint", "sequence", "type"];
-var OBJECT_OPERATIONS2 = [
-  "create",
-  "replace",
-  "alter",
-  "drop",
-  "recreateWithDependents"
-];
-var KIND_OPERATIONS2 = {
-  table: ["create", "alter", "drop", "recreateWithDependents"],
-  column: ["create", "alter", "drop", "recreateWithDependents"],
-  index: ["create", "drop", "recreateWithDependents"],
-  constraint: ["create", "alter", "drop", "recreateWithDependents"],
-  sequence: ["create", "alter", "drop"],
-  view: ["create", "replace", "drop", "recreateWithDependents"],
-  materializedView: ["create", "drop", "recreateWithDependents"],
-  type: ["create", "alter", "drop"],
-  function: ["create", "replace", "drop", "recreateWithDependents"],
-  trigger: ["create", "drop", "recreateWithDependents"],
-  policy: ["create", "alter", "drop"],
-  extension: ["create", "alter", "drop"],
-  role: ["create", "alter"],
-  grant: ["create", "drop"],
-  defaultPrivilege: ["create", "alter", "drop"]
-};
-var REFERENTIAL_ACTIONS = [
-  "cascade",
-  "no action",
-  "restrict",
-  "set default",
-  "set null"
-];
-function referentialAction(value) {
-  for (const action of REFERENTIAL_ACTIONS) {
-    if (action === value) {
-      return action;
-    }
-  }
-  return;
-}
-var CATALOG_VERSION2 = 1;
+} from "./52szzakm.js";
 
 // src/contracts/catalog/json.ts
 function canonicalJson(value) {
@@ -431,6 +373,12 @@ function column2(input) {
   if (input.defaultExpression !== undefined) {
     assertStoredText(input.defaultExpression, "column default");
   }
+  if (input.collation !== undefined) {
+    assertStoredText(input.collation, "column collation");
+    if (input.collation.length === 0) {
+      catalogError2("OKM1020", `Column ${input.name} has an empty collation.`);
+    }
+  }
   if (input.generated !== undefined) {
     assertStoredText(input.generated.expression, "column generated expression");
   }
@@ -443,6 +391,7 @@ function column2(input) {
     dataType: input.dataType,
     nullable: input.nullable,
     ...input.defaultExpression !== undefined ? { defaultExpression: input.defaultExpression } : {},
+    ...input.collation !== undefined ? { collation: input.collation } : {},
     ...input.identity !== undefined ? { identity: { always: input.identity.always } } : {},
     ...input.generated !== undefined ? {
       generated: {
@@ -698,4 +647,4 @@ function copyPartition(partition) {
   return { method: partition.method, columns: [...partition.columns] };
 }
 
-export { OWNERS2, OBJECT_KINDS2, BUILT_KINDS2, OBJECT_OPERATIONS2, KIND_OPERATIONS2, REFERENTIAL_ACTIONS, referentialAction, CATALOG_VERSION2, canonicalJson, staticNamespace2, templateNamespace2, assertNamespace2, resolveNamespace2, identityKey2, identifierLimitApplies2, identityLabel2, sameRef2, sameNamespace2, identityToJson, namespaceToJson, table3, column2, index3, constraint2, sequence2, normaliseEdges, compareText, assertProvenance };
+export { canonicalJson, staticNamespace2, templateNamespace2, assertNamespace2, resolveNamespace2, identityKey2, identifierLimitApplies2, identityLabel2, sameRef2, sameNamespace2, identityToJson, namespaceToJson, table3, column2, index3, constraint2, sequence2, normaliseEdges, compareText, assertProvenance };