Don't rely on entries or values iterators to create arrays

We don't have them in IE

Author: lukechilds

internal/util/comparisons.js

@@ -5,7 +5,19 @@
 
 const regexFlagsSupported = /a/g.flags !== undefined;
 
-const arrayFrom = require('array-from');
+const arrayFromSet = set => {
+  const array = [];
+  set.forEach(value => array.push(value));
+
+  return array;
+};
+
+const arrayFromMap = map => {
+  const array = [];
+  map.forEach((value, key) => array.push([key, value]));
+
+  return array;
+};
 
 const objectIs = Object.is ? Object.is : require('object-is');
 const objectGetOwnPropertySymbols = Object.getOwnPropertySymbols ? Object.getOwnPropertySymbols : () => [];
@@ -347,7 +359,7 @@ function keyCheck(val1, val2, strict, memos, iterationType, aKeys) {
 
 function setHasEqualElement(set, val1, strict, memo) {
   // Go looking.
-  const setValues = arrayFrom(set.values());
+  const setValues = arrayFromSet(set);
   for (let i = 0; i < setValues.length; i++) {
     const val2 = setValues[i];
     if (innerDeepEqual(val1, val2, strict, memo)) {
@@ -410,7 +422,7 @@ function setEquiv(a, b, strict, memo) {
   // This is a lazily initiated Set of entries which have to be compared
   // pairwise.
   let set = null;
-  const aValues = arrayFrom(a.values());
+  const aValues = arrayFromSet(a);
   for (let i = 0; i < aValues.length; i++) {
     const val = aValues[i];
     // Note: Checking for the objects first improves the performance for object
@@ -442,7 +454,7 @@ function setEquiv(a, b, strict, memo) {
   }
 
   if (set !== null) {
-    const bValues = arrayFrom(b.values());
+    const bValues = arrayFromSet(b);
     for (let i = 0; i < bValues.length; i++) {
       const val = bValues[i];
       // We have to check if a primitive value is already
@@ -466,7 +478,7 @@ function mapHasEqualEntry(set, map, key1, item1, strict, memo) {
   // To be able to handle cases like:
   //   Map([[{}, 'a'], [{}, 'b']]) vs Map([[{}, 'b'], [{}, 'a']])
   // ... we need to consider *all* matching keys, not just the first we find.
-  const setValues = arrayFrom(set.values());
+  const setValues = arrayFromSet(set);
   for (let i = 0; i < setValues.length; i++) {
     const key2 = setValues[i];
     if (innerDeepEqual(key1, key2, strict, memo) &&
@@ -482,7 +494,7 @@ function mapHasEqualEntry(set, map, key1, item1, strict, memo) {
 function mapEquiv(a, b, strict, memo) {
   let set = null;
 
-  const aEntries = arrayFrom(a.entries());
+  const aEntries = arrayFromMap(a);
   for (let i = 0; i < aEntries.length; i++) {
     const [key, item1] = aEntries[i];
     if (typeof key === 'object' && key !== null) {
@@ -511,7 +523,7 @@ function mapEquiv(a, b, strict, memo) {
   }
 
   if (set !== null) {
-    const bEntries = arrayFrom(b.entries());
+    const bEntries = arrayFromMap(b);
     for (let i = 0; i < bEntries.length; i++) {
       const [key, item] = bEntries[i];
       if (typeof key === 'object' && key !== null) {

package.json

@@ -27,11 +27,11 @@
     "array-fill": "^1.2.0",
     "core-js": "^3.0.1",
     "cross-env": "^5.2.0",
+    "object.entries": "^1.1.0",
     "object.getownpropertydescriptors": "^2.0.3",
     "tape": "^4.10.1"
   },
   "dependencies": {
-    "array-from": "^2.1.1",
     "buffer": "^5.2.1",
     "es6-object-assign": "^1.1.0",
     "is-nan": "^1.2.1",

test/common/index.js

@@ -4,6 +4,10 @@ const getOwnPropertyDescriptors = Object.getOwnPropertyDescriptors
   ? Object.getOwnPropertyDescriptors
   : require('object.getownpropertydescriptors');
 
+const objectEntries = Object.entries
+  ? Object.entries
+  : require('object.entries');
+
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat
 function repeat(str, count) {
   if (str == null)
@@ -139,7 +143,7 @@ function _expectWarning(name, expected, code) {
   if (typeof expected === 'string') {
     expected = [[expected, code]];
   } else if (!Array.isArray(expected)) {
-    expected = Object.entries(expected).map(([a, b]) => [b, a]);
+    expected = objectEntries(expected).map(([a, b]) => [b, a]);
   } else if (!(Array.isArray(expected[0]))) {
     expected = [[expected[0], expected[1]]];
   }

test/parallel/test-assert-deep.js

@@ -11,7 +11,13 @@ const defaultMsgStart = 'Expected values to be strictly deep-equal:\n';
 const defaultMsgStartFull = `${defaultMsgStart}+ actual - expected`;
 
 const objectEntries = require('object.entries');
-const arrayFrom = require('array-from');
+
+const arrayFromSet = set => {
+  const array = [];
+  set.forEach(value => array.push(value));
+
+  return array;
+};
 
 // Disable colored output to prevent color codes from breaking assertion
 // message comparisons. This should only be an issue when process.stdout
@@ -38,7 +44,7 @@ const createMap = (values = []) => {
 // for assert.throws()
 function re(literals, ...values) {
   let result = 'Expected values to be loosely deep-equal:\n\n';
-  arrayFrom(values.entries()).forEach(([i, value]) => {
+  values.forEach((value, i) => {
     const str = util.inspect(value, {
       compact: false,
       depth: 1000,
@@ -192,8 +198,8 @@ assert.throws(
     (function() { return arguments; })(1)
   ]);
 
-  arrayFrom(similar).forEach(a => {
-    arrayFrom(similar).forEach(b => {
+  arrayFromSet(similar).forEach(a => {
+    arrayFromSet(similar).forEach(b => {
       if (a !== b) {
         assert.notDeepEqual(a, b);
         assert.throws(