Only wrap functions in superPropertyGet helper (#16769)

nicolo-ribaudo · web-flow · commit 40ad3bc41dd4 · 2024-08-23T18:44:54.000+02:00
diff --git a/packages/babel-helpers/src/helpers-generated.ts b/packages/babel-helpers/src/helpers-generated.ts
@@ -1134,10 +1134,10 @@ const helpers: Record<string, Helper> = {
       },
     },
   ),
-  // size: 131, gzip size: 126
+  // size: 153, gzip size: 136
   superPropGet: helper(
     "7.25.0",
-    "function _superPropertyGet(t,e,r,o){var p=get(getPrototypeOf(1&o?t.prototype:t),e,r);return 2&o?function(t){return p.apply(r,t)}:p}",
+    'function _superPropertyGet(t,e,o,r){var p=get(getPrototypeOf(1&r?t.prototype:t),e,o);return 2&r&&"function"==typeof p?function(t){return p.apply(o,t)}:p}',
     {
       globals: [],
       locals: { _superPropertyGet: ["body.0.id"] },
diff --git a/packages/babel-helpers/src/helpers/superPropGet.ts b/packages/babel-helpers/src/helpers/superPropGet.ts
@@ -23,7 +23,7 @@ export default function _superPropertyGet(
     receiver,
   );
   // @ts-expect-error flags may be undefined
-  return flags & Flags.Call
+  return flags & Flags.Call && typeof result === "function"
     ? function (args: any[]) {
         return result.apply(receiver, args);
       }
diff --git a/packages/babel-plugin-transform-optional-chaining/test/fixtures/regression/16767-super-method-undefined-optional-call/exec.js b/packages/babel-plugin-transform-optional-chaining/test/fixtures/regression/16767-super-method-undefined-optional-call/exec.js
@@ -0,0 +1,20 @@
+class SS {
+  constructor(name){
+    this.name = 'ss'+name;
+  }
+}
+
+class AA extends SS {
+  constructor(name){
+    super(name);
+    this.name = 'aa' +name;
+}
+
+aaGreet(s){
+  super.greet?.(s + 'hhh');
+}
+}
+
+const a = new AA('jack');
+
+expect(() => a.aaGreet('d')).not.toThrow();
diff --git a/packages/babel-plugin-transform-optional-chaining/test/fixtures/regression/16767-super-method-undefined-optional-call/options.json b/packages/babel-plugin-transform-optional-chaining/test/fixtures/regression/16767-super-method-undefined-optional-call/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-optional-chaining", "transform-classes"]
+}
diff --git a/packages/babel-runtime-corejs3/helpers/esm/superPropGet.js b/packages/babel-runtime-corejs3/helpers/esm/superPropGet.js
@@ -1,9 +1,9 @@
 import get from "./get.js";
 import getPrototypeOf from "./getPrototypeOf.js";
-function _superPropertyGet(t, e, r, o) {
-  var p = get(getPrototypeOf(1 & o ? t.prototype : t), e, r);
-  return 2 & o ? function (t) {
-    return p.apply(r, t);
+function _superPropertyGet(t, e, o, r) {
+  var p = get(getPrototypeOf(1 & r ? t.prototype : t), e, o);
+  return 2 & r && "function" == typeof p ? function (t) {
+    return p.apply(o, t);
   } : p;
 }
 export { _superPropertyGet as default };

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export default function _superPropertyGet(`
`23`	`23`	`receiver,`
`24`	`24`	`);`
`25`	`25`	`// @ts-expect-error flags may be undefined`
`26`		`- return flags & Flags.Call`
	`26`	`+ return flags & Flags.Call && typeof result === "function"`
`27`	`27`	`? function (args: any[]) {`
`28`	`28`	`return result.apply(receiver, args);`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "plugins": ["transform-optional-chaining", "transform-classes"]`
	`3`	`+}`