[Refactor] use own-keys

es-shims · Dec 29, 2024 · 3a06a02 · 3a06a02
1 parent a2cd996
commit 3a06a02
Show file tree

Hide file tree

Showing 37 changed files with 38 additions and 52 deletions.
diff --git a/2015/ObjectDefineProperties.js b/2015/ObjectDefineProperties.js
@@ -9,7 +9,7 @@ var ToPropertyDescriptor = require('./ToPropertyDescriptor');
 
 var forEach = require('../helpers/forEach');
 var getOwnPropertyDescriptor = require('gopd');
-var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
+var OwnPropertyKeys = require('own-keys');
 
 var $push = callBound('Array.prototype.push');
 

diff --git a/2015/TestIntegrityLevel.js b/2015/TestIntegrityLevel.js
@@ -4,7 +4,7 @@ var $gOPD = require('gopd');
 var $TypeError = require('es-errors/type');
 
 var every = require('../helpers/every');
-var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
+var OwnPropertyKeys = require('own-keys');
 
 var IsDataDescriptor = require('./IsDataDescriptor');
 var IsExtensible = require('./IsExtensible');

diff --git a/2016/ObjectDefineProperties.js b/2016/ObjectDefineProperties.js
diff --git a/2016/TestIntegrityLevel.js b/2016/TestIntegrityLevel.js
diff --git a/2017/ObjectDefineProperties.js b/2017/ObjectDefineProperties.js
diff --git a/2017/TestIntegrityLevel.js b/2017/TestIntegrityLevel.js
diff --git a/2017/WordCharacters.js b/2017/WordCharacters.js
@@ -9,7 +9,7 @@ var Canonicalize = require('./Canonicalize');
 
 var caseFolding = require('../helpers/caseFolding.json');
 var forEach = require('../helpers/forEach');
-var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
+var OwnPropertyKeys = require('own-keys');
 
 var A = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'; // step 1
 

diff --git a/2018/CopyDataProperties.js b/2018/CopyDataProperties.js
@@ -4,7 +4,7 @@ var $TypeError = require('es-errors/type');
 
 var callBound = require('call-bound');
 var forEach = require('../helpers/forEach');
-var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
+var OwnPropertyKeys = require('own-keys');
 
 var $isEnumerable = callBound('Object.prototype.propertyIsEnumerable');
 

diff --git a/2018/ObjectDefineProperties.js b/2018/ObjectDefineProperties.js
diff --git a/2018/TestIntegrityLevel.js b/2018/TestIntegrityLevel.js
diff --git a/2018/WordCharacters.js b/2018/WordCharacters.js
diff --git a/2019/CopyDataProperties.js b/2019/CopyDataProperties.js
diff --git a/2019/ObjectDefineProperties.js b/2019/ObjectDefineProperties.js
diff --git a/2019/TestIntegrityLevel.js b/2019/TestIntegrityLevel.js
diff --git a/2019/WordCharacters.js b/2019/WordCharacters.js
diff --git a/2020/CopyDataProperties.js b/2020/CopyDataProperties.js
@@ -5,7 +5,7 @@ var $TypeError = require('es-errors/type');
 var callBound = require('call-bound');
 var forEach = require('../helpers/forEach');
 var every = require('../helpers/every');
-var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
+var OwnPropertyKeys = require('own-keys');
 
 var $isEnumerable = callBound('Object.prototype.propertyIsEnumerable');
 

diff --git a/2020/ObjectDefineProperties.js b/2020/ObjectDefineProperties.js
diff --git a/2020/TestIntegrityLevel.js b/2020/TestIntegrityLevel.js
diff --git a/2020/WordCharacters.js b/2020/WordCharacters.js
diff --git a/2021/CopyDataProperties.js b/2021/CopyDataProperties.js
@@ -6,7 +6,7 @@ var callBound = require('call-bound');
 var forEach = require('../helpers/forEach');
 var every = require('../helpers/every');
 var some = require('../helpers/some');
-var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
+var OwnPropertyKeys = require('own-keys');
 
 var $isEnumerable = callBound('Object.prototype.propertyIsEnumerable');
 

diff --git a/2021/ObjectDefineProperties.js b/2021/ObjectDefineProperties.js
diff --git a/2021/TestIntegrityLevel.js b/2021/TestIntegrityLevel.js
diff --git a/2021/WordCharacters.js b/2021/WordCharacters.js
diff --git a/2022/CopyDataProperties.js b/2022/CopyDataProperties.js
diff --git a/2022/ObjectDefineProperties.js b/2022/ObjectDefineProperties.js
diff --git a/2022/TestIntegrityLevel.js b/2022/TestIntegrityLevel.js
diff --git a/2022/WordCharacters.js b/2022/WordCharacters.js
diff --git a/2023/CopyDataProperties.js b/2023/CopyDataProperties.js
diff --git a/2023/ObjectDefineProperties.js b/2023/ObjectDefineProperties.js
diff --git a/2023/TestIntegrityLevel.js b/2023/TestIntegrityLevel.js
diff --git a/2023/WordCharacters.js b/2023/WordCharacters.js
@@ -10,7 +10,7 @@ var Canonicalize = require('./Canonicalize');
 var caseFolding = require('../helpers/caseFolding.json');
 var forEach = require('../helpers/forEach');
 var isRegExpRecord = require('../helpers/records/regexp-record');
-var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
+var OwnPropertyKeys = require('own-keys');
 
 var basicWordChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'; // step 1
 

diff --git a/2024/CopyDataProperties.js b/2024/CopyDataProperties.js
diff --git a/2024/ObjectDefineProperties.js b/2024/ObjectDefineProperties.js
@@ -9,7 +9,7 @@ var ToPropertyDescriptor = require('./ToPropertyDescriptor');
 
 var forEach = require('../helpers/forEach');
 var getOwnPropertyDescriptor = require('gopd');
-var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
+var OwnPropertyKeys = require('own-keys');
 
 var $push = callBound('Array.prototype.push');
 

diff --git a/2024/TestIntegrityLevel.js b/2024/TestIntegrityLevel.js
diff --git a/2024/WordCharacters.js b/2024/WordCharacters.js
diff --git a/helpers/OwnPropertyKeys.js b/helpers/OwnPropertyKeys.js
@@ -1,19 +1,4 @@
 'use strict';
 
-var GetIntrinsic = require('get-intrinsic');
-
-var safePushApply = require('safe-push-apply');
-
-var $ownKeys = GetIntrinsic('%Reflect.ownKeys%', true);
-var $gOPN = GetIntrinsic('%Object.getOwnPropertyNames%', true);
-var $gOPS = GetIntrinsic('%Object.getOwnPropertySymbols%', true);
-
-var keys = require('object-keys');
-
-module.exports = $ownKeys || function OwnPropertyKeys(source) {
-	var ownKeys = ($gOPN || keys)(source);
-	if ($gOPS) {
-		safePushApply(ownKeys, $gOPS(source));
-	}
-	return ownKeys;
-};
+// TODO, semver-major: remove
+module.exports = require('own-keys');
diff --git a/package.json b/package.json
@@ -91,6 +91,7 @@
 		"object-inspect": "^1.13.3",
 		"object-keys": "^1.1.1",
 		"object.assign": "^4.1.7",
+		"own-keys": "^1.0.0",
 		"regexp.prototype.flags": "^1.5.3",
 		"safe-array-concat": "^1.1.3",
 		"safe-push-apply": "^1.0.0",