@output.ai/core 0.0.12 → 0.0.14

package/src/interface/validations/static.spec.js

@@ -1,11 +1,12 @@
 import { describe, it, expect } from 'vitest';
+import { z } from 'zod';
 import { validateStep, validateWorkflow, validateCreateWebhook, StaticValidationError } from './static.js';
 
 const validArgs = Object.freeze( {
   name: 'valid_name',
   description: 'desc',
-  inputSchema: { type: 'object' },
-  outputSchema: { type: 'object' },
+  inputSchema: z.object( {} ),
+  outputSchema: z.object( {} ),
   fn: () => {}
 } );
 
@@ -35,26 +36,24 @@ describe( 'interface/validator', () => {
       expect( () => validateStep( { ...validArgs, description: 10 } ) ).toThrow( error );
     } );
 
-    it( 'rejects non-object inputSchema', () => {
-      const error = new StaticValidationError( '✖ Invalid input: expected object, received string\n  → at inputSchema' );
-      expect( () => validateStep( { ...validArgs, inputSchema: 'not-an-object' } ) ).toThrow( error );
+    it( 'rejects non-Zod inputSchema', () => {
+      const error = new StaticValidationError( '✖ Schema must be a Zod schema\n  → at inputSchema' );
+      expect( () => validateStep( { ...validArgs, inputSchema: 'not-a-zod-schema' } ) ).toThrow( error );
     } );
 
-    it( 'rejects invalid inputSchema structure', () => {
-      const error = new StaticValidationError( '✖ data/type must be equal to one of the allowed values, \
-data/type must be array, data/type must match a schema in anyOf\n  → at inputSchema' );
-      expect( () => validateStep( { ...validArgs, inputSchema: { type: 1 } } ) ).toThrow( error );
+    it( 'rejects JSON Schema inputSchema', () => {
+      const error = new StaticValidationError( '✖ Schema must be a Zod schema\n  → at inputSchema' );
+      expect( () => validateStep( { ...validArgs, inputSchema: { type: 'object' } } ) ).toThrow( error );
     } );
 
-    it( 'rejects non-object outputSchema', () => {
-      const error = new StaticValidationError( '✖ Invalid input: expected object, received number\n  → at outputSchema' );
+    it( 'rejects non-Zod outputSchema', () => {
+      const error = new StaticValidationError( '✖ Schema must be a Zod schema\n  → at outputSchema' );
       expect( () => validateStep( { ...validArgs, outputSchema: 10 } ) ).toThrow( error );
     } );
 
-    it( 'rejects invalid outputSchema structure', () => {
-      const error = new StaticValidationError( '✖ data/type must be equal to one of the allowed values, \
-data/type must be array, data/type must match a schema in anyOf\n  → at outputSchema' );
-      expect( () => validateStep( { ...validArgs, outputSchema: { type: 1 } } ) ).toThrow( error );
+    it( 'rejects JSON Schema outputSchema', () => {
+      const error = new StaticValidationError( '✖ Schema must be a Zod schema\n  → at outputSchema' );
+      expect( () => validateStep( { ...validArgs, outputSchema: { type: 'string' } } ) ).toThrow( error );
     } );
 
     it( 'rejects missing fn', () => {

package/src/interface/workflow.js

@@ -2,10 +2,10 @@
 import { proxyActivities, inWorkflowContext, executeChild, workflowInfo, ApplicationFailure, proxySinks } from '@temporalio/workflow';
 import { getInvocationDir } from './utils.js';
 import { setMetadata } from './metadata.js';
-import { FatalError, ValidationError } from '../errors.js';
+import { FatalError, ValidationError } from '#errors';
 import { validateWorkflow } from './validations/static.js';
-import { validateWorkflowInput, validateWorkflowOutput } from './validations/runtime.js';
 import { READ_TRACE_FILE, TraceEvent } from '#consts';
+import { validateWithSchema } from './schema_utils.js';
 
 const temporalActivityConfigs = {
   startToCloseTimeout: '20 minute',
@@ -19,7 +19,13 @@ const temporalActivityConfigs = {
 };
 
 export function workflow( { name, description, inputSchema, outputSchema, fn } ) {
-  validateWorkflow( { name, description, inputSchema, outputSchema, fn } );
+  validateWorkflow( {
+    name,
+    description,
+    inputSchema,
+    outputSchema,
+    fn
+  } );
   const workflowPath = getInvocationDir();
 
   const steps = proxyActivities( temporalActivityConfigs );
@@ -31,16 +37,12 @@ export function workflow( { name, description, inputSchema, outputSchema, fn } )
         sinks.log.trace( { event: TraceEvent.WORKFLOW_START, input } );
       }
 
-      if ( inputSchema ) {
-        validateWorkflowInput( name, inputSchema, input );
-      }
+      validateWithSchema( inputSchema, input, `Workflow ${name} input` );
 
       // this returns a plain function, for example, in unit tests
       if ( !inWorkflowContext() ) {
         const output = await fn( input );
-        if ( outputSchema ) {
-          validateWorkflowOutput( name, outputSchema, output );
-        }
+        validateWithSchema( outputSchema, output, `Workflow ${name} output` );
         return output;
       }
 
@@ -64,9 +66,7 @@ export function workflow( { name, description, inputSchema, outputSchema, fn } )
         }
       }, input );
 
-      if ( outputSchema ) {
-        validateWorkflowOutput( name, outputSchema, output );
-      }
+      validateWithSchema( outputSchema, output, `Workflow ${name} output` );
 
       sinks.log.trace( { event: TraceEvent.WORKFLOW_END, output } );