Closure templates release 2014-04-22.

Author: Talin Joiner

README.md

@@ -60,6 +60,7 @@ Author: Neil Sanchala
     <mkdir dir="${build.genfiles.dir}" />
     <mkdir dir="${build.genfiles.dir}/com/google/template/soy/exprparse" />
     <mkdir dir="${build.genfiles.dir}/com/google/template/soy/soyparse" />
+    <mkdir dir="${build.genfiles.dir}/com/google/template/soy/types/parse" />
 
     <!-- JavaCC compilation. Generated files go into the 'genfiles' directory. -->
     <javacc target="${java.src.dir}/com/google/template/soy/exprparse/ExpressionParser.jj"
@@ -71,12 +72,15 @@ Author: Neil Sanchala
     <javacc target = "${java.src.dir}/com/google/template/soy/soyparse/TemplateParser.jj"
             outputdirectory = "${build.genfiles.dir}/com/google/template/soy/soyparse"
             javacchome = "buildtools/javacc" />
+    <javacc target = "${java.src.dir}/com/google/template/soy/types/parse/TypeParser.jj"
+            outputdirectory = "${build.genfiles.dir}/com/google/template/soy/types/parse"
+            javacchome = "buildtools/javacc" />
 
     <!-- Java compilation. -->
     <javac srcdir="${java.src.dir}:${build.genfiles.dir}"
            destdir="${build.classes.dir}"
-           source="1.6"
-           target="1.6"
+           source="1.7"
+           target="1.7"
            includeAntRuntime="true"
            debug="${includeDebugInfo}">
       <classpath refid="classpath.path" />
@@ -92,7 +96,7 @@ Author: Neil Sanchala
           description="generates soyutils.js and soyutils_usegoog.js.">
     <!-- Load a custom ANT task. -->
     <taskdef name="gen.escape.directives"
-             classname="com.google.template.soy.jssrc.internal.GenerateSoyUtilsEscapingDirectiveCode">
+             classname="com.google.template.soy.shared.internal.GenerateSoyUtilsEscapingDirectiveCode">
       <classpath>
         <fileset dir="${java.lib.dir}">
           <include name="*.jar" />
@@ -111,8 +115,8 @@ Author: Neil Sanchala
     <gen.escape.directives>
       <input path="${basedir}/javascript/soyutils_usegoog.js"/>
       <output path="${build.dir}/javascript/soyutils_usegoog.js"/>
-      <jsdefined pattern="goog.string.*"/>
-      <jsdefined pattern="goog.asserts.*"/>
+      <libdefined pattern="goog.string.*"/>
+      <libdefined pattern="goog.asserts.*"/>
     </gen.escape.directives>
   </target>
 
@@ -189,19 +193,6 @@ Author: Neil Sanchala
   </target>
 
 
-  <!-- Target to create a standalone executable SoyToJavaSrcCompilerExperimental.jar. -->
-  <target name="SoyToJavaSrcCompilerExperimental"
-          depends="jar"
-          description="Creates a standalone executable SoyToJavaSrcCompilerExperimental.jar.">
-    <jar destfile="${build.dir}/SoyToJavaSrcCompilerExperimental.jar" update="true">
-      <manifest>
-        <attribute name="Main-Class" value="com.google.template.soy.SoyToJavaSrcCompilerExperimental" />
-      </manifest>
-      <zipfileset src="${soy.jar.file}" />
-    </jar>
-  </target>
-
-
   <!-- Target to generate lite javadoc (for API users). -->
   <target name="javadoc-lite"
           depends="compile"
@@ -215,7 +206,6 @@ Author: Neil Sanchala
       <packageset dir="${java.src.dir}">
         <include name="com/google/template/soy" />
         <include name="com/google/template/soy/data" />
-        <include name="com/google/template/soy/javasrc" />
         <include name="com/google/template/soy/jssrc" />
         <include name="com/google/template/soy/msgs" />
         <include name="com/google/template/soy/parseinfo" />
@@ -664,8 +654,8 @@ Author: Neil Sanchala
     <mkdir dir="${build.testclasses.dir}" />
     <javac srcdir="${java.tests.dir}"
            destdir="${build.testclasses.dir}"
-           source="1.6"
-           target="1.6"
+           source="1.7"
+           target="1.7"
            includeAntRuntime="false"
            debug="${includeDebugInfo}">
       <classpath refid="classpath.path" />

build.xml

@@ -15,7 +15,7 @@
 // Delegates examples (total 3 files).
 // Author: Kai Huang
 
-{namespace soy.examples.delegates}
+{namespace soy.examples.delegates autoescape="strict"}
 
 
 /**
@@ -36,6 +36,6 @@
  * @param moo Note: Must list same params for all implementations, even if not all implementations
  *     use a param.
  */
-{deltemplate myDelegates.foo}
+{deltemplate myDelegates.foo kind="text"}
   myDelegates.foo default.
 {/deltemplate}

examples/delegates0.soy

@@ -16,13 +16,13 @@
 // Author: Kai Huang
 
 {delpackage alpha}
-{namespace soy.examples.delegates}
+{namespace soy.examples.delegates autoescape="strict"}
 
 
 /**
  * Delegate package 'alpha' implementation of 'delegateBoo'.
  */
-{deltemplate delegateBoo}
+{deltemplate delegateBoo kind="text"}
   delegateBoo from delegate package alpha.
 {/deltemplate}
 
@@ -32,6 +32,6 @@
  * @param moo Note: Must list same params for all implementations, even if not all implementations
  *     use a param.
  */
-{deltemplate myDelegates.foo}
+{deltemplate myDelegates.foo kind="text"}
   myDelegates.foo from delegate package alpha (moo = {$moo}).
 {/deltemplate}

examples/delegates1.soy

@@ -16,12 +16,12 @@
 // Author: Kai Huang
 
 {delpackage beta}
-{namespace soy.examples.delegates}
+{namespace soy.examples.delegates autoescape="strict"}
 
 
 /**
  * Delegate package 'beta' implementation of 'delegateBoo'.
  */
-{deltemplate delegateBoo}
+{deltemplate delegateBoo kind="text"}
   delegateBoo from delegate package beta.
 {/deltemplate}

examples/delegates2.soy

@@ -19,6 +19,8 @@
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Helper class to initialize Guice for Soy users that do not use Guice.
@@ -35,30 +37,56 @@
  *
  * @author Kai Huang
  */
+// TODO(gboyer): This class is very unfortunate. Static injection essentially means that whichever
+// Injector installed SoyModule last wins, which can cause bewildering errors.
 class GuiceInitializer {
+  private static final Logger LOGGER = Logger.getLogger(GuiceInitializer.class.getName());
 
+  /** How many time this has been statically injected. */
+  private static int initializationCount;
 
-  /** Whether the SoyModule has been initialized. */
-  private static boolean isInitialized = false;
-
+  /** Factory created from static injection. */
+  @Inject
+  private static SoyFileSet.SoyFileSetFactory soyFileSetFactory = null;
 
   /** Marks that the SoyModule has been initialized. */
   @Inject
-  static void markInitialized() {
-    isInitialized = true;
+  static synchronized void markInitialized() {
+    initializationCount++;
   }
 
-
   /** Initializes the SoyModule if it has not already been initialized. */
-  static void initializeIfNecessary() {
-    if (!isInitialized) {
+  private static synchronized void initializeIfNecessary() {
+    if (initializationCount == 0) {
       // This injector creation has the important side effect of performing static injections.
       Guice.createInjector(new SoyModule());
       // The injector creation above should have called this class's markInitialized().
-      if (!isInitialized) {
+      if (initializationCount == 0) {
         throw new AssertionError("Injector creation failed to do static injection.");
       }
     }
   }
 
+  /**
+   * Returns the hacky static-injected SoyFileSetFactory containing bindings from whichever
+   * injector happened to install SoyModule first.
+   */
+  static synchronized SoyFileSet.SoyFileSetFactory getHackySoyFileSetFactory() {
+    initializeIfNecessary();
+    if (initializationCount > 1) {
+      String message =
+          "The SoyFileSet.Builder constructor is trying to guess which Injector to use, but"
+          + " multiple Injectors have already installed a new SoyModule(). We will essentially"
+          + " configure Soy at random, so you get an inconsistent set of plugins or Soy types."
+          + " To fix, inject SoyFileSet.Builder (with SoyModule installed) instead of new'ing it.";
+      LOGGER.log(Level.SEVERE, message, new IllegalStateException(message));
+    } else {
+      String message =
+          "Falling back to statically-injected SoyFileSetFactory; unpredictable behavior is likely."
+          + " Instead of constructing a SoyFileSet.Builder directly, either inject it using Guice"
+          + " (with SoyModule installed), or call the static SoyFileSet.builder() method.";
+      LOGGER.log(Level.WARNING, message);
+    }
+    return soyFileSetFactory;
+  }
 }

java/lib/guava-12.0.jar

@@ -20,12 +20,14 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.template.soy.SoyFileSet.Builder;
-import com.google.template.soy.base.SoyFileKind;
+import com.google.template.soy.base.internal.SoyFileKind;
 
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
@@ -37,10 +39,10 @@
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nullable;
 
-
 /**
  * Private utils for classes with a main() method.
  *
@@ -51,6 +53,7 @@ class MainClassUtils {
   private MainClassUtils() {}
 
 
+
   /**
    * OptionHandler for args4j that handles a boolean.
    *
@@ -189,10 +192,9 @@ public static void exitWithError(
     System.exit(1);
   }
 
-
   /**
    * Creates a Guice injector that includes the SoyModule, a message plugin module, and maybe
-   * additional plugin modules.
+   * additional plugin modules, and maybe additional modules.
    *
    * @param msgPluginModuleName The full class name of the message plugin module. Required.
    * @param pluginModuleNames Comma-delimited list of full class names of additional plugin modules
@@ -210,7 +212,7 @@ public static Injector createInjector(
     checkArgument(msgPluginModuleName != null && msgPluginModuleName.length() > 0);
     guiceModules.add(instantiatePluginModule(msgPluginModuleName));
 
-    if (pluginModuleNames != null && pluginModuleNames.length() > 0) {
+    if (pluginModuleNames != null && !pluginModuleNames.isEmpty()) {
       for (String pluginModuleName : Splitter.on(',').split(pluginModuleNames)) {
         guiceModules.add(instantiatePluginModule(pluginModuleName));
       }
@@ -219,6 +221,29 @@ public static Injector createInjector(
     return Guice.createInjector(guiceModules);
   }
 
+  /**
+   * Creates a Guice injector that includes the SoyModule, a message plugin module, and maybe
+   * additional plugin modules, and maybe additional modules.
+   *
+   * @param pluginModuleNames Comma-delimited list of full class names of additional plugin modules
+   *     to include. Optional.
+   * @return A Guice injector that includes the SoyModule, the given message plugin module, and the
+   *     given additional plugin modules (if any).
+   */
+  public static Injector createInjector(@Nullable String pluginModuleNames) {
+
+    List<Module> guiceModules = Lists.newArrayListWithCapacity(2);
+
+    guiceModules.add(new SoyModule());
+
+    if (pluginModuleNames != null && !pluginModuleNames.isEmpty()) {
+      for (String pluginModuleName : Splitter.on(',').split(pluginModuleNames)) {
+        guiceModules.add(instantiatePluginModule(pluginModuleName));
+      }
+    }
+
+    return Guice.createInjector(guiceModules);
+  }
 
   /**
    * Private helper for createInjector().
@@ -253,7 +278,8 @@ private static Module instantiatePluginModule(String moduleName) {
    */
   public static void addSoyFilesToBuilder(
       Builder sfsBuilder, String inputPrefix, Collection<String> srcs, Collection<String> args,
-      Collection<String> deps, Function<String, Void> exitWithErrorFn) {
+      Collection<String> deps, Collection<String> indirectDeps,
+      Function<String, Void> exitWithErrorFn) {
 
     if (srcs.size() == 0 && args.size() == 0) {
       exitWithErrorFn.apply("Must provide list of source Soy files (--srcs).");
@@ -263,16 +289,24 @@ public static void addSoyFilesToBuilder(
           "Found source Soy files from --srcs and from args (please use --srcs only).");
     }
 
-    for (String src : srcs) {
-      sfsBuilder.addWithKind(new File(inputPrefix + src), SoyFileKind.SRC);
-    }
-    // TODO: Maybe stop supporting old style (srcs from command line args) at some point.
-    for (String src : args) {
+    // Create Set versions of each of the arguments, and de-dupe. If something is included as
+    // multiple file kinds, we'll keep the strongest one; a file in both srcs and deps will be a
+    // src, and one in both deps and indirect_deps will be a dep.
+    // TODO(gboyer): Maybe stop supporting old style (srcs from command line args) at some point.
+    Set<String> srcsSet = ImmutableSet.<String>builder().addAll(srcs).addAll(args).build();
+    Set<String> depsSet = Sets.difference(ImmutableSet.copyOf(deps), srcsSet);
+    Set<String> indirectDepsSet = Sets.difference(ImmutableSet.copyOf(indirectDeps),
+        Sets.union(srcsSet, depsSet));
+
+    for (String src : srcsSet) {
       sfsBuilder.addWithKind(new File(inputPrefix + src), SoyFileKind.SRC);
     }
-    for (String dep : deps) {
+    for (String dep : depsSet) {
       sfsBuilder.addWithKind(new File(inputPrefix + dep), SoyFileKind.DEP);
     }
+    for (String dep : indirectDepsSet) {
+      sfsBuilder.addWithKind(new File(inputPrefix + dep), SoyFileKind.INDIRECT_DEP);
+    }
   }
 
 }