Indirect calls for imported functions

microsoft · rbuckton · Jun 22, 2021 · Jun 17, 2021 · Jun 18, 2021 · Jun 17, 2021
commit f0a7f9939c2c0304a9d5b7f1900a512ac27303b0
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -2473,7 +2473,17 @@ namespace ts {
         }
 
         function emitCallExpression(node: CallExpression) {
+            const indirectCall = getEmitFlags(node) & EmitFlags.IndirectCall;
+            if (indirectCall) {
+                writePunctuation("(");
+                writeLiteral("0");
+                writePunctuation(",");
+                writeSpace();
+            }
             emitExpression(node.expression, parenthesizer.parenthesizeLeftSideOfAccess);
+            if (indirectCall) {
+                writePunctuation(")");
+            }
             emit(node.questionDotToken);
             emitTypeArguments(node, node.typeArguments);
             emitExpressionList(node, node.arguments, ListFormat.CallExpressionArguments, parenthesizer.parenthesizeExpressionForDisallowedComma);
@@ -2488,7 +2498,17 @@ namespace ts {
         }
 
         function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
+            const indirectCall = getEmitFlags(node) & EmitFlags.IndirectCall;
+            if (indirectCall) {
+                writePunctuation("(");
+                writeLiteral("0");
+                writePunctuation(",");
+                writeSpace();
+            }
             emitExpression(node.tag, parenthesizer.parenthesizeLeftSideOfAccess);
+            if (indirectCall) {
+                writePunctuation(")");
+            }
             emitTypeArguments(node, node.typeArguments);
             writeSpace();
             emitExpression(node.template);

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -33,6 +33,8 @@ namespace ts {
         const previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
+        context.enableSubstitution(SyntaxKind.CallExpression); // Substitute calls to imported/exported symbols to avoid incorrect `this`.
+        context.enableSubstitution(SyntaxKind.TaggedTemplateExpression); // Substitute calls to imported/exported symbols to avoid incorrect `this`.
         context.enableSubstitution(SyntaxKind.Identifier); // Substitutes expression identifiers with imported/exported symbols.
         context.enableSubstitution(SyntaxKind.BinaryExpression); // Substitutes assignments to exported symbols.
         context.enableSubstitution(SyntaxKind.PrefixUnaryExpression); // Substitutes updates to exported symbols.
@@ -47,6 +49,8 @@ namespace ts {
         let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file.
         let noSubstitution: boolean[]; // Set of nodes for which substitution rules should be ignored.
         let needUMDDynamicImportHelper: boolean;
+        const zeroLiteral = factory.createNumericLiteral(0);
+        setEmitFlags(zeroLiteral, EmitFlags.Immutable);
 
         return chainBundle(context, transformSourceFile);
 
@@ -1741,6 +1745,10 @@ namespace ts {
             switch (node.kind) {
                 case SyntaxKind.Identifier:
                     return substituteExpressionIdentifier(node as Identifier);
+                case SyntaxKind.CallExpression:
+                    return substituteCallExpression(node as CallExpression);
+                case SyntaxKind.TaggedTemplateExpression:
+                    return substituteTaggedTemplateExpression(node as TaggedTemplateExpression);
                 case SyntaxKind.BinaryExpression:
                     return substituteBinaryExpression(node as BinaryExpression);
                 case SyntaxKind.PostfixUnaryExpression:
@@ -1751,6 +1759,43 @@ namespace ts {
             return node;
         }
 
+        function substituteCallExpression(node: CallExpression) {
+            if (isIdentifier(node.expression)) {
+                const expression = substituteExpressionIdentifier(node.expression);
+                noSubstitution[getNodeId(expression)] = true;
+                if (!isIdentifier(expression)) {
+                    return addEmitFlags(
+                        factory.updateCallExpression(node,
+                            expression,
+                            /*typeArguments*/ undefined,
+                            node.arguments
+                        ),
+                        EmitFlags.IndirectCall
+                    );
+
+                }
+            }
+            return node;
+        }
+
+        function substituteTaggedTemplateExpression(node: TaggedTemplateExpression) {
+            if (isIdentifier(node.tag)) {
+                const tag = substituteExpressionIdentifier(node.tag);
+                noSubstitution[getNodeId(tag)] = true;
+                if (!isIdentifier(tag)) {
+                    return addEmitFlags(
+                        factory.updateTaggedTemplateExpression(node,
+                            tag,
+                            /*typeArguments*/ undefined,
+                            node.template
+                        ),
+                        EmitFlags.IndirectCall
+                    );
+                }
+            }
+            return node;
+        }
+
         /**
          * Substitution for an Identifier expression that may contain an imported or exported
          * symbol.

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -6728,6 +6728,7 @@ namespace ts {
         /*@internal*/ NeverApplyImportHelper = 1 << 26, // Indicates the node should never be wrapped with an import star helper (because, for example, it imports tslib itself)
         /*@internal*/ IgnoreSourceNewlines = 1 << 27,   // Overrides `printerOptions.preserveSourceNewlines` to print this node (and all descendants) with default whitespace.
         /*@internal*/ Immutable = 1 << 28,      // Indicates a node is a singleton intended to be reused in multiple locations. Any attempt to make further changes to the node will result in an error.
+        /*@internal*/ IndirectCall = 1 << 29,   // Emit CallExpression as an indirect call: `(0, f)()`
     }
 
     export interface EmitHelperBase {

diff --git a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.js b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.js
@@ -30,7 +30,7 @@ exports.__esModule = true;
 exports.a = void 0;
 var func_1 = require("./func");
 // hover on vextend
-exports.a = func_1.vextend({
+exports.a = (0, func_1.vextend)({
     watch: {
         data1: function (val) {
             this.data2 = 1;

diff --git a/tests/baselines/reference/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.js b/tests/baselines/reference/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.js
@@ -23,7 +23,7 @@ exports.__esModule = true;
 exports.__esModule = true;
 exports.A = void 0;
 var file1_1 = require("./file1");
-exports.A = file1_1.styled();
+exports.A = (0, file1_1.styled)();
 
 
 //// [color.d.ts]

diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js
@@ -37,9 +37,9 @@ foo(fileText);
 exports.__esModule = true;
 ///<reference path="declarations.d.ts" />
 var foobarbaz_1 = require("foobarbaz");
-foobarbaz_1.foo(foobarbaz_1.baz);
+(0, foobarbaz_1.foo)(foobarbaz_1.baz);
 var foosball_1 = require("foosball");
-foobarbaz_1.foo(foosball_1.foos);
+(0, foobarbaz_1.foo)(foosball_1.foos);
 // Works with relative file name
 var file_text_1 = require("./file!text");
-foobarbaz_1.foo(file_text_1["default"]);
+(0, foobarbaz_1.foo)(file_text_1["default"]);
diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js
@@ -20,4 +20,4 @@ exports.__esModule = true;
 var jquery_1 = require("jquery");
 var baz = require("fs");
 var boom = require("jquery");
-jquery_1["default"](jquery_1.bar, baz, boom);
+(0, jquery_1["default"])(jquery_1.bar, baz, boom);
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -49,4 +49,4 @@ exports.__esModule = true;
 var reExportX_1 = require("./reExportX");
 var $ = require("./reExportAll");
 // '$' is not callable, it is an object.
-reExportX_1.x($);
+(0, reExportX_1.x)($);
diff --git a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
@@ -72,7 +72,7 @@ define("Class", ["require", "exports", "Configurable"], function (require, expor
             return _super !== null && _super.apply(this, arguments) || this;
         }
         return ActualClass;
-    }(Configurable_1.Configurable(HiddenClass)));
+    }((0, Configurable_1.Configurable)(HiddenClass)));
     exports.ActualClass = ActualClass;
 });
 

diff --git a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
@@ -96,7 +96,7 @@ var __extends = (this && this.__extends) || (function () {
 exports.__esModule = true;
 exports.TimestampedUser = exports.User = void 0;
 var wrapClass_1 = require("./wrapClass");
-exports["default"] = wrapClass_1.wrapClass(0);
+exports["default"] = (0, wrapClass_1.wrapClass)(0);
 // Simple class
 var User = /** @class */ (function () {
     function User() {
@@ -112,7 +112,7 @@ var TimestampedUser = /** @class */ (function (_super) {
         return _super.call(this) || this;
     }
     return TimestampedUser;
-}(wrapClass_1.Timestamped(User)));
+}((0, wrapClass_1.Timestamped)(User)));
 exports.TimestampedUser = TimestampedUser;
 
 

diff --git a/tests/baselines/reference/callbackTagVariadicType.js b/tests/baselines/reference/callbackTagVariadicType.js
@@ -22,7 +22,7 @@ exports.x = void 0;
 /** @type {Foo} */
 var x = function () { return 1; };
 exports.x = x;
-var res = exports.x('a', 'b');
+var res = (0, exports.x)('a', 'b');
 
 
 //// [callbackTagVariadicType.d.ts]

diff --git a/...aselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=commonjs).js b/...aselines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsx,module=commonjs).js
@@ -25,7 +25,7 @@ var Component = /** @class */ (function () {
     function Component() {
     }
     Component.prototype.render = function () {
-        return _a.jsx("div", { children: null /* preserved */ }, void 0);
+        return (0, _a.jsx)("div", { children: null /* preserved */ }, void 0);
     };
     return Component;
 }());
diff --git a/...lines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=commonjs).js b/...lines/reference/commentsOnJSXExpressionsArePreserved(jsx=react-jsxdev,module=commonjs).js
@@ -26,7 +26,7 @@ var Component = /** @class */ (function () {
     function Component() {
     }
     Component.prototype.render = function () {
-        return _a.jsxDEV("div", { children: null /* preserved */ }, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 15 }, this);
+        return (0, _a.jsxDEV)("div", { children: null /* preserved */ }, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 15 }, this);
     };
     return Component;
 }());
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
@@ -19,7 +19,7 @@ exports.Foo = Foo;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var _10_lib_1 = require("./10_lib");
-_10_lib_1.Foo();
+(0, _10_lib_1.Foo)();
 
 
 //// [10_lib.d.ts]

diff --git a/tests/baselines/reference/declarationEmitCommonJsModuleReferencedType.js b/tests/baselines/reference/declarationEmitCommonJsModuleReferencedType.js
@@ -30,5 +30,5 @@ exports.__esModule = true;
 exports.y = exports.x = void 0;
 var foo_1 = require("foo");
 var root_1 = require("root");
-exports.x = foo_1.foo();
-exports.y = root_1.bar();
+exports.x = (0, foo_1.foo)();
+exports.y = (0, root_1.bar)();
diff --git a/tests/baselines/reference/declarationEmitExpandoPropertyPrivateName.js b/tests/baselines/reference/declarationEmitExpandoPropertyPrivateName.js
@@ -23,7 +23,7 @@ exports.q = void 0;
 var a_1 = require("./a");
 function q() { }
 exports.q = q;
-q.val = a_1.f();
+q.val = (0, a_1.f)();
 
 
 //// [a.d.ts]

diff --git a/tests/baselines/reference/declarationEmitExpandoWithGenericConstraint.js b/tests/baselines/reference/declarationEmitExpandoWithGenericConstraint.js
@@ -22,7 +22,7 @@ var Point = function (x, y) { return ({ x: x, y: y }); };
 exports.Point = Point;
 var Rect = function (a, b) { return ({ a: a, b: b }); };
 exports.Rect = Rect;
-exports.Point.zero = function () { return exports.Point(0, 0); };
+exports.Point.zero = function () { return (0, exports.Point)(0, 0); };
 
 
 //// [declarationEmitExpandoWithGenericConstraint.d.ts]

diff --git a/.../baselines/reference/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.js b/.../baselines/reference/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.js
@@ -53,7 +53,7 @@ var get_comp_1 = require("./get-comp");
 // this shouldn't need any triple-slash references - it should have a direct import to `react` and that's it
 // This issue (#35343) _only_ reproduces in the test harness when the file in question is in a subfolder
 exports.obj = {
-    comp: get_comp_1.getComp()
+    comp: (0, get_comp_1.getComp)()
 };
 //// [some-other-file.js]
 "use strict";

diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.bar = void 0;
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return utils_1.bar; } });
-utils_1.foo();
+(0, utils_1.foo)();
 var obj;
 
 

diff --git a/tests/baselines/reference/declarationEmitForGlobalishSpecifierSymlink.js b/tests/baselines/reference/declarationEmitForGlobalishSpecifierSymlink.js
@@ -39,7 +39,7 @@ export const a: import("typescript-fsa").A;
 exports.__esModule = true;
 exports.a = void 0;
 var typescript_fsa_1 = require("typescript-fsa");
-exports.a = typescript_fsa_1.getA();
+exports.a = (0, typescript_fsa_1.getA)();
 
 
 //// [index.d.ts]

diff --git a/tests/baselines/reference/declarationEmitForGlobalishSpecifierSymlink2.js b/tests/baselines/reference/declarationEmitForGlobalishSpecifierSymlink2.js
@@ -27,7 +27,7 @@ export const a: import("typescript-fsa").A;
 exports.__esModule = true;
 exports.a = void 0;
 var typescript_fsa_1 = require("typescript-fsa");
-exports.a = typescript_fsa_1.getA();
+exports.a = (0, typescript_fsa_1.getA)();
 
 
 //// [index.d.ts]

diff --git a/...s/baselines/reference/declarationEmitForModuleImportingModuleAugmentationRetainsImport.js b/...s/baselines/reference/declarationEmitForModuleImportingModuleAugmentationRetainsImport.js
@@ -31,7 +31,7 @@ var ParentThing = /** @class */ (function () {
     return ParentThing;
 }());
 exports.ParentThing = ParentThing;
-child1_1.child1(ParentThing.prototype);
+(0, child1_1.child1)(ParentThing.prototype);
 //// [child1.js]
 "use strict";
 exports.__esModule = true;

diff --git a/tests/baselines/reference/declarationEmitForTypesWhichNeedImportTypes.js b/tests/baselines/reference/declarationEmitForTypesWhichNeedImportTypes.js
@@ -25,7 +25,7 @@ exports.createNamed = createNamed;
 exports.__esModule = true;
 exports.Value = void 0;
 var b_1 = require("./b");
-exports.Value = b_1.createNamed();
+exports.Value = (0, b_1.createNamed)();
 
 
 //// [b.d.ts]

diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo.js b/tests/baselines/reference/declarationEmitPathMappingMonorepo.js
@@ -21,7 +21,7 @@ exports.__esModule = true;
 exports.b = void 0;
 var a_1 = require("@ts-bug/a");
 function b(text) {
-    return a_1.a(text);
+    return (0, a_1.a)(text);
 }
 exports.b = b;
 

diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo2.js b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.js
@@ -33,7 +33,7 @@ export default createSvgIcon("Hello", "ArrowLeft");
 "use strict";
 exports.__esModule = true;
 var utils_1 = require("@ts-bug/core/utils");
-exports["default"] = utils_1.createSvgIcon("Hello", "ArrowLeft");
+exports["default"] = (0, utils_1.createSvgIcon)("Hello", "ArrowLeft");
 
 
 //// [index.d.ts]

diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.js b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.js
@@ -33,7 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var scalar_1 = require("../lib/operators/scalar");
 exports.default = {
     get xs() {
-        return scalar_1.scalar("14px");
+        return (0, scalar_1.scalar)("14px");
     }
 };
 

diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.js b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.js
@@ -34,7 +34,7 @@ define("settings/spacing", ["require", "exports", "lib/operators/scalar"], funct
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = {
         get xs() {
-            return scalar_1.scalar("14px");
+            return (0, scalar_1.scalar)("14px");
         }
     };
 });

diff --git a/tests/baselines/reference/declarationEmitQualifiedAliasTypeArgument.js b/tests/baselines/reference/declarationEmitQualifiedAliasTypeArgument.js
@@ -32,8 +32,8 @@ export const fun2 = create<Q>();
 exports.__esModule = true;
 exports.fun2 = exports.fun = void 0;
 var bbb_1 = require("./bbb");
-exports.fun = bbb_1.create();
-exports.fun2 = bbb_1.create();
+exports.fun = (0, bbb_1.create)();
+exports.fun2 = (0, bbb_1.create)();
 
 
 //// [index.d.ts]

diff --git a/tests/baselines/reference/declarationEmitReadonlyComputedProperty.js b/tests/baselines/reference/declarationEmitReadonlyComputedProperty.js
@@ -48,7 +48,7 @@ var __assign = (this && this.__assign) || function () {
 exports.__esModule = true;
 exports.spread = void 0;
 var bug_1 = require("./bug");
-exports.spread = __assign({}, bug_1.createInstance());
+exports.spread = __assign({}, (0, bug_1.createInstance)());
 
 
 //// [bug.d.ts]

diff --git a/tests/baselines/reference/declarationEmitSymlinkPaths.js b/tests/baselines/reference/declarationEmitSymlinkPaths.js
@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationScenario = void 0;
 var index_1 = require("search/lib/index");
 var NotificationAPIUtils_1 = require("../API/NotificationAPIUtils");
-exports.NotificationScenario = index_1.test(NotificationAPIUtils_1.getNotification);
+exports.NotificationScenario = (0, index_1.test)(NotificationAPIUtils_1.getNotification);
 
 
 //// [NotificationAPIUtils.d.ts]

diff --git a/tests/baselines/reference/declarationsForInferredTypeFromOtherFile.js b/tests/baselines/reference/declarationsForInferredTypeFromOtherFile.js
@@ -37,7 +37,7 @@ exports.__esModule = true;
 exports.bar = void 0;
 var file2_1 = require("./file2");
 function bar() {
-    return file2_1.foo();
+    return (0, file2_1.foo)();
 }
 exports.bar = bar;
 

diff --git a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
@@ -75,12 +75,12 @@ var testRecFun = function (parent) {
     return {
         result: parent,
         deeper: function (child) {
-            return exports.testRecFun(__assign(__assign({}, parent), child));
+            return (0, exports.testRecFun)(__assign(__assign({}, parent), child));
         }
     };
 };
 exports.testRecFun = testRecFun;
-var p1 = exports.testRecFun({ one: '1' });
+var p1 = (0, exports.testRecFun)({ one: '1' });
 void p1.result.one;
 var p2 = p1.deeper({ two: '2' });
 void p2.result.one;