@valbuild/cli 0.91.0 → 0.91.2

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

@@ -126,6 +126,8 @@ const textEncoder = new TextEncoder();
 
 // Types for handler system
 
+// Cache types for avoiding redundant service.get() calls
+
 // Handler functions
 async function handleFileMetadata(ctx) {
   const [, modulePath] = core.Internal.splitModuleFilePathAndModulePath(ctx.sourcePath);
@@ -183,7 +185,7 @@ async function handleKeyOfCheck(ctx) {
       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);
+  const res = await checkKeyIsValid(key, sourcePath, ctx.service, ctx.keyOfCache);
   if (res.error) {
     return {
       success: false,
@@ -397,15 +399,28 @@ async function handleRemoteFileCheck() {
 }
 
 // Helper function
-async function checkKeyIsValid(key, sourcePath, service) {
+async function checkKeyIsValid(key, sourcePath, service, cache) {
   const [moduleFilePath, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
-  const keyOfModule = await service.get(moduleFilePath, modulePath, {
-    source: true,
-    schema: false,
-    validate: false
-  });
-  const keyOfModuleSource = keyOfModule.source;
-  const keyOfModuleSchema = keyOfModule.schema;
+  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,
@@ -434,25 +449,28 @@ async function checkKeyIsValid(key, sourcePath, service) {
  * 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) {
-  // 1. Scan all val files to find modules with routers
-  const routerModules = {};
-  for (const file of valFiles) {
-    var _valModule$schema;
-    const moduleFilePath = `/${file}`;
-    const valModule = await service.get(moduleFilePath, "", {
-      source: true,
-      schema: true,
-      validate: false
-    });
+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") {
-        routerModules[moduleFilePath] = valModule.source;
+      // 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;
@@ -502,7 +520,8 @@ async function handleRouteCheck(ctx) {
     sourcePath,
     validationError,
     service,
-    valFiles
+    valFiles,
+    routerModulesCache
   } = ctx;
 
   // Extract route and patterns from validation error value
@@ -516,16 +535,13 @@ async function handleRouteCheck(ctx) {
   const route = value.route;
 
   // Check if the route is valid
-  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles);
+  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles, routerModulesCache);
   if (result.error) {
     return {
       success: false,
       errorMessage: `${sourcePath}: ${result.message}`
     };
   }
-
-  // Route is valid - no fix needed
-  console.log(picocolors__default["default"].green("✓"), `Route '${route}' is valid in`, sourcePath);
   return {
     success: true
   };
@@ -577,6 +593,13 @@ async function validate({
   console.log(picocolors__default["default"].greenBright(`Found ${valFiles.length} files...`));
   let publicProjectId;
   let didFix = false;
+
+  // Create caches that persist across all file validations
+  const keyOfCache = new Map();
+  const routerModulesCache = {
+    loaded: false,
+    modules: {}
+  };
   async function validateFile(file) {
     const moduleFilePath = `/${file}`; // TODO: check if this always works? (Windows?)
     const start = Date.now();
@@ -631,7 +654,9 @@ async function validate({
                 remoteFilesCounter,
                 valRemoteHost,
                 contentHostUrl,
-                valConfigFile: valConfigFile ?? undefined
+                valConfigFile: valConfigFile ?? undefined,
+                keyOfCache,
+                routerModulesCache
               });
 
               // Update shared state from handler result

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

@@ -126,6 +126,8 @@ const textEncoder = new TextEncoder();
 
 // Types for handler system
 
+// Cache types for avoiding redundant service.get() calls
+
 // Handler functions
 async function handleFileMetadata(ctx) {
   const [, modulePath] = core.Internal.splitModuleFilePathAndModulePath(ctx.sourcePath);
@@ -183,7 +185,7 @@ async function handleKeyOfCheck(ctx) {
       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);
+  const res = await checkKeyIsValid(key, sourcePath, ctx.service, ctx.keyOfCache);
   if (res.error) {
     return {
       success: false,
@@ -397,15 +399,28 @@ async function handleRemoteFileCheck() {
 }
 
 // Helper function
-async function checkKeyIsValid(key, sourcePath, service) {
+async function checkKeyIsValid(key, sourcePath, service, cache) {
   const [moduleFilePath, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
-  const keyOfModule = await service.get(moduleFilePath, modulePath, {
-    source: true,
-    schema: false,
-    validate: false
-  });
-  const keyOfModuleSource = keyOfModule.source;
-  const keyOfModuleSchema = keyOfModule.schema;
+  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,
@@ -434,25 +449,28 @@ async function checkKeyIsValid(key, sourcePath, service) {
  * 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) {
-  // 1. Scan all val files to find modules with routers
-  const routerModules = {};
-  for (const file of valFiles) {
-    var _valModule$schema;
-    const moduleFilePath = `/${file}`;
-    const valModule = await service.get(moduleFilePath, "", {
-      source: true,
-      schema: true,
-      validate: false
-    });
+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") {
-        routerModules[moduleFilePath] = valModule.source;
+      // 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;
@@ -502,7 +520,8 @@ async function handleRouteCheck(ctx) {
     sourcePath,
     validationError,
     service,
-    valFiles
+    valFiles,
+    routerModulesCache
   } = ctx;
 
   // Extract route and patterns from validation error value
@@ -516,16 +535,13 @@ async function handleRouteCheck(ctx) {
   const route = value.route;
 
   // Check if the route is valid
-  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles);
+  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles, routerModulesCache);
   if (result.error) {
     return {
       success: false,
       errorMessage: `${sourcePath}: ${result.message}`
     };
   }
-
-  // Route is valid - no fix needed
-  console.log(picocolors__default["default"].green("✓"), `Route '${route}' is valid in`, sourcePath);
   return {
     success: true
   };
@@ -577,6 +593,13 @@ async function validate({
   console.log(picocolors__default["default"].greenBright(`Found ${valFiles.length} files...`));
   let publicProjectId;
   let didFix = false;
+
+  // Create caches that persist across all file validations
+  const keyOfCache = new Map();
+  const routerModulesCache = {
+    loaded: false,
+    modules: {}
+  };
   async function validateFile(file) {
     const moduleFilePath = `/${file}`; // TODO: check if this always works? (Windows?)
     const start = Date.now();
@@ -631,7 +654,9 @@ async function validate({
                 remoteFilesCounter,
                 valRemoteHost,
                 contentHostUrl,
-                valConfigFile: valConfigFile ?? undefined
+                valConfigFile: valConfigFile ?? undefined,
+                keyOfCache,
+                routerModulesCache
               });
 
               // Update shared state from handler result

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

@@ -94,6 +94,8 @@ const textEncoder = new TextEncoder();
 
 // Types for handler system
 
+// Cache types for avoiding redundant service.get() calls
+
 // Handler functions
 async function handleFileMetadata(ctx) {
   const [, modulePath] = Internal.splitModuleFilePathAndModulePath(ctx.sourcePath);
@@ -151,7 +153,7 @@ async function handleKeyOfCheck(ctx) {
       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);
+  const res = await checkKeyIsValid(key, sourcePath, ctx.service, ctx.keyOfCache);
   if (res.error) {
     return {
       success: false,
@@ -365,15 +367,28 @@ async function handleRemoteFileCheck() {
 }
 
 // Helper function
-async function checkKeyIsValid(key, sourcePath, service) {
+async function checkKeyIsValid(key, sourcePath, service, cache) {
   const [moduleFilePath, modulePath] = Internal.splitModuleFilePathAndModulePath(sourcePath);
-  const keyOfModule = await service.get(moduleFilePath, modulePath, {
-    source: true,
-    schema: false,
-    validate: false
-  });
-  const keyOfModuleSource = keyOfModule.source;
-  const keyOfModuleSchema = keyOfModule.schema;
+  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,
@@ -402,25 +417,28 @@ async function checkKeyIsValid(key, sourcePath, service) {
  * 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) {
-  // 1. Scan all val files to find modules with routers
-  const routerModules = {};
-  for (const file of valFiles) {
-    var _valModule$schema;
-    const moduleFilePath = `/${file}`;
-    const valModule = await service.get(moduleFilePath, "", {
-      source: true,
-      schema: true,
-      validate: false
-    });
+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") {
-        routerModules[moduleFilePath] = valModule.source;
+      // 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;
@@ -470,7 +488,8 @@ async function handleRouteCheck(ctx) {
     sourcePath,
     validationError,
     service,
-    valFiles
+    valFiles,
+    routerModulesCache
   } = ctx;
 
   // Extract route and patterns from validation error value
@@ -484,16 +503,13 @@ async function handleRouteCheck(ctx) {
   const route = value.route;
 
   // Check if the route is valid
-  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles);
+  const result = await checkRouteIsValid(route, value.include, value.exclude, service, valFiles, routerModulesCache);
   if (result.error) {
     return {
       success: false,
       errorMessage: `${sourcePath}: ${result.message}`
     };
   }
-
-  // Route is valid - no fix needed
-  console.log(picocolors.green("✓"), `Route '${route}' is valid in`, sourcePath);
   return {
     success: true
   };
@@ -545,6 +561,13 @@ async function validate({
   console.log(picocolors.greenBright(`Found ${valFiles.length} files...`));
   let publicProjectId;
   let didFix = false;
+
+  // Create caches that persist across all file validations
+  const keyOfCache = new Map();
+  const routerModulesCache = {
+    loaded: false,
+    modules: {}
+  };
   async function validateFile(file) {
     const moduleFilePath = `/${file}`; // TODO: check if this always works? (Windows?)
     const start = Date.now();
@@ -599,7 +622,9 @@ async function validate({
                 remoteFilesCounter,
                 valRemoteHost,
                 contentHostUrl,
-                valConfigFile: valConfigFile ?? undefined
+                valConfigFile: valConfigFile ?? undefined,
+                keyOfCache,
+                routerModulesCache
               });
 
               // Update shared state from handler result

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@valbuild/cli",
   "private": false,
-  "version": "0.91.0",
+  "version": "0.91.2",
   "description": "Val CLI tools",
   "repository": {
     "type": "git",
@@ -22,10 +22,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@valbuild/core": "~0.91.0",
-    "@valbuild/eslint-plugin": "~0.91.0",
-    "@valbuild/server": "~0.91.0",
-    "@valbuild/shared": "~0.91.0",
+    "@valbuild/core": "~0.91.2",
+    "@valbuild/eslint-plugin": "~0.91.2",
+    "@valbuild/server": "~0.91.2",
+    "@valbuild/shared": "~0.91.2",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
     "fast-glob": "^3.3.1",

package/src/validate.ts

@@ -42,6 +42,16 @@ type ValidationError = {
   fixes?: ValidationFix[];
 };
 
+// Cache types for avoiding redundant service.get() calls
+type KeyOfCache = Map<
+  string, // moduleFilePath + modulePath key
+  { source: unknown; schema: { type: string } | undefined }
+>;
+type RouterModulesCache = {
+  loaded: boolean;
+  modules: Record<string, Record<string, unknown>>;
+};
+
 type FixHandlerContext = {
   sourcePath: SourcePath;
   validationError: ValidationError;
@@ -63,6 +73,9 @@ type FixHandlerContext = {
   valRemoteHost: string;
   contentHostUrl: string;
   valConfigFile?: { project?: string };
+  // Caches for validation
+  keyOfCache: KeyOfCache;
+  routerModulesCache: RouterModulesCache;
 };
 
 type FixHandlerResult = {
@@ -157,7 +170,12 @@ async function handleKeyOfCheck(
     };
   }
 
-  const res = await checkKeyIsValid(key, sourcePath, ctx.service);
+  const res = await checkKeyIsValid(
+    key,
+    sourcePath,
+    ctx.service,
+    ctx.keyOfCache,
+  );
   if (res.error) {
     return {
       success: false,
@@ -438,17 +456,33 @@ 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 keyOfModule = await service.get(moduleFilePath, modulePath, {
-    source: true,
-    schema: false,
-    validate: false,
-  });
 
-  const keyOfModuleSource = keyOfModule.source;
-  const keyOfModuleSchema = keyOfModule.schema;
+  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,
@@ -488,29 +522,33 @@ async function checkRouteIsValid(
   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
-  const routerModules: Record<string, Record<string, unknown>> = {};
-
-  for (const file of valFiles) {
-    const moduleFilePath = `/${file}` as ModuleFilePath;
-    const valModule = await service.get(moduleFilePath, "" as ModulePath, {
-      source: true,
-      schema: true,
-      validate: false,
-    });
+  // 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") {
-        routerModules[moduleFilePath] = valModule.source as Record<
-          string,
-          unknown
-        >;
+      // 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)) {
@@ -569,7 +607,8 @@ async function checkRouteIsValid(
 async function handleRouteCheck(
   ctx: FixHandlerContext,
 ): Promise<FixHandlerResult> {
-  const { sourcePath, validationError, service, valFiles } = ctx;
+  const { sourcePath, validationError, service, valFiles, routerModulesCache } =
+    ctx;
 
   // Extract route and patterns from validation error value
   const value = validationError.value as
@@ -596,6 +635,7 @@ async function handleRouteCheck(
     value.exclude,
     service,
     valFiles,
+    routerModulesCache,
   );
 
   if (result.error) {
@@ -605,12 +645,6 @@ async function handleRouteCheck(
     };
   }
 
-  // Route is valid - no fix needed
-  console.log(
-    picocolors.green("✓"),
-    `Route '${route}' is valid in`,
-    sourcePath,
-  );
   return { success: true };
 }
 
@@ -672,6 +706,11 @@ export async function validate({
   console.log(picocolors.greenBright(`Found ${valFiles.length} files...`));
   let publicProjectId: string | undefined;
   let didFix = false;
+
+  // Create caches that persist across all file validations
+  const keyOfCache: KeyOfCache = new Map();
+  const routerModulesCache: RouterModulesCache = { loaded: false, modules: {} };
+
   async function validateFile(file: string): Promise<number> {
     const moduleFilePath = `/${file}` as ModuleFilePath; // TODO: check if this always works? (Windows?)
     const start = Date.now();
@@ -748,6 +787,8 @@ export async function validate({
                 valRemoteHost,
                 contentHostUrl,
                 valConfigFile: valConfigFile ?? undefined,
+                keyOfCache,
+                routerModulesCache,
               });
 
               // Update shared state from handler result