Fixed crash when transforming modules with top-level if statements incorrectly containining export statements (#59375)

Andarist · web-flow · commit 09e47d0638c4 · 2024-07-22T15:59:12.000-07:00
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -1019,7 +1019,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile
         return factory.updateIfStatement(
             node,
             visitNode(node.expression, visitor, isExpression),
-            Debug.checkDefined(visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock)),
+            visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock) ?? factory.createBlock([]),
             visitNode(node.elseStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock),
         );
     }
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
@@ -1445,7 +1445,7 @@ export function transformSystemModule(context: TransformationContext): (x: Sourc
         return factory.updateIfStatement(
             node,
             visitNode(node.expression, visitor, isExpression),
-            Debug.checkDefined(visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock)),
+            visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock) ?? factory.createBlock([]),
             visitNode(node.elseStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock),
         );
     }
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=commonjs).errors.txt b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=commonjs).errors.txt
@@ -0,0 +1,18 @@
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,1): error TS1184: Modifiers cannot appear here.
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,14): error TS1155: 'const' declarations must be initialized.
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,26): error TS2304: Cannot find name 'CssExports'.
+
+
+==== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts (3 errors) ====
+    // https://github.com/microsoft/TypeScript/issues/59373
+    
+    if (true)
+    export const cssExports: CssExports;
+    ~~~~~~
+!!! error TS1184: Modifiers cannot appear here.
+                 ~~~~~~~~~~
+!!! error TS1155: 'const' declarations must be initialized.
+                             ~~~~~~~~~~
+!!! error TS2304: Cannot find name 'CssExports'.
+    export default cssExports;
+    
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=commonjs).js b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=commonjs).js
@@ -0,0 +1,16 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+//// [exportNonInitializedVariablesInIfThenStatementNoCrash1.ts]
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+export const cssExports: CssExports;
+export default cssExports;
+
+
+//// [exportNonInitializedVariablesInIfThenStatementNoCrash1.js]
+"use strict";
+// https://github.com/microsoft/TypeScript/issues/59373
+Object.defineProperty(exports, "__esModule", { value: true });
+if (true) { }
+exports.default = exports.cssExports;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=commonjs).symbols b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=commonjs).symbols
@@ -0,0 +1,13 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+=== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts ===
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+export const cssExports: CssExports;
+>cssExports : Symbol(cssExports, Decl(exportNonInitializedVariablesInIfThenStatementNoCrash1.ts, 3, 12))
+>CssExports : Symbol(CssExports)
+
+export default cssExports;
+>cssExports : Symbol(cssExports, Decl(exportNonInitializedVariablesInIfThenStatementNoCrash1.ts, 3, 12))
+
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=commonjs).types b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=commonjs).types
@@ -0,0 +1,17 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+=== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts ===
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+>true : true
+>     : ^^^^
+
+export const cssExports: CssExports;
+>cssExports : CssExports
+>           : ^^^^^^^^^^
+
+export default cssExports;
+>cssExports : CssExports
+>           : ^^^^^^^^^^
+
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=esnext).errors.txt b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=esnext).errors.txt
@@ -0,0 +1,18 @@
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,1): error TS1184: Modifiers cannot appear here.
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,14): error TS1155: 'const' declarations must be initialized.
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,26): error TS2304: Cannot find name 'CssExports'.
+
+
+==== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts (3 errors) ====
+    // https://github.com/microsoft/TypeScript/issues/59373
+    
+    if (true)
+    export const cssExports: CssExports;
+    ~~~~~~
+!!! error TS1184: Modifiers cannot appear here.
+                 ~~~~~~~~~~
+!!! error TS1155: 'const' declarations must be initialized.
+                             ~~~~~~~~~~
+!!! error TS2304: Cannot find name 'CssExports'.
+    export default cssExports;
+    
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=esnext).js b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=esnext).js
@@ -0,0 +1,15 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+//// [exportNonInitializedVariablesInIfThenStatementNoCrash1.ts]
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+export const cssExports: CssExports;
+export default cssExports;
+
+
+//// [exportNonInitializedVariablesInIfThenStatementNoCrash1.js]
+// https://github.com/microsoft/TypeScript/issues/59373
+if (true)
+    export var cssExports;
+export default cssExports;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=esnext).symbols b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=esnext).symbols
@@ -0,0 +1,13 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+=== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts ===
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+export const cssExports: CssExports;
+>cssExports : Symbol(cssExports, Decl(exportNonInitializedVariablesInIfThenStatementNoCrash1.ts, 3, 12))
+>CssExports : Symbol(CssExports)
+
+export default cssExports;
+>cssExports : Symbol(cssExports, Decl(exportNonInitializedVariablesInIfThenStatementNoCrash1.ts, 3, 12))
+
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=esnext).types b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=esnext).types
@@ -0,0 +1,17 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+=== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts ===
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+>true : true
+>     : ^^^^
+
+export const cssExports: CssExports;
+>cssExports : CssExports
+>           : ^^^^^^^^^^
+
+export default cssExports;
+>cssExports : CssExports
+>           : ^^^^^^^^^^
+
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).errors.txt b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).errors.txt
@@ -0,0 +1,18 @@
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,1): error TS1184: Modifiers cannot appear here.
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,14): error TS1155: 'const' declarations must be initialized.
+exportNonInitializedVariablesInIfThenStatementNoCrash1.ts(4,26): error TS2304: Cannot find name 'CssExports'.
+
+
+==== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts (3 errors) ====
+    // https://github.com/microsoft/TypeScript/issues/59373
+    
+    if (true)
+    export const cssExports: CssExports;
+    ~~~~~~
+!!! error TS1184: Modifiers cannot appear here.
+                 ~~~~~~~~~~
+!!! error TS1155: 'const' declarations must be initialized.
+                             ~~~~~~~~~~
+!!! error TS2304: Cannot find name 'CssExports'.
+    export default cssExports;
+    
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).js b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).js
@@ -0,0 +1,24 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+//// [exportNonInitializedVariablesInIfThenStatementNoCrash1.ts]
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+export const cssExports: CssExports;
+export default cssExports;
+
+
+//// [exportNonInitializedVariablesInIfThenStatementNoCrash1.js]
+// https://github.com/microsoft/TypeScript/issues/59373
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var cssExports;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            if (true) { }
+            exports_1("default", cssExports);
+        }
+    };
+});
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).symbols b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).symbols
@@ -0,0 +1,13 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+=== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts ===
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+export const cssExports: CssExports;
+>cssExports : Symbol(cssExports, Decl(exportNonInitializedVariablesInIfThenStatementNoCrash1.ts, 3, 12))
+>CssExports : Symbol(CssExports)
+
+export default cssExports;
+>cssExports : Symbol(cssExports, Decl(exportNonInitializedVariablesInIfThenStatementNoCrash1.ts, 3, 12))
+
diff --git a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).types b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).types
@@ -0,0 +1,17 @@
+//// [tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts] ////
+
+=== exportNonInitializedVariablesInIfThenStatementNoCrash1.ts ===
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+>true : true
+>     : ^^^^
+
+export const cssExports: CssExports;
+>cssExports : CssExports
+>           : ^^^^^^^^^^
+
+export default cssExports;
+>cssExports : CssExports
+>           : ^^^^^^^^^^
+
diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesInIfThenStatementNoCrash1.ts
@@ -0,0 +1,8 @@
+// @strict: true
+// @module: esnext, commonjs, system
+
+// https://github.com/microsoft/TypeScript/issues/59373
+
+if (true)
+export const cssExports: CssExports;
+export default cssExports;

Original file line number	Diff line number	Diff line change
`@@ -1019,7 +1019,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile`
`1019`	`1019`	`return factory.updateIfStatement(`
`1020`	`1020`	`node,`
`1021`	`1021`	`visitNode(node.expression, visitor, isExpression),`
`1022`		`- Debug.checkDefined(visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock)),`
	`1022`	`+ visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock) ?? factory.createBlock([]),`
`1023`	`1023`	`visitNode(node.elseStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock),`
`1024`	`1024`	`);`
`1025`	`1025`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1445,7 +1445,7 @@ export function transformSystemModule(context: TransformationContext): (x: Sourc`
`1445`	`1445`	`return factory.updateIfStatement(`
`1446`	`1446`	`node,`
`1447`	`1447`	`visitNode(node.expression, visitor, isExpression),`
`1448`		`- Debug.checkDefined(visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock)),`
	`1448`	`+ visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock) ?? factory.createBlock([]),`
`1449`	`1449`	`visitNode(node.elseStatement, topLevelNestedVisitor, isStatement, factory.liftToBlock),`
`1450`	`1450`	`);`
`1451`	`1451`	`}`