fix(strip): Expand class expressions as sequences

swc_ecma_transforms_typescript: - `strip`: Expand class expressions as sequences. Co-authored-by: 강동윤 <kdy1997.dev@gmail.com>
swc-project · Mar 30, 2021 · 8b1f8dd · 8b1f8dd
1 parent 393808a
commit 8b1f8dd
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 121 deletions.
diff --git a/bundler/tests/fixture/deno-9591/output/entry.inlined.ts b/bundler/tests/fixture/deno-9591/output/entry.inlined.ts
@@ -2256,10 +2256,10 @@ class ConsoleHandler extends BaseHandler {
     }
 }
 class WriterHandler extends BaseHandler {
-    #encoder=new TextEncoder();
+    #encoder = new TextEncoder();
 }
 class FileHandler extends WriterHandler {
-    #unloadCallback=()=>this.destroy()
+    #unloadCallback = ()=>this.destroy()
     ;
     constructor(levelName3, options3){
         super(levelName3, options3);
@@ -2305,7 +2305,7 @@ class FileHandler extends WriterHandler {
 class RotatingFileHandler extends FileHandler {
     #maxBytes;
     #maxBackupCount;
-    #currentFileSize=0;
+    #currentFileSize = 0;
     constructor(levelName4, options4){
         super(levelName4, options4);
         this.#maxBytes = options4.maxBytes;

diff --git a/bundler/tests/fixture/deno-9591/output/entry.ts b/bundler/tests/fixture/deno-9591/output/entry.ts
@@ -2267,10 +2267,10 @@ class ConsoleHandler extends BaseHandler {
     }
 }
 class WriterHandler extends BaseHandler {
-    #encoder=new TextEncoder();
+    #encoder = new TextEncoder();
 }
 class FileHandler extends WriterHandler {
-    #unloadCallback=()=>this.destroy()
+    #unloadCallback = ()=>this.destroy()
     ;
     constructor(levelName3, options3){
         super(levelName3, options3);
@@ -2316,7 +2316,7 @@ class FileHandler extends WriterHandler {
 class RotatingFileHandler extends FileHandler {
     #maxBytes;
     #maxBackupCount;
-    #currentFileSize=0;
+    #currentFileSize = 0;
     constructor(levelName4, options4){
         super(levelName4, options4);
         this.#maxBytes = options4.maxBytes;

diff --git a/ecmascript/codegen/src/lib.rs b/ecmascript/codegen/src/lib.rs
@@ -986,8 +986,17 @@ impl<'a> Emitter<'a> {
         }
 
         if let Some(value) = &n.value {
+            formatting_space!();
             punct!("=");
-            emit!(value);
+            formatting_space!();
+
+            if value.is_seq() {
+                punct!("(");
+                emit!(value);
+                punct!(")");
+            } else {
+                emit!(value);
+            }
         }
 
         formatting_semi!();
@@ -1030,7 +1039,13 @@ impl<'a> Emitter<'a> {
             punct!("=");
             formatting_space!();
 
-            emit!(v);
+            if v.is_seq() {
+                punct!("(");
+                emit!(v);
+                punct!(")");
+            } else {
+                emit!(v);
+            }
         }
 
         formatting_semi!();

diff --git a/ecmascript/transforms/tests/decorators.rs b/ecmascript/transforms/tests/decorators.rs
@@ -4291,20 +4291,17 @@ class Person {
 
 const p = new Person();
 p.save();",
-    "var _class, _dec;
+    "var _class;
+var _class1, _dec;
 import { Debounce } from 'lodash-decorators';
-let Person = ((_class = function() {
-    class Person {
-        save() {
-            console.log('Hello World!');
-        }
+let Person = ((_class1 = (_class = class Person {
+    save() {
+        console.log('Hello World!');
     }
-    Person.debounceTime = 500;
-    return Person;
-}()) || _class, _dec = Debounce(_class.debounceTime), _applyDecoratedDescriptor(_class.prototype, \
-     'save', [
+}, _class.debounceTime = 500, _class)) || _class1, _dec = Debounce(_class1.debounceTime), \
+     _applyDecoratedDescriptor(_class1.prototype, 'save', [
     _dec
-], Object.getOwnPropertyDescriptor(_class.prototype, 'save'), _class.prototype), _class);
+], Object.getOwnPropertyDescriptor(_class1.prototype, 'save'), _class1.prototype), _class1);
 const p = new Person();
 p.save();"
 );
@@ -4335,20 +4332,17 @@ class Person {
 
 const p = new Person();
 p.save();",
-    "var _class, _dec;
+    "var _class;
+var _class1, _dec;
 import { Debounce } from 'lodash-decorators';
-let Person = ((_class = function() {
-    class Person {
-        save() {
-            console.log('Hello World!');
-        }
+let Person = ((_class1 = (_class = class Person {
+    save() {
+        console.log('Hello World!');
     }
-    Person.debounceTime = 500;
-    return Person;
-}()) || _class, _dec = Debounce(_class.debounceTime), _applyDecoratedDescriptor(_class.prototype, \
-     'save', [
+}, _class.debounceTime = 500, _class)) || _class1, _dec = Debounce(_class1.debounceTime), \
+     _applyDecoratedDescriptor(_class1.prototype, 'save', [
     _dec
-], Object.getOwnPropertyDescriptor(_class.prototype, 'save'), _class.prototype), _class);
+], Object.getOwnPropertyDescriptor(_class1.prototype, 'save'), _class1.prototype), _class1);
 const p = new Person();
 p.save();
 "
@@ -4380,30 +4374,27 @@ class Person {
 
 const p = new Person();
 p.save();",
-    "var _class, _dec;
+    "var _class;
+var _class1, _dec;
 import { Debounce } from 'lodash-decorators';
-let Person = ((_class = function() {
-    let Person = function() {
-        'use strict';
-        function Person() {
-            _classCallCheck(this, Person);
-        }
-        _createClass(Person, [
-            {
-                key: 'save',
-                value: function save() {
-                    console.log('Hello World!');
-                }
+let Person = ((_class1 = (_class = function() {
+    'use strict';
+    function Person() {
+        _classCallCheck(this, Person);
+    }
+    _createClass(Person, [
+        {
+            key: 'save',
+            value: function save() {
+                console.log('Hello World!');
             }
-        ]);
-        return Person;
-    }();
-    Person.debounceTime = 500;
+        }
+    ]);
     return Person;
-}()) || _class, _dec = Debounce(_class.debounceTime), _applyDecoratedDescriptor(_class.prototype, \
-     'save', [
+}(), _class.debounceTime = 500, _class)) || _class1, _dec = Debounce(_class1.debounceTime), \
+     _applyDecoratedDescriptor(_class1.prototype, 'save', [
     _dec
-], Object.getOwnPropertyDescriptor(_class.prototype, 'save'), _class.prototype), _class);
+], Object.getOwnPropertyDescriptor(_class1.prototype, 'save'), _class1.prototype), _class1);
 const p = new Person();
 p.save();"
 );

diff --git a/ecmascript/transforms/typescript/Cargo.toml b/ecmascript/transforms/typescript/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0/MIT"
 name = "swc_ecma_transforms_typescript"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.11.2"
+version = "0.11.3"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]