Ensure _.keys works with arguments objets cross-browser.

Former-commit-id: 1238c9efcfc13a420804c26c5edee1e4aa5a4238
2026-02-03 00:27:50 +00:00 · 2012-08-06 01:51:47 -07:00
parent 0e16bac6e2
commit f72b833724
3 changed files with 60 additions and 39 deletions
--- a/build.js
+++ b/build.js
@@ -254,6 +254,7 @@
    'isKeysFast',
    'object',
    'objectBranch',
+    'noArgsEnum',
    'noCharByIndex',
    'shadowed',
    'top',
@@ -321,7 +322,7 @@
      '    lodash include=...   Comma separated names of methods to include in the build',
      '',
      '    All arguments, except `backbone` with `underscore`, `exclude` with `include`,',
-      '    and `legacy` with `mobile`, may be combined.',
+      '    and `legacy` with `csp`/`mobile`, may be combined.',
      '',
      '  Options:',
      '',
@@ -947,8 +948,8 @@
      return match.replace(/\bcallee\b/g, 'merge');
    });

-    // remove `hasDontEnumBug` and `iteratesOwnLast` assignment
-    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *var hasDontEnumBug\b[\s\S]+?}\(\)\);\n/, '');
+    // remove `hasDontEnumBug`, `iteratesOwnLast`, `noArgsEnum` assignment
+    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *var hasDontEnumBug\b[\s\S]+?}\(1\)\);\n/, '');

    // remove `iteratesOwnLast` from `isPlainObject`
    source = source.replace(/(?:\s*\/\/.*)*\n( +)if *\(iteratesOwnLast[\s\S]+?\n\1}/, '');
@@ -1049,23 +1050,23 @@
  }
  if ((source.match(/\bcreateIterator\b/g) || []).length < 2) {
    source = removeFunction(source, 'createIterator');
+    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *var noArgsEnum;|.+?noArgsEnum *=.+/g, '');
  }
  if (isRemoved(source, 'createIterator', 'bind', 'isArray', 'keys')) {
    source = removeVar(source, 'reNative');
  }
  if (isRemoved(source, 'createIterator', 'clone', 'merge')) {
-    source = removeVar(source, 'iteratesOwnLast');
-    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *var iteratesOwnLast;| +iteratesOwnLast *=.+/, '');
+    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *var iteratesOwnLast;|.+?iteratesOwnLast *=.+/g, '');
  }
-  if (isRemoved(source, 'createIterator', 'extend', 'isEqual', 'merge')) {
-    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *var hasDontEnumBug;| +hasDontEnumBug *=.+/, '');
+  if (isRemoved(source, 'createIterator', 'isEqual')) {
+    source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *var hasDontEnumBug;|.+?hasDontEnumBug *=.+/g, '');
  }
  if (isRemoved(source, 'createIterator', 'keys')) {
    source = removeVar(source, 'nativeKeys');
  }
-  if (!source.match(/var (?:hasDontEnumBug|iteratesOwnLast)\b/g)) {
-    // remove `hasDontEnumBug` and `iteratesOwnLast` assignment
-    source = source.replace(/ *\(function\(\) *{\s*var props\b[\s\S]+?}\(\)\);/, '');
+  if (!source.match(/var (?:hasDontEnumBug|iteratesOwnLast|noArgsEnum)\b/g)) {
+    // remove `hasDontEnumBug`, `iteratesOwnLast`, `noArgsEnum` assignment
+    source = source.replace(/ *\(function\(\) *{\s*var props\b[\s\S]+?}\(1\)\);/, '');
  }

  // remove pseudo private properties
--- a/build/pre-compile.js
+++ b/build/pre-compile.js
@@ -16,7 +16,6 @@
    'identity',
    'index',
    'iteratee',
-    'iterateeIndex',
    'iteratorBind',
    'length',
    'nativeKeys',
@@ -38,6 +37,8 @@
    // lesser used variables
    'accumulator',
    'args',
+    'argsIndex',
+    'argsLength',
    'arrayLikeClasses',
    'ArrayProto',
    'bind',
@@ -84,6 +85,7 @@
    'isKeysFast',
    'object',
    'objectBranch',
+    'noArgsEnum',
    'noCharByIndex',
    'shadowed',
    'top',
--- a/lodash.js
+++ b/lodash.js
@@ -134,14 +134,18 @@
  /** Detect if own properties are iterated after inherited properties (IE < 9) */
  var iteratesOwnLast;

+  /** Detect if an `arguments` object's indexes are non-enumerable (IE < 9) */
+  var noArgsEnum = true;
+
  (function() {
    var props = [];
    function ctor() { this.x = 1; }
    ctor.prototype = { 'valueOf': 1, 'y': 1 };
    for (var prop in new ctor) { props.push(prop); }
+    for (prop in arguments) { noArgsEnum = !prop; }
    hasDontEnumBug = (props + '').length < 4;
    iteratesOwnLast = props[0] != 'x';
-  }());
+  }(1));

  /** Detect if an `arguments` object's [[Class]] is unresolvable (Firefox < 4, IE < 9) */
  var noArgsClass = !isArguments(arguments);
@@ -353,7 +357,20 @@

    // the following branch is for iterating an object's own/inherited properties
    '<% if (objectBranch) { %>' +
-    '  <% if (arrayBranch) { %>\nelse {<% } %>' +
+    '  <% if (arrayBranch) { %>\nelse {' +
+
+    // add support for iterating over `arguments` objects if needed
+    '  <%  } else if (noArgsEnum) { %>\n' +
+    '  var length = iteratee.length; index = -1;\n' +
+    '  if (length && isArguments(iteratee)) {\n' +
+    '    while (++index < length) {\n' +
+    '      value = iteratee[index];\n' +
+    '      index += \'\';\n' +
+    '      <%= objectBranch.inLoop %>\n' +
+    '    }\n' +
+    '  } else {' +
+    '  <% } %>' +
+
    '  <% if (!hasDontEnumBug) { %>\n' +
    '  var skipProto = typeof iteratee == \'function\' && \n' +
    '    propertyIsEnumerable.call(iteratee, \'prototype\');\n' +
@@ -416,7 +433,7 @@
    '  }' +
    '    <% } %>' +
    '  <% } %>' +
-    '  <% if (arrayBranch) { %>\n}<% } %>' +
+    '  <% if (arrayBranch || noArgsEnum) { %>\n}<% } %>' +
    '<% } %>\n' +

    // add code to the bottom of the iteration function
@@ -473,8 +490,8 @@
    'args': 'object',
    'init': 'object',
    'top':
-      'for (var iterateeIndex = 1, length = arguments.length; iterateeIndex < length; iterateeIndex++) {\n' +
-      '  iteratee = arguments[iterateeIndex];\n' +
+      'for (var argsIndex = 1, argsLength = arguments.length; argsIndex < argsLength; argsIndex++) {\n' +
+      '  iteratee = arguments[argsIndex];\n' +
      (hasDontEnumBug ? '  if (iteratee) {' : ''),
    'inLoop': 'result[index] = value',
    'bottom': (hasDontEnumBug ? '  }\n' : '') + '}'
@@ -629,6 +646,7 @@
    data.firstArg = firstArg;
    data.hasDontEnumBug = hasDontEnumBug;
    data.isKeysFast = isKeysFast;
+    data.noArgsEnum = noArgsEnum;
    data.shadowed = shadowed;
    data.useHas = data.useHas !== false;
    data.useStrict = data.useStrict !== false;
@@ -780,21 +798,6 @@
    // no operation performed
  }

-  /**
-   * A shim implementation of `Object.keys` that produces an array of the given
-   * object's own enumerable property names.
-   *
-   * @private
-   * @param {Object} object The object to inspect.
-   * @returns {Array} Returns a new array of property names.
-   */
-  var shimKeys = createIterator({
-    'args': 'object',
-    'exit': 'if (!(object && objectTypes[typeof object])) throw TypeError()',
-    'init': '[]',
-    'inLoop': 'result.push(index)'
-  });
-
  /**
   * Used by `template` to replace "escape" template delimiters with tokens.
   *
@@ -858,8 +861,8 @@
   * Creates a clone of `value`. If `deep` is `true`, all nested objects will
   * also be cloned otherwise they will be assigned by reference. If a value has
   * a `clone` method it will be used to perform the clone. Functions, DOM nodes,
-   * `arguments` objects, and object instances created by a constructor other
-   * than `Object` are **not** cloned unless they have a custom `clone` method.
+   * `arguments` objects, and objects created by constructors other than `Object`
+   * are **not** cloned unless they have a custom `clone` method.
   *
   * @static
   * @memberOf _
@@ -1042,8 +1045,8 @@
  /**
   * Iterates over `object`'s own and inherited enumerable properties, executing
   * the `callback` for each property. The `callback` is bound to `thisArg` and
-   * invoked with 3 arguments; (value, key, object). Callbacks may terminate
-   * iteration early by explicitly returning `false`.
+   * invoked with 3 arguments; (value, key, object). Callbacks may exit iteration
+   * early by explicitly returning `false`.
   *
   * @static
   * @memberOf _
@@ -1074,7 +1077,7 @@
  /**
   * Iterates over `object`'s own enumerable properties, executing the `callback`
   * for each property. The `callback` is bound to `thisArg` and invoked with 3
-   * arguments; (value, key, object). Callbacks may terminate iteration early by
+   * arguments; (value, key, object). Callbacks may exit iteration early by
   * explicitly returning `false`.
   *
   * @static
@@ -1628,6 +1631,21 @@
    return value === undefined;
  }

+  /**
+   * A shim implementation of `Object.keys` that produces an array of the given
+   * object's own enumerable property names.
+   *
+   * @private
+   * @param {Object} object The object to inspect.
+   * @returns {Array} Returns a new array of property names.
+   */
+  var shimKeys = createIterator({
+    'args': 'object',
+    'exit': 'if (!(object && objectTypes[typeof object])) throw TypeError()',
+    'init': '[]',
+    'inLoop': 'result.push(index)'
+  });
+
  /**
   * Creates an array composed of the own enumerable property names of `object`.
   *
@@ -1860,7 +1878,7 @@
  /**
   * Iterates over a `collection`, executing the `callback` for each element in
   * the `collection`. The `callback` is bound to `thisArg` and invoked with 3
-   * arguments; (value, index|key, collection). Callbacks may terminate iteration
+   * arguments; (value, index|key, collection). Callbacks may exit iteration
   * early by explicitly returning `false`.
   *
   * @static
@@ -2008,8 +2026,8 @@
    'top':
      'var destValue, found, isArr, stackLength, recursive = indicator == isPlainObject;\n' +
      'if (!recursive) stack = [];\n' +
-      'for (var iterateeIndex = 1, length = recursive ? 2 : arguments.length; iterateeIndex < length; iterateeIndex++) {\n' +
-      '  iteratee = arguments[iterateeIndex];\n' +
+      'for (var argsIndex = 1, argsLength = recursive ? 2 : arguments.length; argsIndex < argsLength; argsIndex++) {\n' +
+      '  iteratee = arguments[argsIndex];\n' +
      (hasDontEnumBug ? '  if (iteratee) {' : ''),
    'inLoop':
      'if (value && ((isArr = isArray(value)) || isPlainObject(value))) {\n' +