@drzl/validation-core 3.12.0 → 3.14.0

package/dist/index.cjs

@@ -84460,6 +84460,7 @@ __export(index_exports2, {
   moduleSpecifier: () => moduleSpecifier,
   parseCheck: () => parseCheck,
   pascalCase: () => pascalCase,
+  renderDuplicateFinder: () => renderDuplicateFinder,
   resolveAffix: () => resolveAffix,
   resolveConfiguredImport: () => resolveConfiguredImport,
   schemaName: () => schemaName,
@@ -84473,6 +84474,7 @@ module.exports = __toCommonJS(index_exports2);
 // src/checks.ts
 var COMPARISON = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s*(>=|<=|<>|!=|>|<|=)\s*(.+?)\s*$/;
 var IN_LIST = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s+IN\s*\((.+)\)\s*$/i;
+var CARDINALITY_OF = /^\s*(?:cardinality\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)|array_length\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*,\s*1\s*\))\s*(>=|<=|<>|!=|>|<|=)\s*(\d+)\s*$/i;
 var LENGTH_OF = /^\s*(?:length|char_length)\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)\s*(>=|<=|<>|!=|>|<|=)\s*(\d+)\s*$/i;
 function splitTopLevelAnd(expr) {
   const parts = [];
@@ -84595,6 +84597,7 @@ function parseCheck(expression, name) {
     const sets = [];
     const rows = [];
     const lengths = [];
+    const cardinalities = [];
     for (const part of parts) {
       const parsed = parseCheck(part, name);
       if (!parsed.ok)
@@ -84603,13 +84606,15 @@ function parseCheck(expression, name) {
       if (parsed.sets) sets.push(...parsed.sets);
       if (parsed.rows) rows.push(...parsed.rows);
       if (parsed.lengths) lengths.push(...parsed.lengths);
+      if (parsed.cardinalities) cardinalities.push(...parsed.cardinalities);
     }
     return {
       ok: true,
       checks,
       ...sets.length ? { sets } : {},
       ...rows.length ? { rows } : {},
-      ...lengths.length ? { lengths } : {}
+      ...lengths.length ? { lengths } : {},
+      ...cardinalities.length ? { cardinalities } : {}
     };
   }
   const lengthOf = expr.match(LENGTH_OF);
@@ -84621,6 +84626,22 @@ function parseCheck(expression, name) {
       lengths: [{ column: lengthOf[1], operator: op4, value: lengthOf[3], name }]
     };
   }
+  const cardinalityOf = expr.match(CARDINALITY_OF);
+  if (cardinalityOf) {
+    const op4 = cardinalityOf[3] === "!=" ? "<>" : cardinalityOf[3];
+    return {
+      ok: true,
+      checks: [],
+      cardinalities: [
+        {
+          column: cardinalityOf[1] ?? cardinalityOf[2],
+          operator: op4,
+          value: cardinalityOf[4],
+          ...name ? { name } : {}
+        }
+      ]
+    };
+  }
   const inList = expr.match(IN_LIST);
   if (inList) {
     const raw = splitTopLevelCommas(inList[2]);
@@ -84829,6 +84850,54 @@ function validateAffix(affix, schemaSuffix) {
   return issues;
 }
 
+// src/duplicates.ts
+function usableKeys(table) {
+  return (table.unique ?? []).filter((k5) => k5.columns.length > 0);
+}
+function renderDuplicateFinder(table, fnName, rowType) {
+  const keys = usableKeys(table);
+  if (!keys.length) return void 0;
+  const constraints = keys.map((k5, i) => {
+    const name = k5.name ?? k5.columns.join("_");
+    return `  { name: ${JSON.stringify(name)}, columns: ${JSON.stringify(k5.columns)} }${i === keys.length - 1 ? "" : ","}`;
+  }).join("\n");
+  return `/**
+ * Rows in \`rows\` that collide with an earlier row on a unique constraint.
+ *
+ * Uniqueness is a fact about the table rather than about a row, so no schema can check it. This
+ * checks the half that needs no database: whether the batch collides with itself. A batch that
+ * passes here can still collide with rows already stored.
+ *
+ * A constraint is skipped for any row where one of its columns is null or absent, matching SQL,
+ * where NULL is not equal to NULL and a unique index therefore permits repeats.
+ */
+export function ${fnName}(
+  rows: readonly ${rowType}[]
+): Array<{ index: number; constraint: string; firstIndex: number }> {
+  const constraints = [
+${constraints}
+  ] as const;
+  const seen = constraints.map(() => new Map<string, number>());
+  const out: Array<{ index: number; constraint: string; firstIndex: number }> = [];
+
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i] as Record<string, unknown>;
+    for (let c = 0; c < constraints.length; c++) {
+      const cols = constraints[c].columns;
+      const values = cols.map((col) => row?.[col]);
+      if (values.some((v) => v === null || v === undefined)) continue;
+      // JSON, so a composite key compares by value and \`[1, "2"]\` never collides with
+      // \`["1", 2]\`. A join on a separator would.
+      const key = JSON.stringify(values);
+      const first = seen[c].get(key);
+      if (first === undefined) seen[c].set(key, i);
+      else out.push({ index: i, constraint: constraints[c].name, firstIndex: first });
+    }
+  }
+  return out;
+}`;
+}
+
 // src/index.ts
 function isGeneratedColumn(c5, _primaryKeyColumns = []) {
   return c5.isGenerated;
@@ -84901,6 +84970,7 @@ async function formatCode(code, filePath, fmt) {
   moduleSpecifier,
   parseCheck,
   pascalCase,
+  renderDuplicateFinder,
   resolveAffix,
   resolveConfiguredImport,
   schemaName,

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Column, Analysis } from '@drzl/analyzer';
+import { Table as Table$1, Column, Analysis } from '@drzl/analyzer';
 
 /**
  * One place that decides what a generated module is called, on disk and in an import.
@@ -244,6 +244,18 @@ interface LengthCheck {
     value: string;
     name?: string;
 }
+/**
+ * A constraint on an array column's element count, from `CHECK (cardinality(tags) > 0)`.
+ *
+ * The array analogue of `LengthCheck`, and free of the question that one carries: an element
+ * count is the same number in SQL and in JavaScript, with no encoding involved.
+ */
+interface CardinalityCheck {
+    column: string;
+    operator: ColumnCheck['operator'];
+    value: string;
+    name?: string;
+}
 /** A check that was understood, or the reason it was not. */
 type ParsedCheck = {
     ok: true;
@@ -251,6 +263,7 @@ type ParsedCheck = {
     sets?: ColumnSet[];
     rows?: RowCheck[];
     lengths?: LengthCheck[];
+    cardinalities?: CardinalityCheck[];
 } | {
     ok: false;
     reason: string;
@@ -271,6 +284,30 @@ declare function parseCheck(expression: string | undefined, name?: string): Pars
  */
 declare function describeSet(set: ColumnSet): string;
 
+/**
+ * A duplicate finder for a batch of rows, emitted beside the schemas.
+ *
+ * A validator checks one row at a time, so uniqueness is the one constraint it structurally
+ * cannot see: whether a value is unique is a fact about the table, not about the row. That is
+ * fine for a single insert, where the database answers immediately. It is not fine for a bulk
+ * insert, where a batch of a thousand rows fails whole on one collision and the error names a
+ * constraint rather than a row.
+ *
+ * What *is* checkable without the database is whether a batch collides with **itself**, and that
+ * is worth checking, because it is the half a user can fix before sending anything.
+ *
+ * The emitted function is plain TypeScript with no reference to any validation library, so all
+ * four generators emit the same thing. It is rendered from one place for that reason.
+ */
+
+/**
+ * `findDuplicate<Table>s` for a table with unique constraints, or nothing.
+ *
+ * `rowType` is the name of the insert type, which is what a caller has in hand before an insert.
+ * Passed in rather than derived, because each generator names its types differently.
+ */
+declare function renderDuplicateFinder(table: Table$1, fnName: string, rowType: string): string | undefined;
+
 interface Table {
     name: string;
     tsName: string;
@@ -448,4 +485,4 @@ declare function updateColumns(table: Table): Column[];
 declare function selectColumns(table: Table): Column[];
 declare function formatCode(code: string, filePath: string, fmt?: FormatOptions): Promise<any>;
 
-export { AFFIX_PROBE_TABLE, type AffixIssue, type AffixOptions, type AffixValue, CODEPOINT_LENGTH, COLUMN_FORMATS, type ColumnCheck, type ColumnSet, DEFAULT_IMPORT_EXTENSION, DEFAULT_MODE_PREFIX, DEFAULT_SCHEMA_SUFFIX, DEFAULT_TYPE_SUFFIX, type FormatOptions, IMPORT_EXTENSIONS, type ImportExtension, type LengthCheck, NAME_MODES, type NameMode, type ParsedCheck, type ResolvedAffix, type RowCheck, type Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, describeSet, formatCode, importSpecifier, insertColumns, isGeneratedColumn, isIntegerColumn, moduleFileName, moduleSpecifier, parseCheck, pascalCase, resolveAffix, resolveConfiguredImport, schemaName, selectColumns, typeName, updateColumns, validateAffix };
+export { AFFIX_PROBE_TABLE, type AffixIssue, type AffixOptions, type AffixValue, CODEPOINT_LENGTH, COLUMN_FORMATS, type CardinalityCheck, type ColumnCheck, type ColumnSet, DEFAULT_IMPORT_EXTENSION, DEFAULT_MODE_PREFIX, DEFAULT_SCHEMA_SUFFIX, DEFAULT_TYPE_SUFFIX, type FormatOptions, IMPORT_EXTENSIONS, type ImportExtension, type LengthCheck, NAME_MODES, type NameMode, type ParsedCheck, type ResolvedAffix, type RowCheck, type Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, describeSet, formatCode, importSpecifier, insertColumns, isGeneratedColumn, isIntegerColumn, moduleFileName, moduleSpecifier, parseCheck, pascalCase, renderDuplicateFinder, resolveAffix, resolveConfiguredImport, schemaName, selectColumns, typeName, updateColumns, validateAffix };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Column, Analysis } from '@drzl/analyzer';
+import { Table as Table$1, Column, Analysis } from '@drzl/analyzer';
 
 /**
  * One place that decides what a generated module is called, on disk and in an import.
@@ -244,6 +244,18 @@ interface LengthCheck {
     value: string;
     name?: string;
 }
+/**
+ * A constraint on an array column's element count, from `CHECK (cardinality(tags) > 0)`.
+ *
+ * The array analogue of `LengthCheck`, and free of the question that one carries: an element
+ * count is the same number in SQL and in JavaScript, with no encoding involved.
+ */
+interface CardinalityCheck {
+    column: string;
+    operator: ColumnCheck['operator'];
+    value: string;
+    name?: string;
+}
 /** A check that was understood, or the reason it was not. */
 type ParsedCheck = {
     ok: true;
@@ -251,6 +263,7 @@ type ParsedCheck = {
     sets?: ColumnSet[];
     rows?: RowCheck[];
     lengths?: LengthCheck[];
+    cardinalities?: CardinalityCheck[];
 } | {
     ok: false;
     reason: string;
@@ -271,6 +284,30 @@ declare function parseCheck(expression: string | undefined, name?: string): Pars
  */
 declare function describeSet(set: ColumnSet): string;
 
+/**
+ * A duplicate finder for a batch of rows, emitted beside the schemas.
+ *
+ * A validator checks one row at a time, so uniqueness is the one constraint it structurally
+ * cannot see: whether a value is unique is a fact about the table, not about the row. That is
+ * fine for a single insert, where the database answers immediately. It is not fine for a bulk
+ * insert, where a batch of a thousand rows fails whole on one collision and the error names a
+ * constraint rather than a row.
+ *
+ * What *is* checkable without the database is whether a batch collides with **itself**, and that
+ * is worth checking, because it is the half a user can fix before sending anything.
+ *
+ * The emitted function is plain TypeScript with no reference to any validation library, so all
+ * four generators emit the same thing. It is rendered from one place for that reason.
+ */
+
+/**
+ * `findDuplicate<Table>s` for a table with unique constraints, or nothing.
+ *
+ * `rowType` is the name of the insert type, which is what a caller has in hand before an insert.
+ * Passed in rather than derived, because each generator names its types differently.
+ */
+declare function renderDuplicateFinder(table: Table$1, fnName: string, rowType: string): string | undefined;
+
 interface Table {
     name: string;
     tsName: string;
@@ -448,4 +485,4 @@ declare function updateColumns(table: Table): Column[];
 declare function selectColumns(table: Table): Column[];
 declare function formatCode(code: string, filePath: string, fmt?: FormatOptions): Promise<any>;
 
-export { AFFIX_PROBE_TABLE, type AffixIssue, type AffixOptions, type AffixValue, CODEPOINT_LENGTH, COLUMN_FORMATS, type ColumnCheck, type ColumnSet, DEFAULT_IMPORT_EXTENSION, DEFAULT_MODE_PREFIX, DEFAULT_SCHEMA_SUFFIX, DEFAULT_TYPE_SUFFIX, type FormatOptions, IMPORT_EXTENSIONS, type ImportExtension, type LengthCheck, NAME_MODES, type NameMode, type ParsedCheck, type ResolvedAffix, type RowCheck, type Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, describeSet, formatCode, importSpecifier, insertColumns, isGeneratedColumn, isIntegerColumn, moduleFileName, moduleSpecifier, parseCheck, pascalCase, resolveAffix, resolveConfiguredImport, schemaName, selectColumns, typeName, updateColumns, validateAffix };
+export { AFFIX_PROBE_TABLE, type AffixIssue, type AffixOptions, type AffixValue, CODEPOINT_LENGTH, COLUMN_FORMATS, type CardinalityCheck, type ColumnCheck, type ColumnSet, DEFAULT_IMPORT_EXTENSION, DEFAULT_MODE_PREFIX, DEFAULT_SCHEMA_SUFFIX, DEFAULT_TYPE_SUFFIX, type FormatOptions, IMPORT_EXTENSIONS, type ImportExtension, type LengthCheck, NAME_MODES, type NameMode, type ParsedCheck, type ResolvedAffix, type RowCheck, type Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, describeSet, formatCode, importSpecifier, insertColumns, isGeneratedColumn, isIntegerColumn, moduleFileName, moduleSpecifier, parseCheck, pascalCase, renderDuplicateFinder, resolveAffix, resolveConfiguredImport, schemaName, selectColumns, typeName, updateColumns, validateAffix };

package/dist/index.js

@@ -3,6 +3,7 @@ import "./chunk-ZZGILH5A.js";
 // src/checks.ts
 var COMPARISON = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s*(>=|<=|<>|!=|>|<|=)\s*(.+?)\s*$/;
 var IN_LIST = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s+IN\s*\((.+)\)\s*$/i;
+var CARDINALITY_OF = /^\s*(?:cardinality\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)|array_length\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*,\s*1\s*\))\s*(>=|<=|<>|!=|>|<|=)\s*(\d+)\s*$/i;
 var LENGTH_OF = /^\s*(?:length|char_length)\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)\s*(>=|<=|<>|!=|>|<|=)\s*(\d+)\s*$/i;
 function splitTopLevelAnd(expr) {
   const parts = [];
@@ -125,6 +126,7 @@ function parseCheck(expression, name) {
     const sets = [];
     const rows = [];
     const lengths = [];
+    const cardinalities = [];
     for (const part of parts) {
       const parsed = parseCheck(part, name);
       if (!parsed.ok)
@@ -133,13 +135,15 @@ function parseCheck(expression, name) {
       if (parsed.sets) sets.push(...parsed.sets);
       if (parsed.rows) rows.push(...parsed.rows);
       if (parsed.lengths) lengths.push(...parsed.lengths);
+      if (parsed.cardinalities) cardinalities.push(...parsed.cardinalities);
     }
     return {
       ok: true,
       checks,
       ...sets.length ? { sets } : {},
       ...rows.length ? { rows } : {},
-      ...lengths.length ? { lengths } : {}
+      ...lengths.length ? { lengths } : {},
+      ...cardinalities.length ? { cardinalities } : {}
     };
   }
   const lengthOf = expr.match(LENGTH_OF);
@@ -151,6 +155,22 @@ function parseCheck(expression, name) {
       lengths: [{ column: lengthOf[1], operator: op2, value: lengthOf[3], name }]
     };
   }
+  const cardinalityOf = expr.match(CARDINALITY_OF);
+  if (cardinalityOf) {
+    const op2 = cardinalityOf[3] === "!=" ? "<>" : cardinalityOf[3];
+    return {
+      ok: true,
+      checks: [],
+      cardinalities: [
+        {
+          column: cardinalityOf[1] ?? cardinalityOf[2],
+          operator: op2,
+          value: cardinalityOf[4],
+          ...name ? { name } : {}
+        }
+      ]
+    };
+  }
   const inList = expr.match(IN_LIST);
   if (inList) {
     const raw = splitTopLevelCommas(inList[2]);
@@ -359,6 +379,54 @@ function validateAffix(affix, schemaSuffix) {
   return issues;
 }
 
+// src/duplicates.ts
+function usableKeys(table) {
+  return (table.unique ?? []).filter((k) => k.columns.length > 0);
+}
+function renderDuplicateFinder(table, fnName, rowType) {
+  const keys = usableKeys(table);
+  if (!keys.length) return void 0;
+  const constraints = keys.map((k, i) => {
+    const name = k.name ?? k.columns.join("_");
+    return `  { name: ${JSON.stringify(name)}, columns: ${JSON.stringify(k.columns)} }${i === keys.length - 1 ? "" : ","}`;
+  }).join("\n");
+  return `/**
+ * Rows in \`rows\` that collide with an earlier row on a unique constraint.
+ *
+ * Uniqueness is a fact about the table rather than about a row, so no schema can check it. This
+ * checks the half that needs no database: whether the batch collides with itself. A batch that
+ * passes here can still collide with rows already stored.
+ *
+ * A constraint is skipped for any row where one of its columns is null or absent, matching SQL,
+ * where NULL is not equal to NULL and a unique index therefore permits repeats.
+ */
+export function ${fnName}(
+  rows: readonly ${rowType}[]
+): Array<{ index: number; constraint: string; firstIndex: number }> {
+  const constraints = [
+${constraints}
+  ] as const;
+  const seen = constraints.map(() => new Map<string, number>());
+  const out: Array<{ index: number; constraint: string; firstIndex: number }> = [];
+
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i] as Record<string, unknown>;
+    for (let c = 0; c < constraints.length; c++) {
+      const cols = constraints[c].columns;
+      const values = cols.map((col) => row?.[col]);
+      if (values.some((v) => v === null || v === undefined)) continue;
+      // JSON, so a composite key compares by value and \`[1, "2"]\` never collides with
+      // \`["1", 2]\`. A join on a separator would.
+      const key = JSON.stringify(values);
+      const first = seen[c].get(key);
+      if (first === undefined) seen[c].set(key, i);
+      else out.push({ index: i, constraint: constraints[c].name, firstIndex: first });
+    }
+  }
+  return out;
+}`;
+}
+
 // src/index.ts
 function isGeneratedColumn(c, _primaryKeyColumns = []) {
   return c.isGenerated;
@@ -430,6 +498,7 @@ export {
   moduleSpecifier,
   parseCheck,
   pascalCase,
+  renderDuplicateFinder,
   resolveAffix,
   resolveConfiguredImport,
   schemaName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drzl/validation-core",
-  "version": "3.12.0",
+  "version": "3.14.0",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",
@@ -11,7 +11,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@drzl/analyzer": "^1.11.0"
+    "@drzl/analyzer": "^1.14.0"
   },
   "devDependencies": {
     "tsup": "^8.5.1",
@@ -36,6 +36,6 @@
   },
   "scripts": {
     "build": "tsup src/index.ts --dts --format esm,cjs",
-    "test": "vitest run"
+    "test": "vitest run --testTimeout=20000"
   }
 }