Address PR: remove __resolved when emit for commonJs and just do Promise.resolve().then(...)

Yui T · Yui T · commit d9e2033dfc7c · 2017-06-01T23:26:40.000-07:00
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -553,8 +553,8 @@ namespace ts {
             //     ...
             //     new Promise(function (_a, _b) { require([x], _a, _b); }); /*Amd Require*/
             // });
-            const resolve = createIdentifier("_a");
-            const reject = createIdentifier("_b");
+            const resolve = createUniqueName("resolve");
+            const reject = createUniqueName("reject")
             return createNew(
                 createIdentifier("Promise"),
                 /*typeArguments*/ undefined,
@@ -570,24 +570,21 @@ namespace ts {
                         createCall(
                             createIdentifier("require"),
                             /*typeArguments*/ undefined,
-                            [createArrayLiteral(node.arguments), resolve, reject]
+                            [createArrayLiteral([firstOrUndefined(node.arguments) || createOmittedExpression()]), resolve, reject]
                         ))])
             )]);
         }
 
     function transformImportCallExpressionCommonJS(node: ImportCall): Expression {
             // import("./blah")
             // emit as
-            // var __resolved = new Promise(function (resolve) { resolve(); });
-            //  ....
-            // __resolved.then(function () { return require(x); }) /*CommonJs Require*/
-
-            // Promise.resolve().then(() => require("./blah"));
+            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
             // We have to wrap require in then callback so that require is done in asynchronously
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
-            context.requestEmitHelper(dynamicImportCreateResolvedHelper);
             return createCall(
-                createPropertyAccess(createIdentifier("__resolved"), "then"),
+                createPropertyAccess(
+                    createCall(createPropertyAccess(createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []),
+                    "then"),
                 /*typeArguments*/ undefined,
                 [createFunctionExpression(
                     /*modifiers*/ undefined,
@@ -1609,14 +1606,6 @@ namespace ts {
         name: "typescript:dynamicimport-sync-require",
         scoped: true,
         text: `
-            var __syncRequire = typeof module === "object" && typeof module.exports === "object";
-            var __resolved = new Promise(function (resolve) { resolve(); });`
-    };
-
-    const dynamicImportCreateResolvedHelper: EmitHelper = {
-        name: "typescript:dynamicimport-create-resolved",
-        scoped: false,
-        priority: 1,
-        text: `var __resolved = new Promise(function (resolve) { resolve(); });`
+            var __syncRequire = typeof module === "object" && typeof module.exports === "object";`
     };
 }
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
@@ -50,7 +50,7 @@ namespace ts {
          * @param node The SourceFile node.
          */
         function transformSourceFile(node: SourceFile) {
-            if (node.isDeclarationFile || !(isExternalModule(node) || compilerOptions.isolatedModules || node.transformFlags & TransformFlags.ContainsDynamicImport)) {
+            if (node.isDeclarationFile || !(isEffectiveExternalModule(node, compilerOptions)|| node.transformFlags & TransformFlags.ContainsDynamicImport)) {
                 return node;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ namespace ts {`
`50`	`50`	`* @param node The SourceFile node.`
`51`	`51`	`*/`
`52`	`52`	`function transformSourceFile(node: SourceFile) {`
`53`		`- if (node.isDeclarationFile \|\| !(isExternalModule(node) \|\| compilerOptions.isolatedModules \|\| node.transformFlags & TransformFlags.ContainsDynamicImport)) {`
	`53`	`+ if (node.isDeclarationFile \|\| !(isEffectiveExternalModule(node, compilerOptions)\|\| node.transformFlags & TransformFlags.ContainsDynamicImport)) {`
`54`	`54`	`return node;`
`55`	`55`	`}`
`56`	`56`