Run own or immediately extended beforeQueue (#1475)

yeoman · Sep 25, 2023 · 232587e · 232587e
1 parent 1938e71
commit 232587e
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/actions/lifecycle.ts b/src/actions/lifecycle.ts
@@ -371,9 +371,25 @@ export abstract class TasksMixin {
    */
   async queueTasks(this: BaseGeneratorImpl): Promise<void> {
     const thisAny = this as any;
+    const thisPrototype = Object.getPrototypeOf(thisAny);
+
+    let beforeQueueCallback: (() => Promise<any>) | undefined;
+    if (this.features.taskPrefix) {
+      // We want beforeQueue if beforeQueue belongs to the object or to the imediatelly extended class.
+      beforeQueueCallback =
+        Object.hasOwn(thisAny, 'beforeQueue') || Object.hasOwn(thisPrototype, 'beforeQueue')
+          ? thisAny.beforeQueue
+          : undefined;
+    }
+
+    if (!beforeQueueCallback) {
+      // Fallback to _beforeQueue,
+      beforeQueueCallback =
+        Object.hasOwn(thisAny, '_beforeQueue') || Object.hasOwn(thisPrototype, '_beforeQueue')
+          ? thisAny._beforeQueue
+          : undefined;
+    }
 
-    const beforeQueueCallback: () => Promise<any> =
-      (this.features.taskPrefix && thisAny.beforeQueue) ?? thisAny._beforeQueue;
     if (beforeQueueCallback) {
       await beforeQueueCallback.call(this);
     }