@scout9/app 1.0.0-alpha.0.5.3 → 1.0.0-alpha.0.5.5

package/src/utils/configs/agents.js

@@ -3,6 +3,7 @@ import colors from 'kleur';
 import { globSync } from 'glob';
 import { checkVariableType, requireProjectFile } from '../../utils/index.js';
 import { AgentsConfigurationSchema, AgentsSchema } from '../../runtime/index.js';
+import { logUserValidationError } from '../../report.js';
 
 /**
  * @param {Array<Agent>} agents
@@ -29,7 +30,7 @@ export function validateAgentConfig(agents) {
   const result = AgentsSchema.safeParse(agents);
   if (!result.success) {
     result.error.source = `src/entities/agents.js|ts`;
-    throw result.error;
+    throw logUserValidationError(result.error, `src/entities/agents.js|ts`)
   }
   return agents;
 }

package/src/utils/configs/entities.js

@@ -7,6 +7,8 @@ import {
   EntityRootProjectConfigurationSchema
 } from '../../runtime/index.js';
 import { checkVariableType, requireOptionalProjectFile, requireProjectFile } from '../module.js';
+import { logUserValidationError } from '../../report.js';
+import { simplifyError } from '../error.js';
 
 async function loadEntityApiConfig(cwd, filePath) {
   const dir = path.dirname(filePath);
@@ -86,7 +88,7 @@ export default async function loadEntitiesConfig(
       const result = EntityConfigurationSchema.safeParse(entityConfig, {path: ['entities', config.length]});
       if (!result.success) {
         result.error.source = filePath;
-        throw result.error;
+        throw logUserValidationError(result.error, filePath);
       }
     } else if (isSpecial && (fileName === 'index' || fileName === 'config')) {
       // If this is a special entity file, then ignore as we will capture it another method
@@ -100,7 +102,12 @@ export default async function loadEntitiesConfig(
       entities: parents.reverse(),
       api
     };
-    EntityRootProjectConfigurationSchema.parse(entityProjectConfig);
+
+    try {
+      EntityRootProjectConfigurationSchema.parse(entityProjectConfig);
+    } catch (e) {
+      throw simplifyError(e);
+    }
     const existingIndex = config.findIndex(c => c.entity === entityProjectConfig.entity);
     if (existingIndex > -1) {
       if (config[existingIndex].entities.length !== entityProjectConfig.entities.length) {
@@ -138,8 +145,11 @@ export default async function loadEntitiesConfig(
   // }
 
   // Validate the config
-  EntitiesRootProjectConfigurationSchema.parse(config);
+  try {
+    return EntitiesRootProjectConfigurationSchema.parse(config);
+  } catch (e) {
+    throw simplifyError(e);
+  }
 
-  return config;
 }
 

package/src/utils/configs/workflow.js

@@ -1,47 +1,54 @@
 import { globSync } from 'glob';
 import { WorkflowConfigurationSchema, WorkflowsConfigurationSchema } from '../../runtime/index.js';
+import { simplifyError } from '../error.js';
+import { logUserValidationError } from '../../report.js';
 
 
 /**
- * @returns {Promise<WorkflowsBuildConfig>}
+ * @returns {Promise<WorkflowsConfigurationSchema>}
  */
 export default async function loadWorkflowsConfig(
-  {
-    cwd = process.cwd(),
-    src = 'src',
-    // cb = (message) => {}
-  } = {}
+    {
+        cwd = process.cwd(),
+        src = 'src'
+        // cb = (message) => {}
+    } = {}
 ) {
-  // const config = globSync(path.resolve(cwd, `${src}/workflows/**/workflow.{ts,js}`), {cwd, absolute: true})
-  const config = globSync(`${src}/workflows/**/workflow.{ts,js}`, {cwd, absolute: true})
-    .map((path) => {
-      const segments = path.split('/');
-      const srcIndex = segments.findIndex((segment, index) => segment === src && segments[index + 1] === 'workflows');
-      const parents = segments.slice(srcIndex + 2, -1).reverse(); // +2 to skip "${src}" and "workflows"
-      return {path, parents};
-    })
-    .filter(path => {
-      if (path.parents.length > 0) {
-        return true;
-      } else {
-        console.log(`WARNING: "${path}" Is not a valid entity path, must be contained in a named src under workflows/`);
-      }
-    })
-    .map(({path, parents}) => {
+    // const config = globSync(path.resolve(cwd, `${src}/workflows/**/workflow.{ts,js}`), {cwd, absolute: true})
+    const config = globSync(`${src}/workflows/**/workflow.{ts,js}`, {cwd, absolute: true})
+        .map((path) => {
+            const segments = path.split('/');
+            const srcIndex = segments.findIndex((segment, index) => segment === src && segments[index + 1] === 'workflows');
+            const parents = segments.slice(srcIndex + 2, -1).reverse(); // +2 to skip "${src}" and "workflows"
+            return {path, parents};
+        })
+        .filter(path => {
+            if (path.parents.length > 0) {
+                return true;
+            } else {
+                console.log(`WARNING: "${path}" Is not a valid entity path, must be contained in a named src under workflows/`);
+            }
+        })
+        .map(({path, parents}) => {
 
-      // Validate project configuration
-      /** @type {WorkflowBuildConfig} */
-      const workflowConfig = {
-        entity: parents[0],
-        entities: parents.reverse(),
-      }
-      WorkflowConfigurationSchema.parse(workflowConfig);
+            // Validate project configuration
+            /** @type {WorkflowConfigurationSchema} */
+            const workflowConfig = {
+                entity: parents[0],
+                entities: parents.reverse()
+            };
+            try {
+                return WorkflowConfigurationSchema.parse(workflowConfig);
+            } catch (e) {
+                throw logUserValidationError(e, path);
+            }
+        });
 
-      return workflowConfig;
-    });
+    // Validate the config
+    try {
+        return WorkflowsConfigurationSchema.parse(config);
+    } catch (e) {
+        throw simplifyError(e);
+    }
 
-  // Validate the config
-  WorkflowsConfigurationSchema.parse(config);
-
-  return config;
 }

package/src/utils/project.js

@@ -11,6 +11,7 @@ import loadWorkflowsConfig from './configs/workflow.js';
 import { Scout9ProjectBuildConfigSchema } from '../runtime/index.js';
 import { ProgressLogger } from './logger.js';
 import { formatGlobPattern, normalizeGlobPattern } from './glob.js';
+import { logUserValidationError } from '../report.js';
 
 /**
  * Utility class to load and write project files in a targeted way
@@ -278,7 +279,8 @@ export default class ProjectFiles {
       ...(await this._loadEnv()),
       entities: [],
       agents: [],
-      workflows: []
+      workflows: [],
+      commands: []
     };
 
     // Load entities, except for special entities such as ["agents"]
@@ -298,7 +300,7 @@ export default class ProjectFiles {
     const result = Scout9ProjectBuildConfigSchema.safeParse(projectConfig);
     if (!result.success) {
       result.error.source = `${this.src}/index.js`;
-      throw result.error;
+      throw logUserValidationError(result.error, `${this.src}/index.js`);
     }
 
     // Log