@quazardous/quarkernel 1.0.10 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quazardous/quarkernel",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "type": "module",
   "description": "Micro Custom Events Kernel",
   "repository": {

package/src/index.js

@@ -1,3 +1,3 @@
-import { QuarKernel, QuarKernelEvent } from './lib/QuarKernel.js';
+import { QuarKernel, QuarKernelEvent, QuarKernelLegacyAsyncFunctionWrapper } from './lib/QuarKernel.js';
 
-export { QuarKernel, QuarKernelEvent };
+export { QuarKernel, QuarKernelEvent, QuarKernelLegacyAsyncFunctionWrapper };

package/src/lib/QuarKernel.js

@@ -1,6 +1,18 @@
 /* eslint-disable no-plusplus */
 import toposort from 'toposort';
 
+/**
+ * @class LegacyAsync provides a way to handle async eventListenerCallback for old stacks
+ */
+class QuarKernelLegacyAsyncFunctionWrapper {
+  /**
+   * @param {async eventListenerCallback} asyncCallback 
+   */
+  constructor(asyncCallback) {
+    this.asyncCallback = asyncCallback;
+  }
+}
+
 class GraphNode {
   /**
    * @param {string} target 
@@ -57,20 +69,23 @@ class GraphNodeProcessor {
   processAll(e) {
     return Promise.all(
       this.nodes.map(n => this.process(n, e))
-    );
+    ).then(() => e);
   }
 
   /**
    * @param  {GraphNode} node 
    * @param  {QuarKernelEvent} e
-   * @return {Promise<QuarKernelEvent>} 
+   * @return {Promise<*>} 
    * @private
    */
   process(node, e) {
     const process = this.processMap[node.name];
     if (!process.promise) {
       let then = null;
-      if (node.callback.constructor.name === 'AsyncFunction') {
+      if (node.callback instanceof QuarKernelLegacyAsyncFunctionWrapper) {
+        // handle legacy async
+        then = () => node.callback.asyncCallback(e, node.target);
+      } else if (node.callback.constructor.name === 'AsyncFunction') {
         // handle async
         then = () => node.callback(e, node.target);
       } else {
@@ -81,7 +96,7 @@ class GraphNodeProcessor {
       }
       process.promise = this.processDependencies(node, e).then(then);
     }
-    return process.promise.then(() => e);
+    return process.promise;
   }
 
   /**
@@ -242,7 +257,7 @@ class QuarKernel {
    * Register for some event.
    *
    * @param {string} type Type of event to listen to
-   * @param {eventCallback|eventAsyncCallback} callback
+   * @param {eventCallback|eventAsyncCallback|QuarKernelLegacyAsyncFunctionWrapper} callback
    * @param {string} [target] A unique code for the target listener
    * @param {string|Array<string>} [dependencies] A list of targets dependencies
    * In the event scope, callbacks will be fired according to dependencies
@@ -387,4 +402,4 @@ class QuarKernel {
   }
 }
 
-export { QuarKernel, QuarKernelEvent };
+export { QuarKernel, QuarKernelEvent, QuarKernelLegacyAsyncFunctionWrapper };

package/types/QuarKernel.d.ts

@@ -1,12 +1,12 @@
 export type eventListenerCallback = (e?: QuarKernelEvent) => any;
 export type composeTriggerCallback = (stack?: {
-    [x: string]: Array<{
+    [x: string]: {
         e: QuarKernelEvent;
         p: Promise<QuarKernelEvent>;
-    }>;
+    }[];
 }) => any;
 export type composeEventFactory = (stack?: {
-    [x: string]: Array<QuarKernelEvent>;
+    [x: string]: QuarKernelEvent[];
 }) => QuarKernelEvent;
 export type eventCallback = (e?: QuarKernelEvent, target?: string) => any;
 export type eventAsyncCallback = () => any;
@@ -67,12 +67,12 @@ export class QuarKernel {
      * Register for some event.
      *
      * @param {string} type Type of event to listen to
-     * @param {eventCallback|eventAsyncCallback} callback
+     * @param {eventCallback|eventAsyncCallback|QuarKernelLegacyAsyncFunctionWrapper} callback
      * @param {string} [target] A unique code for the target listener
      * @param {string|Array<string>} [dependencies] A list of targets dependencies
      * In the event scope, callbacks will be fired according to dependencies
      */
-    addEventListener(type: string, callback: eventCallback | eventAsyncCallback, target?: string, dependencies?: string | Array<string>): void;
+    addEventListener(type: string, callback: eventCallback | eventAsyncCallback | QuarKernelLegacyAsyncFunctionWrapper, target?: string, dependencies?: string | Array<string>): void;
     /**
      * Create a composite trigger.
      *
@@ -120,3 +120,13 @@ export class QuarKernelEvent {
     param: any;
     context: any;
 }
+/**
+ * @class LegacyAsync provides a way to handle async eventListenerCallback for old stacks
+ */
+export class QuarKernelLegacyAsyncFunctionWrapper {
+    /**
+     * @param {async eventListenerCallback} asyncCallback
+     */
+    constructor(asyncCallback: any);
+    asyncCallback: any;
+}