Bind module.export = {Thing} with alias symbols

Author: weswigham

src/compiler/binder.ts

@@ -2833,6 +2833,11 @@ namespace ts {
                 return;
             }
 
+            if (isObjectLiteralExpression(assignedExpression) && every(assignedExpression.properties, isShorthandPropertyAssignment)) {
+                forEach(assignedExpression.properties, bindExportAssignedObjectMemberAlias);
+                return;
+            }
+
             // 'module.exports = expr' assignment
             const flags = exportAssignmentIsAlias(node)
                 ? SymbolFlags.Alias // An export= with an EntityNameExpression or a ClassExpression exports all meanings of that identifier or class
@@ -2841,6 +2846,10 @@ namespace ts {
             setValueDeclaration(symbol, node);
         }
 
+        function bindExportAssignedObjectMemberAlias(node: ShorthandPropertyAssignment) {
+            declareSymbol(file.symbol.exports!, file.symbol, node, SymbolFlags.Alias | SymbolFlags.Assignment, SymbolFlags.None);
+        }
+
         function bindThisPropertyAssignment(node: BindablePropertyAssignmentExpression | PropertyAccessExpression | LiteralLikeElementAccessExpression) {
             Debug.assert(isInJSFile(node));
             // private identifiers *must* be declared (even in JS files)

src/compiler/checker.ts

@@ -6807,21 +6807,17 @@ namespace ts {
                                 ), ModifierFlags.None);
                                 break;
                             }
-                            // At present, the below case should be entirely unhit, as, generally speaking, the below case is *usually* bound
-                            // such that the `BinaryExpression` is the declaration rather than the specific, nested binding element
-                            // (because we don't seek to emit an alias in these forms yet). As such, the `BinaryExpression` switch case
-                            // will be what actually handles this form. _However_, in anticipation of binding the below with proper
-                            // alias symbols, I'm _pretty comfortable_ including the case here, even though it is not yet live.
+                            // We don't know how to serialize this (nested?) binding element
+                            Debug.failBadSyntaxKind(node.parent?.parent || node, "Unhandled binding element grandparent kind in declaration serialization");
+                            break;
+                        case SyntaxKind.ShorthandPropertyAssignment:
                             if (node.parent?.parent?.kind === SyntaxKind.BinaryExpression) {
                                 // module.exports = { SomeClass }
                                 serializeExportSpecifier(
                                     unescapeLeadingUnderscores(symbol.escapedName),
                                     targetName
                                 );
-                                break;
                             }
-                            // We don't know how to serialize this (nested?) binding element
-                            Debug.failBadSyntaxKind(node.parent?.parent || node, "Unhandled binding element grandparent kind in declaration serialization");
                             break;
                         case SyntaxKind.VariableDeclaration:
                             // commonjs require: const x = require('y')

tests/baselines/reference/findAllRefsCommonJsRequire3.baseline.jsonc

@@ -13,7 +13,7 @@
       "containerName": "",
       "fileName": "/b.js",
       "kind": "alias",
-      "name": "(alias) (property) f: () => void\nimport f",
+      "name": "(alias) function f(): void\nimport f",
       "textSpan": {
         "start": 8,
         "length": 1
@@ -36,16 +36,8 @@
           "kind": "space"
         },
         {
-          "text": "(",
-          "kind": "punctuation"
-        },
-        {
-          "text": "property",
-          "kind": "text"
-        },
-        {
-          "text": ")",
-          "kind": "punctuation"
+          "text": "function",
+          "kind": "keyword"
         },
         {
           "text": " ",
@@ -55,14 +47,6 @@
           "text": "f",
           "kind": "aliasName"
         },
-        {
-          "text": ":",
-          "kind": "punctuation"
-        },
-        {
-          "text": " ",
-          "kind": "space"
-        },
         {
           "text": "(",
           "kind": "punctuation"
@@ -72,11 +56,7 @@
           "kind": "punctuation"
         },
         {
-          "text": " ",
-          "kind": "space"
-        },
-        {
-          "text": "=>",
+          "text": ":",
           "kind": "punctuation"
         },
         {

tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js

@@ -17,6 +17,6 @@ module.exports = { Thing }
 export class Thing {
 }
 //// [reexport.d.ts]
+export { Thing };
 import Thing_1 = require("./thing");
 import Thing = Thing_1.Thing;
-export { Thing };

tests/baselines/reference/jsDeclarationsCommonjsRelativePath.symbols

@@ -9,8 +9,8 @@ const Thing = require('./thing').Thing
 
 module.exports = { Thing }
 >module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/reexport", Decl(reexport.js, 0, 0))
->module : Symbol(export=, Decl(reexport.js, 1, 38))
->exports : Symbol(export=, Decl(reexport.js, 1, 38))
+>module : Symbol(module, Decl(reexport.js, 1, 38))
+>exports : Symbol("tests/cases/conformance/jsdoc/declarations/reexport", Decl(reexport.js, 0, 0))
 >Thing : Symbol(Thing, Decl(reexport.js, 2, 18))
 
 === tests/cases/conformance/jsdoc/declarations/thing.js ===
@@ -20,7 +20,7 @@ class Thing {}
 
 module.exports = { Thing }
 >module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/thing", Decl(thing.js, 0, 0))
->module : Symbol(export=, Decl(thing.js, 1, 14))
->exports : Symbol(export=, Decl(thing.js, 1, 14))
+>module : Symbol(module, Decl(thing.js, 1, 14))
+>exports : Symbol("tests/cases/conformance/jsdoc/declarations/thing", Decl(thing.js, 0, 0))
 >Thing : Symbol(Thing, Decl(thing.js, 2, 18))
 

tests/baselines/reference/jsDeclarationsCommonjsRelativePath.types

@@ -5,16 +5,16 @@
 const Thing = require('./thing').Thing
 >Thing : typeof Thing
 >require('./thing').Thing : typeof Thing
->require('./thing') : { Thing: typeof Thing; }
+>require('./thing') : typeof import("tests/cases/conformance/jsdoc/declarations/thing")
 >require : any
 >'./thing' : "./thing"
 >Thing : typeof Thing
 
 module.exports = { Thing }
->module.exports = { Thing } : { Thing: typeof Thing; }
->module.exports : { Thing: typeof Thing; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/reexport\"": { Thing: typeof Thing; }; }
->exports : { Thing: typeof Thing; }
+>module.exports = { Thing } : typeof import("tests/cases/conformance/jsdoc/declarations/reexport")
+>module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/reexport")
+>module : { "\"tests/cases/conformance/jsdoc/declarations/reexport\"": typeof import("tests/cases/conformance/jsdoc/declarations/reexport"); }
+>exports : typeof import("tests/cases/conformance/jsdoc/declarations/reexport")
 >{ Thing } : { Thing: typeof Thing; }
 >Thing : typeof Thing
 
@@ -26,10 +26,10 @@ class Thing {}
 >Thing : Thing
 
 module.exports = { Thing }
->module.exports = { Thing } : { Thing: typeof Thing; }
->module.exports : { Thing: typeof Thing; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/thing\"": { Thing: typeof Thing; }; }
->exports : { Thing: typeof Thing; }
+>module.exports = { Thing } : typeof import("tests/cases/conformance/jsdoc/declarations/thing")
+>module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/thing")
+>module : { "\"tests/cases/conformance/jsdoc/declarations/thing\"": typeof import("tests/cases/conformance/jsdoc/declarations/thing"); }
+>exports : typeof import("tests/cases/conformance/jsdoc/declarations/thing")
 >{ Thing } : { Thing: typeof Thing; }
 >Thing : typeof Thing
 

tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.symbols

@@ -20,8 +20,8 @@ function b() {
 
 module.exports = {x, b}
 >module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/index1", Decl(index1.js, 0, 0))
->module : Symbol(export=, Decl(index1.js, 12, 1))
->exports : Symbol(export=, Decl(index1.js, 12, 1))
+>module : Symbol(module, Decl(index1.js, 12, 1))
+>exports : Symbol("tests/cases/conformance/jsdoc/declarations/index1", Decl(index1.js, 0, 0))
 >x : Symbol(x, Decl(index1.js, 14, 18))
 >b : Symbol(b, Decl(index1.js, 14, 20))
 

tests/baselines/reference/jsDeclarationsDocCommentsOnConsts.types

@@ -23,10 +23,10 @@ function b() {
 }
 
 module.exports = {x, b}
->module.exports = {x, b} : { x: (a: any) => string; b: () => number; }
->module.exports : { x: (a: any) => string; b: () => number; }
->module : { "\"tests/cases/conformance/jsdoc/declarations/index1\"": { x: (a: any) => string; b: () => number; }; }
->exports : { x: (a: any) => string; b: () => number; }
+>module.exports = {x, b} : typeof import("tests/cases/conformance/jsdoc/declarations/index1")
+>module.exports : typeof import("tests/cases/conformance/jsdoc/declarations/index1")
+>module : { "\"tests/cases/conformance/jsdoc/declarations/index1\"": typeof import("tests/cases/conformance/jsdoc/declarations/index1"); }
+>exports : typeof import("tests/cases/conformance/jsdoc/declarations/index1")
 >{x, b} : { x: (a: any) => string; b: () => number; }
 >x : (a: any) => string
 >b : () => number

tests/baselines/reference/jsDeclarationsExportForms.js

@@ -176,8 +176,8 @@ import * as ns from "./cls";
 export { ns as classContainer };
 import * as ns from "./cls";
 //// [cjs.d.ts]
-import ns = require("./cls");
 export { ns };
+import ns = require("./cls");
 //// [cjs2.d.ts]
 export = ns;
 import ns = require("./cls");

tests/baselines/reference/jsDeclarationsExportForms.symbols

@@ -50,8 +50,8 @@ const ns = require("./cls");
 
 module.exports = { ns };
 >module.exports : Symbol("tests/cases/conformance/jsdoc/declarations/cjs", Decl(cjs.js, 0, 0))
->module : Symbol(export=, Decl(cjs.js, 0, 28))
->exports : Symbol(export=, Decl(cjs.js, 0, 28))
+>module : Symbol(module, Decl(cjs.js, 0, 28))
+>exports : Symbol("tests/cases/conformance/jsdoc/declarations/cjs", Decl(cjs.js, 0, 0))
 >ns : Symbol(ns, Decl(cjs.js, 1, 18))
 
 === tests/cases/conformance/jsdoc/declarations/cjs2.js ===