@drzl/validation-core 3.7.0 → 3.9.0

package/dist/index.cjs

@@ -84449,6 +84449,7 @@ __export(index_exports2, {
   IMPORT_EXTENSIONS: () => IMPORT_EXTENSIONS,
   NAME_MODES: () => NAME_MODES,
   applyTableCase: () => applyTableCase,
+  describeSet: () => describeSet,
   formatCode: () => formatCode,
   importSpecifier: () => importSpecifier,
   insertColumns: () => insertColumns,
@@ -84470,6 +84471,94 @@ 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;
+function splitTopLevelAnd(expr) {
+  const parts = [];
+  let depth = 0;
+  let inString = false;
+  let start = 0;
+  for (let i = 0; i < expr.length; i++) {
+    const c5 = expr[i];
+    if (inString) {
+      if (c5 === "'") {
+        if (expr[i + 1] === "'") i++;
+        else inString = false;
+      }
+      continue;
+    }
+    if (c5 === "'") {
+      inString = true;
+      continue;
+    }
+    if (c5 === "(") depth++;
+    else if (c5 === ")") depth--;
+    else if (depth === 0 && /\s/.test(c5)) {
+      const m7 = /^\s+AND\s+/i.exec(expr.slice(i));
+      if (m7) {
+        parts.push(expr.slice(start, i));
+        i += m7[0].length - 1;
+        start = i + 1;
+      }
+    }
+  }
+  parts.push(expr.slice(start));
+  return parts;
+}
+function unwrap(expr) {
+  let e7 = expr.trim();
+  while (e7.startsWith("(") && e7.endsWith(")")) {
+    let depth = 0;
+    let inString = false;
+    let wrapsWhole = true;
+    for (let i = 0; i < e7.length; i++) {
+      const c5 = e7[i];
+      if (inString) {
+        if (c5 === "'") {
+          if (e7[i + 1] === "'") i++;
+          else inString = false;
+        }
+        continue;
+      }
+      if (c5 === "'") inString = true;
+      else if (c5 === "(") depth++;
+      else if (c5 === ")") {
+        depth--;
+        if (depth === 0 && i < e7.length - 1) {
+          wrapsWhole = false;
+          break;
+        }
+      }
+    }
+    if (!wrapsWhole) break;
+    e7 = e7.slice(1, -1).trim();
+  }
+  return e7;
+}
+function splitTopLevelCommas(list) {
+  const parts = [];
+  let depth = 0;
+  let inString = false;
+  let start = 0;
+  for (let i = 0; i < list.length; i++) {
+    const c5 = list[i];
+    if (inString) {
+      if (c5 === "'") {
+        if (list[i + 1] === "'") i++;
+        else inString = false;
+      }
+      continue;
+    }
+    if (c5 === "'") inString = true;
+    else if (c5 === "(") depth++;
+    else if (c5 === ")") depth--;
+    else if (c5 === "," && depth === 0) {
+      parts.push(list.slice(start, i));
+      start = i + 1;
+    }
+  }
+  parts.push(list.slice(start));
+  return parts;
+}
 var BETWEEN = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s+BETWEEN\s+(.+?)\s+AND\s+(.+?)\s*$/i;
 function literal(raw) {
   const t36 = raw.trim();
@@ -84479,9 +84568,11 @@ function literal(raw) {
   return void 0;
 }
 function parseCheck(expression, name) {
-  const expr = (expression ?? "").trim();
+  const expr = unwrap((expression ?? "").trim());
   if (!expr) return { ok: false, reason: "empty expression" };
   if (expr.includes("?")) return { ok: false, reason: "expression contains an unresolved value" };
+  if (/(^|[\s)])OR($|[\s(])/i.test(expr)) return { ok: false, reason: "contains OR" };
+  if (/(^|[\s(])NOT($|[\s(])/i.test(expr)) return { ok: false, reason: "contains NOT" };
   const between = expr.match(BETWEEN);
   if (between) {
     const lo6 = literal(between[2]);
@@ -84496,14 +84587,67 @@ function parseCheck(expression, name) {
       ]
     };
   }
+  const parts = splitTopLevelAnd(expr);
+  if (parts.length > 1) {
+    const checks = [];
+    const sets = [];
+    const rows = [];
+    for (const part of parts) {
+      const parsed = parseCheck(part, name);
+      if (!parsed.ok)
+        return { ok: false, reason: `part of an AND was not understood: ${parsed.reason}` };
+      checks.push(...parsed.checks);
+      if (parsed.sets) sets.push(...parsed.sets);
+      if (parsed.rows) rows.push(...parsed.rows);
+    }
+    return {
+      ok: true,
+      checks,
+      ...sets.length ? { sets } : {},
+      ...rows.length ? { rows } : {}
+    };
+  }
+  const inList = expr.match(IN_LIST);
+  if (inList) {
+    const raw = splitTopLevelCommas(inList[2]);
+    const parsedValues = raw.map((r5) => literal(r5));
+    if (parsedValues.some((v5) => !v5)) return { ok: false, reason: "IN list holds a non-literal" };
+    const kinds = new Set(parsedValues.map((v5) => v5.kind));
+    if (kinds.size > 1) return { ok: false, reason: "IN list mixes types" };
+    if (!parsedValues.length) return { ok: false, reason: "IN list is empty" };
+    return {
+      ok: true,
+      checks: [],
+      sets: [
+        {
+          column: inList[1],
+          values: parsedValues.map((v5) => v5.value),
+          kind: parsedValues[0].kind,
+          name
+        }
+      ]
+    };
+  }
   const cmp = expr.match(COMPARISON);
   if (!cmp) return { ok: false, reason: "not a single comparison this version understands" };
   const value = literal(cmp[3]);
   if (!value) {
+    const right = cmp[3].trim();
+    if (/^[A-Za-z_][A-Za-z0-9_]*$/.test(right)) {
+      const op4 = cmp[2] === "!=" ? "<>" : cmp[2];
+      return { ok: true, checks: [], rows: [{ left: cmp[1], right, operator: op4, name }] };
+    }
     return { ok: false, reason: "right side is not a literal" };
   }
   const op3 = cmp[2] === "!=" ? "<>" : cmp[2];
-  return { ok: true, checks: [{ column: cmp[1], operator: op3, value: value.value, kind: value.kind, name }] };
+  return {
+    ok: true,
+    checks: [{ column: cmp[1], operator: op3, value: value.value, kind: value.kind, name }]
+  };
+}
+function describeSet(set) {
+  const shown = set.values.map((v5) => set.kind === "string" ? `'${v5}'` : v5).join(", ");
+  return `${set.name ? `${set.name}: ` : ""}${set.column} IN (${shown})`;
 }
 
 // src/files.ts
@@ -84731,6 +84875,7 @@ async function formatCode(code, filePath, fmt) {
   IMPORT_EXTENSIONS,
   NAME_MODES,
   applyTableCase,
+  describeSet,
   formatCode,
   importSpecifier,
   insertColumns,

package/dist/index.d.cts

@@ -206,10 +206,36 @@ interface ColumnCheck {
     /** Constraint name, used to say which one failed. */
     name?: string;
 }
+/**
+ * A column constrained to a set of literals, from `col IN ('a', 'b')`.
+ *
+ * Kept separate from `ColumnCheck` rather than folded into it as another operator, so the
+ * existing shape is unchanged for anything already consuming it.
+ */
+interface ColumnSet {
+    column: string;
+    values: string[];
+    kind: 'number' | 'string';
+    name?: string;
+}
+/**
+ * A comparison between two columns of the same row, from `CHECK (start_date < end_date)`.
+ *
+ * It cannot live on a field, because it is a statement about the row: neither column alone can
+ * say whether it holds. It can live on the *object* schema, which is where this ends up.
+ */
+interface RowCheck {
+    left: string;
+    right: string;
+    operator: ColumnCheck['operator'];
+    name?: string;
+}
 /** A check that was understood, or the reason it was not. */
 type ParsedCheck = {
     ok: true;
     checks: ColumnCheck[];
+    sets?: ColumnSet[];
+    rows?: RowCheck[];
 } | {
     ok: false;
     reason: string;
@@ -222,6 +248,13 @@ type ParsedCheck = {
  * silently change what is enforced.
  */
 declare function parseCheck(expression: string | undefined, name?: string): ParsedCheck;
+/**
+ * A human-readable rendering of a set constraint, for an error message.
+ *
+ * Values are re-quoted the way SQL wrote them, so the message reads like the constraint in the
+ * schema rather than like its JavaScript translation.
+ */
+declare function describeSet(set: ColumnSet): string;
 
 interface Table {
     name: string;
@@ -363,4 +396,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, COLUMN_FORMATS, type ColumnCheck, 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 Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, 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, 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 };

package/dist/index.d.ts

@@ -206,10 +206,36 @@ interface ColumnCheck {
     /** Constraint name, used to say which one failed. */
     name?: string;
 }
+/**
+ * A column constrained to a set of literals, from `col IN ('a', 'b')`.
+ *
+ * Kept separate from `ColumnCheck` rather than folded into it as another operator, so the
+ * existing shape is unchanged for anything already consuming it.
+ */
+interface ColumnSet {
+    column: string;
+    values: string[];
+    kind: 'number' | 'string';
+    name?: string;
+}
+/**
+ * A comparison between two columns of the same row, from `CHECK (start_date < end_date)`.
+ *
+ * It cannot live on a field, because it is a statement about the row: neither column alone can
+ * say whether it holds. It can live on the *object* schema, which is where this ends up.
+ */
+interface RowCheck {
+    left: string;
+    right: string;
+    operator: ColumnCheck['operator'];
+    name?: string;
+}
 /** A check that was understood, or the reason it was not. */
 type ParsedCheck = {
     ok: true;
     checks: ColumnCheck[];
+    sets?: ColumnSet[];
+    rows?: RowCheck[];
 } | {
     ok: false;
     reason: string;
@@ -222,6 +248,13 @@ type ParsedCheck = {
  * silently change what is enforced.
  */
 declare function parseCheck(expression: string | undefined, name?: string): ParsedCheck;
+/**
+ * A human-readable rendering of a set constraint, for an error message.
+ *
+ * Values are re-quoted the way SQL wrote them, so the message reads like the constraint in the
+ * schema rather than like its JavaScript translation.
+ */
+declare function describeSet(set: ColumnSet): string;
 
 interface Table {
     name: string;
@@ -363,4 +396,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, COLUMN_FORMATS, type ColumnCheck, 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 Table, type TableCase, type ValidationGenerateOptions, type ValidationLibrary, type ValidationRenderer, applyTableCase, 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, 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 };

package/dist/index.js

@@ -2,6 +2,94 @@ 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;
+function splitTopLevelAnd(expr) {
+  const parts = [];
+  let depth = 0;
+  let inString = false;
+  let start = 0;
+  for (let i = 0; i < expr.length; i++) {
+    const c = expr[i];
+    if (inString) {
+      if (c === "'") {
+        if (expr[i + 1] === "'") i++;
+        else inString = false;
+      }
+      continue;
+    }
+    if (c === "'") {
+      inString = true;
+      continue;
+    }
+    if (c === "(") depth++;
+    else if (c === ")") depth--;
+    else if (depth === 0 && /\s/.test(c)) {
+      const m = /^\s+AND\s+/i.exec(expr.slice(i));
+      if (m) {
+        parts.push(expr.slice(start, i));
+        i += m[0].length - 1;
+        start = i + 1;
+      }
+    }
+  }
+  parts.push(expr.slice(start));
+  return parts;
+}
+function unwrap(expr) {
+  let e = expr.trim();
+  while (e.startsWith("(") && e.endsWith(")")) {
+    let depth = 0;
+    let inString = false;
+    let wrapsWhole = true;
+    for (let i = 0; i < e.length; i++) {
+      const c = e[i];
+      if (inString) {
+        if (c === "'") {
+          if (e[i + 1] === "'") i++;
+          else inString = false;
+        }
+        continue;
+      }
+      if (c === "'") inString = true;
+      else if (c === "(") depth++;
+      else if (c === ")") {
+        depth--;
+        if (depth === 0 && i < e.length - 1) {
+          wrapsWhole = false;
+          break;
+        }
+      }
+    }
+    if (!wrapsWhole) break;
+    e = e.slice(1, -1).trim();
+  }
+  return e;
+}
+function splitTopLevelCommas(list) {
+  const parts = [];
+  let depth = 0;
+  let inString = false;
+  let start = 0;
+  for (let i = 0; i < list.length; i++) {
+    const c = list[i];
+    if (inString) {
+      if (c === "'") {
+        if (list[i + 1] === "'") i++;
+        else inString = false;
+      }
+      continue;
+    }
+    if (c === "'") inString = true;
+    else if (c === "(") depth++;
+    else if (c === ")") depth--;
+    else if (c === "," && depth === 0) {
+      parts.push(list.slice(start, i));
+      start = i + 1;
+    }
+  }
+  parts.push(list.slice(start));
+  return parts;
+}
 var BETWEEN = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s+BETWEEN\s+(.+?)\s+AND\s+(.+?)\s*$/i;
 function literal(raw) {
   const t = raw.trim();
@@ -11,9 +99,11 @@ function literal(raw) {
   return void 0;
 }
 function parseCheck(expression, name) {
-  const expr = (expression ?? "").trim();
+  const expr = unwrap((expression ?? "").trim());
   if (!expr) return { ok: false, reason: "empty expression" };
   if (expr.includes("?")) return { ok: false, reason: "expression contains an unresolved value" };
+  if (/(^|[\s)])OR($|[\s(])/i.test(expr)) return { ok: false, reason: "contains OR" };
+  if (/(^|[\s(])NOT($|[\s(])/i.test(expr)) return { ok: false, reason: "contains NOT" };
   const between = expr.match(BETWEEN);
   if (between) {
     const lo = literal(between[2]);
@@ -28,14 +118,67 @@ function parseCheck(expression, name) {
       ]
     };
   }
+  const parts = splitTopLevelAnd(expr);
+  if (parts.length > 1) {
+    const checks = [];
+    const sets = [];
+    const rows = [];
+    for (const part of parts) {
+      const parsed = parseCheck(part, name);
+      if (!parsed.ok)
+        return { ok: false, reason: `part of an AND was not understood: ${parsed.reason}` };
+      checks.push(...parsed.checks);
+      if (parsed.sets) sets.push(...parsed.sets);
+      if (parsed.rows) rows.push(...parsed.rows);
+    }
+    return {
+      ok: true,
+      checks,
+      ...sets.length ? { sets } : {},
+      ...rows.length ? { rows } : {}
+    };
+  }
+  const inList = expr.match(IN_LIST);
+  if (inList) {
+    const raw = splitTopLevelCommas(inList[2]);
+    const parsedValues = raw.map((r) => literal(r));
+    if (parsedValues.some((v) => !v)) return { ok: false, reason: "IN list holds a non-literal" };
+    const kinds = new Set(parsedValues.map((v) => v.kind));
+    if (kinds.size > 1) return { ok: false, reason: "IN list mixes types" };
+    if (!parsedValues.length) return { ok: false, reason: "IN list is empty" };
+    return {
+      ok: true,
+      checks: [],
+      sets: [
+        {
+          column: inList[1],
+          values: parsedValues.map((v) => v.value),
+          kind: parsedValues[0].kind,
+          name
+        }
+      ]
+    };
+  }
   const cmp = expr.match(COMPARISON);
   if (!cmp) return { ok: false, reason: "not a single comparison this version understands" };
   const value = literal(cmp[3]);
   if (!value) {
+    const right = cmp[3].trim();
+    if (/^[A-Za-z_][A-Za-z0-9_]*$/.test(right)) {
+      const op2 = cmp[2] === "!=" ? "<>" : cmp[2];
+      return { ok: true, checks: [], rows: [{ left: cmp[1], right, operator: op2, name }] };
+    }
     return { ok: false, reason: "right side is not a literal" };
   }
   const op = cmp[2] === "!=" ? "<>" : cmp[2];
-  return { ok: true, checks: [{ column: cmp[1], operator: op, value: value.value, kind: value.kind, name }] };
+  return {
+    ok: true,
+    checks: [{ column: cmp[1], operator: op, value: value.value, kind: value.kind, name }]
+  };
+}
+function describeSet(set) {
+  const shown = set.values.map((v) => set.kind === "string" ? `'${v}'` : v).join(", ");
+  return `${set.name ? `${set.name}: ` : ""}${set.column} IN (${shown})`;
 }
 
 // src/files.ts
@@ -262,6 +405,7 @@ export {
   IMPORT_EXTENSIONS,
   NAME_MODES,
   applyTableCase,
+  describeSet,
   formatCode,
   importSpecifier,
   insertColumns,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drzl/validation-core",
-  "version": "3.7.0",
+  "version": "3.9.0",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",
@@ -11,7 +11,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@drzl/analyzer": "^1.9.0"
+    "@drzl/analyzer": "^1.10.0"
   },
   "devDependencies": {
     "tsup": "^8.5.1",