Reuse getter/setter templates

babel · Jul 29, 2019 · 4897125 · 4897125
1 parent 4968521
commit 4897125
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 81 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
@@ -358,35 +358,15 @@ function buildPrivateMethodInitLoose(ref, prop, privateNamesMap) {
       initAdded: true,
     });
 
-    if (getId && setId) {
-      return template.statement.ast`
-        Object.defineProperty(${ref}, ${id}, {
-          // 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`
-        Object.defineProperty(${ref}, ${id}, {
-          // 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`
-        Object.defineProperty(${ref}, ${id}, {
-          // configurable is false by default
-          // enumerable is false by default
-          // writable is false by default
-          set: ${setId.name}
-        });
-      `;
-    }
+    return template.statement.ast`
+      Object.defineProperty(${ref}, ${id}, {
+        // configurable is false by default
+        // enumerable is false by default
+        // writable is false by default
+        get: ${getId ? getId.name : "undefined"},
+        set: ${setId ? setId.name : "undefined"}
+      });
+    `;
   }
 }
 
@@ -401,26 +381,12 @@ function buildPrivateInstanceMethodInitSpec(ref, prop, privateNamesMap) {
       initAdded: true,
     });
 
-    if (getId && setId) {
-      return template.statement.ast`
-        ${id}.set(${ref}, {
-          get: ${getId.name},
-          set: ${setId.name}
-        });
-      `;
-    } else if (getId && !setId) {
-      return template.statement.ast`
-        ${id}.set(${ref}, {
-          get: ${getId.name}
-        });
-      `;
-    } else if (!getId && setId) {
-      return template.statement.ast`
-        ${id}.set(${ref}, {
-          set: ${setId.name}
-        });
-      `;
-    }
+    return template.statement.ast`
+      ${id}.set(${ref}, {
+        get: ${getId ? getId.name : "undefined"},
+        set: ${setId ? setId.name : "undefined"}
+      });
+    `;
   }
   return template.statement.ast`${id}.add(${ref})`;
 }
@@ -462,35 +428,15 @@ function buildPrivateStaticMethodInitLoose(ref, prop, state, privateNamesMap) {
       initAdded: true,
     });
 
-    if (getId && setId) {
-      return template.statement.ast`
-        Object.defineProperty(${ref}, ${id}, {
-          // 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`
-        Object.defineProperty(${ref}, ${id}, {
-          // 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`
-        Object.defineProperty(${ref}, ${id}, {
-          // configurable is false by default
-          // enumerable is false by default
-          // writable is false by default
-          set: ${setId.name},
-        })
-      `;
-    }
+    return template.statement.ast`
+      Object.defineProperty(${ref}, ${id}, {
+        // configurable is false by default
+        // enumerable is false by default
+        // writable is false by default
+        get: ${getId ? getId.name : "undefined"},
+        set: ${setId ? setId.name : "undefined"}
+      })
+    `;
   }
 
   return template.statement.ast`

diff --git a/...l-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js b/...l-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js
@@ -1,6 +1,7 @@
 class Cl {
   constructor() {
     Object.defineProperty(this, _privateFieldValue, {
+      get: undefined,
       set: _set_privateFieldValue
     });
     Object.defineProperty(this, _privateField, {

diff --git a/...l-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js b/...l-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js
@@ -1,7 +1,8 @@
 class Cl {
   constructor() {
     Object.defineProperty(this, _privateFieldValue, {
-      get: _get_privateFieldValue
+      get: _get_privateFieldValue,
+      set: undefined
     });
     Object.defineProperty(this, _privateField, {
       writable: true,

diff --git a/...s/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js b/...s/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js
@@ -1,6 +1,7 @@
 class Cl {
   constructor() {
     _privateFieldValue.set(this, {
+      get: undefined,
       set: _set_privateFieldValue
     });
 

diff --git a/...s/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js b/...s/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js
@@ -1,7 +1,8 @@
 class Cl {
   constructor() {
     _privateFieldValue.set(this, {
-      get: _get_privateFieldValue
+      get: _get_privateFieldValue,
+      set: undefined
     });
 
     _privateField.set(this, {

diff --git a/...n-proposal-private-methods/test/fixtures/static-accessors-loose/get-only-setter/output.js b/...n-proposal-private-methods/test/fixtures/static-accessors-loose/get-only-setter/output.js
@@ -18,5 +18,6 @@ Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
   value: 0
 });
 Object.defineProperty(Cl, _privateStaticFieldValue, {
+  get: undefined,
   set: _set_privateStaticFieldValue
 });
diff --git a/...n-proposal-private-methods/test/fixtures/static-accessors-loose/set-only-getter/output.js b/...n-proposal-private-methods/test/fixtures/static-accessors-loose/set-only-getter/output.js
@@ -18,5 +18,6 @@ Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
   value: 0
 });
 Object.defineProperty(Cl, _privateStaticFieldValue, {
-  get: _get_privateStaticFieldValue
+  get: _get_privateStaticFieldValue,
+  set: undefined
 });