@valbuild/cli 0.97.0 → 0.97.2

package/cli/dist/valbuild-cli-cli.cjs.dev.js

@@ -126,8 +126,6 @@ const textEncoder = new TextEncoder();
 
 // Types for handler system
 
-// Cache types for avoiding redundant service.get() calls
-
 // Handler functions
 async function handleFileMetadata(ctx) {
   var _fileSource$source;
@@ -160,40 +158,6 @@ async function handleFileMetadata(ctx) {
     shouldApplyPatch: true
   };
 }
-async function handleKeyOfCheck(ctx) {
-  if (!ctx.validationError.value || typeof ctx.validationError.value !== "object" || !("key" in ctx.validationError.value) || !("sourcePath" in ctx.validationError.value)) {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${ctx.sourcePath}: ${ctx.validationError.message} (Expected value to be an object with 'key' and 'sourcePath' properties - this is likely a bug in Val)`
-    };
-  }
-  const {
-    key,
-    sourcePath
-  } = ctx.validationError.value;
-  if (typeof key !== "string") {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${sourcePath}: ${ctx.validationError.message} (Expected value property 'key' to be a string - this is likely a bug in Val)`
-    };
-  }
-  if (typeof sourcePath !== "string") {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${sourcePath}: ${ctx.validationError.message} (Expected value property 'sourcePath' to be a string - this is likely a bug in Val)`
-    };
-  }
-  const res = await checkKeyIsValid(key, sourcePath, ctx.service, ctx.keyOfCache);
-  if (res.error) {
-    return {
-      success: false,
-      errorMessage: res.message
-    };
-  }
-  return {
-    success: true
-  };
-}
 async function handleRemoteFileUpload(ctx) {
   var _resolvedRemoteFileAt;
   if (!ctx.fix) {
@@ -402,155 +366,6 @@ async function handleRemoteFileCheck() {
     shouldApplyPatch: true
   };
 }
-
-// Helper function
-async function checkKeyIsValid(key, sourcePath, service, cache) {
-  const [moduleFilePath, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
-  const cacheKey = `${moduleFilePath}::${modulePath}`;
-  let keyOfModuleSource;
-  let keyOfModuleSchema;
-  const cached = cache.get(cacheKey);
-  if (cached) {
-    keyOfModuleSource = cached.source;
-    keyOfModuleSchema = cached.schema;
-  } else {
-    const keyOfModule = await service.get(moduleFilePath, modulePath, {
-      source: true,
-      schema: true,
-      validate: false
-    });
-    keyOfModuleSource = keyOfModule.source;
-    keyOfModuleSchema = keyOfModule.schema;
-    cache.set(cacheKey, {
-      source: keyOfModuleSource,
-      schema: keyOfModuleSchema
-    });
-  }
-  if (keyOfModuleSchema && keyOfModuleSchema.type !== "record") {
-    return {
-      error: true,
-      message: `Expected key at ${sourcePath} to be of type 'record'`
-    };
-  }
-  if (keyOfModuleSource && typeof keyOfModuleSource === "object" && key in keyOfModuleSource) {
-    return {
-      error: false
-    };
-  }
-  if (!keyOfModuleSource || typeof keyOfModuleSource !== "object") {
-    return {
-      error: true,
-      message: `Expected ${sourcePath} to be a truthy object`
-    };
-  }
-  const alternatives = findSimilar(key, Object.keys(keyOfModuleSource));
-  return {
-    error: true,
-    message: `Key '${key}' does not exist in ${sourcePath}. Closest match: '${alternatives[0].target}'. Other similar: ${alternatives.slice(1, 4).map(a => `'${a.target}'`).join(", ")}${alternatives.length > 4 ? ", ..." : ""}`
-  };
-}
-
-/**
- * Check if a route is valid by scanning all router modules
- * and validating against include/exclude patterns
- */
-async function checkRouteIsValid(route, include, exclude, service, valFiles, cache) {
-  // 1. Scan all val files to find modules with routers (use cache if available)
-  if (!cache.loaded) {
-    for (const file of valFiles) {
-      var _valModule$schema;
-      const moduleFilePath = `/${file}`;
-      const valModule = await service.get(moduleFilePath, "", {
-        source: true,
-        schema: true,
-        validate: false
-      });
-
-      // Check if this module has a router defined
-      if (((_valModule$schema = valModule.schema) === null || _valModule$schema === void 0 ? void 0 : _valModule$schema.type) === "record" && valModule.schema.router) {
-        if (valModule.source && typeof valModule.source === "object") {
-          cache.modules[moduleFilePath] = valModule.source;
-        }
-      }
-    }
-    cache.loaded = true;
-  }
-  const routerModules = cache.modules;
-
-  // 2. Check if route exists in any router module
-  let foundInModule = null;
-  for (const [moduleFilePath, source] of Object.entries(routerModules)) {
-    if (route in source) {
-      foundInModule = moduleFilePath;
-      break;
-    }
-  }
-  if (!foundInModule) {
-    // Route not found in any router module
-    let allRoutes = Object.values(routerModules).flatMap(source => Object.keys(source));
-    if (allRoutes.length === 0) {
-      return {
-        error: true,
-        message: `Route '${route}' could not be validated: No router modules found in the project. Use s.record(...).router(...) to define router modules.`
-      };
-    }
-
-    // Filter routes by include/exclude patterns for suggestions
-    allRoutes = internal.filterRoutesByPatterns(allRoutes, include, exclude);
-    const alternatives = findSimilar(route, allRoutes);
-    return {
-      error: true,
-      message: `Route '${route}' does not exist in any router module. ${alternatives.length > 0 ? `Closest match: '${alternatives[0].target}'. Other similar: ${alternatives.slice(1, 4).map(a => `'${a.target}'`).join(", ")}${alternatives.length > 4 ? ", ..." : ""}` : "No similar routes found."}`
-    };
-  }
-
-  // 3. Validate against include/exclude patterns
-  const patternValidation = internal.validateRoutePatterns(route, include, exclude);
-  if (!patternValidation.valid) {
-    return {
-      error: true,
-      message: patternValidation.message
-    };
-  }
-  return {
-    error: false
-  };
-}
-
-/**
- * Handler for router:check-route validation fix
- */
-async function handleRouteCheck(ctx) {
-  const {
-    sourcePath,
-    validationError,
-    service,
-    valFiles,
-    routerModulesCache
-  } = ctx;
-
-  // Extract route and patterns from validation error value
-  const value = validationError.value;
-  if (!value || typeof value.route !== "string") {
-    return {
-      success: false,
-      errorMessage: `Invalid route value in validation error: ${JSON.stringify(value)}`
-    };
-  }
-  const route = value.route;
-
-  // Check if the route is valid
-  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles, routerModulesCache);
-  if (result.error) {
-    return {
-      success: false,
-      errorMessage: `${sourcePath}: ${result.message}`
-    };
-  }
-  return {
-    success: true
-  };
-}
 async function handleUniqueFolderCheck(ctx) {
   const value = ctx.validationError.value;
   if (!value || typeof value.directory !== "string") {
@@ -649,14 +464,14 @@ async function handleCheckAllFiles(ctx) {
   };
 }
 
-// Fix handler registry
+// Fix handler registry. `keyof:check-keys` and `router:check-route` are
+// resolved upfront by the shared resolveSchemaSourceFixes — they never reach
+// this registry, so they're excluded from the key set.
 const currentFixHandlers = {
   "image:check-metadata": handleFileMetadata,
   "image:add-metadata": handleFileMetadata,
   "file:check-metadata": handleFileMetadata,
   "file:add-metadata": handleFileMetadata,
-  "keyof:check-keys": handleKeyOfCheck,
-  "router:check-route": handleRouteCheck,
   "image:upload-remote": handleRemoteFileUpload,
   "file:upload-remote": handleRemoteFileUpload,
   "image:download-remote": handleRemoteFileDownload,
@@ -708,12 +523,27 @@ async function* runValidation({
   const service = await server.createService(projectRoot, {}, fs);
   let errors = 0;
 
-  // Create caches that persist across all file validations
-  const keyOfCache = new Map();
-  const routerModulesCache = {
-    loaded: false,
-    modules: {}
+  // Build a single schema/source snapshot up front so the shared resolver
+  // can resolve keyof:check-keys / router:check-route references that span
+  // multiple val files.
+  const snapshot = {
+    schemas: {},
+    sources: {}
   };
+  for (const file of valFiles) {
+    const moduleFilePath = `/${file}`;
+    const valModule = await service.get(moduleFilePath, "", {
+      source: true,
+      schema: true,
+      validate: false
+    });
+    if (valModule.schema) {
+      snapshot.schemas[moduleFilePath] = valModule.schema;
+    }
+    if (valModule.source !== undefined) {
+      snapshot.sources[moduleFilePath] = valModule.source;
+    }
+  }
   async function* validateFile(file) {
     const moduleFilePath = `/${file}`; // TODO: check if this always works? (Windows?)
     const start = Date.now();
@@ -737,7 +567,12 @@ async function* runValidation({
       let fixedErrors = 0;
       if (valModule.errors) {
         if (valModule.errors.validation) {
-          for (const [sourcePath, validationErrors] of Object.entries(valModule.errors.validation)) {
+          // Resolve schema/source fixes (keyof:check-keys, router:check-route)
+          // against the snapshot before per-error dispatch. Resolved errors
+          // are dropped; invalid references come back with rewritten messages
+          // and fixes cleared, so they fall through the "no fixes" branch.
+          const resolvedValidationErrors = internal.resolveSchemaSourceFixes(valModule.errors.validation, snapshot);
+          for (const [sourcePath, validationErrors] of Object.entries(resolvedValidationErrors)) {
             for (const v of validationErrors) {
               if (!v.fixes || v.fixes.length === 0) {
                 // No fixes available - just report error
@@ -780,9 +615,7 @@ async function* runValidation({
                 remoteFileBuckets,
                 remoteFilesCounter,
                 remote,
-                project,
-                keyOfCache,
-                routerModulesCache
+                project
               });
 
               // Yield any events from handler
@@ -894,31 +727,6 @@ async function* runValidation({
   }
 }
 
-// GPT generated levenshtein distance algorithm:
-const levenshtein = (a, b) => {
-  const [m, n] = [a.length, b.length];
-  if (!m || !n) return Math.max(m, n);
-  const dp = Array.from({
-    length: m + 1
-  }, (_, i) => i);
-  for (let j = 1; j <= n; j++) {
-    let prev = dp[0];
-    dp[0] = j;
-    for (let i = 1; i <= m; i++) {
-      const temp = dp[i];
-      dp[i] = a[i - 1] === b[j - 1] ? prev : Math.min(prev + 1, dp[i - 1] + 1, dp[i] + 1);
-      prev = temp;
-    }
-  }
-  return dp[m];
-};
-function findSimilar(key, targets) {
-  return targets.map(target => ({
-    target,
-    distance: levenshtein(key, target)
-  })).sort((a, b) => a.distance - b.distance);
-}
-
 async function validate({
   root,
   fix

package/cli/dist/valbuild-cli-cli.cjs.prod.js

@@ -126,8 +126,6 @@ const textEncoder = new TextEncoder();
 
 // Types for handler system
 
-// Cache types for avoiding redundant service.get() calls
-
 // Handler functions
 async function handleFileMetadata(ctx) {
   var _fileSource$source;
@@ -160,40 +158,6 @@ async function handleFileMetadata(ctx) {
     shouldApplyPatch: true
   };
 }
-async function handleKeyOfCheck(ctx) {
-  if (!ctx.validationError.value || typeof ctx.validationError.value !== "object" || !("key" in ctx.validationError.value) || !("sourcePath" in ctx.validationError.value)) {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${ctx.sourcePath}: ${ctx.validationError.message} (Expected value to be an object with 'key' and 'sourcePath' properties - this is likely a bug in Val)`
-    };
-  }
-  const {
-    key,
-    sourcePath
-  } = ctx.validationError.value;
-  if (typeof key !== "string") {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${sourcePath}: ${ctx.validationError.message} (Expected value property 'key' to be a string - this is likely a bug in Val)`
-    };
-  }
-  if (typeof sourcePath !== "string") {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${sourcePath}: ${ctx.validationError.message} (Expected value property 'sourcePath' to be a string - this is likely a bug in Val)`
-    };
-  }
-  const res = await checkKeyIsValid(key, sourcePath, ctx.service, ctx.keyOfCache);
-  if (res.error) {
-    return {
-      success: false,
-      errorMessage: res.message
-    };
-  }
-  return {
-    success: true
-  };
-}
 async function handleRemoteFileUpload(ctx) {
   var _resolvedRemoteFileAt;
   if (!ctx.fix) {
@@ -402,155 +366,6 @@ async function handleRemoteFileCheck() {
     shouldApplyPatch: true
   };
 }
-
-// Helper function
-async function checkKeyIsValid(key, sourcePath, service, cache) {
-  const [moduleFilePath, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
-  const cacheKey = `${moduleFilePath}::${modulePath}`;
-  let keyOfModuleSource;
-  let keyOfModuleSchema;
-  const cached = cache.get(cacheKey);
-  if (cached) {
-    keyOfModuleSource = cached.source;
-    keyOfModuleSchema = cached.schema;
-  } else {
-    const keyOfModule = await service.get(moduleFilePath, modulePath, {
-      source: true,
-      schema: true,
-      validate: false
-    });
-    keyOfModuleSource = keyOfModule.source;
-    keyOfModuleSchema = keyOfModule.schema;
-    cache.set(cacheKey, {
-      source: keyOfModuleSource,
-      schema: keyOfModuleSchema
-    });
-  }
-  if (keyOfModuleSchema && keyOfModuleSchema.type !== "record") {
-    return {
-      error: true,
-      message: `Expected key at ${sourcePath} to be of type 'record'`
-    };
-  }
-  if (keyOfModuleSource && typeof keyOfModuleSource === "object" && key in keyOfModuleSource) {
-    return {
-      error: false
-    };
-  }
-  if (!keyOfModuleSource || typeof keyOfModuleSource !== "object") {
-    return {
-      error: true,
-      message: `Expected ${sourcePath} to be a truthy object`
-    };
-  }
-  const alternatives = findSimilar(key, Object.keys(keyOfModuleSource));
-  return {
-    error: true,
-    message: `Key '${key}' does not exist in ${sourcePath}. Closest match: '${alternatives[0].target}'. Other similar: ${alternatives.slice(1, 4).map(a => `'${a.target}'`).join(", ")}${alternatives.length > 4 ? ", ..." : ""}`
-  };
-}
-
-/**
- * Check if a route is valid by scanning all router modules
- * and validating against include/exclude patterns
- */
-async function checkRouteIsValid(route, include, exclude, service, valFiles, cache) {
-  // 1. Scan all val files to find modules with routers (use cache if available)
-  if (!cache.loaded) {
-    for (const file of valFiles) {
-      var _valModule$schema;
-      const moduleFilePath = `/${file}`;
-      const valModule = await service.get(moduleFilePath, "", {
-        source: true,
-        schema: true,
-        validate: false
-      });
-
-      // Check if this module has a router defined
-      if (((_valModule$schema = valModule.schema) === null || _valModule$schema === void 0 ? void 0 : _valModule$schema.type) === "record" && valModule.schema.router) {
-        if (valModule.source && typeof valModule.source === "object") {
-          cache.modules[moduleFilePath] = valModule.source;
-        }
-      }
-    }
-    cache.loaded = true;
-  }
-  const routerModules = cache.modules;
-
-  // 2. Check if route exists in any router module
-  let foundInModule = null;
-  for (const [moduleFilePath, source] of Object.entries(routerModules)) {
-    if (route in source) {
-      foundInModule = moduleFilePath;
-      break;
-    }
-  }
-  if (!foundInModule) {
-    // Route not found in any router module
-    let allRoutes = Object.values(routerModules).flatMap(source => Object.keys(source));
-    if (allRoutes.length === 0) {
-      return {
-        error: true,
-        message: `Route '${route}' could not be validated: No router modules found in the project. Use s.record(...).router(...) to define router modules.`
-      };
-    }
-
-    // Filter routes by include/exclude patterns for suggestions
-    allRoutes = internal.filterRoutesByPatterns(allRoutes, include, exclude);
-    const alternatives = findSimilar(route, allRoutes);
-    return {
-      error: true,
-      message: `Route '${route}' does not exist in any router module. ${alternatives.length > 0 ? `Closest match: '${alternatives[0].target}'. Other similar: ${alternatives.slice(1, 4).map(a => `'${a.target}'`).join(", ")}${alternatives.length > 4 ? ", ..." : ""}` : "No similar routes found."}`
-    };
-  }
-
-  // 3. Validate against include/exclude patterns
-  const patternValidation = internal.validateRoutePatterns(route, include, exclude);
-  if (!patternValidation.valid) {
-    return {
-      error: true,
-      message: patternValidation.message
-    };
-  }
-  return {
-    error: false
-  };
-}
-
-/**
- * Handler for router:check-route validation fix
- */
-async function handleRouteCheck(ctx) {
-  const {
-    sourcePath,
-    validationError,
-    service,
-    valFiles,
-    routerModulesCache
-  } = ctx;
-
-  // Extract route and patterns from validation error value
-  const value = validationError.value;
-  if (!value || typeof value.route !== "string") {
-    return {
-      success: false,
-      errorMessage: `Invalid route value in validation error: ${JSON.stringify(value)}`
-    };
-  }
-  const route = value.route;
-
-  // Check if the route is valid
-  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles, routerModulesCache);
-  if (result.error) {
-    return {
-      success: false,
-      errorMessage: `${sourcePath}: ${result.message}`
-    };
-  }
-  return {
-    success: true
-  };
-}
 async function handleUniqueFolderCheck(ctx) {
   const value = ctx.validationError.value;
   if (!value || typeof value.directory !== "string") {
@@ -649,14 +464,14 @@ async function handleCheckAllFiles(ctx) {
   };
 }
 
-// Fix handler registry
+// Fix handler registry. `keyof:check-keys` and `router:check-route` are
+// resolved upfront by the shared resolveSchemaSourceFixes — they never reach
+// this registry, so they're excluded from the key set.
 const currentFixHandlers = {
   "image:check-metadata": handleFileMetadata,
   "image:add-metadata": handleFileMetadata,
   "file:check-metadata": handleFileMetadata,
   "file:add-metadata": handleFileMetadata,
-  "keyof:check-keys": handleKeyOfCheck,
-  "router:check-route": handleRouteCheck,
   "image:upload-remote": handleRemoteFileUpload,
   "file:upload-remote": handleRemoteFileUpload,
   "image:download-remote": handleRemoteFileDownload,
@@ -708,12 +523,27 @@ async function* runValidation({
   const service = await server.createService(projectRoot, {}, fs);
   let errors = 0;
 
-  // Create caches that persist across all file validations
-  const keyOfCache = new Map();
-  const routerModulesCache = {
-    loaded: false,
-    modules: {}
+  // Build a single schema/source snapshot up front so the shared resolver
+  // can resolve keyof:check-keys / router:check-route references that span
+  // multiple val files.
+  const snapshot = {
+    schemas: {},
+    sources: {}
   };
+  for (const file of valFiles) {
+    const moduleFilePath = `/${file}`;
+    const valModule = await service.get(moduleFilePath, "", {
+      source: true,
+      schema: true,
+      validate: false
+    });
+    if (valModule.schema) {
+      snapshot.schemas[moduleFilePath] = valModule.schema;
+    }
+    if (valModule.source !== undefined) {
+      snapshot.sources[moduleFilePath] = valModule.source;
+    }
+  }
   async function* validateFile(file) {
     const moduleFilePath = `/${file}`; // TODO: check if this always works? (Windows?)
     const start = Date.now();
@@ -737,7 +567,12 @@ async function* runValidation({
       let fixedErrors = 0;
       if (valModule.errors) {
         if (valModule.errors.validation) {
-          for (const [sourcePath, validationErrors] of Object.entries(valModule.errors.validation)) {
+          // Resolve schema/source fixes (keyof:check-keys, router:check-route)
+          // against the snapshot before per-error dispatch. Resolved errors
+          // are dropped; invalid references come back with rewritten messages
+          // and fixes cleared, so they fall through the "no fixes" branch.
+          const resolvedValidationErrors = internal.resolveSchemaSourceFixes(valModule.errors.validation, snapshot);
+          for (const [sourcePath, validationErrors] of Object.entries(resolvedValidationErrors)) {
             for (const v of validationErrors) {
               if (!v.fixes || v.fixes.length === 0) {
                 // No fixes available - just report error
@@ -780,9 +615,7 @@ async function* runValidation({
                 remoteFileBuckets,
                 remoteFilesCounter,
                 remote,
-                project,
-                keyOfCache,
-                routerModulesCache
+                project
               });
 
               // Yield any events from handler
@@ -894,31 +727,6 @@ async function* runValidation({
   }
 }
 
-// GPT generated levenshtein distance algorithm:
-const levenshtein = (a, b) => {
-  const [m, n] = [a.length, b.length];
-  if (!m || !n) return Math.max(m, n);
-  const dp = Array.from({
-    length: m + 1
-  }, (_, i) => i);
-  for (let j = 1; j <= n; j++) {
-    let prev = dp[0];
-    dp[0] = j;
-    for (let i = 1; i <= m; i++) {
-      const temp = dp[i];
-      dp[i] = a[i - 1] === b[j - 1] ? prev : Math.min(prev + 1, dp[i - 1] + 1, dp[i] + 1);
-      prev = temp;
-    }
-  }
-  return dp[m];
-};
-function findSimilar(key, targets) {
-  return targets.map(target => ({
-    target,
-    distance: levenshtein(key, target)
-  })).sort((a, b) => a.distance - b.distance);
-}
-
 async function validate({
   root,
   fix

package/cli/dist/valbuild-cli-cli.esm.js

@@ -10,7 +10,7 @@ import vm from 'node:vm';
 import ts from 'typescript';
 import z from 'zod';
 import { createRequire } from 'node:module';
-import { filterRoutesByPatterns, validateRoutePatterns } from '@valbuild/shared/internal';
+import { resolveSchemaSourceFixes } from '@valbuild/shared/internal';
 import nodeFs from 'fs';
 
 function error(message) {
@@ -94,8 +94,6 @@ const textEncoder = new TextEncoder();
 
 // Types for handler system
 
-// Cache types for avoiding redundant service.get() calls
-
 // Handler functions
 async function handleFileMetadata(ctx) {
   var _fileSource$source;
@@ -128,40 +126,6 @@ async function handleFileMetadata(ctx) {
     shouldApplyPatch: true
   };
 }
-async function handleKeyOfCheck(ctx) {
-  if (!ctx.validationError.value || typeof ctx.validationError.value !== "object" || !("key" in ctx.validationError.value) || !("sourcePath" in ctx.validationError.value)) {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${ctx.sourcePath}: ${ctx.validationError.message} (Expected value to be an object with 'key' and 'sourcePath' properties - this is likely a bug in Val)`
-    };
-  }
-  const {
-    key,
-    sourcePath
-  } = ctx.validationError.value;
-  if (typeof key !== "string") {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${sourcePath}: ${ctx.validationError.message} (Expected value property 'key' to be a string - this is likely a bug in Val)`
-    };
-  }
-  if (typeof sourcePath !== "string") {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${sourcePath}: ${ctx.validationError.message} (Expected value property 'sourcePath' to be a string - this is likely a bug in Val)`
-    };
-  }
-  const res = await checkKeyIsValid(key, sourcePath, ctx.service, ctx.keyOfCache);
-  if (res.error) {
-    return {
-      success: false,
-      errorMessage: res.message
-    };
-  }
-  return {
-    success: true
-  };
-}
 async function handleRemoteFileUpload(ctx) {
   var _resolvedRemoteFileAt;
   if (!ctx.fix) {
@@ -370,155 +334,6 @@ async function handleRemoteFileCheck() {
     shouldApplyPatch: true
   };
 }
-
-// Helper function
-async function checkKeyIsValid(key, sourcePath, service, cache) {
-  const [moduleFilePath, modulePath] = Internal.splitModuleFilePathAndModulePath(sourcePath);
-  const cacheKey = `${moduleFilePath}::${modulePath}`;
-  let keyOfModuleSource;
-  let keyOfModuleSchema;
-  const cached = cache.get(cacheKey);
-  if (cached) {
-    keyOfModuleSource = cached.source;
-    keyOfModuleSchema = cached.schema;
-  } else {
-    const keyOfModule = await service.get(moduleFilePath, modulePath, {
-      source: true,
-      schema: true,
-      validate: false
-    });
-    keyOfModuleSource = keyOfModule.source;
-    keyOfModuleSchema = keyOfModule.schema;
-    cache.set(cacheKey, {
-      source: keyOfModuleSource,
-      schema: keyOfModuleSchema
-    });
-  }
-  if (keyOfModuleSchema && keyOfModuleSchema.type !== "record") {
-    return {
-      error: true,
-      message: `Expected key at ${sourcePath} to be of type 'record'`
-    };
-  }
-  if (keyOfModuleSource && typeof keyOfModuleSource === "object" && key in keyOfModuleSource) {
-    return {
-      error: false
-    };
-  }
-  if (!keyOfModuleSource || typeof keyOfModuleSource !== "object") {
-    return {
-      error: true,
-      message: `Expected ${sourcePath} to be a truthy object`
-    };
-  }
-  const alternatives = findSimilar(key, Object.keys(keyOfModuleSource));
-  return {
-    error: true,
-    message: `Key '${key}' does not exist in ${sourcePath}. Closest match: '${alternatives[0].target}'. Other similar: ${alternatives.slice(1, 4).map(a => `'${a.target}'`).join(", ")}${alternatives.length > 4 ? ", ..." : ""}`
-  };
-}
-
-/**
- * Check if a route is valid by scanning all router modules
- * and validating against include/exclude patterns
- */
-async function checkRouteIsValid(route, include, exclude, service, valFiles, cache) {
-  // 1. Scan all val files to find modules with routers (use cache if available)
-  if (!cache.loaded) {
-    for (const file of valFiles) {
-      var _valModule$schema;
-      const moduleFilePath = `/${file}`;
-      const valModule = await service.get(moduleFilePath, "", {
-        source: true,
-        schema: true,
-        validate: false
-      });
-
-      // Check if this module has a router defined
-      if (((_valModule$schema = valModule.schema) === null || _valModule$schema === void 0 ? void 0 : _valModule$schema.type) === "record" && valModule.schema.router) {
-        if (valModule.source && typeof valModule.source === "object") {
-          cache.modules[moduleFilePath] = valModule.source;
-        }
-      }
-    }
-    cache.loaded = true;
-  }
-  const routerModules = cache.modules;
-
-  // 2. Check if route exists in any router module
-  let foundInModule = null;
-  for (const [moduleFilePath, source] of Object.entries(routerModules)) {
-    if (route in source) {
-      foundInModule = moduleFilePath;
-      break;
-    }
-  }
-  if (!foundInModule) {
-    // Route not found in any router module
-    let allRoutes = Object.values(routerModules).flatMap(source => Object.keys(source));
-    if (allRoutes.length === 0) {
-      return {
-        error: true,
-        message: `Route '${route}' could not be validated: No router modules found in the project. Use s.record(...).router(...) to define router modules.`
-      };
-    }
-
-    // Filter routes by include/exclude patterns for suggestions
-    allRoutes = filterRoutesByPatterns(allRoutes, include, exclude);
-    const alternatives = findSimilar(route, allRoutes);
-    return {
-      error: true,
-      message: `Route '${route}' does not exist in any router module. ${alternatives.length > 0 ? `Closest match: '${alternatives[0].target}'. Other similar: ${alternatives.slice(1, 4).map(a => `'${a.target}'`).join(", ")}${alternatives.length > 4 ? ", ..." : ""}` : "No similar routes found."}`
-    };
-  }
-
-  // 3. Validate against include/exclude patterns
-  const patternValidation = validateRoutePatterns(route, include, exclude);
-  if (!patternValidation.valid) {
-    return {
-      error: true,
-      message: patternValidation.message
-    };
-  }
-  return {
-    error: false
-  };
-}
-
-/**
- * Handler for router:check-route validation fix
- */
-async function handleRouteCheck(ctx) {
-  const {
-    sourcePath,
-    validationError,
-    service,
-    valFiles,
-    routerModulesCache
-  } = ctx;
-
-  // Extract route and patterns from validation error value
-  const value = validationError.value;
-  if (!value || typeof value.route !== "string") {
-    return {
-      success: false,
-      errorMessage: `Invalid route value in validation error: ${JSON.stringify(value)}`
-    };
-  }
-  const route = value.route;
-
-  // Check if the route is valid
-  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles, routerModulesCache);
-  if (result.error) {
-    return {
-      success: false,
-      errorMessage: `${sourcePath}: ${result.message}`
-    };
-  }
-  return {
-    success: true
-  };
-}
 async function handleUniqueFolderCheck(ctx) {
   const value = ctx.validationError.value;
   if (!value || typeof value.directory !== "string") {
@@ -617,14 +432,14 @@ async function handleCheckAllFiles(ctx) {
   };
 }
 
-// Fix handler registry
+// Fix handler registry. `keyof:check-keys` and `router:check-route` are
+// resolved upfront by the shared resolveSchemaSourceFixes — they never reach
+// this registry, so they're excluded from the key set.
 const currentFixHandlers = {
   "image:check-metadata": handleFileMetadata,
   "image:add-metadata": handleFileMetadata,
   "file:check-metadata": handleFileMetadata,
   "file:add-metadata": handleFileMetadata,
-  "keyof:check-keys": handleKeyOfCheck,
-  "router:check-route": handleRouteCheck,
   "image:upload-remote": handleRemoteFileUpload,
   "file:upload-remote": handleRemoteFileUpload,
   "image:download-remote": handleRemoteFileDownload,
@@ -676,12 +491,27 @@ async function* runValidation({
   const service = await createService(projectRoot, {}, fs);
   let errors = 0;
 
-  // Create caches that persist across all file validations
-  const keyOfCache = new Map();
-  const routerModulesCache = {
-    loaded: false,
-    modules: {}
+  // Build a single schema/source snapshot up front so the shared resolver
+  // can resolve keyof:check-keys / router:check-route references that span
+  // multiple val files.
+  const snapshot = {
+    schemas: {},
+    sources: {}
   };
+  for (const file of valFiles) {
+    const moduleFilePath = `/${file}`;
+    const valModule = await service.get(moduleFilePath, "", {
+      source: true,
+      schema: true,
+      validate: false
+    });
+    if (valModule.schema) {
+      snapshot.schemas[moduleFilePath] = valModule.schema;
+    }
+    if (valModule.source !== undefined) {
+      snapshot.sources[moduleFilePath] = valModule.source;
+    }
+  }
   async function* validateFile(file) {
     const moduleFilePath = `/${file}`; // TODO: check if this always works? (Windows?)
     const start = Date.now();
@@ -705,7 +535,12 @@ async function* runValidation({
       let fixedErrors = 0;
       if (valModule.errors) {
         if (valModule.errors.validation) {
-          for (const [sourcePath, validationErrors] of Object.entries(valModule.errors.validation)) {
+          // Resolve schema/source fixes (keyof:check-keys, router:check-route)
+          // against the snapshot before per-error dispatch. Resolved errors
+          // are dropped; invalid references come back with rewritten messages
+          // and fixes cleared, so they fall through the "no fixes" branch.
+          const resolvedValidationErrors = resolveSchemaSourceFixes(valModule.errors.validation, snapshot);
+          for (const [sourcePath, validationErrors] of Object.entries(resolvedValidationErrors)) {
             for (const v of validationErrors) {
               if (!v.fixes || v.fixes.length === 0) {
                 // No fixes available - just report error
@@ -748,9 +583,7 @@ async function* runValidation({
                 remoteFileBuckets,
                 remoteFilesCounter,
                 remote,
-                project,
-                keyOfCache,
-                routerModulesCache
+                project
               });
 
               // Yield any events from handler
@@ -862,31 +695,6 @@ async function* runValidation({
   }
 }
 
-// GPT generated levenshtein distance algorithm:
-const levenshtein = (a, b) => {
-  const [m, n] = [a.length, b.length];
-  if (!m || !n) return Math.max(m, n);
-  const dp = Array.from({
-    length: m + 1
-  }, (_, i) => i);
-  for (let j = 1; j <= n; j++) {
-    let prev = dp[0];
-    dp[0] = j;
-    for (let i = 1; i <= m; i++) {
-      const temp = dp[i];
-      dp[i] = a[i - 1] === b[j - 1] ? prev : Math.min(prev + 1, dp[i - 1] + 1, dp[i] + 1);
-      prev = temp;
-    }
-  }
-  return dp[m];
-};
-function findSimilar(key, targets) {
-  return targets.map(target => ({
-    target,
-    distance: levenshtein(key, target)
-  })).sort((a, b) => a.distance - b.distance);
-}
-
 async function validate({
   root,
   fix

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@valbuild/cli",
   "private": false,
-  "version": "0.97.0",
+  "version": "0.97.2",
   "description": "Val CLI tools",
   "repository": {
     "type": "git",
@@ -25,10 +25,10 @@
     "open": "^9.1.0",
     "picocolors": "^1.1.1",
     "zod": "^4.3.5",
-    "@valbuild/core": "0.97.0",
+    "@valbuild/core": "0.97.1",
     "@valbuild/eslint-plugin": "0.93.0",
-    "@valbuild/server": "0.97.0",
-    "@valbuild/shared": "0.97.0"
+    "@valbuild/server": "0.97.2",
+    "@valbuild/shared": "0.97.1"
   },
   "peerDependencies": {
     "prettier": "*",

package/src/runValidation.ts

@@ -10,6 +10,7 @@ import {
 import {
   FILE_REF_PROP,
   Internal,
+  type Json,
   ModuleFilePath,
   ModulePath,
   SerializedFileSchema,
@@ -18,9 +19,8 @@ import {
   ValidationFix,
 } from "@valbuild/core";
 import {
-  filterRoutesByPatterns,
-  validateRoutePatterns,
-  type SerializedRegExpPattern,
+  resolveSchemaSourceFixes,
+  type SchemaSourceSnapshot,
 } from "@valbuild/shared/internal";
 import { getFileExt } from "./utils/getFileExt";
 import ts from "typescript";
@@ -64,16 +64,6 @@ export type ValidationError = {
   fixes?: ValidationFix[];
 };
 
-// Cache types for avoiding redundant service.get() calls
-export type KeyOfCache = Map<
-  string, // moduleFilePath + modulePath key
-  { source: unknown; schema: { type: string } | undefined }
->;
-export type RouterModulesCache = {
-  loaded: boolean;
-  modules: Record<string, Record<string, unknown>>;
-};
-
 export type FixHandlerContext = {
   sourcePath: SourcePath;
   validationError: ValidationError;
@@ -95,9 +85,6 @@ export type FixHandlerContext = {
   remoteFilesCounter: number;
   remote: IValRemote;
   project: string | undefined;
-  // Caches for validation
-  keyOfCache: KeyOfCache;
-  routerModulesCache: RouterModulesCache;
 };
 
 export type FixHandlerResult = {
@@ -180,56 +167,6 @@ export async function handleFileMetadata(
   return { success: true, shouldApplyPatch: true };
 }
 
-export async function handleKeyOfCheck(
-  ctx: FixHandlerContext,
-): Promise<FixHandlerResult> {
-  if (
-    !ctx.validationError.value ||
-    typeof ctx.validationError.value !== "object" ||
-    !("key" in ctx.validationError.value) ||
-    !("sourcePath" in ctx.validationError.value)
-  ) {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${ctx.sourcePath}: ${ctx.validationError.message} (Expected value to be an object with 'key' and 'sourcePath' properties - this is likely a bug in Val)`,
-    };
-  }
-
-  const { key, sourcePath } = ctx.validationError.value as {
-    key: unknown;
-    sourcePath: unknown;
-  };
-
-  if (typeof key !== "string") {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${sourcePath}: ${ctx.validationError.message} (Expected value property 'key' to be a string - this is likely a bug in Val)`,
-    };
-  }
-
-  if (typeof sourcePath !== "string") {
-    return {
-      success: false,
-      errorMessage: `Unexpected error in ${sourcePath}: ${ctx.validationError.message} (Expected value property 'sourcePath' to be a string - this is likely a bug in Val)`,
-    };
-  }
-
-  const res = await checkKeyIsValid(
-    key,
-    sourcePath,
-    ctx.service,
-    ctx.keyOfCache,
-  );
-  if (res.error) {
-    return {
-      success: false,
-      errorMessage: res.message,
-    };
-  }
-
-  return { success: true };
-}
-
 export async function handleRemoteFileUpload(
   ctx: FixHandlerContext,
 ): Promise<FixHandlerResult> {
@@ -486,203 +423,6 @@ export async function handleRemoteFileCheck(): Promise<FixHandlerResult> {
   return { success: true, shouldApplyPatch: true };
 }
 
-// Helper function
-export async function checkKeyIsValid(
-  key: string,
-  sourcePath: string,
-  service: Service,
-  cache: KeyOfCache,
-): Promise<{ error: false } | { error: true; message: string }> {
-  const [moduleFilePath, modulePath] =
-    Internal.splitModuleFilePathAndModulePath(sourcePath as SourcePath);
-
-  const cacheKey = `${moduleFilePath}::${modulePath}`;
-  let keyOfModuleSource: unknown;
-  let keyOfModuleSchema: { type: string } | undefined;
-
-  const cached = cache.get(cacheKey);
-  if (cached) {
-    keyOfModuleSource = cached.source;
-    keyOfModuleSchema = cached.schema;
-  } else {
-    const keyOfModule = await service.get(moduleFilePath, modulePath, {
-      source: true,
-      schema: true,
-      validate: false,
-    });
-    keyOfModuleSource = keyOfModule.source;
-    keyOfModuleSchema = keyOfModule.schema as { type: string } | undefined;
-    cache.set(cacheKey, {
-      source: keyOfModuleSource,
-      schema: keyOfModuleSchema,
-    });
-  }
-
-  if (keyOfModuleSchema && keyOfModuleSchema.type !== "record") {
-    return {
-      error: true,
-      message: `Expected key at ${sourcePath} to be of type 'record'`,
-    };
-  }
-  if (
-    keyOfModuleSource &&
-    typeof keyOfModuleSource === "object" &&
-    key in keyOfModuleSource
-  ) {
-    return { error: false };
-  }
-  if (!keyOfModuleSource || typeof keyOfModuleSource !== "object") {
-    return {
-      error: true,
-      message: `Expected ${sourcePath} to be a truthy object`,
-    };
-  }
-  const alternatives = findSimilar(key, Object.keys(keyOfModuleSource));
-  return {
-    error: true,
-    message: `Key '${key}' does not exist in ${sourcePath}. Closest match: '${alternatives[0].target}'. Other similar: ${alternatives
-      .slice(1, 4)
-      .map((a) => `'${a.target}'`)
-      .join(", ")}${alternatives.length > 4 ? ", ..." : ""}`,
-  };
-}
-
-/**
- * Check if a route is valid by scanning all router modules
- * and validating against include/exclude patterns
- */
-export async function checkRouteIsValid(
-  route: string,
-  include: SerializedRegExpPattern | undefined,
-  exclude: SerializedRegExpPattern | undefined,
-  service: Service,
-  valFiles: string[],
-  cache: RouterModulesCache,
-): Promise<{ error: false } | { error: true; message: string }> {
-  // 1. Scan all val files to find modules with routers (use cache if available)
-  if (!cache.loaded) {
-    for (const file of valFiles) {
-      const moduleFilePath = `/${file}` as ModuleFilePath;
-      const valModule = await service.get(moduleFilePath, "" as ModulePath, {
-        source: true,
-        schema: true,
-        validate: false,
-      });
-
-      // Check if this module has a router defined
-      if (valModule.schema?.type === "record" && valModule.schema.router) {
-        if (valModule.source && typeof valModule.source === "object") {
-          cache.modules[moduleFilePath] = valModule.source as Record<
-            string,
-            unknown
-          >;
-        }
-      }
-    }
-    cache.loaded = true;
-  }
-
-  const routerModules = cache.modules;
-
-  // 2. Check if route exists in any router module
-  let foundInModule: string | null = null;
-  for (const [moduleFilePath, source] of Object.entries(routerModules)) {
-    if (route in source) {
-      foundInModule = moduleFilePath;
-      break;
-    }
-  }
-
-  if (!foundInModule) {
-    // Route not found in any router module
-    let allRoutes = Object.values(routerModules).flatMap((source) =>
-      Object.keys(source),
-    );
-
-    if (allRoutes.length === 0) {
-      return {
-        error: true,
-        message: `Route '${route}' could not be validated: No router modules found in the project. Use s.record(...).router(...) to define router modules.`,
-      };
-    }
-
-    // Filter routes by include/exclude patterns for suggestions
-    allRoutes = filterRoutesByPatterns(allRoutes, include, exclude);
-
-    const alternatives = findSimilar(route, allRoutes);
-
-    return {
-      error: true,
-      message: `Route '${route}' does not exist in any router module. ${
-        alternatives.length > 0
-          ? `Closest match: '${alternatives[0].target}'. Other similar: ${alternatives
-              .slice(1, 4)
-              .map((a) => `'${a.target}'`)
-              .join(", ")}${alternatives.length > 4 ? ", ..." : ""}`
-          : "No similar routes found."
-      }`,
-    };
-  }
-
-  // 3. Validate against include/exclude patterns
-  const patternValidation = validateRoutePatterns(route, include, exclude);
-  if (!patternValidation.valid) {
-    return {
-      error: true,
-      message: patternValidation.message,
-    };
-  }
-
-  return { error: false };
-}
-
-/**
- * Handler for router:check-route validation fix
- */
-export async function handleRouteCheck(
-  ctx: FixHandlerContext,
-): Promise<FixHandlerResult> {
-  const { sourcePath, validationError, service, valFiles, routerModulesCache } =
-    ctx;
-
-  // Extract route and patterns from validation error value
-  const value = validationError.value as
-    | {
-        route: unknown;
-        include?: { source: string; flags: string };
-        exclude?: { source: string; flags: string };
-      }
-    | undefined;
-
-  if (!value || typeof value.route !== "string") {
-    return {
-      success: false,
-      errorMessage: `Invalid route value in validation error: ${JSON.stringify(value)}`,
-    };
-  }
-
-  const route = value.route;
-
-  // Check if the route is valid
-  const result = await checkRouteIsValid(
-    route,
-    value.include,
-    value.exclude,
-    service,
-    valFiles,
-    routerModulesCache,
-  );
-
-  if (result.error) {
-    return {
-      success: false,
-      errorMessage: `${sourcePath}: ${result.message}`,
-    };
-  }
-
-  return { success: true };
-}
-
 export async function handleUniqueFolderCheck(
   ctx: FixHandlerContext,
 ): Promise<FixHandlerResult> {
@@ -791,14 +531,17 @@ export async function handleCheckAllFiles(
   return { success: true, shouldApplyPatch: true };
 }
 
-// Fix handler registry
-export const currentFixHandlers: Record<ValidationFix, FixHandler> = {
+// Fix handler registry. `keyof:check-keys` and `router:check-route` are
+// resolved upfront by the shared resolveSchemaSourceFixes — they never reach
+// this registry, so they're excluded from the key set.
+export const currentFixHandlers: Record<
+  Exclude<ValidationFix, "keyof:check-keys" | "router:check-route">,
+  FixHandler
+> = {
   "image:check-metadata": handleFileMetadata,
   "image:add-metadata": handleFileMetadata,
   "file:check-metadata": handleFileMetadata,
   "file:add-metadata": handleFileMetadata,
-  "keyof:check-keys": handleKeyOfCheck,
-  "router:check-route": handleRouteCheck,
   "image:upload-remote": handleRemoteFileUpload,
   "file:upload-remote": handleRemoteFileUpload,
   "image:download-remote": handleRemoteFileDownload,
@@ -863,12 +606,24 @@ export async function* runValidation({
 
   let errors = 0;
 
-  // Create caches that persist across all file validations
-  const keyOfCache: KeyOfCache = new Map();
-  const routerModulesCache: RouterModulesCache = {
-    loaded: false,
-    modules: {},
-  };
+  // Build a single schema/source snapshot up front so the shared resolver
+  // can resolve keyof:check-keys / router:check-route references that span
+  // multiple val files.
+  const snapshot: SchemaSourceSnapshot = { schemas: {}, sources: {} };
+  for (const file of valFiles) {
+    const moduleFilePath = `/${file}` as ModuleFilePath;
+    const valModule = await service.get(moduleFilePath, "" as ModulePath, {
+      source: true,
+      schema: true,
+      validate: false,
+    });
+    if (valModule.schema) {
+      snapshot.schemas[moduleFilePath] = valModule.schema;
+    }
+    if (valModule.source !== undefined) {
+      snapshot.sources[moduleFilePath] = valModule.source as Json;
+    }
+  }
 
   async function* validateFile(file: string): AsyncGenerator<ValidationEvent> {
     const moduleFilePath = `/${file}` as ModuleFilePath; // TODO: check if this always works? (Windows?)
@@ -896,8 +651,16 @@ export async function* runValidation({
       let fixedErrors = 0;
       if (valModule.errors) {
         if (valModule.errors.validation) {
-          for (const [sourcePath, validationErrors] of Object.entries(
+          // Resolve schema/source fixes (keyof:check-keys, router:check-route)
+          // against the snapshot before per-error dispatch. Resolved errors
+          // are dropped; invalid references come back with rewritten messages
+          // and fixes cleared, so they fall through the "no fixes" branch.
+          const resolvedValidationErrors = resolveSchemaSourceFixes(
             valModule.errors.validation,
+            snapshot,
+          );
+          for (const [sourcePath, validationErrors] of Object.entries(
+            resolvedValidationErrors,
           )) {
             for (const v of validationErrors) {
               if (!v.fixes || v.fixes.length === 0) {
@@ -943,8 +706,6 @@ export async function* runValidation({
                 remoteFilesCounter,
                 remote,
                 project,
-                keyOfCache,
-                routerModulesCache,
               });
 
               // Yield any events from handler
@@ -1064,33 +825,3 @@ export async function* runValidation({
     yield { type: "summary-success" };
   }
 }
-
-// GPT generated levenshtein distance algorithm:
-export const levenshtein = (a: string, b: string): number => {
-  const [m, n] = [a.length, b.length];
-  if (!m || !n) return Math.max(m, n);
-
-  const dp = Array.from({ length: m + 1 }, (_, i) => i);
-
-  for (let j = 1; j <= n; j++) {
-    let prev = dp[0];
-    dp[0] = j;
-
-    for (let i = 1; i <= m; i++) {
-      const temp = dp[i];
-      dp[i] =
-        a[i - 1] === b[j - 1]
-          ? prev
-          : Math.min(prev + 1, dp[i - 1] + 1, dp[i] + 1);
-      prev = temp;
-    }
-  }
-
-  return dp[m];
-};
-
-export function findSimilar(key: string, targets: string[]) {
-  return targets
-    .map((target) => ({ target, distance: levenshtein(key, target) }))
-    .sort((a, b) => a.distance - b.distance);
-}