Stage 3 Decorators normative changes (microsoft#56955)

Author: rbuckton

src/compiler/transformers/esDecorators.ts

@@ -2183,24 +2183,25 @@ describe("unittests:: evaluation:: esDecorators", () => {
                 "static method extra initializer evaluation 2b",
                 "static method extra initializer evaluation 1a",
                 "static method extra initializer evaluation 1b",
-                "static auto-accessor extra initializer evaluation 2a",
-                "static auto-accessor extra initializer evaluation 2b",
-                "static auto-accessor extra initializer evaluation 1a",
-                "static auto-accessor extra initializer evaluation 1b",
-                "static field extra initializer evaluation 2a",
-                "static field extra initializer evaluation 2b",
-                "static field extra initializer evaluation 1a",
-                "static field extra initializer evaluation 1b",
 
                 // next, static initializers (i.e., fields, auto-accessors, and static blocks) are evaluated in document
                 // order and applied to the replacement class:
                 "static block evaluation",
                 "static field initializer evaluation",
                 "static field injected initializer evaluation 1",
                 "static field injected initializer evaluation 2",
+                "static field extra initializer evaluation 2a",
+                "static field extra initializer evaluation 2b",
+                "static field extra initializer evaluation 1a",
+                "static field extra initializer evaluation 1b",
+
                 "static auto-accessor initializer evaluation",
                 "static auto-accessor injected initializer evaluation 1",
                 "static auto-accessor injected initializer evaluation 2",
+                "static auto-accessor extra initializer evaluation 2a",
+                "static auto-accessor extra initializer evaluation 2b",
+                "static auto-accessor extra initializer evaluation 1a",
+                "static auto-accessor extra initializer evaluation 1b",
                 // NOTE: at this point, static private fields will be installed (TODO: on the replacement class)
 
                 // finally, class extra initializers are applied in the order they were added (i.e., methods before fields,
@@ -2230,23 +2231,23 @@ describe("unittests:: evaluation:: esDecorators", () => {
                 "instance method extra initializer evaluation 2b",
                 "instance method extra initializer evaluation 1a",
                 "instance method extra initializer evaluation 1b",
-                "instance auto-accessor extra initializer evaluation 2a",
-                "instance auto-accessor extra initializer evaluation 2b",
-                "instance auto-accessor extra initializer evaluation 1a",
-                "instance auto-accessor extra initializer evaluation 1b",
-                "instance field extra initializer evaluation 2a",
-                "instance field extra initializer evaluation 2b",
-                "instance field extra initializer evaluation 1a",
-                "instance field extra initializer evaluation 1b",
 
                 // next, instance initializers (i.e., fields, auto-accessors, and static blocks) are evaluated in document
                 // order:
                 "instance field initializer evaluation",
                 "instance field injected initializer evaluation 1",
                 "instance field injected initializer evaluation 2",
+                "instance field extra initializer evaluation 2a",
+                "instance field extra initializer evaluation 2b",
+                "instance field extra initializer evaluation 1a",
+                "instance field extra initializer evaluation 1b",
                 "instance auto-accessor initializer evaluation",
                 "instance auto-accessor injected initializer evaluation 1",
                 "instance auto-accessor injected initializer evaluation 2",
+                "instance auto-accessor extra initializer evaluation 2a",
+                "instance auto-accessor extra initializer evaluation 2b",
+                "instance auto-accessor extra initializer evaluation 1a",
+                "instance auto-accessor extra initializer evaluation 1b",
                 // NOTE: at this point, instance private fields will be installed.
 
                 // finally, statements in the constructor after the call to `super()` are evaluated:

src/testRunner/unittests/evaluation/esDecorators.ts

@@ -137,22 +137,21 @@ let C = (() => {
     let _static_private_set_x_descriptor;
     let _static_private_y_decorators;
     let _static_private_y_initializers = [];
+    let _static_private_y_extraInitializers = [];
     let _static_private_z_decorators;
     let _static_private_z_initializers = [];
+    let _static_private_z_extraInitializers = [];
     let _static_private_z_descriptor;
     let _method_decorators;
     let _get_x_decorators;
     let _set_x_decorators;
     let _y_decorators;
     let _y_initializers = [];
+    let _y_extraInitializers = [];
     let _z_decorators;
     let _z_initializers = [];
+    let _z_extraInitializers = [];
     var C = _classThis = class {
-        constructor() {
-            /*13*/
-            this.y = (__runInitializers(this, _instanceExtraInitializers), __runInitializers(this, _y_initializers, 1));
-            _C_z_1_accessor_storage.set(this, __runInitializers(this, _z_initializers, 1));
-        }
         /*4*/
         method() { }
         /*7*/
@@ -162,6 +161,12 @@ let C = (() => {
         /*16*/
         get z() { return __classPrivateFieldGet(this, _C_z_1_accessor_storage, "f"); }
         set z(value) { __classPrivateFieldSet(this, _C_z_1_accessor_storage, value, "f"); }
+        constructor() {
+            /*13*/
+            this.y = (__runInitializers(this, _instanceExtraInitializers), __runInitializers(this, _y_initializers, 1));
+            _C_z_1_accessor_storage.set(this, (__runInitializers(this, _y_extraInitializers), __runInitializers(this, _z_initializers, 1)));
+            __runInitializers(this, _z_extraInitializers);
+        }
     };
     _C_z_1_accessor_storage = new WeakMap();
     _C_method_get = function _C_method_get() { return _static_private_method_descriptor.value; };
@@ -185,22 +190,22 @@ let C = (() => {
         __esDecorate(_classThis, _static_private_method_descriptor = { value: __setFunctionName(function () { }, "#method") }, _static_private_method_decorators, { kind: "method", name: "#method", static: true, private: true, access: { has: obj => __classPrivateFieldIn(_classThis, obj), get: obj => __classPrivateFieldGet(obj, _classThis, "a", _C_method_get) }, metadata: _metadata }, null, _staticExtraInitializers);
         __esDecorate(_classThis, _static_private_get_x_descriptor = { get: __setFunctionName(function () { return 1; }, "#x", "get") }, _static_private_get_x_decorators, { kind: "getter", name: "#x", static: true, private: true, access: { has: obj => __classPrivateFieldIn(_classThis, obj), get: obj => __classPrivateFieldGet(obj, _classThis, "a", _C_x_get) }, metadata: _metadata }, null, _staticExtraInitializers);
         __esDecorate(_classThis, _static_private_set_x_descriptor = { set: __setFunctionName(function (value) { }, "#x", "set") }, _static_private_set_x_decorators, { kind: "setter", name: "#x", static: true, private: true, access: { has: obj => __classPrivateFieldIn(_classThis, obj), set: (obj, value) => { __classPrivateFieldSet(obj, _classThis, value, "a", _C_x_set); } }, metadata: _metadata }, null, _staticExtraInitializers);
-        __esDecorate(_classThis, _static_private_z_descriptor = { get: __setFunctionName(function () { return __classPrivateFieldGet(_classThis, _classThis, "f", _C_z_accessor_storage); }, "#z", "get"), set: __setFunctionName(function (value) { __classPrivateFieldSet(_classThis, _classThis, value, "f", _C_z_accessor_storage); }, "#z", "set") }, _static_private_z_decorators, { kind: "accessor", name: "#z", static: true, private: true, access: { has: obj => __classPrivateFieldIn(_classThis, obj), get: obj => __classPrivateFieldGet(obj, _classThis, "a", _C_z_get), set: (obj, value) => { __classPrivateFieldSet(obj, _classThis, value, "a", _C_z_set); } }, metadata: _metadata }, _static_private_z_initializers, _staticExtraInitializers);
+        __esDecorate(_classThis, _static_private_z_descriptor = { get: __setFunctionName(function () { return __classPrivateFieldGet(_classThis, _classThis, "f", _C_z_accessor_storage); }, "#z", "get"), set: __setFunctionName(function (value) { __classPrivateFieldSet(_classThis, _classThis, value, "f", _C_z_accessor_storage); }, "#z", "set") }, _static_private_z_decorators, { kind: "accessor", name: "#z", static: true, private: true, access: { has: obj => __classPrivateFieldIn(_classThis, obj), get: obj => __classPrivateFieldGet(obj, _classThis, "a", _C_z_get), set: (obj, value) => { __classPrivateFieldSet(obj, _classThis, value, "a", _C_z_set); } }, metadata: _metadata }, _static_private_z_initializers, _static_private_z_extraInitializers);
         __esDecorate(_classThis, null, _method_decorators, { kind: "method", name: "method", static: false, private: false, access: { has: obj => "method" in obj, get: obj => obj.method }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(_classThis, null, _get_x_decorators, { kind: "getter", name: "x", static: false, private: false, access: { has: obj => "x" in obj, get: obj => obj.x }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(_classThis, null, _set_x_decorators, { kind: "setter", name: "x", static: false, private: false, access: { has: obj => "x" in obj, set: (obj, value) => { obj.x = value; } }, metadata: _metadata }, null, _instanceExtraInitializers);
-        __esDecorate(_classThis, null, _z_decorators, { kind: "accessor", name: "z", static: false, private: false, access: { has: obj => "z" in obj, get: obj => obj.z, set: (obj, value) => { obj.z = value; } }, metadata: _metadata }, _z_initializers, _instanceExtraInitializers);
-        __esDecorate(null, null, _static_private_y_decorators, { kind: "field", name: "#y", static: true, private: true, access: { has: obj => __classPrivateFieldIn(_classThis, obj), get: obj => __classPrivateFieldGet(obj, _classThis, "f", _C_y), set: (obj, value) => { __classPrivateFieldSet(obj, _classThis, value, "f", _C_y); } }, metadata: _metadata }, _static_private_y_initializers, _staticExtraInitializers);
-        __esDecorate(null, null, _y_decorators, { kind: "field", name: "y", static: false, private: false, access: { has: obj => "y" in obj, get: obj => obj.y, set: (obj, value) => { obj.y = value; } }, metadata: _metadata }, _y_initializers, _instanceExtraInitializers);
+        __esDecorate(_classThis, null, _z_decorators, { kind: "accessor", name: "z", static: false, private: false, access: { has: obj => "z" in obj, get: obj => obj.z, set: (obj, value) => { obj.z = value; } }, metadata: _metadata }, _z_initializers, _z_extraInitializers);
+        __esDecorate(null, null, _static_private_y_decorators, { kind: "field", name: "#y", static: true, private: true, access: { has: obj => __classPrivateFieldIn(_classThis, obj), get: obj => __classPrivateFieldGet(obj, _classThis, "f", _C_y), set: (obj, value) => { __classPrivateFieldSet(obj, _classThis, value, "f", _C_y); } }, metadata: _metadata }, _static_private_y_initializers, _static_private_y_extraInitializers);
+        __esDecorate(null, null, _y_decorators, { kind: "field", name: "y", static: false, private: false, access: { has: obj => "y" in obj, get: obj => obj.y, set: (obj, value) => { obj.y = value; } }, metadata: _metadata }, _y_initializers, _y_extraInitializers);
         __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
         C = _classThis = _classDescriptor.value;
         if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-        __runInitializers(_classThis, _staticExtraInitializers);
     })();
     /*28*/
-    _C_y = { value: __runInitializers(_classThis, _static_private_y_initializers, 1) };
-    _C_z_accessor_storage = { value: __runInitializers(_classThis, _static_private_z_initializers, 1) };
+    _C_y = { value: (__runInitializers(_classThis, _staticExtraInitializers), __runInitializers(_classThis, _static_private_y_initializers, 1)) };
+    _C_z_accessor_storage = { value: (__runInitializers(_classThis, _static_private_y_extraInitializers), __runInitializers(_classThis, _static_private_z_initializers, 1)) };
     (() => {
+        __runInitializers(_classThis, _static_private_z_extraInitializers);
         __runInitializers(_classThis, _classExtraInitializers);
     })();
     return C = _classThis;