From fd956e3678f0322c3e48b59e96a00d87b828b448 Mon Sep 17 00:00:00 2001
From: Ruslan Lopatin <ruslan.lopatin@gmail.com>
Date: Sat, 12 Aug 2023 11:15:43 +0700
Subject: [PATCH] `esgen` v0.2.10

---
 package.json                                  |  4 ++--
 .../deserialization/list.ucrx.class.ts        | 22 ++++++-------------
 .../deserialization/map.ucrx.class.ts         | 15 +++++--------
 .../deserialization/unknown.ucrx.class.ts     | 10 +++------
 4 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 0ddb1868..c84ddc58 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "esgen": "^0.2.4"
+    "esgen": "^0.2.10"
   },
   "peerDependenciesMeta": {
     "esgen": {
@@ -85,7 +85,7 @@
     "@swc/jest": "^0.2.28",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",
-    "esgen": "^0.2.9",
+    "esgen": "^0.2.10",
     "eslint": "^8.47.0",
     "eslint-plugin-jest": "^27.2.3",
     "expect": "^29.6.2",
diff --git a/src/compiler/deserialization/list.ucrx.class.ts b/src/compiler/deserialization/list.ucrx.class.ts
index 0848bddb..edbb27b6 100644
--- a/src/compiler/deserialization/list.ucrx.class.ts
+++ b/src/compiler/deserialization/list.ucrx.class.ts
@@ -2,7 +2,6 @@ import {
   EsArg,
   EsField,
   EsFieldHandle,
-  EsMemberVisibility,
   EsMethod,
   EsMethodHandle,
   EsProperty,
@@ -97,15 +96,13 @@ export class ListUcrxClass<
     this.#isMatrix = isMatrix;
     this.#single = single;
 
-    this.#items = new EsField('items', { visibility: EsMemberVisibility.Private }).declareIn(this, {
+    this.#items = new EsField('#items').declareIn(this, {
       initializer: () => '[]',
     });
     this.#addItem = this.#declareAddItem();
-    this.#listCreated = new EsField('listCreated', {
-      visibility: EsMemberVisibility.Private,
-    }).declareIn(this, { initializer: () => '0' });
+    this.#listCreated = new EsField('#listCreated').declareIn(this, { initializer: () => '0' });
     this.#isNull = this.#isNullableList
-      ? new EsField('isNull', { visibility: EsMemberVisibility.Private }).declareIn(this, {
+      ? new EsField('#isNull').declareIn(this, {
           initializer: () => '0',
         })
       : undefined;
@@ -131,9 +128,8 @@ export class ListUcrxClass<
   }
 
   #declareAddItem(): EsMethodHandle<{ item: EsArg }> {
-    return new EsMethod('addItem', {
+    return new EsMethod('#addItem', {
       args: { item: {} },
-      visibility: EsMemberVisibility.Private,
     }).declareIn(this, {
       body: ({
         member: {
@@ -148,9 +144,7 @@ export class ListUcrxClass<
       return [`this.set`];
     }
 
-    const setList = new EsField('setList', { visibility: EsMemberVisibility.Private }).declareIn(
-      this,
-    );
+    const setList = new EsField('#setList').declareIn(this);
 
     return [setList.get('this'), setList];
   }
@@ -160,11 +154,9 @@ export class ListUcrxClass<
       return;
     }
 
-    const itemRxState = new EsField('_itemRx', {
-      visibility: EsMemberVisibility.Private,
-    }).declareIn(this);
+    const itemRxState = new EsField('#_itemRx').declareIn(this);
 
-    return new EsProperty('itemRx', { visibility: EsMemberVisibility.Private }).declareIn(this, {
+    return new EsProperty('#itemRx').declareIn(this, {
       get: () => esline`return ${itemRxState.get('this')} ??= ${this.itemClass.instantiate({
           set: esline`item => ${this.#addItem.call('this', { item: 'item' })}`,
         })};`,
diff --git a/src/compiler/deserialization/map.ucrx.class.ts b/src/compiler/deserialization/map.ucrx.class.ts
index a657ab9c..73e949cd 100644
--- a/src/compiler/deserialization/map.ucrx.class.ts
+++ b/src/compiler/deserialization/map.ucrx.class.ts
@@ -3,7 +3,6 @@ import {
   EsCode,
   EsField,
   EsFieldHandle,
-  EsMemberVisibility,
   EsMethod,
   EsSnippet,
   EsSymbol,
@@ -75,7 +74,7 @@ export class MapUcrxClass<
     this.#extra = this.#declareExtra();
     this.#collector = this.#declareCollector(variant);
     this.#store = this.allocateStore();
-    this.#slot = new EsField('slot', { visibility: EsMemberVisibility.Private }).declareIn(this);
+    this.#slot = new EsField('#slot').declareIn(this);
 
     this.#declareConstructor();
     this.#declareFor();
@@ -141,7 +140,7 @@ export class MapUcrxClass<
       case 'reject':
         return { assigned: this.#declareAssigned(), counter, noDuplicates: true };
       case 'collect':
-        return { rxs: this.#declareAssigned('rxs'), counter };
+        return { rxs: this.#declareAssigned('#rxs'), counter };
     }
   }
 
@@ -152,9 +151,7 @@ export class MapUcrxClass<
       return;
     }
 
-    const missingCount = new EsField('missingCount', {
-      visibility: EsMemberVisibility.Private,
-    }).declareIn(this, {
+    const missingCount = new EsField('#missingCount').declareIn(this, {
       initializer: () => `${requiredCount}`,
     });
 
@@ -176,10 +173,8 @@ export class MapUcrxClass<
     return requiredCount;
   }
 
-  #declareAssigned(name: 'assigned' | 'rxs' = 'assigned'): EsFieldHandle {
-    return new EsField(name, {
-      visibility: EsMemberVisibility.Private,
-    }).declareIn(this, {
+  #declareAssigned(name: '#assigned' | '#rxs' = '#assigned'): EsFieldHandle {
+    return new EsField(name).declareIn(this, {
       initializer: () => '{}',
     });
   }
diff --git a/src/compiler/deserialization/unknown.ucrx.class.ts b/src/compiler/deserialization/unknown.ucrx.class.ts
index 3a494fa8..e80aa397 100644
--- a/src/compiler/deserialization/unknown.ucrx.class.ts
+++ b/src/compiler/deserialization/unknown.ucrx.class.ts
@@ -3,7 +3,6 @@ import {
   EsArg,
   EsField,
   EsFieldHandle,
-  EsMemberVisibility,
   EsMethod,
   EsMethodHandle,
   EsSignature,
@@ -60,10 +59,8 @@ export class UnknownUcrxClass extends UcrxClass {
         args: UcrxSignature,
       },
     });
-    this.#listRx = new EsField('listRx', { visibility: EsMemberVisibility.Private }).declareIn(
-      this,
-    );
-    this.#mapRx = new EsField('mapRx', { visibility: EsMemberVisibility.Private }).declareIn(this);
+    this.#listRx = new EsField('#listRx').declareIn(this);
+    this.#mapRx = new EsField('#mapRx').declareIn(this);
     this.#setMap = this.#declareSetMap();
 
     this.#listClass = lazyValue(() => {
@@ -108,8 +105,7 @@ export class UnknownUcrxClass extends UcrxClass {
   }
 
   #declareSetMap(): EsMethodHandle<{ map: EsArg; cx: EsArg }> {
-    return new EsMethod('setMap', {
-      visibility: EsMemberVisibility.Private,
+    return new EsMethod('#setMap', {
       args: { map: {}, cx: {} },
     }).declareIn(this, {
       body: