@drzl/validation-core 3.11.0 → 3.13.0

package/dist/index.cjs

@@ -84473,6 +84473,8 @@ 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 = [];
   let depth = 0;
@@ -84593,6 +84595,8 @@ function parseCheck(expression, name) {
     const checks = [];
     const sets = [];
     const rows = [];
+    const lengths = [];
+    const cardinalities = [];
     for (const part of parts) {
       const parsed = parseCheck(part, name);
       if (!parsed.ok)
@@ -84600,12 +84604,41 @@ function parseCheck(expression, name) {
       checks.push(...parsed.checks);
       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 } : {}
+      ...rows.length ? { rows } : {},
+      ...lengths.length ? { lengths } : {},
+      ...cardinalities.length ? { cardinalities } : {}
+    };
+  }
+  const lengthOf = expr.match(LENGTH_OF);
+  if (lengthOf) {
+    const op4 = lengthOf[2] === "!=" ? "<>" : lengthOf[2];
+    return {
+      ok: true,
+      checks: [],
+      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);

package/dist/index.d.cts

@@ -230,12 +230,40 @@ interface RowCheck {
     operator: ColumnCheck['operator'];
     name?: string;
 }
+/**
+ * A constraint on a column's *character* count, from `CHECK (length(name) > 3)`.
+ *
+ * Kept apart from `ColumnCheck` because it is not a comparison of the value: it compares a count
+ * derived from it, and the count Postgres takes is code points rather than UTF-16 units. See
+ * `CODEPOINT_LENGTH` for why that distinction is load bearing.
+ */
+interface LengthCheck {
+    column: string;
+    operator: ColumnCheck['operator'];
+    /** Decimal, as text, matching how the other bounds are carried. */
+    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;
     checks: ColumnCheck[];
     sets?: ColumnSet[];
     rows?: RowCheck[];
+    lengths?: LengthCheck[];
+    cardinalities?: CardinalityCheck[];
 } | {
     ok: false;
     reason: string;
@@ -433,4 +461,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, 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, resolveAffix, resolveConfiguredImport, schemaName, selectColumns, typeName, updateColumns, validateAffix };

package/dist/index.d.ts

@@ -230,12 +230,40 @@ interface RowCheck {
     operator: ColumnCheck['operator'];
     name?: string;
 }
+/**
+ * A constraint on a column's *character* count, from `CHECK (length(name) > 3)`.
+ *
+ * Kept apart from `ColumnCheck` because it is not a comparison of the value: it compares a count
+ * derived from it, and the count Postgres takes is code points rather than UTF-16 units. See
+ * `CODEPOINT_LENGTH` for why that distinction is load bearing.
+ */
+interface LengthCheck {
+    column: string;
+    operator: ColumnCheck['operator'];
+    /** Decimal, as text, matching how the other bounds are carried. */
+    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;
     checks: ColumnCheck[];
     sets?: ColumnSet[];
     rows?: RowCheck[];
+    lengths?: LengthCheck[];
+    cardinalities?: CardinalityCheck[];
 } | {
     ok: false;
     reason: string;
@@ -433,4 +461,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, 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, resolveAffix, resolveConfiguredImport, schemaName, selectColumns, typeName, updateColumns, validateAffix };

package/dist/index.js

@@ -3,6 +3,8 @@ 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 = [];
   let depth = 0;
@@ -123,6 +125,8 @@ function parseCheck(expression, name) {
     const checks = [];
     const sets = [];
     const rows = [];
+    const lengths = [];
+    const cardinalities = [];
     for (const part of parts) {
       const parsed = parseCheck(part, name);
       if (!parsed.ok)
@@ -130,12 +134,41 @@ function parseCheck(expression, name) {
       checks.push(...parsed.checks);
       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 } : {}
+      ...rows.length ? { rows } : {},
+      ...lengths.length ? { lengths } : {},
+      ...cardinalities.length ? { cardinalities } : {}
+    };
+  }
+  const lengthOf = expr.match(LENGTH_OF);
+  if (lengthOf) {
+    const op2 = lengthOf[2] === "!=" ? "<>" : lengthOf[2];
+    return {
+      ok: true,
+      checks: [],
+      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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drzl/validation-core",
-  "version": "3.11.0",
+  "version": "3.13.0",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",