Add allowJs and declaration emit enabled tests

microsoft · weswigham · Sep 24, 2021 · Jun 8, 2021 · Jun 8, 2021 · Jul 12, 2021
commit 34812f09ba623ed1ee14a779f6da697de2d19e69
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7142,6 +7142,28 @@ namespace ts {
                     ), symbol.declarations && filter(symbol.declarations, d => isClassDeclaration(d) || isClassExpression(d))[0]), modifierFlags);
                 }
 
+                function getSomeTargetNameFromDeclarations(declarations: Declaration[] | undefined) {
+                    return firstDefined(declarations, d => {
+                        if (isImportSpecifier(d) || isExportSpecifier(d)) {
+                            return idText(d.propertyName || d.name);
+                        }
+                        if (isBinaryExpression(d) || isExportAssignment(d)) {
+                            const expression = isExportAssignment(d) ? d.expression : d.right;
+                            if (isPropertyAccessExpression(expression)) {
+                                return idText(expression.name);
+                            }
+                        }
+                        if (isAliasSymbolDeclaration(d)) {
+                            // This is... heuristic, at best. But it's probably better than always printing the name of the shorthand ambient module.
+                            const name = getNameOfDeclaration(d);
+                            if (name && isIdentifier(name)) {
+                                return idText(name);
+                            }
+                        }
+                        return undefined;
+                    });
+                }
+
                 function serializeAsAlias(symbol: Symbol, localName: string, modifierFlags: ModifierFlags) {
                     // synthesize an alias, eg `export { symbolName as Name }`
                     // need to mark the alias `symbol` points at
@@ -7152,7 +7174,9 @@ namespace ts {
                     if (!target) {
                         return;
                     }
-                    let verbatimTargetName = unescapeLeadingUnderscores(target.escapedName);
+                    // If `target` refers to a shorthand module symbol, the name we're trying to pull out isn;t recoverable from the target symbol
+                    // In such a scenario, we must fall back to looking for an alias declaration on `symbol` and pulling the target name from that
+                    let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
                     if (verbatimTargetName === InternalSymbolName.ExportEquals && (getESModuleInterop(compilerOptions) || compilerOptions.allowSyntheticDefaultImports)) {
                         // target refers to an `export=` symbol that was hoisted into a synthetic default - rename here to match
                         verbatimTargetName = InternalSymbolName.Default;

diff --git a/tests/baselines/reference/nodeModules1(module=node12).js b/tests/baselines/reference/nodeModules1(module=node12).js
@@ -56,3 +56,17 @@ export { x };
 // esm format file
 const x = 1;
 export { x };
+
+
+//// [index.d.ts]
+declare const x = 1;
+export { x };
+//// [index.d.ts]
+declare const x = 1;
+export { x };
+//// [index.d.ts]
+declare const x = 1;
+export { x };
+//// [index.d.ts]
+declare const x = 1;
+export { x };
diff --git a/tests/baselines/reference/nodeModules1(module=nodenext).js b/tests/baselines/reference/nodeModules1(module=nodenext).js
@@ -56,3 +56,17 @@ export { x };
 // esm format file
 const x = 1;
 export { x };
+
+
+//// [index.d.ts]
+declare const x = 1;
+export { x };
+//// [index.d.ts]
+declare const x = 1;
+export { x };
+//// [index.d.ts]
+declare const x = 1;
+export { x };
+//// [index.d.ts]
+declare const x = 1;
+export { x };
diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=node12).js b/tests/baselines/reference/nodeModulesAllowJs1(module=node12).js
@@ -0,0 +1,68 @@
+//// [tests/cases/conformance/node/allowJs/nodeModulesAllowJs1.ts] ////
+
+//// [index.js]
+// cjs format file
+const x = 1;
+export {x};
+//// [index.js]
+// cjs format file
+const x = 1;
+export {x};
+//// [index.js]
+// esm format file
+const x = 1;
+export {x};
+//// [index.js]
+// esm format file
+const x = 1;
+export {x};
+//// [package.json]
+{
+    "name": "package",
+    "private": true,
+    "type": "module"
+}
+//// [package.json]
+{
+    "type": "commonjs"
+}
+//// [package.json]
+{
+}
+//// [package.json]
+{
+    "type": "module"
+}
+
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
+// cjs format file
+const x = 1;
+exports.x = x;
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
+// cjs format file
+const x = 1;
+exports.x = x;
+//// [index.js]
+// esm format file
+const x = 1;
+export { x };
+//// [index.js]
+// esm format file
+const x = 1;
+export { x };
+
+
+//// [index.d.ts]
+export const x: 1;
+//// [index.d.ts]
+export const x: 1;
+//// [index.d.ts]
+export const x: 1;
+//// [index.d.ts]
+export const x: 1;
diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=node12).symbols b/tests/baselines/reference/nodeModulesAllowJs1(module=node12).symbols
@@ -0,0 +1,32 @@
+=== tests/cases/conformance/node/allowJs/subfolder/index.js ===
+// cjs format file
+const x = 1;
+>x : Symbol(x, Decl(index.js, 1, 5))
+
+export {x};
+>x : Symbol(x, Decl(index.js, 2, 8))
+
+=== tests/cases/conformance/node/allowJs/subfolder2/index.js ===
+// cjs format file
+const x = 1;
+>x : Symbol(x, Decl(index.js, 1, 5))
+
+export {x};
+>x : Symbol(x, Decl(index.js, 2, 8))
+
+=== tests/cases/conformance/node/allowJs/subfolder2/another/index.js ===
+// esm format file
+const x = 1;
+>x : Symbol(x, Decl(index.js, 1, 5))
+
+export {x};
+>x : Symbol(x, Decl(index.js, 2, 8))
+
+=== tests/cases/conformance/node/allowJs/index.js ===
+// esm format file
+const x = 1;
+>x : Symbol(x, Decl(index.js, 1, 5))
+
+export {x};
+>x : Symbol(x, Decl(index.js, 2, 8))
+
diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=node12).types b/tests/baselines/reference/nodeModulesAllowJs1(module=node12).types
@@ -0,0 +1,36 @@
+=== tests/cases/conformance/node/allowJs/subfolder/index.js ===
+// cjs format file
+const x = 1;
+>x : 1
+>1 : 1
+
+export {x};
+>x : 1
+
+=== tests/cases/conformance/node/allowJs/subfolder2/index.js ===
+// cjs format file
+const x = 1;
+>x : 1
+>1 : 1
+
+export {x};
+>x : 1
+
+=== tests/cases/conformance/node/allowJs/subfolder2/another/index.js ===
+// esm format file
+const x = 1;
+>x : 1
+>1 : 1
+
+export {x};
+>x : 1
+
+=== tests/cases/conformance/node/allowJs/index.js ===
+// esm format file
+const x = 1;
+>x : 1
+>1 : 1
+
+export {x};
+>x : 1
+
diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).js b/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).js
@@ -0,0 +1,68 @@
+//// [tests/cases/conformance/node/allowJs/nodeModulesAllowJs1.ts] ////
+
+//// [index.js]
+// cjs format file
+const x = 1;
+export {x};
+//// [index.js]
+// cjs format file
+const x = 1;
+export {x};
+//// [index.js]
+// esm format file
+const x = 1;
+export {x};
+//// [index.js]
+// esm format file
+const x = 1;
+export {x};
+//// [package.json]
+{
+    "name": "package",
+    "private": true,
+    "type": "module"
+}
+//// [package.json]
+{
+    "type": "commonjs"
+}
+//// [package.json]
+{
+}
+//// [package.json]
+{
+    "type": "module"
+}
+
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
+// cjs format file
+const x = 1;
+exports.x = x;
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
+// cjs format file
+const x = 1;
+exports.x = x;
+//// [index.js]
+// esm format file
+const x = 1;
+export { x };
+//// [index.js]
+// esm format file
+const x = 1;
+export { x };
+
+
+//// [index.d.ts]
+export const x: 1;
+//// [index.d.ts]
+export const x: 1;
+//// [index.d.ts]
+export const x: 1;
+//// [index.d.ts]
+export const x: 1;
diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).symbols b/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).symbols
@@ -0,0 +1,32 @@
+=== tests/cases/conformance/node/allowJs/subfolder/index.js ===
+// cjs format file
+const x = 1;
+>x : Symbol(x, Decl(index.js, 1, 5))
+
+export {x};
+>x : Symbol(x, Decl(index.js, 2, 8))
+
+=== tests/cases/conformance/node/allowJs/subfolder2/index.js ===
+// cjs format file
+const x = 1;
+>x : Symbol(x, Decl(index.js, 1, 5))
+
+export {x};
+>x : Symbol(x, Decl(index.js, 2, 8))
+
+=== tests/cases/conformance/node/allowJs/subfolder2/another/index.js ===
+// esm format file
+const x = 1;
+>x : Symbol(x, Decl(index.js, 1, 5))
+
+export {x};
+>x : Symbol(x, Decl(index.js, 2, 8))
+
+=== tests/cases/conformance/node/allowJs/index.js ===
+// esm format file
+const x = 1;
+>x : Symbol(x, Decl(index.js, 1, 5))
+
+export {x};
+>x : Symbol(x, Decl(index.js, 2, 8))
+
diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).types b/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).types
@@ -0,0 +1,36 @@
+=== tests/cases/conformance/node/allowJs/subfolder/index.js ===
+// cjs format file
+const x = 1;
+>x : 1
+>1 : 1
+
+export {x};
+>x : 1
+
+=== tests/cases/conformance/node/allowJs/subfolder2/index.js ===
+// cjs format file
+const x = 1;
+>x : 1
+>1 : 1
+
+export {x};
+>x : 1
+
+=== tests/cases/conformance/node/allowJs/subfolder2/another/index.js ===
+// esm format file
+const x = 1;
+>x : 1
+>1 : 1
+
+export {x};
+>x : 1
+
+=== tests/cases/conformance/node/allowJs/index.js ===
+// esm format file
+const x = 1;
+>x : 1
+>1 : 1
+
+export {x};
+>x : 1
+
diff --git a/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=node12).js b/tests/baselines/reference/nodeModulesAllowJsDynamicImport(module=node12).js
@@ -0,0 +1,45 @@
+//// [tests/cases/conformance/node/allowJs/nodeModulesAllowJsDynamicImport.ts] ////
+
+//// [index.js]
+// cjs format file
+export async function main() {
+    const { readFile } = await import("fs");
+}
+//// [index.js]
+// esm format file
+export async function main() {
+    const { readFile } = await import("fs");
+}
+//// [package.json]
+{
+    "name": "package",
+    "private": true,
+    "type": "module"
+}
+//// [package.json]
+{
+    "type": "commonjs"
+}
+//// [types.d.ts]
+declare module "fs";
+
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = void 0;
+// cjs format file
+async function main() {
+    const { readFile } = await import("fs");
+}
+exports.main = main;
+//// [index.js]
+// esm format file
+export async function main() {
+    const { readFile } = await import("fs");
+}
+
+
+//// [index.d.ts]
+export function main(): Promise<void>;
+//// [index.d.ts]
+export function main(): Promise<void>;