[Refactor] use safe-push-apply

es-shims · Dec 29, 2024 · a2cd996 · a2cd996
1 parent 795a82b
commit a2cd996
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 62 deletions.
diff --git a/2017/EnumerableOwnProperties.js b/2017/EnumerableOwnProperties.js
@@ -1,17 +1,12 @@
 'use strict';
 
-var GetIntrinsic = require('get-intrinsic');
-
 var $TypeError = require('es-errors/type');
 
 var objectKeys = require('object-keys');
-
 var callBound = require('call-bound');
-
-var callBind = require('call-bind');
+var safePushApply = require('safe-push-apply');
 
 var $isEnumerable = callBound('Object.prototype.propertyIsEnumerable');
-var $pushApply = callBind.apply(GetIntrinsic('%Array.prototype.push%'));
 
 var forEach = require('../helpers/forEach');
 var isObject = require('../helpers/isObject');
@@ -31,7 +26,7 @@ module.exports = function EnumerableOwnProperties(O, kind) {
 		var results = [];
 		forEach(keys, function (key) {
 			if ($isEnumerable(O, key)) {
-				$pushApply(results, [
+				safePushApply(results, [
 					kind === 'value' ? O[key] : [key, O[key]]
 				]);
 			}

diff --git a/2018/EnumerableOwnPropertyNames.js b/2018/EnumerableOwnPropertyNames.js
@@ -1,17 +1,12 @@
 'use strict';
 
-var GetIntrinsic = require('get-intrinsic');
-
 var $TypeError = require('es-errors/type');
 
 var objectKeys = require('object-keys');
-
+var safePushApply = require('safe-push-apply');
 var callBound = require('call-bound');
 
-var callBind = require('call-bind');
-
 var $isEnumerable = callBound('Object.prototype.propertyIsEnumerable');
-var $pushApply = callBind.apply(GetIntrinsic('%Array.prototype.push%'));
 
 var forEach = require('../helpers/forEach');
 var isObject = require('../helpers/isObject');
@@ -31,7 +26,7 @@ module.exports = function EnumerableOwnPropertyNames(O, kind) {
 		var results = [];
 		forEach(keys, function (key) {
 			if ($isEnumerable(O, key)) {
-				$pushApply(results, [
+				safePushApply(results, [
 					kind === 'value' ? O[key] : [key, O[key]]
 				]);
 			}

diff --git a/2019/EnumerableOwnPropertyNames.js b/2019/EnumerableOwnPropertyNames.js
diff --git a/2020/EnumerableOwnPropertyNames.js b/2020/EnumerableOwnPropertyNames.js
diff --git a/2021/EnumerableOwnPropertyNames.js b/2021/EnumerableOwnPropertyNames.js
diff --git a/2022/EnumerableOwnPropertyNames.js b/2022/EnumerableOwnPropertyNames.js
diff --git a/2023/EnumerableOwnProperties.js b/2023/EnumerableOwnProperties.js
@@ -1,17 +1,12 @@
 'use strict';
 
-var GetIntrinsic = require('get-intrinsic');
-
 var $TypeError = require('es-errors/type');
 
 var objectKeys = require('object-keys');
-
+var safePushApply = require('safe-push-apply');
 var callBound = require('call-bound');
 
-var callBind = require('call-bind');
-
 var $isEnumerable = callBound('Object.prototype.propertyIsEnumerable');
-var $pushApply = callBind.apply(GetIntrinsic('%Array.prototype.push%'));
 
 var forEach = require('../helpers/forEach');
 var isObject = require('../helpers/isObject');
@@ -31,7 +26,7 @@ module.exports = function EnumerableOwnProperties(O, kind) {
 		var results = [];
 		forEach(keys, function (key) {
 			if ($isEnumerable(O, key)) {
-				$pushApply(results, [
+				safePushApply(results, [
 					kind === 'value' ? O[key] : [key, O[key]]
 				]);
 			}

diff --git a/2024/EnumerableOwnProperties.js b/2024/EnumerableOwnProperties.js
diff --git a/helpers/OwnPropertyKeys.js b/helpers/OwnPropertyKeys.js
@@ -2,21 +2,18 @@
 
 var GetIntrinsic = require('get-intrinsic');
 
-var callBind = require('call-bind');
-var callBound = require('call-bound');
+var safePushApply = require('safe-push-apply');
 
 var $ownKeys = GetIntrinsic('%Reflect.ownKeys%', true);
-var $pushApply = callBind.apply(GetIntrinsic('%Array.prototype.push%'));
-var $SymbolValueOf = callBound('Symbol.prototype.valueOf', true);
 var $gOPN = GetIntrinsic('%Object.getOwnPropertyNames%', true);
-var $gOPS = $SymbolValueOf ? GetIntrinsic('%Object.getOwnPropertySymbols%') : null;
+var $gOPS = GetIntrinsic('%Object.getOwnPropertySymbols%', true);
 
 var keys = require('object-keys');
 
 module.exports = $ownKeys || function OwnPropertyKeys(source) {
 	var ownKeys = ($gOPN || keys)(source);
 	if ($gOPS) {
-		$pushApply(ownKeys, $gOPS(source));
+		safePushApply(ownKeys, $gOPS(source));
 	}
 	return ownKeys;
 };
diff --git a/package.json b/package.json
@@ -93,6 +93,7 @@
 		"object.assign": "^4.1.7",
 		"regexp.prototype.flags": "^1.5.3",
 		"safe-array-concat": "^1.1.3",
+		"safe-push-apply": "^1.0.0",
 		"safe-regex-test": "^1.1.0",
 		"string.prototype.trim": "^1.2.10",
 		"string.prototype.trimend": "^1.0.9",