bugfix: Fix usage of private methods

chadhietala · chadhietala · commit f47afe238d39 · 2021-04-26T15:10:13.000-04:00
@babel/plugin-proposal-private-methods requires seeing
@babel/plugin-proposal-class-properties being set before it can run. In
Babel plugins run before presets. Because of this, these 2 plugins must
exist in the preset.
diff --git a/packages/@glimmer/babel-preset/index.js b/packages/@glimmer/babel-preset/index.js
@@ -11,6 +11,13 @@ module.exports = function (api, options) {
 
   let precompile, templateCompilerPath;
 
+  const looseProps =
+    typeof options.loose === 'object' &&
+    options.loose !== null &&
+    typeof options.loose.properties === 'boolean'
+      ? options.loose.properties
+      : false;
+
   if (options.precompile) {
     precompile = options.precompile;
   } else {
@@ -75,9 +82,19 @@ module.exports = function (api, options) {
         { legacy: true },
       ],
 
-      __loadPlugins
-        ? require('@babel/plugin-proposal-class-properties')
-        : require.resolve('@babel/plugin-proposal-class-properties'),
+      [
+        __loadPlugins
+          ? require('@babel/plugin-proposal-class-properties')
+          : require.resolve('@babel/plugin-proposal-class-properties'),
+        { loose: looseProps },
+      ],
+
+      [
+        __loadPlugins
+          ? require('@babel/plugin-proposal-private-methods')
+          : require.resolve('@babel/plugin-proposal-private-methods'),
+        { loose: looseProps },
+      ],
     ],
   };
 };
diff --git a/packages/@glimmer/babel-preset/package.json b/packages/@glimmer/babel-preset/package.json
@@ -7,10 +7,11 @@
   "license": "MIT",
   "private": false,
   "scripts": {
-    "test": "mocha -r esm"
+    "test": "mocha -r esm --timeout 10000"
   },
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-private-methods": "^7.13.0",
     "@babel/plugin-proposal-decorators": "^7.8.3",
     "@glimmer/compiler": "0.77.6",
     "@glimmer/vm-babel-plugins": "0.77.6",
diff --git a/packages/@glimmer/babel-preset/test/fixtures/debug/code.js b/packages/@glimmer/babel-preset/test/fixtures/debug/code.js
@@ -13,6 +13,10 @@ deprecate('this is deprecated', false, { id: 'foo' });
 
 class Test {
   @tracked bar = 123;
+
+  #dog = "dog";
+
+  #cat() { return "cat" }
 }
 
 precompileTemplate('Hello, world!', { strictMode: true, scope: { Test } });
diff --git a/packages/@glimmer/babel-preset/test/fixtures/debug/output.js b/packages/@glimmer/babel-preset/test/fixtures/debug/output.js
@@ -1,4 +1,4 @@
-var _class, _descriptor, _temp;
+var _class, _descriptor, _dog, _cat;
 
 import { createTemplateFactory as _createTemplateFactory } from "@glimmer/core";
 
@@ -23,12 +23,19 @@ if (true
 (true && !(false) && deprecate('this is deprecated', false, {
   id: 'foo'
 }));
-let Test = (_class = (_temp = class Test {
+let Test = (_class = (_dog = new WeakMap(), _cat = new WeakSet(), class Test {
   constructor() {
+    _cat.add(this);
+
     _initializerDefineProperty(this, "bar", _descriptor, this);
+
+    _dog.set(this, {
+      writable: true,
+      value: "dog"
+    });
   }
 
-}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
+}), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -37,6 +44,10 @@ let Test = (_class = (_temp = class Test {
   }
 })), _class);
 
+function _cat2() {
+  return "cat";
+}
+
 _createTemplateFactory(
 /*
   Hello, world!
@@ -47,4 +58,4 @@ _createTemplateFactory(
   "moduleName": "(unknown template module)",
   "scope": null,
   "isStrictMode": true
-});
+});
diff --git a/packages/@glimmer/babel-preset/test/fixtures/production/.babelrc b/packages/@glimmer/babel-preset/test/fixtures/production/.babelrc
@@ -1,5 +1,10 @@
 {
   "presets": [
-    ["@glimmer/babel-preset", { "isDebug": false }]
+    [
+      "@glimmer/babel-preset",
+      {
+        "isDebug": false
+      }
+    ]
   ]
-}
+}
diff --git a/packages/@glimmer/babel-preset/test/fixtures/production/code.js b/packages/@glimmer/babel-preset/test/fixtures/production/code.js
@@ -13,6 +13,10 @@ deprecate('this is deprecated', false, { id: 'foo' });
 
 class Test {
   @tracked bar = 123;
+
+  #dog = "dog";
+
+  #cat() { return "cat" }
 }
 
 precompileTemplate('Hello, world!', { strictMode: true, scope: { Test } });
diff --git a/packages/@glimmer/babel-preset/test/fixtures/production/output.js b/packages/@glimmer/babel-preset/test/fixtures/production/output.js
@@ -1,4 +1,4 @@
-var _class, _descriptor, _temp;
+var _class, _descriptor, _dog, _cat;
 
 import { createTemplateFactory as _createTemplateFactory } from "@glimmer/core";
 
@@ -23,12 +23,19 @@ if (false
 (false && !(false) && deprecate('this is deprecated', false, {
   id: 'foo'
 }));
-let Test = (_class = (_temp = class Test {
+let Test = (_class = (_dog = new WeakMap(), _cat = new WeakSet(), class Test {
   constructor() {
+    _cat.add(this);
+
     _initializerDefineProperty(this, "bar", _descriptor, this);
+
+    _dog.set(this, {
+      writable: true,
+      value: "dog"
+    });
   }
 
-}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
+}), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -37,6 +44,10 @@ let Test = (_class = (_temp = class Test {
   }
 })), _class);
 
+function _cat2() {
+  return "cat";
+}
+
 _createTemplateFactory(
 /*
   Hello, world!
@@ -47,4 +58,4 @@ _createTemplateFactory(
   "moduleName": "(unknown template module)",
   "scope": null,
   "isStrictMode": true
-});
+});
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ deprecate('this is deprecated', false, { id: 'foo' });`
`13`	`13`
`14`	`14`	`class Test {`
`15`	`15`	`@tracked bar = 123;`
	`16`	`+`
	`17`	`+ #dog = "dog";`
	`18`	`+`
	`19`	`+ #cat() { return "cat" }`
`16`	`20`	`}`
`17`	`21`
`18`	`22`	`precompileTemplate('Hello, world!', { strictMode: true, scope: { Test } });`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"presets": [`
`3`		`- ["@glimmer/babel-preset", { "isDebug": false }]`
	`3`	`+ [`
	`4`	`+ "@glimmer/babel-preset",`
	`5`	`+ {`
	`6`	`+ "isDebug": false`
	`7`	`+ }`
	`8`	`+ ]`
`4`	`9`	`]`
`5`		`-}`
	`10`	`+}`