add --rename option to rename declarations and references

The `--rename` option takes a string as input, treating every couple, separated by a space,
as a find-replace option.
For example,  `--rename "$theService $myService "theFactory myFactory"`will replace
`$theService` with `$myService` and `theFactory` with `myFactory` in both the declaration
and in any annotation that will be added by ng-annotate. The actual use of the provider
won't be changed.

Closes olov#44

Author: frapontillo

README.md

@@ -51,6 +51,9 @@ Use the `--single_quotes` option to output `'$scope'` instead of `"$scope"`.
 Use the `--regexp` option to restrict matching further or to expand matching.
 See description further down.
 
+Use the `--rename` option to rename providers (services, factories, controllers, etc.) with
+a new name when declared and referenced through annotation.
+
 Use the `--plugin` option to load a user plugin with the provided path (*experimental*, 
 0.9.x may change API). See [plugin-example.js](plugin-example.js) for more info.
 

ng-annotate-main.js

@@ -218,7 +218,7 @@ function matchRegular(node, ctx) {
     const args = node.arguments;
     const target = (is.someof(method.name, ["config", "run"]) ?
         args.length === 1 && args[0] :
-        args.length === 2 && args[0].type === "Literal" && is.string(args[0].value) && args[1]);
+        args.length === 2 && args[0].type === "Literal" && is.string(args[0].value) && [args[0], args[1]]);
 
     if (target) {
         target.$always = true;
@@ -266,16 +266,20 @@ function matchResolve(props) {
     return [];
 };
 
-function stringify(arr, quot) {
+function getReplaceString(ctx, originalString) {
+    return (ctx.rename[originalString] || originalString);
+}
+
+function stringify(ctx, arr, quot) {
     return "[" + arr.map(function(arg) {
-        return quot + arg.name + quot;
+        return quot + getReplaceString(ctx, arg.name) + quot;
     }).join(", ") + "]";
 }
 
-function insertArray(functionExpression, fragments, quot) {
+function insertArray(ctx, functionExpression, fragments, quot) {
     const range = functionExpression.range;
 
-    const args = stringify(functionExpression.params, quot);
+    const args = stringify(ctx, functionExpression.params, quot);
     fragments.push({
         start: range[0],
         end: range[0],
@@ -288,13 +292,14 @@ function insertArray(functionExpression, fragments, quot) {
     });
 }
 
-function replaceArray(array, fragments, quot) {
+function replaceArray(ctx, array, fragments, quot) {
     const functionExpression = last(array.elements);
 
     if (functionExpression.params.length === 0) {
         return removeArray(array, fragments);
     }
-    const args = stringify(functionExpression.params, quot);
+
+    const args = stringify(ctx, functionExpression.params, quot);
     fragments.push({
         start: array.range[0],
         end: functionExpression.range[0],
@@ -317,6 +322,15 @@ function removeArray(array, fragments) {
     });
 }
 
+function replaceString(ctx, string, fragments, quot) {
+    var customReplace = getReplaceString(ctx, string.value);
+    fragments.push({
+        start: string.range[0],
+        end: string.range[1],
+        str: quot + customReplace + quot
+    });
+}
+
 function judgeSuspects(ctx) {
     const suspects = ctx.suspects;
     const mode = ctx.mode;
@@ -341,11 +355,13 @@ function judgeSuspects(ctx) {
         }
 
         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)) {
+            replaceString(ctx, target, fragments, quot);
         }
     }
 }
@@ -368,6 +384,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);
+}
 
 module.exports = function ngAnnotate(src, options) {
     const mode = (options.add && options.remove ? "rebuild" :
@@ -380,6 +399,7 @@ module.exports = function ngAnnotate(src, options) {
 
     const quot = options.single_quotes ? "'" : '"';
     const re = (options.regexp ? new RegExp(options.regexp) : /^[a-zA-Z0-9_\$\.\s]+$/);
+    const rename = options.rename || {};
     let ast;
     const stats = {};
     try {
@@ -437,6 +457,7 @@ module.exports = function ngAnnotate(src, options) {
             return src.slice(range[0], range[1]);
         },
         re: re,
+        rename: rename,
         comments: comments,
         fragments: fragments,
         triggers: triggers,

ng-annotate.js

@@ -34,6 +34,11 @@ const optimist = require("optimist")
     .options("regexp", {
         describe: "detect short form myMod.controller(...) iff myMod matches regexp",
     })
+    .options("rename", {
+        describe: "rename declarations and annotated refernces\n" +
+            "originalName newName anotherOriginalName anotherNewName ...",
+        default: ""
+    })
     .options("plugin", {
         describe: "use plugin with path (experimental)",
     })
@@ -101,7 +106,7 @@ function runAnnotate(err, src) {
     }, {});
 
 
-    ["add", "remove", "o", "regexp", "single_quotes", "plugin", "stats"].forEach(function(opt) {
+    ["add", "remove", "o", "regexp", "rename", "single_quotes", "plugin", "stats"].forEach(function(opt) {
         if (opt in argv) {
             config[opt] = argv[opt];
         }
@@ -126,6 +131,15 @@ function runAnnotate(err, src) {
         });
     }
 
+  if (config.rename) {
+    var flattenRename = config.rename.split(" ");
+    var renameMap = {};
+    for (var i = 0; i < flattenRename.length; i = i + 2) {
+      renameMap[flattenRename[i]]= flattenRename[i+1];
+    }
+    config.rename = renameMap;
+  }
+
     const run_t0 = Date.now();
     const ret = ngAnnotate(src, config);
     const run_t1 = Date.now();