fix: TS constructor parameter properties order

magic-akari · magic-akari · commit 37765b4612b5 · 2023-03-11T10:13:25.000+08:00
diff --git a/crates/swc/tests/fixture/issues-6xxx/6985/useDefineForClassFields/2020_TS/output/index.ts b/crates/swc/tests/fixture/issues-6xxx/6985/useDefineForClassFields/2020_TS/output/index.ts
@@ -4,12 +4,12 @@ import _define_property from "@swc/helpers/src/_define_property.mjs";
 var _b = /*#__PURE__*/ new WeakMap();
 class Foo {
     constructor(foo){
+        _define_property(this, "foo", void 0);
         _define_property(this, "a", void 0);
         _class_private_field_init(this, _b, {
             writable: true,
             value: void 0
         });
-        _define_property(this, "foo", void 0);
         this.foo = foo;
         this.a = 1;
         _class_private_field_set(this, _b, 2);
diff --git a/crates/swc/tests/fixture/issues-6xxx/6985/useDefineForClassFields/2022_TS/output/index.ts b/crates/swc/tests/fixture/issues-6xxx/6985/useDefineForClassFields/2022_TS/output/index.ts
@@ -1,4 +1,5 @@
 class Foo {
+    foo;
     a;
     #b;
     static c = 3;
@@ -8,5 +9,4 @@ class Foo {
         this.a = 1;
         this.#b = 2;
     }
-    foo;
 }
diff --git a/crates/swc/tests/tsc-references/assignParameterPropertyToPropertyDeclarationESNext.1.normal.js b/crates/swc/tests/tsc-references/assignParameterPropertyToPropertyDeclarationESNext.1.normal.js
@@ -1,5 +1,6 @@
 //// [assignParameterPropertyToPropertyDeclarationESNext.ts]
 class C {
+    foo;
     qux;
     bar;
     quiz;
@@ -36,21 +37,20 @@ class C {
         this.foo // ok
         ;
     }
-    foo;
 }
 class D extends C {
     quill = this.foo // ok
     ;
 }
 class E {
+    foo2;
     bar;
     foo1;
     constructor(foo2){
         this.foo2 = foo2;
         this.bar = ()=>this.foo1 + this.foo2;
         this.foo1 = '';
     }
-    foo2;
 }
 class F {
     Inner = class extends F {
@@ -59,16 +59,17 @@ class F {
     p1 = 0;
 }
 class G {
+    p1;
     Inner;
     constructor(p1){
         this.p1 = p1;
         this.Inner = class extends G {
             p2 = this.p1;
         };
     }
-    p1;
 }
 class H {
+    p1;
     constructor(p1){
         this.p1 = p1;
         this.p2 = ()=>{
@@ -78,5 +79,4 @@ class H {
     }
     p2;
     p3;
-    p1;
 }
diff --git a/crates/swc/tests/tsc-references/defineProperty(target=es2022).1.normal.js b/crates/swc/tests/tsc-references/defineProperty(target=es2022).1.normal.js
@@ -2,6 +2,7 @@
 var x = "p";
 let _x = x;
 class A {
+    y;
     a;
     b;
     c;
@@ -16,12 +17,12 @@ class A {
         this.z = this.y;
     }
     z;
-    y;
 }
 class B {
     a;
 }
 class C extends B {
+    ka;
     z;
     constructor(ka){
         super();
@@ -30,5 +31,4 @@ class C extends B {
         this.ki = this.ka;
     }
     ki;
-    ka;
 }
diff --git a/crates/swc/tests/tsc-references/defineProperty(target=es5).1.normal.js b/crates/swc/tests/tsc-references/defineProperty(target=es5).1.normal.js
@@ -12,13 +12,13 @@ var A = /*#__PURE__*/ function() {
     "use strict";
     function A(y) {
         _class_call_check(this, A);
+        _define_property(this, "y", void 0);
         _define_property(this, "a", void 0);
         _define_property(this, "b", void 0);
         _define_property(this, "c", void 0);
         _define_property(this, "computed", void 0);
         _define_property(this, _x1, void 0);
         _define_property(this, "z", void 0);
-        _define_property(this, "y", void 0);
         this.y = y;
         this.a = this.y;
         this["computed"] = 13;
@@ -46,9 +46,9 @@ var C = /*#__PURE__*/ function(B) {
         _class_call_check(this, C);
         var _this;
         _this = _super.call(this);
+        _define_property(_assert_this_initialized(_this), "ka", void 0);
         _define_property(_assert_this_initialized(_this), "z", void 0);
         _define_property(_assert_this_initialized(_this), "ki", void 0);
-        _define_property(_assert_this_initialized(_this), "ka", void 0);
         _this.ka = ka;
         _this.z = _this.ka;
         _this.ki = _this.ka;
diff --git a/crates/swc/tests/tsc-references/emitStatementsBeforeSuperCallWithDefineFields.1.normal.js b/crates/swc/tests/tsc-references/emitStatementsBeforeSuperCallWithDefineFields.1.normal.js
@@ -7,8 +7,8 @@ class Sub extends Base {
     constructor(p){
         console.log('hi');
         super();
-        _define_property(this, "field", void 0);
         _define_property(this, "p", void 0);
+        _define_property(this, "field", void 0);
         this.p = p;
         this.field = 0;
     }
@@ -18,8 +18,8 @@ class Test extends Base {
     constructor(p){
         1;
         super();
-        _define_property(this, "prop", void 0);
         _define_property(this, "p", void 0);
+        _define_property(this, "prop", void 0);
         this.p = p;
         this.prop = 1;
     }
diff --git a/crates/swc/tests/tsc-references/propertyOverridesAccessors5.1.normal.js b/crates/swc/tests/tsc-references/propertyOverridesAccessors5.1.normal.js
@@ -5,9 +5,9 @@ class A {
     }
 }
 class B extends A {
+    p;
     constructor(p){
         super();
         this.p = p;
     }
-    p;
 }
diff --git a/crates/swc/tests/tsc-references/redefinedPararameterProperty.1.normal.js b/crates/swc/tests/tsc-references/redefinedPararameterProperty.1.normal.js
@@ -3,11 +3,11 @@ class Base {
     a = 1;
 }
 class Derived extends Base {
+    a;
     b;
     constructor(a){
         super();
         this.a = a;
         this.b = this.a /*undefined*/ ;
     }
-    a;
 }
diff --git a/crates/swc_ecma_transforms_typescript/src/strip.rs b/crates/swc_ecma_transforms_typescript/src/strip.rs
@@ -1962,23 +1962,26 @@ where
             inject_after_super(c, assign_exprs);
 
             if !extra_props.is_empty() {
-                class.body.extend(extra_props.into_iter().map(|prop| {
-                    ClassMember::ClassProp(ClassProp {
-                        key: PropName::Ident(prop),
-                        value: None,
-                        decorators: Vec::new(),
-                        is_static: false,
-                        type_ann: None,
-                        span: DUMMY_SP,
-                        accessibility: None,
-                        is_abstract: false,
-                        is_optional: false,
-                        is_override: false,
-                        readonly: false,
-                        declare: false,
-                        definite: false,
-                    })
-                }))
+                class.body.splice(
+                    0..0,
+                    extra_props.into_iter().map(|prop| {
+                        ClassMember::ClassProp(ClassProp {
+                            key: PropName::Ident(prop),
+                            value: None,
+                            decorators: Vec::new(),
+                            is_static: false,
+                            type_ann: None,
+                            span: DUMMY_SP,
+                            accessibility: None,
+                            is_abstract: false,
+                            is_optional: false,
+                            is_override: false,
+                            readonly: false,
+                            declare: false,
+                            definite: false,
+                        })
+                    }),
+                );
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`class Foo {`
	`2`	`+ foo;`
`2`	`3`	`a;`
`3`	`4`	`#b;`
`4`	`5`	`static c = 3;`
`@@ -8,5 +9,4 @@ class Foo {`
`8`	`9`	`this.a = 1;`
`9`	`10`	`this.#b = 2;`
`10`	`11`	`}`
`11`		`- foo;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`//// [assignParameterPropertyToPropertyDeclarationESNext.ts]`
`2`	`2`	`class C {`
	`3`	`+ foo;`
`3`	`4`	`qux;`
`4`	`5`	`bar;`
`5`	`6`	`quiz;`
`@@ -36,21 +37,20 @@ class C {`
`36`	`37`	`this.foo // ok`
`37`	`38`	`;`
`38`	`39`	`}`
`39`		`- foo;`
`40`	`40`	`}`
`41`	`41`	`class D extends C {`
`42`	`42`	`quill = this.foo // ok`
`43`	`43`	`;`
`44`	`44`	`}`
`45`	`45`	`class E {`
	`46`	`+ foo2;`
`46`	`47`	`bar;`
`47`	`48`	`foo1;`
`48`	`49`	`constructor(foo2){`
`49`	`50`	`this.foo2 = foo2;`
`50`	`51`	`this.bar = ()=>this.foo1 + this.foo2;`
`51`	`52`	`this.foo1 = '';`
`52`	`53`	`}`
`53`		`- foo2;`
`54`	`54`	`}`
`55`	`55`	`class F {`
`56`	`56`	`Inner = class extends F {`
`@@ -59,16 +59,17 @@ class F {`
`59`	`59`	`p1 = 0;`
`60`	`60`	`}`
`61`	`61`	`class G {`
	`62`	`+ p1;`
`62`	`63`	`Inner;`
`63`	`64`	`constructor(p1){`
`64`	`65`	`this.p1 = p1;`
`65`	`66`	`this.Inner = class extends G {`
`66`	`67`	`p2 = this.p1;`
`67`	`68`	`};`
`68`	`69`	`}`
`69`		`- p1;`
`70`	`70`	`}`
`71`	`71`	`class H {`
	`72`	`+ p1;`
`72`	`73`	`constructor(p1){`
`73`	`74`	`this.p1 = p1;`
`74`	`75`	`this.p2 = ()=>{`
`@@ -78,5 +79,4 @@ class H {`
`78`	`79`	`}`
`79`	`80`	`p2;`
`80`	`81`	`p3;`
`81`		`- p1;`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`var x = "p";`
`3`	`3`	`let _x = x;`
`4`	`4`	`class A {`
	`5`	`+ y;`
`5`	`6`	`a;`
`6`	`7`	`b;`
`7`	`8`	`c;`
`@@ -16,12 +17,12 @@ class A {`
`16`	`17`	`this.z = this.y;`
`17`	`18`	`}`
`18`	`19`	`z;`
`19`		`- y;`
`20`	`20`	`}`
`21`	`21`	`class B {`
`22`	`22`	`a;`
`23`	`23`	`}`
`24`	`24`	`class C extends B {`
	`25`	`+ ka;`
`25`	`26`	`z;`
`26`	`27`	`constructor(ka){`
`27`	`28`	`super();`
`@@ -30,5 +31,4 @@ class C extends B {`
`30`	`31`	`this.ki = this.ka;`
`31`	`32`	`}`
`32`	`33`	`ki;`
`33`		`- ka;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ class A {`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`class B extends A {`
	`8`	`+ p;`
`8`	`9`	`constructor(p){`
`9`	`10`	`super();`
`10`	`11`	`this.p = p;`
`11`	`12`	`}`
`12`		`- p;`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@ class Base {`
`3`	`3`	`a = 1;`
`4`	`4`	`}`
`5`	`5`	`class Derived extends Base {`
	`6`	`+ a;`
`6`	`7`	`b;`
`7`	`8`	`constructor(a){`
`8`	`9`	`super();`
`9`	`10`	`this.a = a;`
`10`	`11`	`this.b = this.a /undefined/ ;`
`11`	`12`	`}`
`12`		`- a;`
`13`	`13`	`}`