0.7.5

pilsy · Sep 16, 2024 · c15be5c · c15be5c
1 parent 945d413
commit c15be5c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chrono-forge",
-  "version": "0.7.2",
+  "version": "0.7.5",
   "description": "A comprehensive framework for building resilient Temporal workflows, advanced state management, and real-time streaming activities in TypeScript. Designed for a seamless developer experience with powerful abstractions, dynamic orchestration, and full control over distributed systems.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/SchemaManager.ts b/src/SchemaManager.ts
@@ -42,6 +42,8 @@ export class SchemaManager extends EventEmitter {
   public static getInstance(workflowId?: string): SchemaManager {
     if (!this.instance) {
       this.instance = new SchemaManager(workflowId);
+    } else {
+      this.instance.workflowId = String(workflowId);
     }
     return this.instance;
   }

diff --git a/src/workflows/StatefulWorkflow.ts b/src/workflows/StatefulWorkflow.ts
@@ -28,6 +28,7 @@ export type ManagedPath = {
   path?: string;
   workflowType?: string;
   idAttribute?: string | string[];
+  includeParentId?: boolean;
   autoStartChildren?: boolean;
   cancellationType?: workflow.ChildWorkflowCancellationType;
   parentClosePolicy?: workflow.ParentClosePolicy;
@@ -561,6 +562,7 @@ export abstract class StatefulWorkflow<
         workflowType,
         entityName,
         idAttribute,
+        includeParentId,
         cancellationType = workflow.ChildWorkflowCancellationType.WAIT_CANCELLATION_COMPLETED,
         parentClosePolicy = workflow.ParentClosePolicy.PARENT_CLOSE_POLICY_REQUEST_CANCEL,
         autoStartChildren
@@ -578,7 +580,7 @@ export abstract class StatefulWorkflow<
       const data = typeof config.processData === 'function' ? config.processData(rawData, this) : rawData;
       const { [idAttribute as string]: id, ...rest } = state;
       const compositeId = Array.isArray(idAttribute) ? getCompositeKey(data, idAttribute) : id;
-      const workflowId = `${entityName}-${compositeId}`;
+      const workflowId = includeParentId ? `${entityName}-${compositeId}-${this.id}` : `${entityName}-${compositeId}`;
 
       if (this.ancestorWorkflowIds.includes(workflowId)) {
         this.log.warn(
@@ -651,6 +653,7 @@ export abstract class StatefulWorkflow<
         workflowType,
         entityName,
         idAttribute,
+        includeParentId,
         cancellationType = workflow.ChildWorkflowCancellationType.WAIT_CANCELLATION_COMPLETED,
         parentClosePolicy = workflow.ParentClosePolicy.PARENT_CLOSE_POLICY_REQUEST_CANCEL,
         autoStartChildren
@@ -668,7 +671,7 @@ export abstract class StatefulWorkflow<
       const data = typeof config.processData === 'function' ? config.processData(rawData, this) : rawData;
       const { [idAttribute as string]: id } = state;
       const compositeId = Array.isArray(config.idAttribute) ? getCompositeKey(data, config.idAttribute) : state[config.idAttribute as string];
-      const workflowId = `${entityName}-${compositeId}`;
+      const workflowId = includeParentId ? `${entityName}-${compositeId}-${this.id}` : `${entityName}-${compositeId}`;
 
       if (this.ancestorWorkflowIds.includes(workflowId)) {
         this.log.warn(

diff --git a/src/workflows/Workflow.ts b/src/workflows/Workflow.ts
@@ -454,7 +454,6 @@ export abstract class Workflow<P = unknown, O = unknown> extends EventEmitter {
 
     // @ts-ignore
     const hooks: { before: { [name: string]: string[] }; after: { [name: string]: string[] } } = this.collectHookMetadata(
-      HOOKS_METADATA_KEY,
       this.constructor.prototype
     );
 
@@ -598,22 +597,31 @@ export abstract class Workflow<P = unknown, O = unknown> extends EventEmitter {
     return collectedMetadata;
   }
 
-  private collectHookMetadata(metadataKey: Symbol, target: any): Record<string, HookMetadata> {
-    const collectedMetadata: Record<string, HookMetadata> = {};
+  private collectHookMetadata(target: any): { [key: string]: { before: string[]; after: string[] } } {
+    const collectedMetadata: { [key: string]: { before: string[]; after: string[] } } = {};
+
+    const protoChain: any[] = [];
     let currentProto = target;
 
+    // Build the prototype chain from base to derived
     while (currentProto && currentProto !== Workflow.prototype) {
-      const metadata = Reflect.getOwnMetadata(metadataKey, currentProto);
-      if (metadata) {
-        for (const key in metadata) {
-          if (metadata.hasOwnProperty(key)) {
-            collectedMetadata[key] = collectedMetadata[key] || { before: [], after: [] };
-            collectedMetadata[key].before.push(...(metadata[key].before || []));
-            collectedMetadata[key].after.push(...(metadata[key].after || []));
-          }
+      protoChain.unshift(currentProto); // Push at the start to reverse the order
+      currentProto = Object.getPrototypeOf(currentProto);
+    }
+
+    // Collect metadata from each prototype in the chain in order
+    for (const proto of protoChain) {
+      const metadata = Reflect.getOwnMetadata(HOOKS_METADATA_KEY, proto) || {};
+
+      for (const key of Object.keys(metadata)) {
+        // Ensure that collectedMetadata has the structure defined
+        if (!collectedMetadata[key]) {
+          collectedMetadata[key] = { before: [], after: [] };
         }
+
+        collectedMetadata[key].before.push(...(metadata[key].before || []));
+        collectedMetadata[key].after.push(...(metadata[key].after || []));
       }
-      currentProto = Object.getPrototypeOf(currentProto);
     }
 
     return collectedMetadata;