Refactor(@inquirer/core) Wrap logic to clear all effects in the hooks…

… engine
SBoudrias · Jul 29, 2024 · 6610cc9 · 6610cc9
1 parent 3871321
commit 6610cc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/core/src/lib/create-prompt.mts b/packages/core/src/lib/create-prompt.mts
@@ -1,4 +1,5 @@
 import * as readline from 'node:readline';
+import { AsyncResource } from 'node:async_hooks';
 import { CancelablePromise, type Prompt, type Prettify } from '@inquirer/type';
 import MuteStream from 'mute-stream';
 import { onExit as onSignalExit } from 'signal-exit';
@@ -42,11 +43,9 @@ export function createPrompt<Value, Config>(view: ViewFunction<Value, Config>) {
           );
         });
 
-        function onExit() {
+        const onExit = AsyncResource.bind(() => {
           try {
-            store.hooksCleanup.forEach((cleanFn) => {
-              cleanFn?.();
-            });
+            effectScheduler.clearAll();
           } catch (error) {
             reject(error);
           }
@@ -60,7 +59,7 @@ export function createPrompt<Value, Config>(view: ViewFunction<Value, Config>) {
 
           removeExitListener();
           store.rl.input.removeListener('keypress', checkCursorPos);
-        }
+        });
 
         cancel = () => {
           onExit();

diff --git a/packages/core/src/lib/hook-engine.mts b/packages/core/src/lib/hook-engine.mts
@@ -140,4 +140,13 @@ export const effectScheduler = {
       store.hooksEffect.length = 0;
     })();
   },
+  clearAll() {
+    const store = getStore();
+    store.hooksCleanup.forEach((cleanFn) => {
+      cleanFn?.();
+    });
+
+    store.hooksEffect.length = 0;
+    store.hooksCleanup.length = 0;
+  },
 };