@bluelibs/runner 1.5.1 → 1.5.3

package/dist/define.d.ts

@@ -1,7 +1,7 @@
-import { ITask, ITaskDefinition, IResource, IResourceWithConfig, IResourceDefinintion, IEventDefinition, IMiddlewareDefinition, DependencyMapType, IMiddleware } from "./defs";
+import { ITask, ITaskDefinition, IResource, IResourceWithConfig, IResourceDefinition, IEventDefinition, IMiddlewareDefinition, DependencyMapType, IMiddleware, IEventDefinitionConfig } from "./defs";
 export declare function defineTask<Input = undefined, Output extends Promise<any> = any, Deps extends DependencyMapType = any, Test = any>(taskConfig: ITaskDefinition<Input, Output, Deps, Test>): ITask<Input, Output, Deps, Test>;
-export declare function defineResource<TConfig = void, TValue = any, TDeps extends DependencyMapType = {}, THooks = any>(constConfig: IResourceDefinintion<TConfig, TValue, TDeps, THooks>): IResource<TConfig, TValue, TDeps>;
-export declare function defineEvent<TPayload = any>(config: IEventDefinition<TPayload>): IEventDefinition<TPayload>;
+export declare function defineResource<TConfig = void, TValue = any, TDeps extends DependencyMapType = {}, THooks = any>(constConfig: IResourceDefinition<TConfig, TValue, TDeps, THooks>): IResource<TConfig, TValue, TDeps>;
+export declare function defineEvent<TPayload = any>(config: IEventDefinitionConfig<TPayload>): IEventDefinition<TPayload>;
 export declare function defineMiddleware<TDeps extends DependencyMapType = {}>(config: IMiddlewareDefinition<TDeps>): IMiddleware<TDeps>;
 export declare function isTask(definition: any): definition is ITask;
 export declare function isResource(definition: any): definition is IResource;

package/dist/define.js

@@ -47,6 +47,7 @@ function defineResource(constConfig) {
         with: function (config) {
             return {
                 [defs_1.symbols.resourceWithConfig]: true,
+                id: this.id,
                 resource: this,
                 config,
             };
@@ -68,7 +69,7 @@ function defineResource(constConfig) {
 }
 function defineEvent(config) {
     return {
-        [defs_1.symbols.event]: true,
+        [defs_1.symbolEvent]: true,
         ...config,
     };
 }

package/dist/define.js.map

@@ -1 +1 @@
-{"version":3,"file":"define.js","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"define.js","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"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"}

package/dist/defs.d.ts

@@ -1,3 +1,9 @@
+export declare const symbolTask: unique symbol;
+export declare const symbolResource: unique symbol;
+export declare const symbolResourceWithConfig: unique symbol;
+export declare const symbolEvent: unique symbol;
+export declare const symbolMiddleware: unique symbol;
+export declare const symbolMiddlewareGlobal: unique symbol;
 export declare const symbols: {
     task: symbol;
     resource: symbol;
@@ -19,7 +25,7 @@ export interface IEventMeta extends IMeta {
 }
 export interface IMiddlewareMeta extends IMeta {
 }
-export type DependencyMapType = Record<string, ITask | IResource | IEventDefinition | IResourceWithConfig<any, any>>;
+export type DependencyMapType = Record<string, ITask<any, any, any> | IResource<any, any, any> | IEventDefinition<any>>;
 type ExtractTaskInput<T> = T extends ITask<infer I, any, infer D> ? I : never;
 type ExtractTaskOutput<T> = T extends ITask<any, infer O, infer D> ? O : never;
 type ExtractResourceValue<T> = T extends IResource<any, infer V, infer D> ? V : never;
@@ -31,7 +37,7 @@ export type DependencyValueType<T> = T extends ITask<any, any, any> ? TaskDepend
 export type DependencyValuesType<T extends DependencyMapType> = {
     [K in keyof T]: DependencyValueType<T[K]>;
 };
-export type RegisterableItems = IResourceWithConfig<any> | IResource<any> | ITaskDefinition | IMiddlewareDefinition | IEventDefinition;
+export type RegisterableItems = IResourceWithConfig<any> | IResource<void, any, any> | ITaskDefinition | IMiddlewareDefinition | IEventDefinition;
 export interface ITaskDefinition<TInput = any, TOutput extends Promise<any> = any, TDependencies extends DependencyMapType = {}, TEventDefinitionInput = null> {
     id: string;
     dependencies?: TDependencies | (() => TDependencies);
@@ -85,7 +91,7 @@ export interface ITask<TInput = any, TOutput extends Promise<any> = any, TDepend
         onError: IEventDefinition<OnErrorEventPayload>;
     };
 }
-export interface IResourceDefinintion<TConfig = any, TValue = unknown, TDependencies extends DependencyMapType = {}, THooks = any, TRegisterableItems = any> {
+export interface IResourceDefinition<TConfig = any, TValue = unknown, TDependencies extends DependencyMapType = {}, THooks = any, TRegisterableItems = any> {
     id: string;
     dependencies?: TDependencies | ((config: TConfig) => TDependencies);
     hooks?: IHookDefinition<TDependencies, THooks>[] | ((config: TConfig) => IHookDefinition<TDependencies, THooks>[]);
@@ -104,7 +110,7 @@ export interface IResourceDefinintion<TConfig = any, TValue = unknown, TDependen
     overrides?: Array<IResource | ITask | IMiddleware | IResourceWithConfig>;
     middleware?: IMiddlewareDefinition[];
 }
-export interface IResource<TConfig = void, TValue = any, TDependencies extends DependencyMapType = any> extends IResourceDefinintion<TConfig, TValue, TDependencies> {
+export interface IResource<TConfig = void, TValue = any, TDependencies extends DependencyMapType = any> extends IResourceDefinition<TConfig, TValue, TDependencies> {
     with(config: TConfig): IResourceWithConfig<TConfig, TValue, TDependencies>;
     register: Array<RegisterableItems> | ((config: TConfig) => Array<RegisterableItems>);
     /**
@@ -120,6 +126,7 @@ export interface IResource<TConfig = void, TValue = any, TDependencies extends D
     middleware: IMiddlewareDefinition[];
 }
 export interface IResourceWithConfig<TConfig = any, TValue = any, TDependencies extends DependencyMapType = any> {
+    id: string;
     resource: IResource<TConfig, TValue, TDependencies>;
     config: TConfig;
 }
@@ -139,8 +146,16 @@ export interface IEvent<TPayload = any> {
     source: string;
 }
 export type EventHandlerType<T = any> = (event: IEvent<T>) => any | Promise<any>;
+export interface IEventDefinitionConfig<TPayload = void> {
+    id: string;
+    meta?: IEventMeta;
+}
 export interface IEventDefinition<TPayload = void> {
     id: string;
+    /**
+     * We use this event to discriminate between resources with just 'id' and 'events' as they collide. This is a workaround, should be redone using classes and instanceof.
+     */
+    [symbolEvent]: true;
     meta?: IEventMeta;
 }
 export interface IMiddlewareDefinition<TDependencies extends DependencyMapType = any> {

package/dist/defs.js

@@ -1,12 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.symbols = void 0;
+exports.symbols = exports.symbolMiddlewareGlobal = exports.symbolMiddleware = exports.symbolEvent = exports.symbolResourceWithConfig = exports.symbolResource = exports.symbolTask = void 0;
+exports.symbolTask = Symbol("runner.task");
+exports.symbolResource = Symbol("runner.resource");
+exports.symbolResourceWithConfig = Symbol("runner.resourceWithConfig");
+exports.symbolEvent = Symbol("runner.event");
+exports.symbolMiddleware = Symbol("runner.middleware");
+exports.symbolMiddlewareGlobal = Symbol("runner.middlewareGlobal");
 exports.symbols = {
-    task: Symbol("task"),
-    resource: Symbol("resource"),
-    resourceWithConfig: Symbol("resourceWithConfig"),
-    event: Symbol("event"),
-    middleware: Symbol("middleware"),
-    middlewareGlobal: Symbol("middlewareGlobal"),
+    task: exports.symbolTask,
+    resource: exports.symbolResource,
+    resourceWithConfig: exports.symbolResourceWithConfig,
+    event: exports.symbolEvent,
+    middleware: exports.symbolMiddleware,
+    middlewareGlobal: exports.symbolMiddlewareGlobal,
 };
 //# sourceMappingURL=defs.js.map

package/dist/defs.js.map

@@ -1 +1 @@
-{"version":3,"file":"defs.js","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC;IAChC,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC;CAC7C,CAAC"}
+{"version":3,"file":"defs.js","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAkB,MAAM,CAAC,aAAa,CAAC,CAAC;AAClD,QAAA,cAAc,GAAkB,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC1D,QAAA,wBAAwB,GAAkB,MAAM,CAC3D,2BAA2B,CAC5B,CAAC;AACW,QAAA,WAAW,GAAkB,MAAM,CAAC,cAAc,CAAC,CAAC;AACpD,QAAA,gBAAgB,GAAkB,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC9D,QAAA,sBAAsB,GAAkB,MAAM,CACzD,yBAAyB,CAC1B,CAAC;AAEW,QAAA,OAAO,GAAG;IACrB,IAAI,EAAE,kBAAU;IAChB,QAAQ,EAAE,sBAAc;IACxB,kBAAkB,EAAE,gCAAwB;IAC5C,KAAK,EAAE,mBAAW;IAClB,UAAU,EAAE,wBAAgB;IAC5B,gBAAgB,EAAE,8BAAsB;CACzC,CAAC"}

package/dist/run.d.ts

@@ -1,6 +1,6 @@
-import { DependencyMapType, ITaskDefinition, IResourceDefinintion, IEventDefinition, IMiddlewareDefinition, DependencyValuesType, IResource } from "./defs";
+import { DependencyMapType, ITaskDefinition, IResourceDefinition, IEventDefinition, IMiddlewareDefinition, DependencyValuesType, IResource } from "./defs";
 export type ResourcesStoreElementType<C = any, V = any, D extends DependencyMapType = {}> = {
-    resource: IResourceDefinintion<C, V, D>;
+    resource: IResourceDefinition<C, V, D>;
     computedDependencies?: DependencyValuesType<D>;
     config: C;
     value: V;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bluelibs/runner",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "BlueLibs Runner",
   "main": "dist/index.js",
   "repository": {

package/src/__tests__/errors.test.ts

@@ -119,7 +119,9 @@ describe("Errors", () => {
     const errorResource = defineResource({
       id: "error.resource",
       init: async () => {
-        throw new Error("Resource error");
+        if (true === true) {
+          throw new Error("Resource error");
+        }
       },
     });
 

package/src/__tests__/models/EventManager.test.ts

@@ -1,4 +1,4 @@
-import { IEvent, IEventDefinition } from "../../defs";
+import { IEvent, IEventDefinition, symbolEvent } from "../../defs";
 import { Errors } from "../../errors";
 import { EventManager } from "../../models/EventManager";
 
@@ -8,7 +8,7 @@ describe("EventManager", () => {
 
   beforeEach(() => {
     eventManager = new EventManager();
-    eventDefinition = { id: "testEvent" };
+    eventDefinition = { id: "testEvent", [symbolEvent]: true };
   });
 
   it("should add and emit event listener", async () => {
@@ -160,8 +160,14 @@ describe("EventManager", () => {
   });
 
   it("should handle multiple events", async () => {
-    const eventDef1: IEventDefinition<string> = { id: "event1" };
-    const eventDef2: IEventDefinition<string> = { id: "event2" };
+    const eventDef1: IEventDefinition<string> = {
+      id: "event1",
+      [symbolEvent]: true,
+    };
+    const eventDef2: IEventDefinition<string> = {
+      id: "event2",
+      [symbolEvent]: true,
+    };
 
     const handler1 = jest.fn();
     const handler2 = jest.fn();
@@ -203,8 +209,14 @@ describe("EventManager", () => {
   });
 
   it("should handle listeners added to multiple events", async () => {
-    const eventDef1: IEventDefinition<string> = { id: "event1" };
-    const eventDef2: IEventDefinition<string> = { id: "event2" };
+    const eventDef1: IEventDefinition<string> = {
+      id: "event1",
+      [symbolEvent]: true,
+    };
+    const eventDef2: IEventDefinition<string> = {
+      id: "event2",
+      [symbolEvent]: true,
+    };
 
     const handler = jest.fn();
 
@@ -231,8 +243,14 @@ describe("EventManager", () => {
   });
 
   it("should not affect other events when emitting one", async () => {
-    const eventDef1: IEventDefinition<string> = { id: "event1" };
-    const eventDef2: IEventDefinition<string> = { id: "event2" };
+    const eventDef1: IEventDefinition<string> = {
+      id: "event1",
+      [symbolEvent]: true,
+    };
+    const eventDef2: IEventDefinition<string> = {
+      id: "event2",
+      [symbolEvent]: true,
+    };
 
     const handler1 = jest.fn();
     const handler2 = jest.fn();
@@ -368,7 +386,10 @@ describe("EventManager", () => {
   it("should handle listeners with no data", async () => {
     const handler = jest.fn();
 
-    const voidEventDefinition: IEventDefinition<void> = { id: "voidEvent" };
+    const voidEventDefinition: IEventDefinition<void> = {
+      id: "voidEvent",
+      [symbolEvent]: true,
+    };
 
     eventManager.addListener(voidEventDefinition, handler);
 

package/src/__tests__/run.test.ts

@@ -440,7 +440,12 @@ describe("run", () => {
 
       const typeTest = defineResource({
         id: "typeTest",
-        register: [t2, testResource],
+        register: [
+          t2,
+          testResource.with({
+            prefix: "Hello,",
+          }),
+        ],
       });
 
       const app = defineResource({
@@ -460,7 +465,10 @@ describe("run", () => {
       const testResource = defineResource({
         id: "test.resource",
         init: async () => {
-          throw new Error("Init failed");
+          // we do this so it doesn't become a never.
+          if (true === true) {
+            throw new Error("Init failed");
+          }
         },
       });
 

package/src/__tests__/typesafety.test.ts

@@ -77,12 +77,15 @@ describe("typesafety", () => {
         // @ts-expect-error
         deps.task2;
       },
-      register: () => [
+      register: [
         dummyResourceNoConfig,
         // @ts-expect-error
         dummyResourceNoConfig.with("hello"),
         // @ts-expect-error
         dummyResourceNoConfig.with({ anyObject: true }),
+
+        // @ts-expect-error
+        dummyResource, // should throw
         dummyResource.with({ ok: true }),
         // @ts-expect-error
         dummyResource.with({ ok: 123 }),

package/src/define.ts

@@ -3,7 +3,7 @@ import {
   ITaskDefinition,
   IResource,
   IResourceWithConfig,
-  IResourceDefinintion,
+  IResourceDefinition,
   IEventDefinition,
   IMiddlewareDefinition,
   symbols,
@@ -12,6 +12,8 @@ import {
   IMiddleware,
   IHookDefinition,
   IEvent,
+  IEventDefinitionConfig,
+  symbolEvent,
 } from "./defs";
 import { Errors } from "./errors";
 
@@ -52,7 +54,7 @@ export function defineResource<
   TDeps extends DependencyMapType = {},
   THooks = any
 >(
-  constConfig: IResourceDefinintion<TConfig, TValue, TDeps, THooks>
+  constConfig: IResourceDefinition<TConfig, TValue, TDeps, THooks>
 ): IResource<TConfig, TValue, TDeps> {
   return {
     [symbols.resource]: true,
@@ -66,6 +68,7 @@ export function defineResource<
     with: function (config: TConfig) {
       return {
         [symbols.resourceWithConfig]: true,
+        id: this.id,
         resource: this,
         config,
       };
@@ -88,10 +91,10 @@ export function defineResource<
 }
 
 export function defineEvent<TPayload = any>(
-  config: IEventDefinition<TPayload>
+  config: IEventDefinitionConfig<TPayload>
 ): IEventDefinition<TPayload> {
   return {
-    [symbols.event]: true,
+    [symbolEvent]: true,
     ...config,
   };
 }

package/src/defs.ts

@@ -1,10 +1,21 @@
+export const symbolTask: unique symbol = Symbol("runner.task");
+export const symbolResource: unique symbol = Symbol("runner.resource");
+export const symbolResourceWithConfig: unique symbol = Symbol(
+  "runner.resourceWithConfig"
+);
+export const symbolEvent: unique symbol = Symbol("runner.event");
+export const symbolMiddleware: unique symbol = Symbol("runner.middleware");
+export const symbolMiddlewareGlobal: unique symbol = Symbol(
+  "runner.middlewareGlobal"
+);
+
 export const symbols = {
-  task: Symbol("task"),
-  resource: Symbol("resource"),
-  resourceWithConfig: Symbol("resourceWithConfig"),
-  event: Symbol("event"),
-  middleware: Symbol("middleware"),
-  middlewareGlobal: Symbol("middlewareGlobal"),
+  task: symbolTask,
+  resource: symbolResource,
+  resourceWithConfig: symbolResourceWithConfig,
+  event: symbolEvent,
+  middleware: symbolMiddleware,
+  middlewareGlobal: symbolMiddlewareGlobal,
 };
 
 export interface IMeta {
@@ -21,7 +32,7 @@ export interface IMiddlewareMeta extends IMeta {}
 // DependencyMap types
 export type DependencyMapType = Record<
   string,
-  ITask | IResource | IEventDefinition | IResourceWithConfig<any, any>
+  ITask<any, any, any> | IResource<any, any, any> | IEventDefinition<any>
 >;
 
 // Helper Types for Extracting Generics
@@ -53,7 +64,7 @@ export type DependencyValuesType<T extends DependencyMapType> = {
 // RegisterableItems Type with Conditional Inclusion
 export type RegisterableItems =
   | IResourceWithConfig<any>
-  | IResource<any>
+  | IResource<void, any, any>
   | ITaskDefinition
   | IMiddlewareDefinition
   | IEventDefinition;
@@ -136,7 +147,7 @@ export interface ITask<
   };
 }
 // Resource interfaces
-export interface IResourceDefinintion<
+export interface IResourceDefinition<
   TConfig = any,
   TValue = unknown,
   TDependencies extends DependencyMapType = {},
@@ -177,7 +188,7 @@ export interface IResource<
   TConfig = void,
   TValue = any,
   TDependencies extends DependencyMapType = any
-> extends IResourceDefinintion<TConfig, TValue, TDependencies> {
+> extends IResourceDefinition<TConfig, TValue, TDependencies> {
   with(config: TConfig): IResourceWithConfig<TConfig, TValue, TDependencies>;
   register:
     | Array<RegisterableItems>
@@ -203,6 +214,7 @@ export interface IResourceWithConfig<
   TValue = any,
   TDependencies extends DependencyMapType = any
 > {
+  id: string;
   resource: IResource<TConfig, TValue, TDependencies>;
   config: TConfig;
 }
@@ -228,8 +240,17 @@ export type EventHandlerType<T = any> = (
 ) => any | Promise<any>;
 
 // Other necessary interfaces
+export interface IEventDefinitionConfig<TPayload = void> {
+  id: string;
+  meta?: IEventMeta;
+}
+
 export interface IEventDefinition<TPayload = void> {
   id: string;
+  /**
+   * We use this event to discriminate between resources with just 'id' and 'events' as they collide. This is a workaround, should be redone using classes and instanceof.
+   */
+  [symbolEvent]: true;
   meta?: IEventMeta;
 }
 

package/src/run.ts

@@ -2,7 +2,7 @@ import { TaskRunner } from "./models/TaskRunner";
 import {
   DependencyMapType,
   ITaskDefinition,
-  IResourceDefinintion,
+  IResourceDefinition,
   IEventDefinition,
   IMiddlewareDefinition,
   DependencyValuesType,
@@ -22,7 +22,7 @@ export type ResourcesStoreElementType<
   V = any,
   D extends DependencyMapType = {}
 > = {
-  resource: IResourceDefinintion<C, V, D>;
+  resource: IResourceDefinition<C, V, D>;
   computedDependencies?: DependencyValuesType<D>;
   config: C;
   value: V;