Implement recursive gyp dependencies for Closure Compilation

third_party/closure_compiler/build/inputs.py

Index: third_party/closure_compiler/build/inputs.py
diff --git a/third_party/closure_compiler/build/inputs.py b/third_party/closure_compiler/build/inputs.py
index 356c77197140845d246c855a18ddc20466731977..d7f1a5b40292345c2a6b152e64b81bd38520fd52 100755
--- a/third_party/closure_compiler/build/inputs.py
+++ b/third_party/closure_compiler/build/inputs.py
@@ -4,6 +4,8 @@
 # found in the LICENSE file.
 
 import argparse
+import ast
+import collections
 import os
 import sys
 
@@ -12,17 +14,79 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 import processor
 
 
+def remove_duplicates_with_order(list_):

[Dan Beam, 2014/09/29 19:23:47]

nit: list_ => has_dupes

[Vitaly Pavlenko, 2014/09/29 23:00:33]

list_ => has_duplicates, done.

+  return list(collections.OrderedDict.fromkeys(list_))
+
+
+def expand_depends(source, dep):
+  if ":" in dep:

[Dan Beam, 2014/09/29 19:23:47]

if ":" not in dep:
  return [dep], {}

[Vitaly Pavlenko, 2014/09/29 23:00:33]

Done.

+    gyp_relative_path, target = dep.split(":")
+    gyp_path = os.path.join(os.path.dirname(source), gyp_relative_path)
+    gyp_content = ast.literal_eval(open(gyp_path).read())
+
+    for target_description in gyp_content["targets"]:
+      if target_description["target_name"] == target:
+        break
+    else:
+      raise ValueError("Target '%s' not found in file '%s'" %
+                       (target, gyp_path))
+
+    depends = []
+    externs = []
+    if "variables" in target_description:
+      depends = target_description["variables"].get("depends", [])
+      externs = target_description["variables"].get("externs", [])
+
+    def attach_gyp_dir(relative_path):
+      return os.path.join(os.path.dirname(gyp_path), relative_path)
+
+    target_source = attach_gyp_dir(target + ".js")
+    expanded_depends, expanded_externs = resolve_recursive_dependencies(
+        target_source,
+        depends,
+        externs)
+
+    expanded_depends = map(attach_gyp_dir, expanded_depends)
+    expanded_externs = set(map(attach_gyp_dir, expanded_externs))
+
+    expanded_depends.append(target_source)
+
+    return expanded_depends, expanded_externs
+
+  return [dep], {}
+
+
+def resolve_recursive_dependencies(source, input_depends, depends_externs):
+  output_depends = []
+  output_externs = set(depends_externs)
+
+  for depends in input_depends:
+    expanded_depends, expanded_externs = expand_depends(source, depends)
+    output_depends.extend(expanded_depends)
+    output_externs.update(expanded_externs)
+
+  output_depends = remove_duplicates_with_order(output_depends)
+
+  return output_depends, output_externs
+
+
 def GetInputs(args):
   parser = argparse.ArgumentParser()
-  parser.add_argument("sources", nargs=argparse.ONE_OR_MORE)
+  parser.add_argument("source", nargs=1)
   parser.add_argument("-d", "--depends", nargs=argparse.ZERO_OR_MORE,
                       default=[])
   parser.add_argument("-e", "--externs", nargs=argparse.ZERO_OR_MORE,
                       default=[])
   opts = parser.parse_args(args)
 
+  source = opts.source[0]
+  depends, externs = resolve_recursive_dependencies(
+      source,
+      opts.depends,
+      opts.externs)
+
   files = set()
-  for file in opts.sources + opts.depends + opts.externs:
+  for file in {source} | set(depends) | externs:
     files.add(file)
     files.update(processor.Processor(file).included_files)