@quonfig/cli 0.1.0 → 0.2.1

package/dist/verify/validate.js

@@ -16,11 +16,15 @@
  *  - Log level constraints (valueType=log_level)
  *  - Referential integrity (IN_SEG/NOT_IN_SEG reference existing segments)
  *  - schemaKey references existing schemas
+ *  - Schema-bound JSON values match their schema, and every schema compiles
+ *    (Ajv, opt-in via `validateValues`, which the CLI and the pre-receive
+ *    hook both set; see validateBoundJsonValues)
  *  - Rule structure (criteria + value present)
  *  - Value type consistency
  *  - Weighted values non-empty and consistent
  */
 import { z } from 'zod';
+import { compileSchema, validateAgainstSchema } from './schema-validator.js';
 // Inlined to keep this directory self-contained for the standalone bun-compile
 // build that runs as the qfg-verify pre-receive hook in app-gitea — that build
 // only copies cli/src/verify/, so any out-of-tree imports break it. Source of
@@ -297,7 +301,7 @@ import * as path from 'node:path';
 /**
  * Validate an entire workspace directory on disk.
  */
-export function validateWorkspace(workspaceDir) {
+export function validateWorkspace(workspaceDir, options = {}) {
     const issues = [];
     let filesChecked = 0;
     const stats = {
@@ -318,6 +322,7 @@ export function validateWorkspace(workspaceDir) {
     const allSchemaFiles = [];
     const segmentKeys = new Set();
     const schemaKeys = new Set();
+    const schemaDocuments = new Map();
     const declaredEnvIds = new Set();
     // Check for unexpected top-level entries
     let entries;
@@ -446,6 +451,9 @@ export function validateWorkspace(workspaceDir) {
                 }
                 const schemaKey = file.replace(/\.json$/, '');
                 schemaKeys.add(schemaKey);
+                schemaDocuments.set(schemaKey, result.data);
+                if (options.validateValues)
+                    validateSchemaCompiles(schemaKey, result.data, relPath, issues);
                 validateKey(schemaKey, relPath, issues);
                 allSchemaFiles.push({ key: schemaKey, file: relPath });
                 stats.schemas++;
@@ -567,6 +575,7 @@ export function validateWorkspace(workspaceDir) {
     }
     // Second pass: referential integrity. Keep the plain skip-filter here —
     // ghost entries were already reported (once) by the first pass.
+    const cycleNodes = [];
     for (const dir of KNOWN_DIRS) {
         const dirPath = path.join(workspaceDir, dir);
         if (!fs.existsSync(dirPath))
@@ -596,6 +605,7 @@ export function validateWorkspace(workspaceDir) {
             if (!result.success)
                 continue;
             const config = result.data;
+            cycleNodes.push({ config, raw: parsed, relPath });
             // Check segment references in criteria
             const segRefs = collectSegmentReferences(config);
             for (const ref of segRefs) {
@@ -621,6 +631,8 @@ export function validateWorkspace(workspaceDir) {
                     });
                 }
             }
+            if (options.validateValues)
+                validateBoundJsonValues(parsed, config, schemaDocuments, relPath, issues);
             // Check environment IDs referenced in config exist in quonfig.json
             if (declaredEnvIds.size > 0) {
                 for (const env of config.environments) {
@@ -637,6 +649,7 @@ export function validateWorkspace(workspaceDir) {
             }
         }
     }
+    detectReferenceCycles(cycleNodes, issues);
     // Check for duplicate keys across directories (case-insensitive — see
     // detectDuplicateKeys).
     const uniqueConfigKeys = detectDuplicateKeys(allConfigs, 'key', issues);
@@ -666,13 +679,14 @@ function emptyStats() {
  * Validate configs provided as a map of { "dir/file.json": jsonString }.
  * Used by the pre-receive hook which reads files from git objects.
  */
-export function validateFileMap(files) {
+export function validateFileMap(files, options = {}) {
     const issues = [];
     let filesChecked = 0;
     const segmentKeys = new Set();
     const schemaKeys = new Set();
     const allSchemaFiles = [];
     const allConfigs = [];
+    const schemaDocuments = new Map();
     const parsedConfigs = [];
     const declaredEnvIds = new Set();
     // Validate quonfig.json if it's included in the file map (it may not be in every commit)
@@ -745,6 +759,9 @@ export function validateFileMap(files) {
             }
             const schemaKey = file.replace(/\.json$/, '');
             schemaKeys.add(schemaKey);
+            schemaDocuments.set(schemaKey, result.data);
+            if (options.validateValues)
+                validateSchemaCompiles(schemaKey, result.data, relPath, issues);
             validateKey(schemaKey, relPath, issues);
             allSchemaFiles.push({ key: schemaKey, file: relPath });
             continue;
@@ -826,10 +843,10 @@ export function validateFileMap(files) {
             validateRules(env.rules, relPath, `environments[${env.id}]`, config.valueType, issues, config.variants);
         }
         allConfigs.push({ key: config.key, file: relPath });
-        parsedConfigs.push({ relPath, config, dir });
+        parsedConfigs.push({ config, dir, raw: parsed, relPath });
     }
     // Referential integrity
-    for (const { relPath, config } of parsedConfigs) {
+    for (const { config, raw, relPath } of parsedConfigs) {
         const segRefs = collectSegmentReferences(config);
         for (const ref of segRefs) {
             if (!segmentKeys.has(ref)) {
@@ -849,6 +866,8 @@ export function validateFileMap(files) {
                 suggestion: `Create schemas/${config.schemaKey}.json or schemas-protected/${config.schemaKey}.json, or remove schemaKey`,
             });
         }
+        if (options.validateValues)
+            validateBoundJsonValues(raw, config, schemaDocuments, relPath, issues);
         // Check environment IDs referenced in config exist in quonfig.json
         if (declaredEnvIds.size > 0) {
             for (const env of config.environments) {
@@ -863,6 +882,7 @@ export function validateFileMap(files) {
             }
         }
     }
+    detectReferenceCycles(parsedConfigs, issues);
     // Duplicate keys (case-insensitive — see detectDuplicateKeys).
     detectDuplicateKeys(allConfigs, 'key', issues);
     detectDuplicateKeys(allSchemaFiles, 'schema key', issues);
@@ -870,6 +890,79 @@ export function validateFileMap(files) {
     return { issues, filesChecked, valid: !hasErrors, stats: emptyStats() };
 }
 // ── Helpers ─────────────────────────────────────────────────────────────
+/**
+ * Validate a config's schema-bound JSON values (qfg-phcv). Scope matches the
+ * app's save gate (app-quonfig config-crud-handlers.ts findJsonBoundViolations)
+ * exactly:
+ * - only `type === "config"` with `valueType === "json"` and a `schemaKey`
+ *   whose schema exists (a missing schema is the reference error above);
+ * - every `{type: "json", value}` node anywhere in the RAW document: default
+ *   and environment rules, weighted-value entries, top-level variants.
+ *   `provided` values are not json nodes, so they are skipped;
+ * - one issue per violation, worded `Value does not match schema "<key>":
+ *   <document path>.<path in value>: <message>`;
+ * - a schema that does not compile is reported once, on the schema file
+ *   (validateSchemaCompiles), whether or not anything is bound to it. Values
+ *   bound to it are not reported again.
+ */
+function validateBoundJsonValues(raw, config, schemaDocuments, file, issues) {
+    if (config.type !== 'config' || config.valueType !== 'json' || !config.schemaKey)
+        return;
+    const schemaKey = config.schemaKey;
+    const schema = schemaDocuments.get(schemaKey);
+    if (!schema)
+        return;
+    const isPlainObject = (node) => typeof node === 'object' && node !== null && !Array.isArray(node);
+    // Returns true to stop the walk.
+    const walk = (node, docPath) => {
+        if (Array.isArray(node))
+            return node.some((child, index) => walk(child, `${docPath}[${index}]`));
+        if (!isPlainObject(node))
+            return false;
+        if (node.type === 'json' && 'value' in node) {
+            const valuePath = docPath || 'value';
+            const result = validateAgainstSchema(schema, node.value);
+            if (result.ok)
+                return false;
+            if (result.kind === 'invalid-schema')
+                return true;
+            for (const violation of result.violations) {
+                issues.push({
+                    file,
+                    message: `Value does not match schema "${schemaKey}": ${joinSchemaPath(valuePath, violation.path)}: ${violation.message}`,
+                    severity: 'error',
+                });
+            }
+            return false;
+        }
+        return Object.entries(node).some(([key, child]) => walk(child, docPath ? `${docPath}.${key}` : key));
+    };
+    walk(raw, '');
+}
+/**
+ * A schema that does not compile is an error on the schema file, bound or not.
+ * Gated on `validateValues` with the value checks; the CLI and the pre-receive
+ * hook both turn it on.
+ */
+function validateSchemaCompiles(schemaKey, schema, file, issues) {
+    const compiled = compileSchema(schema);
+    if (compiled.ok)
+        return;
+    issues.push({
+        file,
+        message: `schema ${schemaKey} is invalid: ${compiled.reason}`,
+        severity: 'error',
+        suggestion: `Fix the schema "${schemaKey}" so it compiles as JSON Schema draft 2020-12 or draft-07`,
+    });
+}
+/** Same as app-quonfig schema-json.ts joinSchemaPath: `[n]` attaches without a dot. */
+function joinSchemaPath(prefix, valuePath) {
+    if (!valuePath)
+        return prefix;
+    if (!prefix)
+        return valuePath;
+    return valuePath.startsWith('[') ? `${prefix}${valuePath}` : `${prefix}.${valuePath}`;
+}
 function validateEnvironmentIds(environments, file, issues) {
     for (const env of environments) {
         if (UUID_RE.test(env.id)) {
@@ -1135,6 +1228,97 @@ function collectSegmentReferences(config) {
     }
     return refs;
 }
+/**
+ * Reject reference cycles that SDKs recurse through at eval time (qfg-9dxb.11):
+ * - segment -> segment via IN_SEG / NOT_IN_SEG criteria;
+ * - config -> config via `decryptWith` on a confidential value (the SDKs
+ *   resolve the key config's value to decrypt, and follow its decryptWith).
+ * An unguarded SDK recurses until the stack overflows (sdk-net: an
+ * uncatchable StackOverflowException), so a cycle is a hard error at write
+ * time. Edges to keys that do not exist are skipped — a missing segment is
+ * the reference error above. Each cycle is reported once, on the file of its
+ * lexicographically first key, with the path starting there.
+ */
+function detectReferenceCycles(nodes, issues) {
+    const segments = nodes.filter((n) => n.config.type === 'segment');
+    const segmentKeys = new Set(segments.map((n) => n.config.key));
+    reportCycles(segments.map((n) => ({
+        key: n.config.key,
+        relPath: n.relPath,
+        targets: collectSegmentReferences(n.config).filter((ref) => segmentKeys.has(ref)),
+    })), 'Segment reference cycle', 'Remove one of the IN_SEG / NOT_IN_SEG references in the cycle', issues);
+    const configKeys = new Set(nodes.map((n) => n.config.key));
+    reportCycles(nodes.map((n) => ({
+        key: n.config.key,
+        relPath: n.relPath,
+        targets: collectDecryptWithReferences(n.raw).filter((ref) => configKeys.has(ref)),
+    })), 'decryptWith cycle', 'A decryption key config must not itself be decrypted with a config in the cycle', issues);
+}
+function reportCycles(graph, label, suggestion, issues) {
+    const byKey = new Map(graph.map((n) => [n.key, n]));
+    const state = new Map();
+    const stack = [];
+    const seen = new Set();
+    function visit(key) {
+        state.set(key, 'visiting');
+        stack.push(key);
+        for (const target of [...new Set(byKey.get(key).targets)].sort()) {
+            const s = state.get(target);
+            if (s === 'visiting') {
+                const cycle = stack.slice(stack.indexOf(target));
+                const first = cycle.indexOf([...cycle].sort()[0]);
+                const rotated = [...cycle.slice(first), ...cycle.slice(0, first)];
+                const id = rotated.join('\0');
+                if (!seen.has(id)) {
+                    seen.add(id);
+                    issues.push({
+                        file: byKey.get(rotated[0]).relPath,
+                        message: `${label}: ${[...rotated, rotated[0]].join(' -> ')}`,
+                        severity: 'error',
+                        suggestion,
+                    });
+                }
+            }
+            else if (s === undefined) {
+                visit(target);
+            }
+        }
+        stack.pop();
+        state.set(key, 'done');
+    }
+    for (const key of [...byKey.keys()].sort()) {
+        if (!state.has(key))
+            visit(key);
+    }
+}
+/** decryptWith targets of every confidential value in a config's rules and variants. */
+function collectDecryptWithReferences(raw) {
+    const refs = [];
+    const doc = (raw ?? {});
+    function scanValue(value) {
+        if (!value || typeof value !== 'object')
+            return;
+        const v = value;
+        if (v.type === 'weighted_values') {
+            const wv = v.value;
+            for (const entry of wv?.weightedValues ?? [])
+                scanValue(entry?.value);
+            return;
+        }
+        if (v.confidential === true && typeof v.decryptWith === 'string')
+            refs.push(v.decryptWith);
+    }
+    function scanRules(rules) {
+        for (const rule of rules ?? [])
+            scanValue(rule?.value);
+    }
+    scanRules(doc.default?.rules);
+    for (const env of doc.environments ?? [])
+        scanRules(env?.rules);
+    for (const variant of doc.variants ?? [])
+        scanValue(variant?.value);
+    return refs;
+}
 function typeToDir(type) {
     for (const [dir, t] of Object.entries(DIR_TO_TYPE)) {
         if (t === type)

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.1.0";
+declare const _default: "0.2.1";
 export default _default;

package/dist/version.js

@@ -1,2 +1,2 @@
 // AUTO-GENERATED from package.json by scripts/generate-version.mjs — do not edit.
-export default '0.1.0';
+export default '0.2.1';