🤖 Merge PR #49972 [undertaker] remove 'any' from TaskFunctionBase's r…

…eturn type union by @kazarmy * fix: remove 'any' from TaskFunctionBase's return type union * Fix glob-watcher tests * Update types/undertaker/undertaker-tests.ts Co-authored-by: Ron Buckton <ron.buckton@microsoft.com> * Remove rxjs dependency * Add explicit 'any' return type * Use '~' instead of '^' in package.json Co-authored-by: Ron Buckton <ron.buckton@microsoft.com>
DefinitelyTyped · Dec 10, 2020 · 17c5828 · 17c5828
1 parent 526f5ee
commit 17c5828
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/types/glob-watcher/glob-watcher-tests.ts b/types/glob-watcher/glob-watcher-tests.ts
@@ -18,9 +18,9 @@ function test() {
     optionsTypeTest(opts1);
     optionsTypeTest(opts2);
 
-    const taskFunc: Undertaker.TaskFunction = () => "";
+    const taskFunc: Undertaker.TaskFunction = async () => "";
 
-    const cb = () => {
+    const cb = async () => {
         console.log("watch change!");
     };
 

diff --git a/types/undertaker/index.d.ts b/types/undertaker/index.d.ts
@@ -7,7 +7,7 @@
 
 /// <reference types="node" />
 import * as Registry from "undertaker-registry";
-import { Duplex } from "stream";
+import { AsyncTask } from "async-done";
 import { EventEmitter } from "events";
 
 declare namespace Undertaker {
@@ -23,7 +23,7 @@ declare namespace Undertaker {
     }
 
     interface TaskFunctionBase {
-        (done: (error?: Error | null) => void): void | Duplex | NodeJS.Process | Promise<never> | any;
+        (done: (error?: Error | null) => void): ReturnType<AsyncTask>;
     }
 
     interface TaskFunction extends TaskFunctionBase, TaskFunctionParams {}

diff --git a/types/undertaker/package.json b/types/undertaker/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "async-done": "~1.3.2"
+    }
+}
diff --git a/types/undertaker/undertaker-tests.ts b/types/undertaker/undertaker-tests.ts
@@ -1,3 +1,5 @@
+import { exec } from "child_process";
+import { EventEmitter } from "events";
 import * as fs from "fs";
 import Undertaker = require("undertaker");
 import Registry = require("undertaker-registry");
@@ -34,6 +36,18 @@ const {
     flags,
 } = taker.task("task4").unwrap();
 
+taker.task("task5", () => {
+    const emitter = new EventEmitter();
+    setTimeout(() => emitter.emit("done"), 1000);
+    return emitter;
+});
+
+taker.task("task6", () => exec("ls"));
+
+declare const task7: () => {
+    subscribe(next?: (v: any) => void, error?: (e: any) => void, complete?: () => void): any;
+};
+taker.task("task7", task7);
 taker.task("combined", taker.series("task1", "task2"));
 
 taker.task("all", taker.parallel("combined", "task3"));