@bluelibs/runner 3.3.2 → 3.4.0

package/src/models/TaskRunner.ts

@@ -1,10 +1,10 @@
 import { DependencyMapType, DependencyValuesType, ITask } from "../defs";
-import { Errors } from "../errors";
 import { EventManager } from "./EventManager";
 import { globalEvents } from "../globals/globalEvents";
 import { Store } from "./Store";
 import { MiddlewareStoreElementType } from "./StoreTypes";
 import { Logger } from "./Logger";
+import { ValidationError } from "../errors";
 
 export class TaskRunner {
   protected readonly runnerStore = new Map<
@@ -150,6 +150,15 @@ export class TaskRunner {
 
     // this is the final next()
     let next = async (input: any) => {
+      // Validate input with schema if provided
+      if (task.inputSchema) {
+        try {
+          input = task.inputSchema.parse(input);
+        } catch (error) {
+          throw new ValidationError("Task input", task.id, error instanceof Error ? error : new Error(String(error)));
+        }
+      }
+      
       return task.run.call(null, input, storeTask?.computedDependencies as any);
     };
 

package/src/run.ts

@@ -13,13 +13,13 @@ import { EventManager } from "./models/EventManager";
 import { globalEvents } from "./globals/globalEvents";
 import { Store } from "./models/Store";
 import { findCircularDependencies } from "./tools/findCircularDependencies";
-import { Errors } from "./errors";
+import { CircularDependenciesError } from "./errors";
 import { globalResources } from "./globals/globalResources";
 import { Logger } from "./models/Logger";
 
 export type ResourcesStoreElementType<
   C = any,
-  V = any,
+  V extends Promise<any> = any,
   D extends DependencyMapType = {}
 > = {
   resource: IResourceDefinition<C, V, D>;
@@ -53,9 +53,12 @@ export type RunnerState = {
 };
 
 export async function run<C, V>(
-  resource: IResource<C, V>,
+  resource: IResource<C, V extends Promise<any> ? V : Promise<any>>,
   config?: C
-): Promise<{ value: V; dispose: () => Promise<void> }> {
+): Promise<{
+  value: V extends Promise<infer U> ? U : V;
+  dispose: () => Promise<void>;
+}> {
   const eventManager = new EventManager();
 
   // ensure for logger, that it can be used only after: computeAllDependencies() has executed
@@ -79,7 +82,7 @@ export async function run<C, V>(
   const dependentNodes = store.getDependentNodes();
   const circularDependencies = findCircularDependencies(dependentNodes);
   if (circularDependencies.cycles.length > 0) {
-    throw Errors.circularDependencies(circularDependencies.cycles);
+    throw new CircularDependenciesError(circularDependencies.cycles);
   }
 
   // the overrides that were registered now will override the other registered resources

package/src/testing.ts

@@ -25,7 +25,7 @@ export function createTestResource(
   options?: {
     overrides?: Array<IResource | ITask | IMiddleware | IResourceWithConfig>;
   }
-): IResource<void, ReturnType<typeof buildTestFacade>> {
+): IResource<void, Promise<ReturnType<typeof buildTestFacade>>> {
   return defineResource({
     id: `tests.createTestResource.${++testResourceCounter}`,
     register: [root],