Added tests for private static fields methods and accessors.

dragomirtitian · Mar 17, 2021 · Feb 16, 2021 · Feb 16, 2021 · Feb 18, 2021 · Feb 18, 2021
commit 31a8c00fe6e574dff301a9430299f02d5068202c
diff --git a/tests/baselines/reference/privateNameAndObjectRestSpread.errors.txt b/tests/baselines/reference/privateNameAndObjectRestSpread.errors.txt
@@ -1,10 +1,13 @@
-tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts(6,13): error TS2339: Property '#prop' does not exist on type '{}'.
-tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts(8,14): error TS2339: Property '#prop' does not exist on type '{}'.
+tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts(7,13): error TS2339: Property '#prop' does not exist on type '{}'.
+tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts(9,14): error TS2339: Property '#prop' does not exist on type '{}'.
+tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts(12,17): error TS2339: Property '#propStatic' does not exist on type '{ prototype: C; }'.
+tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts(14,15): error TS2339: Property '#propStatic' does not exist on type '{ prototype: C; }'.
 
 
-==== tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts (2 errors) ====
+==== tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpread.ts (4 errors) ====
     class C {
         #prop = 1;
+        static #propStatic = 1;
 
         method(other: C) {
             const obj = { ...other };
@@ -15,5 +18,14 @@ tests/cases/conformance/classes/members/privateNames/privateNameAndObjectRestSpr
             rest.#prop;
                  ~~~~~
 !!! error TS2339: Property '#prop' does not exist on type '{}'.
+
+            const statics = { ... C};
+            statics.#propStatic
+                    ~~~~~~~~~~~
+!!! error TS2339: Property '#propStatic' does not exist on type '{ prototype: C; }'.
+            const { ...sRest } = C;
+            sRest.#propStatic;
+                  ~~~~~~~~~~~
+!!! error TS2339: Property '#propStatic' does not exist on type '{ prototype: C; }'.
         }
     }
diff --git a/tests/baselines/reference/privateNameAndObjectRestSpread.js b/tests/baselines/reference/privateNameAndObjectRestSpread.js
@@ -1,12 +1,18 @@
 //// [privateNameAndObjectRestSpread.ts]
 class C {
     #prop = 1;
+    static #propStatic = 1;
 
     method(other: C) {
         const obj = { ...other };
         obj.#prop;
         const { ...rest } = other;
         rest.#prop;
+
+        const statics = { ... C};
+        statics.#propStatic
+        const { ...sRest } = C;
+        sRest.#propStatic;
     }
 }
 
@@ -18,6 +24,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     }
     return privateMap.get(receiver);
 };
+var __classStaticPrivateFieldGet = (this && this.__classStaticPrivateFieldGet) || function (receiver, classConstructor, propertyDescriptor) {
+    if (receiver !== classConstructor) {
+        throw new TypeError("Private static access of wrong provenance");
+    }
+    return propertyDescriptor.value;
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -29,7 +41,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _C_prop;
+var _C_prop, _C_propStatic;
 class C {
     constructor() {
         _C_prop.set(this, 1);
@@ -39,6 +51,11 @@ class C {
         __classPrivateFieldGet(obj, _C_prop);
         const rest = __rest(other, []);
         __classPrivateFieldGet(rest, _C_prop);
+        const statics = Object.assign({}, C);
+        __classStaticPrivateFieldGet(statics, C, _C_propStatic);
+        const sRest = __rest(C, []);
+        __classStaticPrivateFieldGet(sRest, C, _C_propStatic);
     }
 }
 _C_prop = new WeakMap();
+_C_propStatic = { value: 1 };
diff --git a/tests/baselines/reference/privateNameAndObjectRestSpread.symbols b/tests/baselines/reference/privateNameAndObjectRestSpread.symbols
@@ -5,23 +5,40 @@ class C {
     #prop = 1;
 >#prop : Symbol(C.#prop, Decl(privateNameAndObjectRestSpread.ts, 0, 9))
 
+    static #propStatic = 1;
+>#propStatic : Symbol(C.#propStatic, Decl(privateNameAndObjectRestSpread.ts, 1, 14))
+
     method(other: C) {
->method : Symbol(C.method, Decl(privateNameAndObjectRestSpread.ts, 1, 14))
->other : Symbol(other, Decl(privateNameAndObjectRestSpread.ts, 3, 11))
+>method : Symbol(C.method, Decl(privateNameAndObjectRestSpread.ts, 2, 27))
+>other : Symbol(other, Decl(privateNameAndObjectRestSpread.ts, 4, 11))
 >C : Symbol(C, Decl(privateNameAndObjectRestSpread.ts, 0, 0))
 
         const obj = { ...other };
->obj : Symbol(obj, Decl(privateNameAndObjectRestSpread.ts, 4, 13))
->other : Symbol(other, Decl(privateNameAndObjectRestSpread.ts, 3, 11))
+>obj : Symbol(obj, Decl(privateNameAndObjectRestSpread.ts, 5, 13))
+>other : Symbol(other, Decl(privateNameAndObjectRestSpread.ts, 4, 11))
 
         obj.#prop;
->obj : Symbol(obj, Decl(privateNameAndObjectRestSpread.ts, 4, 13))
+>obj : Symbol(obj, Decl(privateNameAndObjectRestSpread.ts, 5, 13))
 
         const { ...rest } = other;
->rest : Symbol(rest, Decl(privateNameAndObjectRestSpread.ts, 6, 15))
->other : Symbol(other, Decl(privateNameAndObjectRestSpread.ts, 3, 11))
+>rest : Symbol(rest, Decl(privateNameAndObjectRestSpread.ts, 7, 15))
+>other : Symbol(other, Decl(privateNameAndObjectRestSpread.ts, 4, 11))
 
         rest.#prop;
->rest : Symbol(rest, Decl(privateNameAndObjectRestSpread.ts, 6, 15))
+>rest : Symbol(rest, Decl(privateNameAndObjectRestSpread.ts, 7, 15))
+
+        const statics = { ... C};
+>statics : Symbol(statics, Decl(privateNameAndObjectRestSpread.ts, 10, 13))
+>C : Symbol(C, Decl(privateNameAndObjectRestSpread.ts, 0, 0))
+
+        statics.#propStatic
+>statics : Symbol(statics, Decl(privateNameAndObjectRestSpread.ts, 10, 13))
+
+        const { ...sRest } = C;
+>sRest : Symbol(sRest, Decl(privateNameAndObjectRestSpread.ts, 12, 15))
+>C : Symbol(C, Decl(privateNameAndObjectRestSpread.ts, 0, 0))
+
+        sRest.#propStatic;
+>sRest : Symbol(sRest, Decl(privateNameAndObjectRestSpread.ts, 12, 15))
     }
 }
diff --git a/tests/baselines/reference/privateNameAndObjectRestSpread.types b/tests/baselines/reference/privateNameAndObjectRestSpread.types
@@ -4,6 +4,10 @@ class C {
 
     #prop = 1;
 >#prop : number
+>1 : 1
+
+    static #propStatic = 1;
+>#propStatic : number
 >1 : 1
 
     method(other: C) {
@@ -26,5 +30,22 @@ class C {
         rest.#prop;
 >rest.#prop : any
 >rest : {}
+
+        const statics = { ... C};
+>statics : { prototype: C; }
+>{ ... C} : { prototype: C; }
+>C : typeof C
+
+        statics.#propStatic
+>statics.#propStatic : any
+>statics : { prototype: C; }
+
+        const { ...sRest } = C;
+>sRest : { prototype: C; }
+>C : typeof C
+
+        sRest.#propStatic;
+>sRest.#propStatic : any
+>sRest : { prototype: C; }
     }
 }
diff --git a/tests/baselines/reference/privateNameFieldsESNext.js b/tests/baselines/reference/privateNameFieldsESNext.js
@@ -35,12 +35,11 @@ class C {
         this.#a = "hello";
         console.log(this.#b);
     }
-    static #m;
+    static #m = "test";
     static #x;
     static test() {
         console.log(this.#m);
         console.log(this.#x = "test");
     }
     #something;
 }
-C.#m = "test";
diff --git a/tests/baselines/reference/privateNameStaticAccessors.errors.txt b/tests/baselines/reference/privateNameStaticAccessors.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessors.ts(9,12): error TS2540: Cannot assign to '#roProp' because it is a read-only property.
+
+
+==== tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessors.ts (1 errors) ====
+    class A1 {
+        static get #prop() { return ""; }
+        static set #prop(param: string) { }
+
+        static get #roProp() { return ""; }
+
+        constructor(name: string) {
+            A1.#prop = "";
+            A1.#roProp = ""; // Error
+               ~~~~~~~
+!!! error TS2540: Cannot assign to '#roProp' because it is a read-only property.
+            console.log(A1.#prop);
+            console.log(A1.#roProp);
+        }
+    }
+
diff --git a/tests/baselines/reference/privateNameStaticAccessors.js b/tests/baselines/reference/privateNameStaticAccessors.js
@@ -0,0 +1,44 @@
+//// [privateNameStaticAccessors.ts]
+class A1 {
+    static get #prop() { return ""; }
+    static set #prop(param: string) { }
+
+    static get #roProp() { return ""; }
+
+    constructor(name: string) {
+        A1.#prop = "";
+        A1.#roProp = ""; // Error
+        console.log(A1.#prop);
+        console.log(A1.#roProp);
+    }
+}
+
+
+//// [privateNameStaticAccessors.js]
+"use strict";
+var __classStaticPrivateAccessorSet = (this && this.__classStaticPrivateAccessorSet) || function (receiver, classConstructor, fn, value) {
+    if (receiver !== classConstructor) {
+        throw new TypeError("Private static access of wrong provenance");
+    }
+    fn.call(receiver, value);
+    return value;
+};
+var __classStaticPrivateReadonly = (this && this.__classStaticPrivateReadonly) || function () {
+    throw new TypeError("Private static element is not writable");
+};
+var __classStaticPrivateAccessorGet = (this && this.__classStaticPrivateAccessorGet) || function (receiver, classConstructor, fn) {
+    if (receiver !== classConstructor) {
+        throw new TypeError("Private static access of wrong provenance");
+    }
+    return fn.call(receiver);
+};
+var _A1_prop_get, _A1_prop_set, _A1_roProp_get;
+class A1 {
+    constructor(name) {
+        __classStaticPrivateAccessorSet(A1, A1, _A1_prop_set, "");
+        __classStaticPrivateReadonly(A1, ""); // Error
+        console.log(__classStaticPrivateAccessorGet(A1, A1, _A1_prop_get));
+        console.log(__classStaticPrivateAccessorGet(A1, A1, _A1_roProp_get));
+    }
+}
+_A1_prop_get = function _A1_prop_get() { return ""; }, _A1_prop_set = function _A1_prop_set(param) { }, _A1_roProp_get = function _A1_roProp_get() { return ""; };
diff --git a/tests/baselines/reference/privateNameStaticAccessors.symbols b/tests/baselines/reference/privateNameStaticAccessors.symbols
@@ -0,0 +1,41 @@
+=== tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessors.ts ===
+class A1 {
+>A1 : Symbol(A1, Decl(privateNameStaticAccessors.ts, 0, 0))
+
+    static get #prop() { return ""; }
+>#prop : Symbol(A1.#prop, Decl(privateNameStaticAccessors.ts, 0, 10), Decl(privateNameStaticAccessors.ts, 1, 37))
+
+    static set #prop(param: string) { }
+>#prop : Symbol(A1.#prop, Decl(privateNameStaticAccessors.ts, 0, 10), Decl(privateNameStaticAccessors.ts, 1, 37))
+>param : Symbol(param, Decl(privateNameStaticAccessors.ts, 2, 21))
+
+    static get #roProp() { return ""; }
+>#roProp : Symbol(A1.#roProp, Decl(privateNameStaticAccessors.ts, 2, 39))
+
+    constructor(name: string) {
+>name : Symbol(name, Decl(privateNameStaticAccessors.ts, 6, 16))
+
+        A1.#prop = "";
+>A1.#prop : Symbol(A1.#prop, Decl(privateNameStaticAccessors.ts, 0, 10), Decl(privateNameStaticAccessors.ts, 1, 37))
+>A1 : Symbol(A1, Decl(privateNameStaticAccessors.ts, 0, 0))
+
+        A1.#roProp = ""; // Error
+>A1.#roProp : Symbol(A1.#roProp, Decl(privateNameStaticAccessors.ts, 2, 39))
+>A1 : Symbol(A1, Decl(privateNameStaticAccessors.ts, 0, 0))
+
+        console.log(A1.#prop);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>A1.#prop : Symbol(A1.#prop, Decl(privateNameStaticAccessors.ts, 0, 10), Decl(privateNameStaticAccessors.ts, 1, 37))
+>A1 : Symbol(A1, Decl(privateNameStaticAccessors.ts, 0, 0))
+
+        console.log(A1.#roProp);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>A1.#roProp : Symbol(A1.#roProp, Decl(privateNameStaticAccessors.ts, 2, 39))
+>A1 : Symbol(A1, Decl(privateNameStaticAccessors.ts, 0, 0))
+    }
+}
+
diff --git a/tests/baselines/reference/privateNameStaticAccessors.types b/tests/baselines/reference/privateNameStaticAccessors.types
@@ -0,0 +1,49 @@
+=== tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessors.ts ===
+class A1 {
+>A1 : A1
+
+    static get #prop() { return ""; }
+>#prop : string
+>"" : ""
+
+    static set #prop(param: string) { }
+>#prop : string
+>param : string
+
+    static get #roProp() { return ""; }
+>#roProp : string
+>"" : ""
+
+    constructor(name: string) {
+>name : string
+
+        A1.#prop = "";
+>A1.#prop = "" : ""
+>A1.#prop : string
+>A1 : typeof A1
+>"" : ""
+
+        A1.#roProp = ""; // Error
+>A1.#roProp = "" : ""
+>A1.#roProp : any
+>A1 : typeof A1
+>"" : ""
+
+        console.log(A1.#prop);
+>console.log(A1.#prop) : void
+>console.log : (...data: any[]) => void
+>console : Console
+>log : (...data: any[]) => void
+>A1.#prop : string
+>A1 : typeof A1
+
+        console.log(A1.#roProp);
+>console.log(A1.#roProp) : void
+>console.log : (...data: any[]) => void
+>console : Console
+>log : (...data: any[]) => void
+>A1.#roProp : string
+>A1 : typeof A1
+    }
+}
+
diff --git a/tests/baselines/reference/privateNameStaticAccessorsAccess.errors.txt b/tests/baselines/reference/privateNameStaticAccessorsAccess.errors.txt
@@ -0,0 +1,39 @@
+tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessorsAccess.ts(16,4): error TS18013: Property '#prop' is not accessible outside class 'A2' because it has a private identifier.
+tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessorsAccess.ts(19,8): error TS18013: Property '#prop' is not accessible outside class 'A2' because it has a private identifier.
+tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessorsAccess.ts(24,12): error TS18013: Property '#prop' is not accessible outside class 'A2' because it has a private identifier.
+
+
+==== tests/cases/conformance/classes/members/privateNames/privateNameStaticAccessorsAccess.ts (3 errors) ====
+    export {}
+    class A2 {
+        static get #prop() { return ""; }
+        static set #prop(param: string) { }
+
+        constructor() {
+            console.log(A2.#prop);
+            let a: typeof A2 = A2;
+            a.#prop;
+            function  foo (){
+                a.#prop;
+            }
+        }
+    }
+
+    A2.#prop; // Error
+       ~~~~~
+!!! error TS18013: Property '#prop' is not accessible outside class 'A2' because it has a private identifier.
+
+    function  foo (){
+        A2.#prop; // Error
+           ~~~~~
+!!! error TS18013: Property '#prop' is not accessible outside class 'A2' because it has a private identifier.
+    }
+
+    class B2 {
+        m() {
+            A2.#prop;
+               ~~~~~
+!!! error TS18013: Property '#prop' is not accessible outside class 'A2' because it has a private identifier.
+        }
+    }
+