ngannotate-rails 0.9.11 → 0.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWE4NWU5NzAyODRkODQ3ZTE3Y2Q1NWM1ODBkMmIyYzkyZmYzMGY2MA==
+    NzcwNWRjZWVkYzE0OGFiZmI2MzY0NmJiOTMxM2EzMjZkODllOGY3Ng==
   data.tar.gz: !binary |-
-    MWY2ZGNlZTEzZmUwYmZiYzA5MmMzYzIzOGVkMzBkNWVmZWY3NzA3OQ==
+    MWMwZjQzNzkyMWY5YjRlOTYxY2Y2MzI5MDM0MWZjMDA2MWU0NGY1Mw==
 SHA512:
   metadata.gz: !binary |-
-    N2I1NzE3YzQ2M2FmOGM4NjU4NDViZmQyYzMwZGQ3NDU4OTRlNmM1YTAxNTFk
-    MGM4MDRmOTBjZDQ1Zjc0M2I3OWI3NWRhYjRhZTU3NzRjMzI5ZTdhZjAzODg2
-    YmRjMTRlMDBmMTc3ZWI3YmFjMTIzOTMxYzJkNzcyZjU4ZjkyMmY=
+    ODg3YTVjOWIxNjk4MmQ0OWEyYzIzN2RlNjNiMDI4NTk0ZjJmNjI4MTdiYWQ2
+    MTczMTU2NDRiZWI3MzRjOWM1ZTY0MTQxMWM1NTAwYWY1MjViZTZhODFiYWRi
+    MmM2M2MzNWE2YWVlYzc0NDVhYTczMzY4ZGVlNjlmZDc5NDY5MzY=
   data.tar.gz: !binary |-
-    ZDJkMGNjYTBkNjJlY2EyYWNhMmJhNzI2Y2UzNmZhZDQ1NjIzMGQzZjk3Yjli
-    ODNiNjQxYzNlZGQxZTUwY2MzNDEzZDY1MjIyMjQ0OWM2ZDg1NmM1MDc3NWE3
-    Y2YyMDkzZjJlOWFiNDE1NGRjN2IxN2Y1ZDlhZTU2NzVlOTQ4OTI=
+    N2Y4YTA4NGY5MzM4MmU3MDk4ZjBkMjUzZDFmNWU2YTc5NDkyZmUxMGFhMGM4
+    YTQ0MjMxMmFlZDQ3NDAwNDhiMjQ5ODhhNzBjOTY0MzY5ZDMzM2Q3ODgyODUx
+    YWZmMTBmMDE3ODM1MWJmNzNmZjI1ODY0MzQ0NjZjOThjMjE5ZWY=

data/README.md

@@ -43,7 +43,7 @@ Testing assets locally
 
 To allow testing precompiled assets locally in development environment.
 
-config/environments/development.yml
+config/environments/development.rb
 
     #
     # to allow testing assets:precompile in development environment

data/lib/ngannotate/rails/version.rb

@@ -1,5 +1,5 @@
 module Ngannotate
   module Rails
-    VERSION = "0.9.11"
+    VERSION = "0.10.1"
   end
 end

data/vendor/ngannotate.js

@@ -360,15 +360,80 @@ var objectKeys = Object.keys || function (obj) {
   return keys;
 };
 
-},{"util/":3}],2:[function(require,module,exports){
-module.exports = function isBuffer(arg) {
-  return arg && typeof arg === 'object'
-    && typeof arg.copy === 'function'
-    && typeof arg.fill === 'function'
-    && typeof arg.readUInt8 === 'function';
+},{"util/":7}],2:[function(require,module,exports){
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
 }
+
 },{}],3:[function(require,module,exports){
-(function (process,global){
+exports.endianness = function () { return 'LE' };
+
+exports.hostname = function () {
+    if (typeof location !== 'undefined') {
+        return location.hostname
+    }
+    else return '';
+};
+
+exports.loadavg = function () { return [] };
+
+exports.uptime = function () { return 0 };
+
+exports.freemem = function () {
+    return Number.MAX_VALUE;
+};
+
+exports.totalmem = function () {
+    return Number.MAX_VALUE;
+};
+
+exports.cpus = function () { return [] };
+
+exports.type = function () { return 'Browser' };
+
+exports.release = function () {
+    if (typeof navigator !== 'undefined') {
+        return navigator.appVersion;
+    }
+    return '';
+};
+
+exports.networkInterfaces
+= exports.getNetworkInterfaces
+= function () { return {} };
+
+exports.arch = function () { return 'javascript' };
+
+exports.platform = function () { return 'browser' };
+
+exports.tmpdir = exports.tmpDir = function () {
+    return '/tmp';
+};
+
+exports.EOL = '\n';
+
+},{}],4:[function(require,module,exports){
+(function (process){
 // Copyright Joyent, Inc. and other Node contributors.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -390,939 +455,874 @@ module.exports = function isBuffer(arg) {
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-var formatRegExp = /%[sdj%]/g;
-exports.format = function(f) {
-  if (!isString(f)) {
-    var objects = [];
-    for (var i = 0; i < arguments.length; i++) {
-      objects.push(inspect(arguments[i]));
+// resolves . and .. elements in a path array with directory names there
+// must be no slashes, empty elements, or device names (c:\) in the array
+// (so also no leading and trailing slashes - it does not distinguish
+// relative and absolute paths)
+function normalizeArray(parts, allowAboveRoot) {
+  // if the path tries to go above the root, `up` ends up > 0
+  var up = 0;
+  for (var i = parts.length - 1; i >= 0; i--) {
+    var last = parts[i];
+    if (last === '.') {
+      parts.splice(i, 1);
+    } else if (last === '..') {
+      parts.splice(i, 1);
+      up++;
+    } else if (up) {
+      parts.splice(i, 1);
+      up--;
     }
-    return objects.join(' ');
   }
 
-  var i = 1;
-  var args = arguments;
-  var len = args.length;
-  var str = String(f).replace(formatRegExp, function(x) {
-    if (x === '%%') return '%';
-    if (i >= len) return x;
-    switch (x) {
-      case '%s': return String(args[i++]);
-      case '%d': return Number(args[i++]);
-      case '%j':
-        try {
-          return JSON.stringify(args[i++]);
-        } catch (_) {
-          return '[Circular]';
-        }
-      default:
-        return x;
-    }
-  });
-  for (var x = args[i]; i < len; x = args[++i]) {
-    if (isNull(x) || !isObject(x)) {
-      str += ' ' + x;
-    } else {
-      str += ' ' + inspect(x);
+  // if the path is allowed to go above the root, restore leading ..s
+  if (allowAboveRoot) {
+    for (; up--; up) {
+      parts.unshift('..');
     }
   }
-  return str;
-};
 
+  return parts;
+}
 
-// Mark that a method should not be used.
-// Returns a modified function which warns once by default.
-// If --no-deprecation is set, then it is a no-op.
-exports.deprecate = function(fn, msg) {
-  // Allow for deprecating things in the process of starting up.
-  if (isUndefined(global.process)) {
-    return function() {
-      return exports.deprecate(fn, msg).apply(this, arguments);
-    };
-  }
+// Split a filename into [root, dir, basename, ext], unix version
+// 'root' is just a slash, or nothing.
+var splitPathRe =
+    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
+var splitPath = function(filename) {
+  return splitPathRe.exec(filename).slice(1);
+};
 
-  if (process.noDeprecation === true) {
-    return fn;
-  }
+// path.resolve([from ...], to)
+// posix version
+exports.resolve = function() {
+  var resolvedPath = '',
+      resolvedAbsolute = false;
 
-  var warned = false;
-  function deprecated() {
-    if (!warned) {
-      if (process.throwDeprecation) {
-        throw new Error(msg);
-      } else if (process.traceDeprecation) {
-        console.trace(msg);
-      } else {
-        console.error(msg);
-      }
-      warned = true;
+  for (var i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
+    var path = (i >= 0) ? arguments[i] : process.cwd();
+
+    // Skip empty and invalid entries
+    if (typeof path !== 'string') {
+      throw new TypeError('Arguments to path.resolve must be strings');
+    } else if (!path) {
+      continue;
     }
-    return fn.apply(this, arguments);
+
+    resolvedPath = path + '/' + resolvedPath;
+    resolvedAbsolute = path.charAt(0) === '/';
   }
 
-  return deprecated;
-};
+  // At this point the path should be resolved to a full absolute path, but
+  // handle relative paths to be safe (might happen when process.cwd() fails)
 
+  // Normalize the path
+  resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
+    return !!p;
+  }), !resolvedAbsolute).join('/');
 
-var debugs = {};
-var debugEnviron;
-exports.debuglog = function(set) {
-  if (isUndefined(debugEnviron))
-    debugEnviron = process.env.NODE_DEBUG || '';
-  set = set.toUpperCase();
-  if (!debugs[set]) {
-    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
-      var pid = process.pid;
-      debugs[set] = function() {
-        var msg = exports.format.apply(exports, arguments);
-        console.error('%s %d: %s', set, pid, msg);
-      };
-    } else {
-      debugs[set] = function() {};
-    }
-  }
-  return debugs[set];
+  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
 };
 
+// path.normalize(path)
+// posix version
+exports.normalize = function(path) {
+  var isAbsolute = exports.isAbsolute(path),
+      trailingSlash = substr(path, -1) === '/';
 
-/**
- * Echos the value of a value. Trys to print the value out
- * in the best way possible given the different types.
- *
- * @param {Object} obj The object to print out.
- * @param {Object} opts Optional options object that alters the output.
- */
-/* legacy: obj, showHidden, depth, colors*/
-function inspect(obj, opts) {
-  // default options
-  var ctx = {
-    seen: [],
-    stylize: stylizeNoColor
-  };
-  // legacy...
-  if (arguments.length >= 3) ctx.depth = arguments[2];
-  if (arguments.length >= 4) ctx.colors = arguments[3];
-  if (isBoolean(opts)) {
-    // legacy...
-    ctx.showHidden = opts;
-  } else if (opts) {
-    // got an "options" object
-    exports._extend(ctx, opts);
+  // Normalize the path
+  path = normalizeArray(filter(path.split('/'), function(p) {
+    return !!p;
+  }), !isAbsolute).join('/');
+
+  if (!path && !isAbsolute) {
+    path = '.';
+  }
+  if (path && trailingSlash) {
+    path += '/';
   }
-  // set default options
-  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
-  if (isUndefined(ctx.depth)) ctx.depth = 2;
-  if (isUndefined(ctx.colors)) ctx.colors = false;
-  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
-  if (ctx.colors) ctx.stylize = stylizeWithColor;
-  return formatValue(ctx, obj, ctx.depth);
-}
-exports.inspect = inspect;
 
+  return (isAbsolute ? '/' : '') + path;
+};
 
-// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
-inspect.colors = {
-  'bold' : [1, 22],
-  'italic' : [3, 23],
-  'underline' : [4, 24],
-  'inverse' : [7, 27],
-  'white' : [37, 39],
-  'grey' : [90, 39],
-  'black' : [30, 39],
-  'blue' : [34, 39],
-  'cyan' : [36, 39],
-  'green' : [32, 39],
-  'magenta' : [35, 39],
-  'red' : [31, 39],
-  'yellow' : [33, 39]
+// posix version
+exports.isAbsolute = function(path) {
+  return path.charAt(0) === '/';
 };
 
-// Don't use 'blue' not visible on cmd.exe
-inspect.styles = {
-  'special': 'cyan',
-  'number': 'yellow',
-  'boolean': 'yellow',
-  'undefined': 'grey',
-  'null': 'bold',
-  'string': 'green',
-  'date': 'magenta',
-  // "name": intentionally not styling
-  'regexp': 'red'
+// posix version
+exports.join = function() {
+  var paths = Array.prototype.slice.call(arguments, 0);
+  return exports.normalize(filter(paths, function(p, index) {
+    if (typeof p !== 'string') {
+      throw new TypeError('Arguments to path.join must be strings');
+    }
+    return p;
+  }).join('/'));
 };
 
 
-function stylizeWithColor(str, styleType) {
-  var style = inspect.styles[styleType];
-
-  if (style) {
-    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
-           '\u001b[' + inspect.colors[style][1] + 'm';
-  } else {
-    return str;
-  }
-}
-
-
-function stylizeNoColor(str, styleType) {
-  return str;
-}
-
-
-function arrayToHash(array) {
-  var hash = {};
-
-  array.forEach(function(val, idx) {
-    hash[val] = true;
-  });
-
-  return hash;
-}
+// path.relative(from, to)
+// posix version
+exports.relative = function(from, to) {
+  from = exports.resolve(from).substr(1);
+  to = exports.resolve(to).substr(1);
 
+  function trim(arr) {
+    var start = 0;
+    for (; start < arr.length; start++) {
+      if (arr[start] !== '') break;
+    }
 
-function formatValue(ctx, value, recurseTimes) {
-  // Provide a hook for user-specified inspect functions.
-  // Check that value is an object with an inspect function on it
-  if (ctx.customInspect &&
-      value &&
-      isFunction(value.inspect) &&
-      // Filter out the util module, it's inspect function is special
-      value.inspect !== exports.inspect &&
-      // Also filter out any prototype objects using the circular check.
-      !(value.constructor && value.constructor.prototype === value)) {
-    var ret = value.inspect(recurseTimes, ctx);
-    if (!isString(ret)) {
-      ret = formatValue(ctx, ret, recurseTimes);
+    var end = arr.length - 1;
+    for (; end >= 0; end--) {
+      if (arr[end] !== '') break;
     }
-    return ret;
-  }
 
-  // Primitive types cannot have properties
-  var primitive = formatPrimitive(ctx, value);
-  if (primitive) {
-    return primitive;
+    if (start > end) return [];
+    return arr.slice(start, end - start + 1);
   }
 
-  // Look up the keys of the object.
-  var keys = Object.keys(value);
-  var visibleKeys = arrayToHash(keys);
+  var fromParts = trim(from.split('/'));
+  var toParts = trim(to.split('/'));
 
-  if (ctx.showHidden) {
-    keys = Object.getOwnPropertyNames(value);
+  var length = Math.min(fromParts.length, toParts.length);
+  var samePartsLength = length;
+  for (var i = 0; i < length; i++) {
+    if (fromParts[i] !== toParts[i]) {
+      samePartsLength = i;
+      break;
+    }
   }
 
-  // IE doesn't make error fields non-enumerable
-  // http://msdn.microsoft.com/en-us/library/ie/dww52sbt(v=vs.94).aspx
-  if (isError(value)
-      && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {
-    return formatError(value);
+  var outputParts = [];
+  for (var i = samePartsLength; i < fromParts.length; i++) {
+    outputParts.push('..');
   }
 
-  // Some type of object without properties can be shortcutted.
-  if (keys.length === 0) {
-    if (isFunction(value)) {
-      var name = value.name ? ': ' + value.name : '';
-      return ctx.stylize('[Function' + name + ']', 'special');
-    }
-    if (isRegExp(value)) {
-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
-    }
-    if (isDate(value)) {
-      return ctx.stylize(Date.prototype.toString.call(value), 'date');
-    }
-    if (isError(value)) {
-      return formatError(value);
-    }
-  }
+  outputParts = outputParts.concat(toParts.slice(samePartsLength));
 
-  var base = '', array = false, braces = ['{', '}'];
+  return outputParts.join('/');
+};
 
-  // Make Array say that they are Array
-  if (isArray(value)) {
-    array = true;
-    braces = ['[', ']'];
-  }
+exports.sep = '/';
+exports.delimiter = ':';
 
-  // Make functions say that they are functions
-  if (isFunction(value)) {
-    var n = value.name ? ': ' + value.name : '';
-    base = ' [Function' + n + ']';
-  }
+exports.dirname = function(path) {
+  var result = splitPath(path),
+      root = result[0],
+      dir = result[1];
 
-  // Make RegExps say that they are RegExps
-  if (isRegExp(value)) {
-    base = ' ' + RegExp.prototype.toString.call(value);
+  if (!root && !dir) {
+    // No dirname whatsoever
+    return '.';
   }
 
-  // Make dates with properties first say the date
-  if (isDate(value)) {
-    base = ' ' + Date.prototype.toUTCString.call(value);
+  if (dir) {
+    // It has a dirname, strip trailing slash
+    dir = dir.substr(0, dir.length - 1);
   }
 
-  // Make error with message first say the error
-  if (isError(value)) {
-    base = ' ' + formatError(value);
-  }
+  return root + dir;
+};
 
-  if (keys.length === 0 && (!array || value.length == 0)) {
-    return braces[0] + base + braces[1];
-  }
 
-  if (recurseTimes < 0) {
-    if (isRegExp(value)) {
-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
-    } else {
-      return ctx.stylize('[Object]', 'special');
-    }
+exports.basename = function(path, ext) {
+  var f = splitPath(path)[2];
+  // TODO: make this comparison case-insensitive on windows?
+  if (ext && f.substr(-1 * ext.length) === ext) {
+    f = f.substr(0, f.length - ext.length);
   }
+  return f;
+};
 
-  ctx.seen.push(value);
-
-  var output;
-  if (array) {
-    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
-  } else {
-    output = keys.map(function(key) {
-      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
-    });
-  }
 
-  ctx.seen.pop();
+exports.extname = function(path) {
+  return splitPath(path)[3];
+};
 
-  return reduceToSingleString(output, base, braces);
+function filter (xs, f) {
+    if (xs.filter) return xs.filter(f);
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        if (f(xs[i], i, xs)) res.push(xs[i]);
+    }
+    return res;
 }
 
+// String.prototype.substr - negative index don't work in IE8
+var substr = 'ab'.substr(-1) === 'b'
+    ? function (str, start, len) { return str.substr(start, len) }
+    : function (str, start, len) {
+        if (start < 0) start = str.length + start;
+        return str.substr(start, len);
+    }
+;
 
-function formatPrimitive(ctx, value) {
-  if (isUndefined(value))
-    return ctx.stylize('undefined', 'undefined');
-  if (isString(value)) {
-    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
-                                             .replace(/'/g, "\\'")
-                                             .replace(/\\"/g, '"') + '\'';
-    return ctx.stylize(simple, 'string');
-  }
-  if (isNumber(value))
-    return ctx.stylize('' + value, 'number');
-  if (isBoolean(value))
-    return ctx.stylize('' + value, 'boolean');
-  // For some reason typeof null is "object", so special case here.
-  if (isNull(value))
-    return ctx.stylize('null', 'null');
-}
+}).call(this,require('_process'))
+},{"_process":5}],5:[function(require,module,exports){
+// shim for using process in browser
 
+var process = module.exports = {};
 
-function formatError(value) {
-  return '[' + Error.prototype.toString.call(value) + ']';
-}
+process.nextTick = (function () {
+    var canSetImmediate = typeof window !== 'undefined'
+    && window.setImmediate;
+    var canPost = typeof window !== 'undefined'
+    && window.postMessage && window.addEventListener
+    ;
 
+    if (canSetImmediate) {
+        return function (f) { return window.setImmediate(f) };
+    }
 
-function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
-  var output = [];
-  for (var i = 0, l = value.length; i < l; ++i) {
-    if (hasOwnProperty(value, String(i))) {
-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-          String(i), true));
-    } else {
-      output.push('');
-    }
-  }
-  keys.forEach(function(key) {
-    if (!key.match(/^\d+$/)) {
-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-          key, true));
-    }
-  });
-  return output;
-}
-
+    if (canPost) {
+        var queue = [];
+        window.addEventListener('message', function (ev) {
+            var source = ev.source;
+            if ((source === window || source === null) && ev.data === 'process-tick') {
+                ev.stopPropagation();
+                if (queue.length > 0) {
+                    var fn = queue.shift();
+                    fn();
+                }
+            }
+        }, true);
 
-function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
-  var name, str, desc;
-  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
-  if (desc.get) {
-    if (desc.set) {
-      str = ctx.stylize('[Getter/Setter]', 'special');
-    } else {
-      str = ctx.stylize('[Getter]', 'special');
-    }
-  } else {
-    if (desc.set) {
-      str = ctx.stylize('[Setter]', 'special');
-    }
-  }
-  if (!hasOwnProperty(visibleKeys, key)) {
-    name = '[' + key + ']';
-  }
-  if (!str) {
-    if (ctx.seen.indexOf(desc.value) < 0) {
-      if (isNull(recurseTimes)) {
-        str = formatValue(ctx, desc.value, null);
-      } else {
-        str = formatValue(ctx, desc.value, recurseTimes - 1);
-      }
-      if (str.indexOf('\n') > -1) {
-        if (array) {
-          str = str.split('\n').map(function(line) {
-            return '  ' + line;
-          }).join('\n').substr(2);
-        } else {
-          str = '\n' + str.split('\n').map(function(line) {
-            return '   ' + line;
-          }).join('\n');
-        }
-      }
-    } else {
-      str = ctx.stylize('[Circular]', 'special');
-    }
-  }
-  if (isUndefined(name)) {
-    if (array && key.match(/^\d+$/)) {
-      return str;
-    }
-    name = JSON.stringify('' + key);
-    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
-      name = name.substr(1, name.length - 2);
-      name = ctx.stylize(name, 'name');
-    } else {
-      name = name.replace(/'/g, "\\'")
-                 .replace(/\\"/g, '"')
-                 .replace(/(^"|"$)/g, "'");
-      name = ctx.stylize(name, 'string');
+        return function nextTick(fn) {
+            queue.push(fn);
+            window.postMessage('process-tick', '*');
+        };
     }
-  }
-
-  return name + ': ' + str;
-}
-
-
-function reduceToSingleString(output, base, braces) {
-  var numLinesEst = 0;
-  var length = output.reduce(function(prev, cur) {
-    numLinesEst++;
-    if (cur.indexOf('\n') >= 0) numLinesEst++;
-    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
-  }, 0);
 
-  if (length > 60) {
-    return braces[0] +
-           (base === '' ? '' : base + '\n ') +
-           ' ' +
-           output.join(',\n  ') +
-           ' ' +
-           braces[1];
-  }
-
-  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
-}
-
-
-// NOTE: These type checking functions intentionally don't use `instanceof`
-// because it is fragile and can be easily faked with `Object.create()`.
-function isArray(ar) {
-  return Array.isArray(ar);
-}
-exports.isArray = isArray;
+    return function nextTick(fn) {
+        setTimeout(fn, 0);
+    };
+})();
 
-function isBoolean(arg) {
-  return typeof arg === 'boolean';
-}
-exports.isBoolean = isBoolean;
+process.title = 'browser';
+process.browser = true;
+process.env = {};
+process.argv = [];
 
-function isNull(arg) {
-  return arg === null;
-}
-exports.isNull = isNull;
+function noop() {}
 
-function isNullOrUndefined(arg) {
-  return arg == null;
-}
-exports.isNullOrUndefined = isNullOrUndefined;
+process.on = noop;
+process.addListener = noop;
+process.once = noop;
+process.off = noop;
+process.removeListener = noop;
+process.removeAllListeners = noop;
+process.emit = noop;
 
-function isNumber(arg) {
-  return typeof arg === 'number';
+process.binding = function (name) {
+    throw new Error('process.binding is not supported');
 }
-exports.isNumber = isNumber;
 
-function isString(arg) {
-  return typeof arg === 'string';
-}
-exports.isString = isString;
+// TODO(shtylman)
+process.cwd = function () { return '/' };
+process.chdir = function (dir) {
+    throw new Error('process.chdir is not supported');
+};
 
-function isSymbol(arg) {
-  return typeof arg === 'symbol';
+},{}],6:[function(require,module,exports){
+module.exports = function isBuffer(arg) {
+  return arg && typeof arg === 'object'
+    && typeof arg.copy === 'function'
+    && typeof arg.fill === 'function'
+    && typeof arg.readUInt8 === 'function';
 }
-exports.isSymbol = isSymbol;
+},{}],7:[function(require,module,exports){
+(function (process,global){
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-function isUndefined(arg) {
-  return arg === void 0;
-}
-exports.isUndefined = isUndefined;
+var formatRegExp = /%[sdj%]/g;
+exports.format = function(f) {
+  if (!isString(f)) {
+    var objects = [];
+    for (var i = 0; i < arguments.length; i++) {
+      objects.push(inspect(arguments[i]));
+    }
+    return objects.join(' ');
+  }
 
-function isRegExp(re) {
-  return isObject(re) && objectToString(re) === '[object RegExp]';
-}
-exports.isRegExp = isRegExp;
+  var i = 1;
+  var args = arguments;
+  var len = args.length;
+  var str = String(f).replace(formatRegExp, function(x) {
+    if (x === '%%') return '%';
+    if (i >= len) return x;
+    switch (x) {
+      case '%s': return String(args[i++]);
+      case '%d': return Number(args[i++]);
+      case '%j':
+        try {
+          return JSON.stringify(args[i++]);
+        } catch (_) {
+          return '[Circular]';
+        }
+      default:
+        return x;
+    }
+  });
+  for (var x = args[i]; i < len; x = args[++i]) {
+    if (isNull(x) || !isObject(x)) {
+      str += ' ' + x;
+    } else {
+      str += ' ' + inspect(x);
+    }
+  }
+  return str;
+};
 
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-exports.isObject = isObject;
 
-function isDate(d) {
-  return isObject(d) && objectToString(d) === '[object Date]';
-}
-exports.isDate = isDate;
+// Mark that a method should not be used.
+// Returns a modified function which warns once by default.
+// If --no-deprecation is set, then it is a no-op.
+exports.deprecate = function(fn, msg) {
+  // Allow for deprecating things in the process of starting up.
+  if (isUndefined(global.process)) {
+    return function() {
+      return exports.deprecate(fn, msg).apply(this, arguments);
+    };
+  }
 
-function isError(e) {
-  return isObject(e) &&
-      (objectToString(e) === '[object Error]' || e instanceof Error);
-}
-exports.isError = isError;
+  if (process.noDeprecation === true) {
+    return fn;
+  }
 
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-exports.isFunction = isFunction;
+  var warned = false;
+  function deprecated() {
+    if (!warned) {
+      if (process.throwDeprecation) {
+        throw new Error(msg);
+      } else if (process.traceDeprecation) {
+        console.trace(msg);
+      } else {
+        console.error(msg);
+      }
+      warned = true;
+    }
+    return fn.apply(this, arguments);
+  }
 
-function isPrimitive(arg) {
-  return arg === null ||
-         typeof arg === 'boolean' ||
-         typeof arg === 'number' ||
-         typeof arg === 'string' ||
-         typeof arg === 'symbol' ||  // ES6 symbol
-         typeof arg === 'undefined';
-}
-exports.isPrimitive = isPrimitive;
+  return deprecated;
+};
 
-exports.isBuffer = require('./support/isBuffer');
 
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
+var debugs = {};
+var debugEnviron;
+exports.debuglog = function(set) {
+  if (isUndefined(debugEnviron))
+    debugEnviron = process.env.NODE_DEBUG || '';
+  set = set.toUpperCase();
+  if (!debugs[set]) {
+    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
+      var pid = process.pid;
+      debugs[set] = function() {
+        var msg = exports.format.apply(exports, arguments);
+        console.error('%s %d: %s', set, pid, msg);
+      };
+    } else {
+      debugs[set] = function() {};
+    }
+  }
+  return debugs[set];
+};
 
 
-function pad(n) {
-  return n < 10 ? '0' + n.toString(10) : n.toString(10);
+/**
+ * Echos the value of a value. Trys to print the value out
+ * in the best way possible given the different types.
+ *
+ * @param {Object} obj The object to print out.
+ * @param {Object} opts Optional options object that alters the output.
+ */
+/* legacy: obj, showHidden, depth, colors*/
+function inspect(obj, opts) {
+  // default options
+  var ctx = {
+    seen: [],
+    stylize: stylizeNoColor
+  };
+  // legacy...
+  if (arguments.length >= 3) ctx.depth = arguments[2];
+  if (arguments.length >= 4) ctx.colors = arguments[3];
+  if (isBoolean(opts)) {
+    // legacy...
+    ctx.showHidden = opts;
+  } else if (opts) {
+    // got an "options" object
+    exports._extend(ctx, opts);
+  }
+  // set default options
+  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
+  if (isUndefined(ctx.depth)) ctx.depth = 2;
+  if (isUndefined(ctx.colors)) ctx.colors = false;
+  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
+  if (ctx.colors) ctx.stylize = stylizeWithColor;
+  return formatValue(ctx, obj, ctx.depth);
 }
+exports.inspect = inspect;
 
 
-var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
-              'Oct', 'Nov', 'Dec'];
-
-// 26 Feb 16:19:34
-function timestamp() {
-  var d = new Date();
-  var time = [pad(d.getHours()),
-              pad(d.getMinutes()),
-              pad(d.getSeconds())].join(':');
-  return [d.getDate(), months[d.getMonth()], time].join(' ');
-}
-
+// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+inspect.colors = {
+  'bold' : [1, 22],
+  'italic' : [3, 23],
+  'underline' : [4, 24],
+  'inverse' : [7, 27],
+  'white' : [37, 39],
+  'grey' : [90, 39],
+  'black' : [30, 39],
+  'blue' : [34, 39],
+  'cyan' : [36, 39],
+  'green' : [32, 39],
+  'magenta' : [35, 39],
+  'red' : [31, 39],
+  'yellow' : [33, 39]
+};
 
-// log is just a thin wrapper to console.log that prepends a timestamp
-exports.log = function() {
-  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+// Don't use 'blue' not visible on cmd.exe
+inspect.styles = {
+  'special': 'cyan',
+  'number': 'yellow',
+  'boolean': 'yellow',
+  'undefined': 'grey',
+  'null': 'bold',
+  'string': 'green',
+  'date': 'magenta',
+  // "name": intentionally not styling
+  'regexp': 'red'
 };
 
 
-/**
- * Inherit the prototype methods from one constructor into another.
- *
- * The Function.prototype.inherits from lang.js rewritten as a standalone
- * function (not on Function.prototype). NOTE: If this file is to be loaded
- * during bootstrapping this function needs to be rewritten using some native
- * functions as prototype setup using normal JavaScript does not work as
- * expected during bootstrapping (see mirror.js in r114903).
- *
- * @param {function} ctor Constructor function which needs to inherit the
- *     prototype.
- * @param {function} superCtor Constructor function to inherit prototype from.
- */
-exports.inherits = require('inherits');
-
-exports._extend = function(origin, add) {
-  // Don't do anything if add isn't an object
-  if (!add || !isObject(add)) return origin;
+function stylizeWithColor(str, styleType) {
+  var style = inspect.styles[styleType];
 
-  var keys = Object.keys(add);
-  var i = keys.length;
-  while (i--) {
-    origin[keys[i]] = add[keys[i]];
+  if (style) {
+    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
+           '\u001b[' + inspect.colors[style][1] + 'm';
+  } else {
+    return str;
   }
-  return origin;
-};
-
-function hasOwnProperty(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
-}).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./support/isBuffer":2,"_process":7,"inherits":4}],4:[function(require,module,exports){
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    ctor.prototype = Object.create(superCtor.prototype, {
-      constructor: {
-        value: ctor,
-        enumerable: false,
-        writable: true,
-        configurable: true
-      }
-    });
-  };
-} else {
-  // old school shim for old browsers
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    var TempCtor = function () {}
-    TempCtor.prototype = superCtor.prototype
-    ctor.prototype = new TempCtor()
-    ctor.prototype.constructor = ctor
-  }
+
+function stylizeNoColor(str, styleType) {
+  return str;
 }
 
-},{}],5:[function(require,module,exports){
-exports.endianness = function () { return 'LE' };
 
-exports.hostname = function () {
-    if (typeof location !== 'undefined') {
-        return location.hostname
-    }
-    else return '';
-};
+function arrayToHash(array) {
+  var hash = {};
 
-exports.loadavg = function () { return [] };
+  array.forEach(function(val, idx) {
+    hash[val] = true;
+  });
 
-exports.uptime = function () { return 0 };
+  return hash;
+}
 
-exports.freemem = function () {
-    return Number.MAX_VALUE;
-};
 
-exports.totalmem = function () {
-    return Number.MAX_VALUE;
-};
+function formatValue(ctx, value, recurseTimes) {
+  // Provide a hook for user-specified inspect functions.
+  // Check that value is an object with an inspect function on it
+  if (ctx.customInspect &&
+      value &&
+      isFunction(value.inspect) &&
+      // Filter out the util module, it's inspect function is special
+      value.inspect !== exports.inspect &&
+      // Also filter out any prototype objects using the circular check.
+      !(value.constructor && value.constructor.prototype === value)) {
+    var ret = value.inspect(recurseTimes, ctx);
+    if (!isString(ret)) {
+      ret = formatValue(ctx, ret, recurseTimes);
+    }
+    return ret;
+  }
 
-exports.cpus = function () { return [] };
+  // Primitive types cannot have properties
+  var primitive = formatPrimitive(ctx, value);
+  if (primitive) {
+    return primitive;
+  }
 
-exports.type = function () { return 'Browser' };
+  // Look up the keys of the object.
+  var keys = Object.keys(value);
+  var visibleKeys = arrayToHash(keys);
 
-exports.release = function () {
-    if (typeof navigator !== 'undefined') {
-        return navigator.appVersion;
+  if (ctx.showHidden) {
+    keys = Object.getOwnPropertyNames(value);
+  }
+
+  // IE doesn't make error fields non-enumerable
+  // http://msdn.microsoft.com/en-us/library/ie/dww52sbt(v=vs.94).aspx
+  if (isError(value)
+      && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {
+    return formatError(value);
+  }
+
+  // Some type of object without properties can be shortcutted.
+  if (keys.length === 0) {
+    if (isFunction(value)) {
+      var name = value.name ? ': ' + value.name : '';
+      return ctx.stylize('[Function' + name + ']', 'special');
     }
-    return '';
-};
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    }
+    if (isDate(value)) {
+      return ctx.stylize(Date.prototype.toString.call(value), 'date');
+    }
+    if (isError(value)) {
+      return formatError(value);
+    }
+  }
 
-exports.networkInterfaces
-= exports.getNetworkInterfaces
-= function () { return {} };
+  var base = '', array = false, braces = ['{', '}'];
 
-exports.arch = function () { return 'javascript' };
+  // Make Array say that they are Array
+  if (isArray(value)) {
+    array = true;
+    braces = ['[', ']'];
+  }
 
-exports.platform = function () { return 'browser' };
+  // Make functions say that they are functions
+  if (isFunction(value)) {
+    var n = value.name ? ': ' + value.name : '';
+    base = ' [Function' + n + ']';
+  }
 
-exports.tmpdir = exports.tmpDir = function () {
-    return '/tmp';
-};
+  // Make RegExps say that they are RegExps
+  if (isRegExp(value)) {
+    base = ' ' + RegExp.prototype.toString.call(value);
+  }
 
-exports.EOL = '\n';
+  // Make dates with properties first say the date
+  if (isDate(value)) {
+    base = ' ' + Date.prototype.toUTCString.call(value);
+  }
 
-},{}],6:[function(require,module,exports){
-(function (process){
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
+  // Make error with message first say the error
+  if (isError(value)) {
+    base = ' ' + formatError(value);
+  }
 
-// resolves . and .. elements in a path array with directory names there
-// must be no slashes, empty elements, or device names (c:\) in the array
-// (so also no leading and trailing slashes - it does not distinguish
-// relative and absolute paths)
-function normalizeArray(parts, allowAboveRoot) {
-  // if the path tries to go above the root, `up` ends up > 0
-  var up = 0;
-  for (var i = parts.length - 1; i >= 0; i--) {
-    var last = parts[i];
-    if (last === '.') {
-      parts.splice(i, 1);
-    } else if (last === '..') {
-      parts.splice(i, 1);
-      up++;
-    } else if (up) {
-      parts.splice(i, 1);
-      up--;
-    }
+  if (keys.length === 0 && (!array || value.length == 0)) {
+    return braces[0] + base + braces[1];
   }
 
-  // if the path is allowed to go above the root, restore leading ..s
-  if (allowAboveRoot) {
-    for (; up--; up) {
-      parts.unshift('..');
+  if (recurseTimes < 0) {
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    } else {
+      return ctx.stylize('[Object]', 'special');
     }
   }
 
-  return parts;
-}
-
-// Split a filename into [root, dir, basename, ext], unix version
-// 'root' is just a slash, or nothing.
-var splitPathRe =
-    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
-var splitPath = function(filename) {
-  return splitPathRe.exec(filename).slice(1);
-};
+  ctx.seen.push(value);
 
-// path.resolve([from ...], to)
-// posix version
-exports.resolve = function() {
-  var resolvedPath = '',
-      resolvedAbsolute = false;
+  var output;
+  if (array) {
+    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+  } else {
+    output = keys.map(function(key) {
+      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+    });
+  }
 
-  for (var i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
-    var path = (i >= 0) ? arguments[i] : process.cwd();
+  ctx.seen.pop();
 
-    // Skip empty and invalid entries
-    if (typeof path !== 'string') {
-      throw new TypeError('Arguments to path.resolve must be strings');
-    } else if (!path) {
-      continue;
-    }
+  return reduceToSingleString(output, base, braces);
+}
 
-    resolvedPath = path + '/' + resolvedPath;
-    resolvedAbsolute = path.charAt(0) === '/';
+
+function formatPrimitive(ctx, value) {
+  if (isUndefined(value))
+    return ctx.stylize('undefined', 'undefined');
+  if (isString(value)) {
+    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+                                             .replace(/'/g, "\\'")
+                                             .replace(/\\"/g, '"') + '\'';
+    return ctx.stylize(simple, 'string');
   }
+  if (isNumber(value))
+    return ctx.stylize('' + value, 'number');
+  if (isBoolean(value))
+    return ctx.stylize('' + value, 'boolean');
+  // For some reason typeof null is "object", so special case here.
+  if (isNull(value))
+    return ctx.stylize('null', 'null');
+}
 
-  // At this point the path should be resolved to a full absolute path, but
-  // handle relative paths to be safe (might happen when process.cwd() fails)
 
-  // Normalize the path
-  resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
-    return !!p;
-  }), !resolvedAbsolute).join('/');
+function formatError(value) {
+  return '[' + Error.prototype.toString.call(value) + ']';
+}
 
-  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
-};
 
-// path.normalize(path)
-// posix version
-exports.normalize = function(path) {
-  var isAbsolute = exports.isAbsolute(path),
-      trailingSlash = substr(path, -1) === '/';
+function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+  var output = [];
+  for (var i = 0, l = value.length; i < l; ++i) {
+    if (hasOwnProperty(value, String(i))) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          String(i), true));
+    } else {
+      output.push('');
+    }
+  }
+  keys.forEach(function(key) {
+    if (!key.match(/^\d+$/)) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          key, true));
+    }
+  });
+  return output;
+}
 
-  // Normalize the path
-  path = normalizeArray(filter(path.split('/'), function(p) {
-    return !!p;
-  }), !isAbsolute).join('/');
 
-  if (!path && !isAbsolute) {
-    path = '.';
+function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+  var name, str, desc;
+  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+  if (desc.get) {
+    if (desc.set) {
+      str = ctx.stylize('[Getter/Setter]', 'special');
+    } else {
+      str = ctx.stylize('[Getter]', 'special');
+    }
+  } else {
+    if (desc.set) {
+      str = ctx.stylize('[Setter]', 'special');
+    }
   }
-  if (path && trailingSlash) {
-    path += '/';
+  if (!hasOwnProperty(visibleKeys, key)) {
+    name = '[' + key + ']';
   }
-
-  return (isAbsolute ? '/' : '') + path;
-};
-
-// posix version
-exports.isAbsolute = function(path) {
-  return path.charAt(0) === '/';
-};
-
-// posix version
-exports.join = function() {
-  var paths = Array.prototype.slice.call(arguments, 0);
-  return exports.normalize(filter(paths, function(p, index) {
-    if (typeof p !== 'string') {
-      throw new TypeError('Arguments to path.join must be strings');
+  if (!str) {
+    if (ctx.seen.indexOf(desc.value) < 0) {
+      if (isNull(recurseTimes)) {
+        str = formatValue(ctx, desc.value, null);
+      } else {
+        str = formatValue(ctx, desc.value, recurseTimes - 1);
+      }
+      if (str.indexOf('\n') > -1) {
+        if (array) {
+          str = str.split('\n').map(function(line) {
+            return '  ' + line;
+          }).join('\n').substr(2);
+        } else {
+          str = '\n' + str.split('\n').map(function(line) {
+            return '   ' + line;
+          }).join('\n');
+        }
+      }
+    } else {
+      str = ctx.stylize('[Circular]', 'special');
     }
-    return p;
-  }).join('/'));
-};
-
+  }
+  if (isUndefined(name)) {
+    if (array && key.match(/^\d+$/)) {
+      return str;
+    }
+    name = JSON.stringify('' + key);
+    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+      name = name.substr(1, name.length - 2);
+      name = ctx.stylize(name, 'name');
+    } else {
+      name = name.replace(/'/g, "\\'")
+                 .replace(/\\"/g, '"')
+                 .replace(/(^"|"$)/g, "'");
+      name = ctx.stylize(name, 'string');
+    }
+  }
 
-// path.relative(from, to)
-// posix version
-exports.relative = function(from, to) {
-  from = exports.resolve(from).substr(1);
-  to = exports.resolve(to).substr(1);
+  return name + ': ' + str;
+}
 
-  function trim(arr) {
-    var start = 0;
-    for (; start < arr.length; start++) {
-      if (arr[start] !== '') break;
-    }
 
-    var end = arr.length - 1;
-    for (; end >= 0; end--) {
-      if (arr[end] !== '') break;
-    }
+function reduceToSingleString(output, base, braces) {
+  var numLinesEst = 0;
+  var length = output.reduce(function(prev, cur) {
+    numLinesEst++;
+    if (cur.indexOf('\n') >= 0) numLinesEst++;
+    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+  }, 0);
 
-    if (start > end) return [];
-    return arr.slice(start, end - start + 1);
+  if (length > 60) {
+    return braces[0] +
+           (base === '' ? '' : base + '\n ') +
+           ' ' +
+           output.join(',\n  ') +
+           ' ' +
+           braces[1];
   }
 
-  var fromParts = trim(from.split('/'));
-  var toParts = trim(to.split('/'));
+  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+}
 
-  var length = Math.min(fromParts.length, toParts.length);
-  var samePartsLength = length;
-  for (var i = 0; i < length; i++) {
-    if (fromParts[i] !== toParts[i]) {
-      samePartsLength = i;
-      break;
-    }
-  }
 
-  var outputParts = [];
-  for (var i = samePartsLength; i < fromParts.length; i++) {
-    outputParts.push('..');
-  }
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
 
-  outputParts = outputParts.concat(toParts.slice(samePartsLength));
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
 
-  return outputParts.join('/');
-};
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
 
-exports.sep = '/';
-exports.delimiter = ':';
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
 
-exports.dirname = function(path) {
-  var result = splitPath(path),
-      root = result[0],
-      dir = result[1];
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
 
-  if (!root && !dir) {
-    // No dirname whatsoever
-    return '.';
-  }
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
 
-  if (dir) {
-    // It has a dirname, strip trailing slash
-    dir = dir.substr(0, dir.length - 1);
-  }
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
 
-  return root + dir;
-};
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
 
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
 
-exports.basename = function(path, ext) {
-  var f = splitPath(path)[2];
-  // TODO: make this comparison case-insensitive on windows?
-  if (ext && f.substr(-1 * ext.length) === ext) {
-    f = f.substr(0, f.length - ext.length);
-  }
-  return f;
-};
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
 
+function isError(e) {
+  return isObject(e) &&
+      (objectToString(e) === '[object Error]' || e instanceof Error);
+}
+exports.isError = isError;
 
-exports.extname = function(path) {
-  return splitPath(path)[3];
-};
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
 
-function filter (xs, f) {
-    if (xs.filter) return xs.filter(f);
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        if (f(xs[i], i, xs)) res.push(xs[i]);
-    }
-    return res;
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
 }
+exports.isPrimitive = isPrimitive;
 
-// String.prototype.substr - negative index don't work in IE8
-var substr = 'ab'.substr(-1) === 'b'
-    ? function (str, start, len) { return str.substr(start, len) }
-    : function (str, start, len) {
-        if (start < 0) start = str.length + start;
-        return str.substr(start, len);
-    }
-;
+exports.isBuffer = require('./support/isBuffer');
 
-}).call(this,require('_process'))
-},{"_process":7}],7:[function(require,module,exports){
-// shim for using process in browser
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
 
-var process = module.exports = {};
 
-process.nextTick = (function () {
-    var canSetImmediate = typeof window !== 'undefined'
-    && window.setImmediate;
-    var canPost = typeof window !== 'undefined'
-    && window.postMessage && window.addEventListener
-    ;
+function pad(n) {
+  return n < 10 ? '0' + n.toString(10) : n.toString(10);
+}
 
-    if (canSetImmediate) {
-        return function (f) { return window.setImmediate(f) };
-    }
 
-    if (canPost) {
-        var queue = [];
-        window.addEventListener('message', function (ev) {
-            var source = ev.source;
-            if ((source === window || source === null) && ev.data === 'process-tick') {
-                ev.stopPropagation();
-                if (queue.length > 0) {
-                    var fn = queue.shift();
-                    fn();
-                }
-            }
-        }, true);
+var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
+              'Oct', 'Nov', 'Dec'];
 
-        return function nextTick(fn) {
-            queue.push(fn);
-            window.postMessage('process-tick', '*');
-        };
-    }
+// 26 Feb 16:19:34
+function timestamp() {
+  var d = new Date();
+  var time = [pad(d.getHours()),
+              pad(d.getMinutes()),
+              pad(d.getSeconds())].join(':');
+  return [d.getDate(), months[d.getMonth()], time].join(' ');
+}
 
-    return function nextTick(fn) {
-        setTimeout(fn, 0);
-    };
-})();
 
-process.title = 'browser';
-process.browser = true;
-process.env = {};
-process.argv = [];
+// log is just a thin wrapper to console.log that prepends a timestamp
+exports.log = function() {
+  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+};
 
-function noop() {}
 
-process.on = noop;
-process.addListener = noop;
-process.once = noop;
-process.off = noop;
-process.removeListener = noop;
-process.removeAllListeners = noop;
-process.emit = noop;
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * The Function.prototype.inherits from lang.js rewritten as a standalone
+ * function (not on Function.prototype). NOTE: If this file is to be loaded
+ * during bootstrapping this function needs to be rewritten using some native
+ * functions as prototype setup using normal JavaScript does not work as
+ * expected during bootstrapping (see mirror.js in r114903).
+ *
+ * @param {function} ctor Constructor function which needs to inherit the
+ *     prototype.
+ * @param {function} superCtor Constructor function to inherit prototype from.
+ */
+exports.inherits = require('inherits');
 
-process.binding = function (name) {
-    throw new Error('process.binding is not supported');
-}
+exports._extend = function(origin, add) {
+  // Don't do anything if add isn't an object
+  if (!add || !isObject(add)) return origin;
 
-// TODO(shtylman)
-process.cwd = function () { return '/' };
-process.chdir = function (dir) {
-    throw new Error('process.chdir is not supported');
+  var keys = Object.keys(add);
+  var i = keys.length;
+  while (i--) {
+    origin[keys[i]] = add[keys[i]];
+  }
+  return origin;
 };
 
-},{}],8:[function(require,module,exports){
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+}).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{"./support/isBuffer":6,"_process":5,"inherits":2}],8:[function(require,module,exports){
 "use strict";
 
 var SourceMapGenerator = require("source-map").SourceMapGenerator;
@@ -1561,6 +1561,7 @@ var ngInject = require("./nginject");
 var generateSourcemap = require("./generate-sourcemap");
 var Lut = require("./lut");
 var scopeTools = require("./scopetools");
+var stringmap = require("stringmap");
 
 var chainedRouteProvider = 1;
 var chainedUrlRouterProvider = 2;
@@ -1584,23 +1585,32 @@ function match(node, ctx, matchPlugins) {
 }
 
 function matchDirectiveReturnObject(node) {
+    // only matches inside directives
     // return { .. controller: function($scope, $timeout), ...}
 
-    return node.type === "ReturnStatement" &&
+    return limit("directive", node.type === "ReturnStatement" &&
         node.argument && node.argument.type === "ObjectExpression" &&
-        matchProp("controller", node.argument.properties);
+        matchProp("controller", node.argument.properties));
+}
+
+function limit(name, node) {
+    if (node) {
+        node.$limitToMethodName = name;
+    }
+    return node;
 }
 
 function matchProviderGet(node) {
+    // only matches inside providers
     // (this|self|that).$get = function($scope, $timeout)
     // { ... $get: function($scope, $timeout), ...}
     var memberExpr;
     var self;
-    return (node.type === "AssignmentExpression" && (memberExpr = node.left).type === "MemberExpression" &&
+    return limit("provider", (node.type === "AssignmentExpression" && (memberExpr = node.left).type === "MemberExpression" &&
         memberExpr.property.name === "$get" &&
         ((self = memberExpr.object).type === "ThisExpression" || (self.type === "Identifier" && is.someof(self.name, ["self", "that"]))) &&
         node.right) ||
-        (node.type === "ObjectExpression" && matchProp("$get", node.properties));
+        (node.type === "ObjectExpression" && matchProp("$get", node.properties)));
 }
 
 function matchNgRoute(node) {
@@ -1655,6 +1665,9 @@ function matchNgUi(node) {
     // $stateProvider.state("myState", {... resolve: {f: function($scope) {}, ..} ..})
     // $stateProvider.state("myState", {... views: {... somename: {... controller: fn, controllerProvider: fn, templateProvider: fn, resolve: {f: fn}}}})
     //
+    // stateHelperProvider.setNestedState({ sameasregularstate, children: [sameasregularstate, ..]})
+    // stateHelperProvider.setNestedState({ sameasregularstate, children: [sameasregularstate, ..]}, true)
+    //
     // $urlRouterProvider.when(.., function($scope) {})
     //
     // $modal.open({.. controller: fn, resolve: {f: function($scope) {}, ..}});
@@ -1668,9 +1681,9 @@ function matchNgUi(node) {
     // shortcut for $modal.open({.. controller: fn, resolve: {f: function($scope) {}, ..}});
     if (obj.type === "Identifier" && obj.name === "$modal" && method.name === "open" &&
         args.length === 1 && args[0].type === "ObjectExpression") {
-        var props$0 = args[0].properties;
-        var res$0 = [matchProp("controller", props$0)];
-        res$0.push.apply(res$0, matchResolve(props$0));
+        var props = args[0].properties;
+        var res$0 = [matchProp("controller", props)];
+        res$0.push.apply(res$0, matchResolve(props));
         return res$0.filter(Boolean);
     }
 
@@ -1684,53 +1697,76 @@ function matchNgUi(node) {
         return false;
     }
 
-    // everything below is for $stateProvider alone
-    if (!(obj.$chained === chainedStateProvider || (obj.type === "Identifier" && obj.name === "$stateProvider"))) {
+    // everything below is for $stateProvider and stateHelperProvider alone
+    if (!(obj.$chained === chainedStateProvider || (obj.type === "Identifier" && is.someof(obj.name, ["$stateProvider", "stateHelperProvider"])))) {
         return false;
     }
     node.$chained = chainedStateProvider;
 
-    if (method.name !== "state") {
+    if (is.noneof(method.name, ["state", "setNestedState"])) {
         return false;
     }
 
     // $stateProvider.state({ ... }) and $stateProvider.state("name", { ... })
+    // stateHelperProvider.setNestedState({ .. }) and stateHelperProvider.setNestedState({ .. }, true)
     if (!(args.length >= 1 && args.length <= 2)) {
         return false;
     }
 
-    var configArg = last(args);
-    if (configArg.type !== "ObjectExpression") {
-        return false;
-    }
-
-    var props = configArg.properties;
-    var res = [
-        matchProp("controller", props),
-        matchProp("controllerProvider", props),
-        matchProp("templateProvider", props),
-        matchProp("onEnter", props),
-        matchProp("onExit", props),
-    ];
+    var configArg = (method.name === "state" ? last(args) : args[0]);
 
-    // {resolve: ..}
-    res.push.apply(res, matchResolve(props));
+    var res = [];
 
-    // {view: ...}
-    var viewObject = matchProp("views", props);
-    if (viewObject && viewObject.type === "ObjectExpression") {
-        viewObject.properties.forEach(function(prop) {
-            if (prop.value.type === "ObjectExpression") {
-                res.push(matchProp("controller", prop.value.properties));
-                res.push(matchProp("controllerProvider", prop.value.properties));
-                res.push(matchProp("templateProvider", prop.value.properties));
-                res.push.apply(res, matchResolve(prop.value.properties));
-            }
-        });
-    }
+    recursiveMatch(configArg);
 
     var filteredRes = res.filter(Boolean);
     return (filteredRes.length === 0 ? false : filteredRes);
+
+
+    function recursiveMatch(objectExpressionNode) {
+        if (!objectExpressionNode || objectExpressionNode.type !== "ObjectExpression") {
+            return false;
+        }
+
+        var properties = objectExpressionNode.properties;
+
+        matchStateProps(properties, res);
+
+        var childrenArrayExpression = matchProp("children", properties);
+        var children = childrenArrayExpression && childrenArrayExpression.elements;
+
+        if (!children) {
+            return;
+        }
+        children.forEach(recursiveMatch);
+    }
+
+    function matchStateProps(props, res) {
+        var simple = [
+            matchProp("controller", props),
+            matchProp("controllerProvider", props),
+            matchProp("templateProvider", props),
+            matchProp("onEnter", props),
+            matchProp("onExit", props),
+        ];
+        res.push.apply(res, simple);
+
+        // {resolve: ..}
+        res.push.apply(res, matchResolve(props));
+
+        // {view: ...}
+        var viewObject = matchProp("views", props);
+        if (viewObject && viewObject.type === "ObjectExpression") {
+            viewObject.properties.forEach(function(prop) {
+                if (prop.value.type === "ObjectExpression") {
+                    res.push(matchProp("controller", prop.value.properties));
+                    res.push(matchProp("controllerProvider", prop.value.properties));
+                    res.push(matchProp("templateProvider", prop.value.properties));
+                    res.push.apply(res, matchResolve(prop.value.properties));
+                }
+            });
+        }
+    }
 }
 
 function matchHttpProvider(node) {
@@ -1759,7 +1795,7 @@ function matchRegular(node, ctx) {
     if (obj.name === "angular" && method.name === "module") {
         var args$0 = node.arguments;
         if (args$0.length >= 2) {
-            last(args$0).$always = true;
+            node.$chained = chainedRegular;
             return last(args$0);
         }
     }
@@ -1780,8 +1816,12 @@ function matchRegular(node, ctx) {
         args.length === 1 && args[0] :
         args.length === 2 && args[0].type === "Literal" && is.string(args[0].value) && args[1]);
 
-    if (target) {
-        target.$always = true;
+    target.$methodName = method.name;
+
+    if (ctx.rename && args.length === 2 && target) {
+        // for eventual rename purposes
+        var somethingNameLiteral = args[0];
+        return [somethingNameLiteral, target];
     }
     return target;
 }
@@ -1826,16 +1866,23 @@ function matchResolve(props) {
     return [];
 };
 
-function stringify(arr, quot) {
+function renamedString(ctx, originalString) {
+    if (ctx.rename) {
+        return ctx.rename.get(originalString) || originalString;
+    }
+    return originalString;
+}
+
+function stringify(ctx, arr, quot) {
     return "[" + arr.map(function(arg) {
-        return quot + arg.name + quot;
+        return quot + renamedString(ctx, arg.name) + quot;
     }).join(", ") + "]";
 }
 
-function insertArray(functionExpression, fragments, quot) {
+function insertArray(ctx, functionExpression, fragments, quot) {
     var range = functionExpression.range;
 
-    var args = stringify(functionExpression.params, quot);
+    var args = stringify(ctx, functionExpression.params, quot);
     fragments.push({
         start: range[0],
         end: range[0],
@@ -1848,13 +1895,14 @@ function insertArray(functionExpression, fragments, quot) {
     });
 }
 
-function replaceArray(array, fragments, quot) {
+function replaceArray(ctx, array, fragments, quot) {
     var functionExpression = last(array.elements);
 
     if (functionExpression.params.length === 0) {
         return removeArray(array, fragments);
     }
-    var args = stringify(functionExpression.params, quot);
+
+    var args = stringify(ctx, functionExpression.params, quot);
     fragments.push({
         start: array.range[0],
         end: functionExpression.range[0],
@@ -1877,49 +1925,128 @@ function removeArray(array, fragments) {
     });
 }
 
+function renameProviderDeclarationSite(ctx, literalNode, fragments) {
+    fragments.push({
+        start: literalNode.range[0] + 1,
+        end: literalNode.range[1] - 1,
+        str: renamedString(ctx, literalNode.value),
+    });
+}
+
 function judgeSuspects(ctx) {
-    var suspects = ctx.suspects;
     var mode = ctx.mode;
     var fragments = ctx.fragments;
     var quot = ctx.quot;
 
-    for (var i = 0; i < suspects.length; i++) {
-        var target = suspects[i];
+    var suspects = makeUnique(ctx.suspects, 1);
 
-        if (target.$once) {
-            continue;
+    for (var n = 0; n < 42; n++) {
+        // could be while(true), above is just a safety-net
+        // in practice it will loop just a couple of times
+        propagateModuleContextAndMethodName(suspects);
+        if (!setChainedAndMethodNameThroughIifesAndReferences(suspects)) {
+            break;
         }
-        target.$once = true;
+    }
 
-        if (!target.$always) {
-            var $caller = target.$caller;
-            for (; $caller && $caller.$chained !== chainedRegular; $caller = $caller.$caller) {
-            }
-            if (!$caller) {
-                continue;
-            }
+    // create final suspects by jumping, following, uniq'ing
+    var finalSuspects = makeUnique(suspects.map(function(target) {
+        var jumped = jumpOverIife(target);
+        var jumpedAndFollowed = followReference(jumped) || jumped;
+
+        if (target.$limitToMethodName && findOuterMethodName(target) !== target.$limitToMethodName) {
+            return null;
         }
 
-        target = jumpOverIife(target);
-        var followedTarget = followReference(target);
-        if (followedTarget) {
-            if (followedTarget.$once) {
-                continue;
-            }
-            followedTarget.$once = true;
-            target = followedTarget;
+        return jumpedAndFollowed;
+    }).filter(Boolean), 2);
+
+    finalSuspects.forEach(function(target) {
+        if (target.$chained !== chainedRegular) {
+            return;
         }
 
         if (mode === "rebuild" && isAnnotatedArray(target)) {
-            replaceArray(target, fragments, quot);
+            replaceArray(ctx, target, fragments, quot);
         } else if (mode === "remove" && isAnnotatedArray(target)) {
             removeArray(target, fragments);
         } else if (is.someof(mode, ["add", "rebuild"]) && isFunctionExpressionWithArgs(target)) {
-            insertArray(target, fragments, quot);
+            insertArray(ctx, target, fragments, quot);
+        } else if (isGenericProviderName(target)) {
+            renameProviderDeclarationSite(ctx, target, fragments);
         } else {
             // if it's not array or function-expression, then it's a candidate for foo.$inject = [..]
             judgeInjectArraySuspect(target, ctx);
         }
+    });
+
+
+    function propagateModuleContextAndMethodName(suspects) {
+        suspects.forEach(function(target) {
+            if (target.$chained !== chainedRegular && isInsideModuleContext(target)) {
+                target.$chained = chainedRegular;
+            }
+
+            if (!target.$methodName) {
+                var methodName = findOuterMethodName(target);
+                if (methodName) {
+                    target.$methodName = methodName;
+                }
+            }
+        });
+    }
+
+    function findOuterMethodName(node) {
+        for (; node && !node.$methodName; node = node.$parent) {
+        }
+        return node ? node.$methodName : null;
+    }
+
+    function setChainedAndMethodNameThroughIifesAndReferences(suspects) {
+        var modified = false;
+        suspects.forEach(function(target) {
+            var jumped = jumpOverIife(target);
+            if (jumped !== target) { // we did skip an IIFE
+                if (target.$chained === chainedRegular && jumped.$chained !== chainedRegular) {
+                    modified = true;
+                    jumped.$chained = chainedRegular;
+                }
+                if (target.$methodName && !jumped.$methodName) {
+                    modified = true;
+                    jumped.$methodName = target.$methodName;
+                }
+            }
+
+            var jumpedAndFollowed = followReference(jumped) || jumped;
+            if (jumpedAndFollowed !== jumped) { // we did follow a reference
+                if (jumped.$chained === chainedRegular && jumpedAndFollowed.$chained !== chainedRegular) {
+                    modified = true;
+                    jumpedAndFollowed.$chained = chainedRegular;
+                }
+                if (jumped.$methodName && !jumpedAndFollowed.$methodName) {
+                    modified = true;
+                    jumpedAndFollowed.$methodName = jumped.$methodName;
+                }
+            }
+        });
+        return modified;
+    }
+
+    function isInsideModuleContext(node) {
+        var $parent = node.$parent;
+        for (; $parent && $parent.$chained !== chainedRegular; $parent = $parent.$parent) {
+        }
+        return Boolean($parent);
+    }
+
+    function makeUnique(suspects, val) {
+        return suspects.filter(function(target) {
+            if (target.$seen === val) {
+                return false;
+            }
+            target.$seen = val;
+            return true;
+        });
     }
 }
 
@@ -1950,10 +2077,36 @@ function followReference(node) {
     return null;
 }
 
+// O(srclength) so should only be used for debugging purposes, else replace with lut
+function posToLine(pos, src) {
+    if (pos >= src.length) {
+        pos = src.length - 1;
+    }
+
+    if (pos <= -1) {
+        return -1;
+    }
+
+    var line = 1;
+    for (var i = 0; i < pos; i++) {
+        if (src[i] === "\n") {
+            ++line;
+        }
+    }
+
+    return line;
+}
+
 function judgeInjectArraySuspect(node, ctx) {
     // /*@ngInject*/ var foo = function($scope) {} and
     // /*@ngInject*/ function foo($scope) {} and
     // /*@ngInject*/ foo.bar[0] = function($scope) {}
+
+    // suspect must be inside of a block or at the top-level (i.e. inside of node.$parent.body[])
+    if (!node.$parent || is.noneof(node.$parent.type, ["Program", "BlockStatement"])) {
+        return;
+    }
+
     var d0 = null;
     var nr0 = node.range[0];
     var nr1 = node.range[1];
@@ -1979,11 +2132,38 @@ function judgeInjectArraySuspect(node, ctx) {
         return src.slice(lineStart, i);
     }
 
-    function addRemoveInjectArray(params, posBeforeFunctionDeclaration, posAfterFunctionDeclaration, name) {
+    function addRemoveInjectArray(params, posAtFunctionDeclaration, posAfterFunctionDeclaration, name) {
+        // if an existing something.$inject = [..] exists then is will always be recycled when rebuilding
+
         var indent = getIndent(posAfterFunctionDeclaration);
 
-        var nextNode = ctx.lut.findNodeFromPos(posAfterFunctionDeclaration);
-        var prevNode = ctx.lut.findNodeBeforePos(posBeforeFunctionDeclaration);
+        var foundSuspectInBody = false;
+        var existingExpressionStatementWithArray = null;
+        var troublesomeReturn = false;
+        node.$parent.body.forEach(function(bnode) {
+            if (bnode === node) {
+                foundSuspectInBody = true;
+            }
+
+            if (hasInjectArray(bnode)) {
+                if (existingExpressionStatementWithArray) {
+                    throw fmt("conflicting inject arrays at line {0} and {1}",
+                        posToLine(existingExpressionStatementWithArray.range[0], ctx.src),
+                        posToLine(bnode.range[0], ctx.src));
+                }
+                existingExpressionStatementWithArray = bnode;
+            }
+
+            // there's a return statement before our function
+            if (!foundSuspectInBody && bnode.type === "ReturnStatement") {
+                troublesomeReturn = bnode;
+            }
+        });
+        assert(foundSuspectInBody);
+
+        if (troublesomeReturn && !existingExpressionStatementWithArray) {
+            posAfterFunctionDeclaration = skipPrevNewline(troublesomeReturn.range[0]);
+        }
 
         function hasInjectArray(node) {
             var lvalue;
@@ -2004,28 +2184,37 @@ function judgeInjectArraySuspect(node, ctx) {
             return pos;
         }
 
-        var hasArrayBefore = hasInjectArray(prevNode);
-        var hasArrayAfter = hasInjectArray(nextNode);
+        function skipPrevNewline(pos) {
+            var prevLF = ctx.src.lastIndexOf("\n", pos);
+            if (prevLF === -1) {
+                return pos;
+            }
+            if (prevLF >= 1 && ctx.src[prevLF] === "\r") {
+                --prevLF;
+            }
+
+            if (/\S/g.test(ctx.src.slice(prevLF, pos - 1))) {
+                return pos;
+            }
 
-        var hasArray = hasArrayBefore || hasArrayAfter;
-        var start = hasArrayBefore ? prevNode.range[0]: posAfterFunctionDeclaration;
-        var end = hasArrayBefore ? skipNewline(prevNode.range[1]) : nextNode.range[1];
+            return prevLF;
+        }
 
-        var str = fmt("{0}{1}{2}.$inject = {3};", EOL, indent, name, ctx.stringify(params, ctx.quot));
+        var str = fmt("{0}{1}{2}.$inject = {3};", EOL, indent, name, ctx.stringify(ctx, params, ctx.quot));
 
-        if (ctx.mode === "rebuild" && hasArray) {
+        if (ctx.mode === "rebuild" && existingExpressionStatementWithArray) {
             ctx.fragments.push({
-                start: start,
-                end: end,
+                start: existingExpressionStatementWithArray.range[0],
+                end: existingExpressionStatementWithArray.range[1],
                 str: str,
             });
-        } else if (ctx.mode === "remove" && hasArray) {
+        } else if (ctx.mode === "remove" && existingExpressionStatementWithArray) {
             ctx.fragments.push({
-                start: start,
-                end: end,
+                start: skipPrevNewline(existingExpressionStatementWithArray.range[0]),
+                end: existingExpressionStatementWithArray.range[1],
                 str: "",
             });
-        } else if (is.someof(ctx.mode, ["add", "rebuild"]) && !hasArray) {
+        } else if (is.someof(ctx.mode, ["add", "rebuild"]) && !existingExpressionStatementWithArray) {
             ctx.fragments.push({
                 start: posAfterFunctionDeclaration,
                 end: posAfterFunctionDeclaration,
@@ -2052,7 +2241,7 @@ function addModuleContextDependentSuspect(target, ctx) {
 }
 
 function addModuleContextIndependentSuspect(target, ctx) {
-    target.$always = true;
+    target.$chained = chainedRegular;
     ctx.suspects.push(target);
 }
 
@@ -2065,6 +2254,9 @@ function isFunctionExpressionWithArgs(node) {
 function isFunctionDeclarationWithArgs(node) {
     return node.type === "FunctionDeclaration" && node.params.length >= 1;
 }
+function isGenericProviderName(node) {
+    return node.type === "Literal" && is.string(node.value);
+}
 
 window.annotate = function ngAnnotate(src, options) {
     var mode = (options.add && options.remove ? "rebuild" :
@@ -2077,6 +2269,12 @@ window.annotate = function ngAnnotate(src, options) {
 
     var quot = options.single_quotes ? "'" : '"';
     var re = (options.regexp ? new RegExp(options.regexp) : /^[a-zA-Z0-9_\$\.\s]+$/);
+    var rename = new stringmap();
+    if (options.rename) {
+        options.rename.forEach(function(value) {
+            rename.set(value.from, value.to);
+        });
+    }
     var ast;
     var stats = {};
     try {
@@ -2118,8 +2316,7 @@ window.annotate = function ngAnnotate(src, options) {
     // A suspect node will get annotations added / removed if it
     // fulfills the arrayexpression or functionexpression look,
     // and if it is in the correct context (inside an angular
-    // module definition) - alternatively is forced to ignore
-    // context with node.$always = true
+    // module definition)
     var suspects = [];
 
     var lut = new Lut(ast, src);
@@ -2134,6 +2331,7 @@ window.annotate = function ngAnnotate(src, options) {
             return src.slice(range[0], range[1]);
         },
         re: re,
+        rename: rename,
         comments: comments,
         fragments: fragments,
         suspects: suspects,
@@ -2163,22 +2361,12 @@ window.annotate = function ngAnnotate(src, options) {
         plugin.init(ctx);
     });
 
-    var recentCaller = undefined; // micro-optimization
-    var callerIds = [];
     traverse(ast, {pre: function(node) {
-        node.$caller = recentCaller;
         if (node.type === "CallExpression") {
-            callerIds.push(node);
-            recentCaller = node;
             ngInject.inspectCallExpression(node, ctx);
         }
 
     }, post: function(node) {
-        if (node === recentCaller) {
-            callerIds.pop();
-            recentCaller = last(callerIds);
-        }
-
         var targets = match(node, ctx, matchPluginsOrNull);
         if (!targets) {
             return;
@@ -2192,7 +2380,13 @@ window.annotate = function ngAnnotate(src, options) {
         }
     }});
 
-    judgeSuspects(ctx);
+    try {
+        judgeSuspects(ctx);
+    } catch(e) {
+        return {
+            errors: ["error: " + e],
+        };
+    }
 
     var out = alter(src, fragments);
     var result = {
@@ -2209,7 +2403,7 @@ window.annotate = function ngAnnotate(src, options) {
     return result;
 }
 
-},{"./generate-sourcemap":8,"./lut":9,"./nginject":11,"./scopetools":13,"alter":14,"assert":1,"esprima":15,"ordered-ast-traverse":17,"os":5,"simple-fmt":18,"simple-is":19}],11:[function(require,module,exports){
+},{"./generate-sourcemap":8,"./lut":9,"./nginject":11,"./scopetools":13,"alter":14,"assert":1,"esprima":15,"ordered-ast-traverse":17,"os":3,"simple-fmt":18,"simple-is":19,"stringmap":31}],11:[function(require,module,exports){
 // nginject-comments.js
 // MIT licensed, see LICENSE file
 // Copyright (c) 2013-2014 Olov Lassus <olov.lassus@gmail.com>
@@ -7672,7 +7866,7 @@ define(function (require, exports, module) {
           this._sourcesContents = {};
         }
         this._sourcesContents[util.toSetString(source)] = aSourceContent;
-      } else {
+      } else if (this._sourcesContents) {
         // Remove the source file from the _sourcesContents map.
         // If the _sourcesContents map is empty, set the property to null.
         delete this._sourcesContents[util.toSetString(source)];
@@ -8972,7 +9166,7 @@ function amdefine(module, requireFn) {
 module.exports = amdefine;
 
 }).call(this,require('_process'),"/node_modules/ng-annotate/node_modules/source-map/node_modules/amdefine/amdefine.js")
-},{"_process":7,"path":6}],30:[function(require,module,exports){
+},{"_process":5,"path":4}],30:[function(require,module,exports){
 //! stable.js 0.1.5, https://github.com/Two-Screen/stable
 //! © 2014 Angry Bytes and contributors. MIT licensed.