Fix shouldEmitImportEqualsDeclaration

Author: jakebailey

internal/transformers/tstransforms/importelision.go

@@ -124,16 +124,10 @@ func (tx *ImportElisionTransformer) shouldEmitAliasDeclaration(node *ast.Node) b
 }
 
 func (tx *ImportElisionTransformer) shouldEmitImportEqualsDeclaration(node *ast.ImportEqualsDeclaration) bool {
-	if !tx.shouldEmitAliasDeclaration(node.AsNode()) {
-		return false
-	}
-	if node.ModuleReference.Kind == ast.KindExternalModuleReference {
-		return true
-	}
 	// preserve old compiler's behavior: emit import declaration (even if we do not consider them referenced) when
 	// - current file is not external module
 	// - import declaration is top level and target is value imported by entity name
-	return tx.currentSourceFile != nil && ast.IsExternalModule(tx.currentSourceFile) && tx.isTopLevelValueImportEqualsWithEntityName(node.AsNode())
+	return tx.shouldEmitAliasDeclaration(node.AsNode()) || (!ast.IsExternalModule(tx.currentSourceFile) && tx.isTopLevelValueImportEqualsWithEntityName(node.AsNode()))
 }
 
 func (tx *ImportElisionTransformer) isReferencedAliasDeclaration(node *ast.Node) bool {

testdata/baselines/reference/submodule/compiler/aliasBug.js

@@ -37,6 +37,7 @@ var foo;
         })(baz = bar.baz || (bar.baz = {}));
     })(bar = foo.bar || (foo.bar = {}));
 })(foo || (foo = {}));
+var provide = foo;
 var p = new provide.Provide();
 function use() {
     var p1; // error here, but should be okay

testdata/baselines/reference/submodule/compiler/aliasBug.js.diff

@@ -1,10 +1,9 @@
 --- old.aliasBug.js
 +++ new.aliasBug.js
-@@= skipped -36, +36 lines =@@
-         })(baz = bar.baz || (bar.baz = {}));
+@@= skipped -37, +37 lines =@@
      })(bar = foo.bar || (foo.bar = {}));
  })(foo || (foo = {}));
--var provide = foo;
+ var provide = foo;
 -var booz = foo.bar.baz;
  var p = new provide.Provide();
  function use() {

testdata/baselines/reference/submodule/compiler/aliasErrors.js

@@ -48,6 +48,8 @@ var foo;
         })(baz = bar.baz || (bar.baz = {}));
     })(bar = foo.bar || (foo.bar = {}));
 })(foo || (foo = {}));
+var provide = foo;
+var beez = foo.bar;
 5;
 "s";
 null;

testdata/baselines/reference/submodule/compiler/aliasErrors.js.diff

@@ -1,12 +1,11 @@
 --- old.aliasErrors.js
 +++ new.aliasErrors.js
-@@= skipped -47, +47 lines =@@
-         })(baz = bar.baz || (bar.baz = {}));
+@@= skipped -48, +48 lines =@@
      })(bar = foo.bar || (foo.bar = {}));
  })(foo || (foo = {}));
--var provide = foo;
+ var provide = foo;
 -var booz = foo.bar.baz;
--var beez = foo.bar;
+ var beez = foo.bar;
 -var m = no;
 -var m2 = no.mod;
  5;

testdata/baselines/reference/submodule/compiler/chainedImportAlias.js

@@ -24,4 +24,5 @@ var m;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const x = require("./chainedImportAlias_file0");
+var y = x;
 y.m.foo();

testdata/baselines/reference/submodule/compiler/chainedImportAlias.js.diff

@@ -5,6 +5,6 @@
  "use strict";
  Object.defineProperty(exports, "__esModule", { value: true });
 -var x = require("./chainedImportAlias_file0");
--var y = x;
 +const x = require("./chainedImportAlias_file0");
+ var y = x;
  y.m.foo();

testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js

@@ -31,6 +31,8 @@ var mOfGloalFile;
     }
     mOfGloalFile.c = c;
 })(mOfGloalFile || (mOfGloalFile = {}));
+var exports = mOfGloalFile.c;
+var require = mOfGloalFile.c;
 new exports();
 new require();
 var m1;

testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js.diff

@@ -192,6 +192,8 @@ var A2;
         })(C = B.C || (B.C = {}));
     })(B = A2.B || (A2.B = {}));
 })(A2 || (A2 = {}));
+var I1 = A1.B;
+var I2 = A2.B;
 function foo0(e) {
     if (e === 1 /* I.V1 */) {
     }