@output.ai/core 0.0.14 → 0.0.16

package/src/worker/webpack_loaders/workflow_rewriter/tools.js

@@ -106,6 +106,13 @@ export const toFunctionExpression = arrow => {
  */
 export const isStepsPath = value => /(^|\/)steps\.js$/.test( value );
 
+/**
+ * Check if a module specifier or request string points to evaluators.js.
+ * @param {string} value - Module path or request string.
+ * @returns {boolean} True if it matches evaluators.js.
+ */
+export const isEvaluatorsPath = value => /(^|\/)evaluators\.js$/.test( value );
+
 /**
  * Check if a module specifier or request string points to workflow.js.
  * @param {string} value - Module path or request string.
@@ -165,14 +172,18 @@ export const resolveNameFromOptions = ( optionsNode, consts, errorMessagePrefix
 };
 
 /**
- * Build a map from exported step variable name to declared step name.
- * Parses the steps module and extracts `step({ name: '...' })` names.
- * @param {string} path - Absolute path to the steps module file.
- * @param {Map<string, Map<string,string>>} cache - Cache of computed step name maps.
- * @returns {Map<string,string>} Exported identifier -> step name.
- * @throws {Error} When a step name is invalid (non-static or missing).
+ * Build a map of exported component identifiers to declared names by scanning a module.
+ * Coerces only static, analyzable forms: `export const X = callee({ name: '...' })`.
+ *
+ * @param {object} params
+ * @param {string} params.path - Absolute path to the module file.
+ * @param {Map<string, Map<string,string>>} params.cache - Cache for memoizing results by file path.
+ * @param {('step'|'evaluator')} params.calleeName - Factory function identifier to match.
+ * @param {string} params.invalidMessagePrefix - Prefix used in thrown errors when name is invalid.
+ * @returns {Map<string,string>} Map of `exportedIdentifier` -> `declaredName`.
+ * @throws {Error} When names are missing, dynamic, or otherwise non-static.
  */
-export const buildStepsNameMap = ( path, cache ) => {
+const buildComponentNameMap = ( { path, cache, calleeName, invalidMessagePrefix } ) => {
   if ( cache.has( path ) ) {
     return cache.get( path );
   }
@@ -180,24 +191,46 @@ export const buildStepsNameMap = ( path, cache ) => {
   const ast = parse( text, path );
   const consts = extractTopLevelStringConsts( ast );
 
-  const stepMap = ast.program.body
+  const result = ast.program.body
     .filter( node => isExportNamedDeclaration( node ) && isVariableDeclaration( node.declaration ) )
     .reduce( ( map, node ) => {
-
       node.declaration.declarations
-        .filter( dec => isIdentifier( dec.id ) && isCallExpression( dec.init ) && isIdentifier( dec.init.callee, { name: 'step' } ) )
+        .filter( dec => isIdentifier( dec.id ) && isCallExpression( dec.init ) && isIdentifier( dec.init.callee, { name: calleeName } ) )
         .map( dec => [
           dec,
-          resolveNameFromOptions( dec.init.arguments[0], consts, `Invalid step name in ${path} for "${dec.id.name}"` )
+          resolveNameFromOptions( dec.init.arguments[0], consts, `${invalidMessagePrefix} ${path} for "${dec.id.name}"` )
         ] )
         .forEach( ( [ dec, name ] ) => map.set( dec.id.name, name ) );
       return map;
     }, new Map() );
 
-  cache.set( path, stepMap );
-  return stepMap;
+  cache.set( path, result );
+  return result;
 };
 
+export const buildStepsNameMap = ( path, cache ) => buildComponentNameMap( {
+  path,
+  cache,
+  calleeName: 'step',
+  invalidMessagePrefix: 'Invalid step name in'
+} );
+
+/**
+ * Build a map from exported evaluator identifier to declared evaluator name.
+ * Parses `evaluators.js` for `export const X = evaluator({ name: '...' })`.
+ *
+ * @param {string} path - Absolute path to the evaluators module file.
+ * @param {Map<string, Map<string,string>>} cache - Cache of computed evaluator name maps.
+ * @returns {Map<string,string>} Exported identifier -> evaluator name.
+ * @throws {Error} When a evaluator name is invalid (non-static or missing).
+ */
+export const buildEvaluatorsNameMap = ( path, cache ) => buildComponentNameMap( {
+  path,
+  cache,
+  calleeName: 'evaluator',
+  invalidMessagePrefix: 'Invalid evaluator name in'
+} );
+
 /**
  * Build a structure with default and named workflow names from a workflow module.
  * Extracts names from `workflow({ name: '...' })` calls.

package/src/worker/webpack_loaders/workflow_rewriter/tools.spec.js

@@ -15,7 +15,8 @@ import {
   createThisMethodCall,
   resolveNameFromOptions,
   buildStepsNameMap,
-  buildWorkflowNameMap
+  buildWorkflowNameMap,
+  buildEvaluatorsNameMap
 } from './tools.js';
 
 describe( 'workflow_rewriter tools', () => {
@@ -72,6 +73,23 @@ describe( 'workflow_rewriter tools', () => {
     rmSync( dir, { recursive: true, force: true } );
   } );
 
+  it( 'buildEvaluatorsNameMap: reads names from evaluators module and caches result', () => {
+    const dir = mkdtempSync( join( tmpdir(), 'tools-evals-' ) );
+    const evalsPath = join( dir, 'evaluators.js' );
+    writeFileSync( evalsPath, [
+      'export const EvalA = evaluator({ name: "eval.a" })',
+      'export const EvalB = evaluator({ name: "eval.b" })'
+    ].join( '\n' ) );
+    const cache = new Map();
+    const map1 = buildEvaluatorsNameMap( evalsPath, cache );
+    expect( map1.get( 'EvalA' ) ).toBe( 'eval.a' );
+    expect( map1.get( 'EvalB' ) ).toBe( 'eval.b' );
+    expect( cache.get( evalsPath ) ).toBe( map1 );
+    const map2 = buildEvaluatorsNameMap( evalsPath, cache );
+    expect( map2 ).toBe( map1 );
+    rmSync( dir, { recursive: true, force: true } );
+  } );
+
   it( 'getLocalNameFromDestructuredProperty: handles { a }, { a: b }, { a: b = 1 }', () => {
     // { a }
     const p1 = t.objectProperty( t.identifier( 'a' ), t.identifier( 'a' ), false, true );
@@ -88,7 +106,7 @@ describe( 'workflow_rewriter tools', () => {
   } );
 
   it( 'buildWorkflowNameMap: reads named and default workflow names and caches', () => {
-    const dir = mkdtempSync( join( tmpdir(), 'tools-flow-' ) );
+    const dir = mkdtempSync( join( tmpdir(), 'tools-output-' ) );
     const wfPath = join( dir, 'workflow.js' );
     writeFileSync( wfPath, [
       'export const FlowA = workflow({ name: "flow.a" })',