@output.ai/core 0.5.2 → 0.5.4

package/src/worker/webpack_loaders/workflow_validator/index.mjs

@@ -1,6 +1,6 @@
 import traverseModule from '@babel/traverse';
 import { dirname } from 'node:path';
-import { parse, toAbsolutePath, getFileKind, isAnyStepsPath, isEvaluatorsPath, isWorkflowPath } from '../tools.js';
+import { parse, toAbsolutePath, getFileKind, isAnyStepsPath, isAnyEvaluatorsPath, isWorkflowPath } from '../tools.js';
 import { ComponentFile } from '../consts.js';
 import {
   isCallExpression,
@@ -27,7 +27,7 @@ const getFileKindLabel = filename => {
   if ( isAnyStepsPath( filename ) ) {
     return 'steps.js';
   }
-  if ( isEvaluatorsPath( filename ) ) {
+  if ( isAnyEvaluatorsPath( filename ) ) {
     return 'evaluators.js';
   }
   if ( /workflow\.js$/.test( filename ) ) {
@@ -48,7 +48,7 @@ const validateInstantiationLocation = ( calleeName, filename ) => {
   if ( calleeName === 'step' && !isAnyStepsPath( filename ) ) {
     throw new Error( `Invalid instantiation location: step() can only be called in files with 'steps' in the path. Found in: ${filename}` );
   }
-  if ( calleeName === 'evaluator' && !isEvaluatorsPath( filename ) ) {
+  if ( calleeName === 'evaluator' && !isAnyEvaluatorsPath( filename ) ) {
     throw new Error( `Invalid instantiation location: evaluator() can only be called in files with 'evaluators' in the path. Found in: ${filename}` );
   }
   if ( calleeName === 'workflow' && !isWorkflowPath( filename ) ) {

package/src/worker/webpack_loaders/workflow_validator/index.spec.js

@@ -565,6 +565,28 @@ describe( 'workflow_validator loader', () => {
       rmSync( dir, { recursive: true, force: true } );
     } );
 
+    it( 'step() called in evaluators.js is blocked by validator', async () => {
+      const dir = mkdtempSync( join( tmpdir(), 'step-evals-fail-' ) );
+      const src = [
+        'import { step } from "@output.ai/core";',
+        'export const badStep = step({ name: "bad", fn: async () => ({}) });'
+      ].join( '\n' );
+      await expect( runLoader( join( dir, 'evaluators.js' ), src ) )
+        .rejects.toThrow( /Invalid instantiation location.*step\(\).*steps/ );
+      rmSync( dir, { recursive: true, force: true } );
+    } );
+
+    it( 'evaluator() called in steps.js is blocked by validator', async () => {
+      const dir = mkdtempSync( join( tmpdir(), 'eval-steps-fail-' ) );
+      const src = [
+        'import { evaluator } from "@output.ai/core";',
+        'export const badEval = evaluator({ name: "bad", fn: async () => ({ value: 1 }) });'
+      ].join( '\n' );
+      await expect( runLoader( join( dir, 'steps.js' ), src ) )
+        .rejects.toThrow( /Invalid instantiation location.*evaluator\(\).*evaluators/ );
+      rmSync( dir, { recursive: true, force: true } );
+    } );
+
     it( 'workflow() called in shared/common.js is blocked by validator', async () => {
       const dir = mkdtempSync( join( tmpdir(), 'wf-shared-fail-' ) );
       mkdirSync( join( dir, 'shared' ) );