fix(es/parser): Consider ASI while parsing TypeScript type aliases (#…

…8263) **Related issue:** - Closes #8073.
swc-project · Nov 10, 2023 · e589126 · e589126
1 parent e0525b5
commit e589126
Show file tree

Hide file tree

Showing 12 changed files with 351 additions and 30 deletions.
diff --git a/crates/swc/tests/fixture/issues-7xxx/7561/es2019/output/1.js b/crates/swc/tests/fixture/issues-7xxx/7561/es2019/output/1.js
@@ -1,6 +1,6 @@
 var _class_private_field_get = require("@swc/helpers/_/_class_private_field_get");
 var _class_private_field_init = require("@swc/helpers/_/_class_private_field_init");
-var _x = /*#__PURE__*/ new WeakMap();
+var _x = new WeakMap();
 class Foo {
     test() {
         var _this, _this_y;

diff --git a/crates/swc/tests/fixture/issues-7xxx/7561/es2021/output/1.js b/crates/swc/tests/fixture/issues-7xxx/7561/es2021/output/1.js
@@ -1,6 +1,6 @@
 var _class_private_field_get = require("@swc/helpers/_/_class_private_field_get");
 var _class_private_field_init = require("@swc/helpers/_/_class_private_field_init");
-var _x = /*#__PURE__*/ new WeakMap();
+var _x = new WeakMap();
 class Foo {
     test() {
         var _this, _this_y;

diff --git a/crates/swc/tests/fixture/issues-8xxx/8073/input/.swcrc b/crates/swc/tests/fixture/issues-8xxx/8073/input/.swcrc
@@ -0,0 +1,19 @@
+{
+    "jsc": {
+        "parser": {
+            "syntax": "typescript",
+            "tsx": false
+        },
+        "target": "es2022",
+        "loose": false,
+        "minify": {
+            "compress": false,
+            "mangle": false
+        }
+    },
+    "module": {
+        "type": "es6"
+    },
+    "minify": false,
+    "isModule": "unknown"
+}
diff --git a/crates/swc/tests/fixture/issues-8xxx/8073/input/1.js b/crates/swc/tests/fixture/issues-8xxx/8073/input/1.js
@@ -0,0 +1,8 @@
+avplay.setListener({
+    onsubtitlechange: (duration, subtitles, type, attributes) => {
+        duration // $ExpectType string
+        subtitles // $ExpectType string
+        type // $ExpectType string
+        attributes // $ExpectType AVPlaySubtitleAttribute[]
+    }
+})
diff --git a/crates/swc/tests/fixture/issues-8xxx/8073/output/1.js b/crates/swc/tests/fixture/issues-8xxx/8073/output/1.js
@@ -0,0 +1,8 @@
+avplay.setListener({
+    onsubtitlechange: (duration, subtitles, type, attributes)=>{
+        duration;
+        subtitles;
+        type;
+        attributes;
+    }
+});
diff --git a/crates/swc/tests/fixture/issues-8xxx/8199/output/1.js b/crates/swc/tests/fixture/issues-8xxx/8199/output/1.js
@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 export const IconSpecHotkey = (param)=>{
     let { icon } = param;
-    return /*#__PURE__*/ _jsx("div", {
+    return _jsx("div", {
         children: icon
     });
 };
diff --git a/crates/swc/tests/fixture/issues-8xxx/8210/output/1.js b/crates/swc/tests/fixture/issues-8xxx/8210/output/1.js
@@ -1,7 +1,7 @@
 import { jsxDEV as _jsxDEV } from "react/jsx-dev-runtime";
 const Component = ()=>{
-    return /*#__PURE__*/ _jsxDEV("p", {
-        thing: /*#__PURE__*/ _jsxDEV("a", {}, void 0, false, {
+    return _jsxDEV("p", {
+        thing: _jsxDEV("a", {}, void 0, false, {
             fileName: "$DIR/tests/fixture/issues-8xxx/8210/input/1.js",
             lineNumber: 2,
             columnNumber: 23

diff --git a/crates/swc_ecma_parser/src/parser/typescript.rs b/crates/swc_ecma_parser/src/parser/typescript.rs
@@ -2581,7 +2581,7 @@ impl<I: Tokens> Parser<I> {
             }
 
             "type" => {
-                if next || is!(self, IdentRef) {
+                if next || (!self.input.had_line_break_before_cur() && is!(self, IdentRef)) {
                     if next {
                         bump!(self);
                     }

diff --git a/crates/swc_ecma_parser/tests/tsc/asiPreventsParsingAsTypeAlias01.json b/crates/swc_ecma_parser/tests/tsc/asiPreventsParsingAsTypeAlias01.json
@@ -106,32 +106,59 @@
       ]
     },
     {
-      "type": "TsTypeAliasDeclaration",
+      "type": "ExpressionStatement",
       "span": {
         "start": 34,
-        "end": 52,
+        "end": 38,
         "ctxt": 0
       },
-      "declare": false,
-      "id": {
+      "expression": {
         "type": "Identifier",
         "span": {
-          "start": 39,
-          "end": 42,
+          "start": 34,
+          "end": 38,
           "ctxt": 0
         },
-        "value": "Foo",
+        "value": "type",
         "optional": false
+      }
+    },
+    {
+      "type": "ExpressionStatement",
+      "span": {
+        "start": 39,
+        "end": 52,
+        "ctxt": 0
       },
-      "typeParams": null,
-      "typeAnnotation": {
-        "type": "TsKeywordType",
+      "expression": {
+        "type": "AssignmentExpression",
         "span": {
-          "start": 45,
+          "start": 39,
           "end": 51,
           "ctxt": 0
         },
-        "kind": "string"
+        "operator": "=",
+        "left": {
+          "type": "Identifier",
+          "span": {
+            "start": 39,
+            "end": 42,
+            "ctxt": 0
+          },
+          "value": "Foo",
+          "optional": false,
+          "typeAnnotation": null
+        },
+        "right": {
+          "type": "Identifier",
+          "span": {
+            "start": 45,
+            "end": 51,
+            "ctxt": 0
+          },
+          "value": "string",
+          "optional": false
+        }
       }
     }
   ],

diff --git a/crates/swc_ecma_parser/tests/tsc/asiPreventsParsingAsTypeAlias02.json b/crates/swc_ecma_parser/tests/tsc/asiPreventsParsingAsTypeAlias02.json
@@ -133,32 +133,59 @@
         },
         "body": [
           {
-            "type": "TsTypeAliasDeclaration",
+            "type": "ExpressionStatement",
             "span": {
               "start": 60,
-              "end": 82,
+              "end": 64,
               "ctxt": 0
             },
-            "declare": false,
-            "id": {
+            "expression": {
               "type": "Identifier",
               "span": {
-                "start": 69,
-                "end": 72,
+                "start": 60,
+                "end": 64,
                 "ctxt": 0
               },
-              "value": "Foo",
+              "value": "type",
               "optional": false
+            }
+          },
+          {
+            "type": "ExpressionStatement",
+            "span": {
+              "start": 69,
+              "end": 82,
+              "ctxt": 0
             },
-            "typeParams": null,
-            "typeAnnotation": {
-              "type": "TsKeywordType",
+            "expression": {
+              "type": "AssignmentExpression",
               "span": {
-                "start": 75,
+                "start": 69,
                 "end": 81,
                 "ctxt": 0
               },
-              "kind": "string"
+              "operator": "=",
+              "left": {
+                "type": "Identifier",
+                "span": {
+                  "start": 69,
+                  "end": 72,
+                  "ctxt": 0
+                },
+                "value": "Foo",
+                "optional": false,
+                "typeAnnotation": null
+              },
+              "right": {
+                "type": "Identifier",
+                "span": {
+                  "start": 75,
+                  "end": 81,
+                  "ctxt": 0
+                },
+                "value": "string",
+                "optional": false
+              }
             }
           }
         ]

diff --git a/crates/swc_ecma_parser/tests/typescript/issue-8073/input.ts b/crates/swc_ecma_parser/tests/typescript/issue-8073/input.ts
@@ -0,0 +1,8 @@
+avplay.setListener({
+    onsubtitlechange: (duration, subtitles, type, attributes) => {
+        duration // $ExpectType string
+        subtitles // $ExpectType string
+        type // $ExpectType string
+        attributes // $ExpectType AVPlaySubtitleAttribute[]
+    }
+})