Make "object without properties" helpers ES6-compatible (#17086)

tquetano-netflix · web-flow · commit 0e6199b2aac1 · 2025-01-24T14:24:47.000+01:00
* change `includes` to `indexOf` and rebuild

* turn off lint rule

* update fixtures
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -351,6 +351,7 @@ export default [
       "prefer-spread": "off",
       "import/no-extraneous-dependencies": "off",
       "import/no-unresolved": "off",
+      "@typescript-eslint/prefer-includes": "off",
       "@typescript-eslint/prefer-optional-chain": "off",
       "unicorn/prefer-includes": "off",
     },
diff --git a/packages/babel-helpers/src/helpers-generated.ts b/packages/babel-helpers/src/helpers-generated.ts
@@ -959,10 +959,10 @@ const helpers: Record<string, Helper> = {
       },
     },
   ),
-  // size: 275, gzip size: 198
+  // size: 279, gzip size: 205
   objectWithoutProperties: helper(
     "7.0.0-beta.0",
-    "function _objectWithoutProperties(e,t){if(null==e)return{};var o,r,i=objectWithoutPropertiesLoose(e,t);if(Object.getOwnPropertySymbols){var s=Object.getOwnPropertySymbols(e);for(r=0;r<s.length;r++)o=s[r],t.includes(o)||{}.propertyIsEnumerable.call(e,o)&&(i[o]=e[o])}return i}",
+    "function _objectWithoutProperties(e,t){if(null==e)return{};var o,r,i=objectWithoutPropertiesLoose(e,t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);for(r=0;r<n.length;r++)o=n[r],-1===t.indexOf(o)&&{}.propertyIsEnumerable.call(e,o)&&(i[o]=e[o])}return i}",
     {
       globals: ["Object"],
       locals: { _objectWithoutProperties: ["body.0.id"] },
@@ -975,10 +975,10 @@ const helpers: Record<string, Helper> = {
       },
     },
   ),
-  // size: 165, gzip size: 151
+  // size: 169, gzip size: 156
   objectWithoutPropertiesLoose: helper(
     "7.0.0-beta.0",
-    "function _objectWithoutPropertiesLoose(r,e){if(null==r)return{};var t={};for(var n in r)if({}.hasOwnProperty.call(r,n)){if(e.includes(n))continue;t[n]=r[n]}return t}",
+    "function _objectWithoutPropertiesLoose(r,e){if(null==r)return{};var t={};for(var n in r)if({}.hasOwnProperty.call(r,n)){if(-1!==e.indexOf(n))continue;t[n]=r[n]}return t}",
     {
       globals: [],
       locals: { _objectWithoutPropertiesLoose: ["body.0.id"] },
diff --git a/packages/babel-helpers/src/helpers/objectWithoutProperties.ts b/packages/babel-helpers/src/helpers/objectWithoutProperties.ts
@@ -29,7 +29,7 @@ export default function _objectWithoutProperties<
     var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
     for (i = 0; i < sourceSymbolKeys.length; i++) {
       key = sourceSymbolKeys[i] as keyof typeof source & keyof typeof target;
-      if (excluded.includes(key)) continue;
+      if (excluded.indexOf(key) !== -1) continue;
       if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
       target[key] = source[key];
     }
diff --git a/packages/babel-helpers/src/helpers/objectWithoutPropertiesLoose.ts b/packages/babel-helpers/src/helpers/objectWithoutPropertiesLoose.ts
@@ -21,7 +21,7 @@ export default function _objectWithoutPropertiesLoose<T extends object>(
 
   for (var key in source) {
     if (Object.prototype.hasOwnProperty.call(source, key)) {
-      if (excluded.includes(key)) continue;
+      if (excluded.indexOf(key) !== -1) continue;
       target[key] = source[key];
     }
   }
diff --git a/packages/babel-preset-env/test/fixtures/corejs2-babel-7/usage-shippedProposals/output.js b/packages/babel-preset-env/test/fixtures/corejs2-babel-7/usage-shippedProposals/output.js
diff --git a/packages/babel-runtime-corejs3/helpers/esm/objectWithoutProperties.js b/packages/babel-runtime-corejs3/helpers/esm/objectWithoutProperties.js
@@ -1,14 +1,14 @@
 import _Object$getOwnPropertySymbols from "core-js-pure/features/object/get-own-property-symbols.js";
-import _includesInstanceProperty from "core-js-pure/features/instance/includes.js";
+import _indexOfInstanceProperty from "core-js-pure/features/instance/index-of.js";
 import objectWithoutPropertiesLoose from "./objectWithoutPropertiesLoose.js";
 function _objectWithoutProperties(e, t) {
   if (null == e) return {};
   var o,
     r,
     i = objectWithoutPropertiesLoose(e, t);
   if (_Object$getOwnPropertySymbols) {
-    var s = _Object$getOwnPropertySymbols(e);
-    for (r = 0; r < s.length; r++) o = s[r], _includesInstanceProperty(t).call(t, o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var n = _Object$getOwnPropertySymbols(e);
+    for (r = 0; r < n.length; r++) o = n[r], -1 === _indexOfInstanceProperty(t).call(t, o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
diff --git a/packages/babel-runtime-corejs3/helpers/esm/objectWithoutPropertiesLoose.js b/packages/babel-runtime-corejs3/helpers/esm/objectWithoutPropertiesLoose.js
@@ -1,9 +1,9 @@
-import _includesInstanceProperty from "core-js-pure/features/instance/includes.js";
+import _indexOfInstanceProperty from "core-js-pure/features/instance/index-of.js";
 function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (_includesInstanceProperty(e).call(e, n)) continue;
+    if (-1 !== _indexOfInstanceProperty(e).call(e, n)) continue;
     t[n] = r[n];
   }
   return t;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export default function _objectWithoutProperties<`
`29`	`29`	`var sourceSymbolKeys = Object.getOwnPropertySymbols(source);`
`30`	`30`	`for (i = 0; i < sourceSymbolKeys.length; i++) {`
`31`	`31`	`key = sourceSymbolKeys[i] as keyof typeof source & keyof typeof target;`
`32`		`- if (excluded.includes(key)) continue;`
	`32`	`+ if (excluded.indexOf(key) !== -1) continue;`
`33`	`33`	`if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;`
`34`	`34`	`target[key] = source[key];`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export default function _objectWithoutPropertiesLoose<T extends object>(`
`21`	`21`
`22`	`22`	`for (var key in source) {`
`23`	`23`	`if (Object.prototype.hasOwnProperty.call(source, key)) {`
`24`		`- if (excluded.includes(key)) continue;`
	`24`	`+ if (excluded.indexOf(key) !== -1) continue;`
`25`	`25`	`target[key] = source[key];`
`26`	`26`	`}`
`27`	`27`	`}`