Reuse getter/setter template

babel · Jul 22, 2019 · ee9364e · ee9364e
1 parent 6ab7fb8
commit ee9364e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 30 deletions.
diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.js b/packages/babel-helper-create-class-features-plugin/src/fields.js
@@ -314,35 +314,15 @@ function buildPrivateStaticFieldInitSpec(prop, privateNamesMap) {
       initAdded: true,
     });
 
-    if (getId && setId) {
-      return template.statement.ast`
-        var ${id.name} = {
-          // configurable is false by default
-          // enumerable is false by default
-          // writable is false by default
-          get: ${getId.name},
-          set: ${setId.name}
-        }
-      `;
-    } else if (getId && !setId) {
-      return template.statement.ast`
-        var ${id.name} = {
-          // configurable is false by default
-          // enumerable is false by default
-          // writable is false by default
-          get: ${getId.name}
-        }
-      `;
-    } else if (!getId && setId) {
-      return template.statement.ast`
-        var ${id.name} = {
-          // configurable is false by default
-          // enumerable is false by default
-          // writable is false by default
-          set: ${setId.name}
-        }
-      `;
-    }
+    return template.statement.ast`
+      var ${id.name} = {
+        // configurable is false by default
+        // enumerable is false by default
+        // writable is false by default
+        get: ${getId ? getId.name : "null"},
+        set: ${setId ? setId.name : "null"}
+      }
+    `;
   }
 
   const value = prop.node.value || prop.scope.buildUndefinedNode();

diff --git a/...-plugin-proposal-private-methods/test/fixtures/static-accessors/get-only-setter/output.js b/...-plugin-proposal-private-methods/test/fixtures/static-accessors/get-only-setter/output.js
@@ -14,5 +14,6 @@ var _PRIVATE_STATIC_FIELD = {
   value: 0
 };
 var _privateStaticFieldValue = {
+  get: null,
   set: _set_privateStaticFieldValue
 };
diff --git a/...-plugin-proposal-private-methods/test/fixtures/static-accessors/set-only-getter/output.js b/...-plugin-proposal-private-methods/test/fixtures/static-accessors/set-only-getter/output.js
@@ -14,5 +14,6 @@ var _PRIVATE_STATIC_FIELD = {
   value: 0
 };
 var _privateStaticFieldValue = {
-  get: _get_privateStaticFieldValue
+  get: _get_privateStaticFieldValue,
+  set: null
 };