fix(54951): using being too strict to throw on Function type (#54969)

microsoft · Jul 17, 2023 · 02e8d5e · 02e8d5e
1 parent 94f03cf
commit 02e8d5e
Show file tree

Hide file tree

Showing 54 changed files with 78 additions and 53 deletions.
diff --git a/src/compiler/factory/emitHelpers.ts b/src/compiler/factory/emitHelpers.ts
@@ -1403,7 +1403,7 @@ export const addDisposableResourceHelper: UnscopedEmitHelper = {
     text: `
         var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
             if (value !== null && value !== void 0) {
-                if (typeof value !== "object") throw new TypeError("Object expected.");
+                if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
                 var dispose;
                 if (async) {
                     if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/src/testRunner/unittests/evaluation/usingDeclarations.ts b/src/testRunner/unittests/evaluation/usingDeclarations.ts
@@ -1658,4 +1658,29 @@ describe("unittests:: evaluation:: usingDeclarations", () => {
             "after block"
         ]);
     });
+
+    it("'using' for 'function' disposable resource ", () => {
+        const { main, output } = evaluator.evaluateTypeScript(`
+        export const output: any[] = [];
+
+        function disposable() {
+            const f = () => output.push("enter");
+            const d = () => output.push("exit");
+            return Object.assign(f, { [Symbol.dispose]: d });
+        }
+
+        export function main() {
+            using run = disposable();
+            run();
+        }
+
+        `, { target: ts.ScriptTarget.ES2018 });
+
+        main();
+
+        assert.deepEqual(output, [
+            "enter",
+            "exit",
+        ]);
+    });
 });
diff --git a/tests/baselines/reference/awaitUsingDeclarations.1(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarations.1(target=es2015).js
@@ -111,7 +111,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.1(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarations.1(target=es2017).js
@@ -102,7 +102,7 @@ export {};
 //// [awaitUsingDeclarations.1.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.1(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarations.1(target=es2022).js
@@ -102,7 +102,7 @@ export {};
 //// [awaitUsingDeclarations.1.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.1(target=es5).js b/tests/baselines/reference/awaitUsingDeclarations.1(target=es5).js
@@ -138,7 +138,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.2(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarations.2(target=es2015).js
@@ -20,7 +20,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.2(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarations.2(target=es2017).js
@@ -11,7 +11,7 @@ export {};
 //// [awaitUsingDeclarations.2.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.2(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarations.2(target=es2022).js
@@ -11,7 +11,7 @@ export {};
 //// [awaitUsingDeclarations.2.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.2(target=es5).js b/tests/baselines/reference/awaitUsingDeclarations.2(target=es5).js
@@ -47,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.3(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarations.3(target=es2015).js
@@ -22,7 +22,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.3(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarations.3(target=es2017).js
@@ -13,7 +13,7 @@ export {};
 //// [awaitUsingDeclarations.3.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.3(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarations.3(target=es2022).js
@@ -13,7 +13,7 @@ export {};
 //// [awaitUsingDeclarations.3.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarations.3(target=es5).js b/tests/baselines/reference/awaitUsingDeclarations.3(target=es5).js
@@ -49,7 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2015).js
@@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2017).js
@@ -12,7 +12,7 @@ async function main() {
 //// [awaitUsingDeclarationsInFor.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2022).js
@@ -12,7 +12,7 @@ async function main() {
 //// [awaitUsingDeclarationsInFor.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInFor(target=es5).js
@@ -48,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js
@@ -18,7 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js
@@ -9,7 +9,7 @@ async function main() {
 //// [awaitUsingDeclarationsInForAwaitOf.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js
@@ -9,7 +9,7 @@ async function main() {
 //// [awaitUsingDeclarationsInForAwaitOf.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js
@@ -45,7 +45,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js
@@ -19,7 +19,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js
@@ -10,7 +10,7 @@ async function main() {
 //// [awaitUsingDeclarationsInForOf.1.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js
@@ -10,7 +10,7 @@ async function main() {
 //// [awaitUsingDeclarationsInForOf.1.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js
@@ -46,7 +46,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/usingDeclarations.1(target=es2015).js b/tests/baselines/reference/usingDeclarations.1(target=es2015).js
@@ -165,7 +165,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/usingDeclarations.1(target=es2017).js b/tests/baselines/reference/usingDeclarations.1(target=es2017).js
@@ -156,7 +156,7 @@ export {};
 //// [usingDeclarations.1.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/usingDeclarations.1(target=es2022).js b/tests/baselines/reference/usingDeclarations.1(target=es2022).js
@@ -156,7 +156,7 @@ export {};
 //// [usingDeclarations.1.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/usingDeclarations.1(target=es5).js b/tests/baselines/reference/usingDeclarations.1(target=es5).js
@@ -207,7 +207,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/usingDeclarations.11.js b/tests/baselines/reference/usingDeclarations.11.js
@@ -54,7 +54,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/usingDeclarations.12(usedefineforclassfields=false).js b/tests/baselines/reference/usingDeclarations.12(usedefineforclassfields=false).js
@@ -16,7 +16,7 @@ class C2 extends C1 {
 //// [usingDeclarations.12.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/usingDeclarations.12(usedefineforclassfields=true).js b/tests/baselines/reference/usingDeclarations.12(usedefineforclassfields=true).js
@@ -16,7 +16,7 @@ class C2 extends C1 {
 //// [usingDeclarations.12.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");

diff --git a/tests/baselines/reference/usingDeclarations.2(target=es2015).js b/tests/baselines/reference/usingDeclarations.2(target=es2015).js
@@ -10,7 +10,7 @@
 //// [usingDeclarations.2.js]
 var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
     if (value !== null && value !== void 0) {
-        if (typeof value !== "object") throw new TypeError("Object expected.");
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
         var dispose;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");