feat(minErr): set max depth for angular error JSON stringify

Closes angular#15402
Closes angular#15433

Author: m-amr

src/.eslintrc.json

@@ -15,6 +15,8 @@
     "splice": false,
     "push": false,
     "toString": false,
+    "objectMaxDepthInErrorMessage": false,
+    "configureErrorHandling": false,
     "ngMinErr": false,
     "_angular": false,
     "angularModule": false,

src/Angular.js

@@ -10,6 +10,8 @@
   splice,
   push,
   toString,
+  objectMaxDepthInErrorMessage,
+  configureErrorHandling,
   ngMinErr,
   angularModule,
   uid,
@@ -125,6 +127,30 @@ var VALIDITY_STATE_PROPERTY = 'validity';
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
+var objectMaxDepthInErrorMessage = 5;
+
+/**
+ * @ngdoc function
+ * @name angular.configureErrorHandling
+ * @module ng
+ * @kind function
+ *
+ * @description Use this function to configure minErr
+ *
+ * @param {Object=} config an object for defining configuration for error handling. The
+ *     following keys are supported:
+ *
+ * * `objectMaxDepth` - used to stringify objects in error messages until reaching the max depth.
+ *
+ */
+function configureErrorHandling(config) {
+  if (isObject(config)) {
+    if (isNumber(config.objectMaxDepth) && config.objectMaxDepth > 0) {
+      objectMaxDepthInErrorMessage = config.objectMaxDepth;
+    }
+  }
+}
+
 /**
  * @ngdoc function
  * @name angular.lowercase
@@ -796,6 +822,7 @@ function arrayRemove(array, value) {
  *   are deleted and then all elements/properties from the source are copied to it.
  * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
  * * If `source` is identical to `destination` an exception will be thrown.
+ * * If `maxDepth` is supplied, all properties of the source will be copied until reaching the max depth.
  *
  * <br />
  * <div class="alert alert-warning">
@@ -807,6 +834,7 @@ function arrayRemove(array, value) {
  *                   Can be any type, including primitives, `null`, and `undefined`.
  * @param {(Object|Array)=} destination Destination into which the source is copied. If
  *     provided, must be of the same type as `source`.
+ * @param {Number=} maxDepth All properties of the source will be copied until reaching the max depth.
  * @returns {*} The copy or updated `destination`, if `destination` was specified.
  *
  * @example
@@ -847,10 +875,14 @@ function arrayRemove(array, value) {
     </file>
   </example>
  */
-function copy(source, destination) {
+function copy(source, destination, maxDepth) {
   var stackSource = [];
   var stackDest = [];
 
+  if (!isNumber(maxDepth) || maxDepth < 1) {
+    maxDepth = NaN;
+  }
+
   if (destination) {
     if (isTypedArray(destination) || isArrayBuffer(destination)) {
       throw ngMinErr('cpta', 'Can\'t copy! TypedArray destination cannot be mutated.');
@@ -872,43 +904,47 @@ function copy(source, destination) {
 
     stackSource.push(source);
     stackDest.push(destination);
-    return copyRecurse(source, destination);
+    return copyRecurse(source, destination, maxDepth);
   }
 
-  return copyElement(source);
+  return copyElement(source, maxDepth);
 
-  function copyRecurse(source, destination) {
+  function copyRecurse(source, destination, maxDepth) {
+    maxDepth--;
+    if (maxDepth < 0) {
+      return '...';
+    }
     var h = destination.$$hashKey;
     var key;
     if (isArray(source)) {
       for (var i = 0, ii = source.length; i < ii; i++) {
-        destination.push(copyElement(source[i]));
+        destination.push(copyElement(source[i], maxDepth));
       }
     } else if (isBlankObject(source)) {
       // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
       for (key in source) {
-        destination[key] = copyElement(source[key]);
+        destination[key] = copyElement(source[key], maxDepth);
       }
     } else if (source && typeof source.hasOwnProperty === 'function') {
       // Slow path, which must rely on hasOwnProperty
       for (key in source) {
         if (source.hasOwnProperty(key)) {
-          destination[key] = copyElement(source[key]);
+          destination[key] = copyElement(source[key], maxDepth);
         }
       }
     } else {
       // Slowest path --- hasOwnProperty can't be called as a method
       for (key in source) {
         if (hasOwnProperty.call(source, key)) {
-          destination[key] = copyElement(source[key]);
+          destination[key] = copyElement(source[key], maxDepth);
         }
       }
     }
     setHashKey(destination, h);
     return destination;
   }
 
-  function copyElement(source) {
+  function copyElement(source, maxDepth) {
     // Simple values
     if (!isObject(source)) {
       return source;
@@ -937,7 +973,7 @@ function copy(source, destination) {
     stackDest.push(destination);
 
     return needsRecurse
-      ? copyRecurse(source, destination)
+      ? copyRecurse(source, destination, maxDepth)
       : destination;
   }
 

src/AngularPublic.js

@@ -126,6 +126,7 @@ var version = {
 
 function publishExternalAPI(angular) {
   extend(angular, {
+    'configureErrorHandling': configureErrorHandling,
     'bootstrap': bootstrap,
     'copy': copy,
     'extend': extend,

src/minErr.js

@@ -35,18 +35,20 @@ function minErr(module, ErrorConstructor) {
   return function() {
     var SKIP_INDEXES = 2;
 
-    var templateArgs = arguments,
-      code = templateArgs[0],
+    var code = arguments[0],
       message = '[' + (module ? module + ':' : '') + code + '] ',
-      template = templateArgs[1],
-      paramPrefix, i;
+      template = arguments[1],
+      paramPrefix, i,
+      templateArgs = arguments.slice(SKIP_INDEXES).map(function(arg) {
+        return toDebugString(arg);
+      });
+
 
     message += template.replace(/\{\d+\}/g, function(match) {
-      var index = +match.slice(1, -1),
-        shiftedIndex = index + SKIP_INDEXES;
+      var index = +match.slice(1, -1);
 
       if (shiftedIndex < templateArgs.length) {
-        return toDebugString(templateArgs[shiftedIndex]);
+        return templateArgs[index];
       }
 
       return match;
@@ -55,9 +57,9 @@ function minErr(module, ErrorConstructor) {
     message += '\nhttp://errors.angularjs.org/"NG_VERSION_FULL"/' +
       (module ? module + '/' : '') + code;
 
-    for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
+    for (i = 0, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
       message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' +
-        encodeURIComponent(toDebugString(templateArgs[i]));
+        encodeURIComponent(templateArgs[i]);
     }
 
     return new ErrorConstructor(message);

src/stringify.js

@@ -2,9 +2,11 @@
 
 /* global toDebugString: true */
 
-function serializeObject(obj) {
+function serializeObject(obj, maxDepth) {
   var seen = [];
-
+  if (maxDepth > 0) {
+    obj = copy(obj, null, maxDepth);
+  }
   return JSON.stringify(obj, function(key, val) {
     val = toJsonReplacer(key, val);
     if (isObject(val)) {
@@ -17,13 +19,13 @@ function serializeObject(obj) {
   });
 }
 
-function toDebugString(obj) {
+function toDebugString(obj, maxDepth) {
   if (typeof obj === 'function') {
     return obj.toString().replace(/ \{[\s\S]*$/, '');
   } else if (isUndefined(obj)) {
     return 'undefined';
   } else if (typeof obj !== 'string') {
-    return serializeObject(obj);
+    return serializeObject(obj, maxDepth);
   }
   return obj;
 }

test/.eslintrc.json

@@ -25,6 +25,8 @@
 
     /* angular.js */
     "angular": false,
+    "objectMaxDepthInErrorMessage": false,
+    "configureErrorHandling": false,
     "msie": false,
     "jqLite": false,
     "jQuery": false,
@@ -37,6 +39,7 @@
     "nodeName_": false,
     "uid": false,
     "toDebugString": false,
+    "serializeObject": false,
 
     "lowercase": false,
     "uppercase": false,

test/AngularSpec.js

@@ -602,6 +602,30 @@ describe('angular', function() {
       expect(copy(new Number(NaN)).valueOf()).toBeNaN();
       /* eslint-enable */
     });
+
+    it('should copy source until reaching a given max depth', function() {
+      var source = {a1: 1, b1: {b2: {b3: 1}}, c1: [1, {c2: 1}], d1: {d2: 1}};
+      var dest;
+
+      dest =  copy(source, {}, 1);
+      expect(dest).toEqual({a1:1, b1:'...', c1:'...', d1:'...'});
+
+      dest =  copy(source, {}, 2);
+      expect(dest).toEqual({a1:1, b1:{b2:'...'}, c1:[1,'...'], d1:{d2:1}});
+
+      dest =  copy(source, {}, 3);
+      expect(dest).toEqual({a1: 1, b1: {b2: {b3: 1}}, c1: [1, {c2: 1}], d1: {d2: 1}});
+
+      dest =  copy(source, {}, 4);
+      expect(dest).toEqual({a1: 1, b1: {b2: {b3: 1}}, c1: [1, {c2: 1}], d1: {d2: 1}});
+    });
+
+    they('should copy source and ignore maxDepth when maxDepth = $prop', [NaN, null, undefined, true, false, -1, 0],
+        function(maxDepth) {
+          var source = {a1: 1, b1: {b2: {b3: 1}}, c1: [1, {c2: 1}], d1: {d2: 1}};
+          var dest =  copy(source, {}, maxDepth);
+          expect(dest).toEqual({a1: 1, b1: {b2: {b3: 1}}, c1: [1, {c2: 1}], d1: {d2: 1}});
+    });
   });
 
   describe('extend', function() {

test/minErrSpec.js

@@ -9,6 +9,11 @@ describe('minErr', function() {
   var emptyTestError = minErr(),
     testError = minErr('test');
 
+  var originalObjectMaxDepthInErrorMessage = objectMaxDepthInErrorMessage;
+  afterEach(function() {
+    configureErrorHandling({objectMaxDepth: originalObjectMaxDepthInErrorMessage});
+  });
+
   it('should return an Error factory', function() {
     var myError = testError('test', 'Oops');
     expect(myError instanceof Error).toBe(true);
@@ -68,6 +73,27 @@ describe('minErr', function() {
     expect(myError.message).toMatch(/a is {"b":{"a":"..."}}/);
   });
 
+  it('should handle arguments that are objects with max depth', function() {
+    var a = {b: {c: {d: 1}}};
+
+    configureErrorHandling({objectMaxDepth: 1});
+    var myError = testError('26', 'a when objectMaxDepth=1 is {0}', a);
+    expect(myError.message).toMatch(/a when maxDepth=1 is {"b":"..."}/);
+
+    configureErrorHandling({objectMaxDepth: 2});
+    myError = testError('26', 'a when objectMaxDepth=2 is {0}', a);
+    expect(myError.message).toMatch(/a when maxDepth=2 is {"b":{"c":"..."}}/);
+  });
+
+  they('should handle arguments that are objects and ignore max depth when objectMaxDepth = $prop',
+      [NaN, null, undefined, true, false, -1, 0], function(maxDepth) {
+        var a = {b: {c: {d: 1}}};
+
+        configureErrorHandling({objectMaxDepth: maxDepth});
+        var myError = testError('26', 'a is {0}', a);
+        expect(myError.message).toMatch(/a is {"b":{"c":{"d":1}}}/);
+  });
+
   it('should preserve interpolation markers when fewer arguments than needed are provided', function() {
     // this way we can easily see if we are passing fewer args than needed
 

test/stringifySpec.js

@@ -12,4 +12,41 @@ describe('toDebugString', function() {
     expect(toDebugString(a)).toEqual('{"a":"..."}');
     expect(toDebugString([a,a])).toEqual('[{"a":"..."},"..."]');
   });
+
+  it('should convert its argument that are objects to string based on maxDepth', function() {
+    var a = {b: {c: {d: 1}}};
+    expect(toDebugString(a, 1)).toEqual('{"b":"..."}');
+    expect(toDebugString(a, 2)).toEqual('{"b":{"c":"..."}}');
+    expect(toDebugString(a, 3)).toEqual('{"b":{"c":{"d":1}}}');
+  });
+
+  they('should convert its argument that object to string  and ignore maxDepth when maxDepth = $prop',
+      [NaN, null, undefined, true, false, -1, 0], function(maxDepth) {
+        var a = {b: {c: {d: 1}}};
+        expect(toDebugString(a, maxDepth)).toEqual('{"b":{"c":{"d":1}}}');
+      });
+});
+
+describe('serializeObject', function() {
+  it('should convert its argument to a string', function() {
+    expect(serializeObject({a:{b:'c'}})).toEqual('{"a":{"b":"c"}}');
+
+    var a = { };
+    a.a = a;
+    expect(serializeObject(a)).toEqual('{"a":"..."}');
+    expect(serializeObject([a,a])).toEqual('[{"a":"..."},"..."]');
+  });
+
+  it('should convert its argument that are objects to string based on maxDepth', function() {
+    var a = {b: {c: {d: 1}}};
+    expect(serializeObject(a, 1)).toEqual('{"b":"..."}');
+    expect(serializeObject(a, 2)).toEqual('{"b":{"c":"..."}}');
+    expect(serializeObject(a, 3)).toEqual('{"b":{"c":{"d":1}}}');
+  });
+
+  they('should convert its argument that object to string  and ignore max depth when maxDepth = $prop',
+      [NaN, null, undefined, true, false, -1, 0], function(maxDepth) {
+        var a = {b: {c: {d: 1}}};
+        expect(serializeObject(a, maxDepth)).toEqual('{"b":{"c":{"d":1}}}');
+      });
 });