Integrate new metal/soyparser

lib/pipelines/compileSoy.js

@@ -11,7 +11,7 @@ var ignore = require('gulp-ignore');
 var merge = require('merge');
 var path = require('path');
 var replace = require('gulp-replace');
-var soyparser = require('soyparser');
+var soyparser = require('soyparser').default;
 var through = require('through2');
 var wrapper = require('gulp-wrapper');
 
@@ -42,10 +42,6 @@ module.exports = function(options) {
 	);
 };
 
-function addTemplateParam(soyJsPath, templateName, param) {
-	templateData[soyJsPath][templateName].params.push(param);
-}
-
 function buildSoyCompilerArgs(files, outputDir, soyDeps) {
 	var args = [
 		'-jar',
@@ -101,25 +97,43 @@ function createCompiledGulpFile(file, outputDir) {
 	});
 }
 
+function extractParamData(paramData, param) {
+	paramData.params.push(param.name);
+	paramData.types[param.name] = param.paramType;
+
+	return paramData;
+};
+
+function extractTemplateData(soyData, template) {
+	if (template.type !== 'DelTemplate') {
+		var templateData = template.params.reduce(
+			extractParamData,
+			{
+				params: [],
+				types: {}
+			}
+		);
+
+		if (template.doc && template.doc.params) {
+			templateData = template.doc.params.reduce(extractParamData, templateData);
+		}
+
+		var templateName = template.id.namespace ? template.id.namespace + '.' : '';
+		templateName += template.id.name;
+
+		soyData[templateName] = templateData;
+	}
+
+	return soyData;
+};
+
 function extractParams() {
 	return through.obj(function(file, encoding, callback) {
 		try {
 			var soyJsPath = file.relative + '.js';
 			var parsed = getParsedSoy(soyJsPath, file.contents);
 
-			templateData[soyJsPath] = {};
-			parsed.templates.forEach(function(cmd) {
-				if (cmd.deltemplate) {
-					return;
-				}
-
-				var templateName = cmd.name;
-				templateData[soyJsPath][templateName] = {params: [], types: {}};
-				cmd.params.forEach(function(tag) {
-					addTemplateParam(soyJsPath, templateName, tag.name);
-					templateData[soyJsPath][templateName].types[tag.name] = tag.type;
-				});
-			});
+			templateData[soyJsPath] = parsed.body.reduce(extractTemplateData, {});
 
 			this.push(file);
 		} catch (e) {
@@ -171,7 +185,7 @@ function getNameFromNamespace(namespace) {
 
 function getParsedSoy(soyJsPath, contents) {
 	if (!parsedSoys[soyJsPath]) {
-		parsedSoys[soyJsPath] = soyparser(contents);
+		parsedSoys[soyJsPath] = soyparser(contents.toString());
 	}
 	return parsedSoys[soyJsPath];
 }

package.json

@@ -32,7 +32,7 @@
     "gulp-util": "^3.0.7",
     "gulp-wrapper": "^1.0.0",
     "merge": "^1.2.0",
-    "soyparser": "^0.2.2",
+    "soyparser": "^1.0.0",
     "stream-combiner": "^0.2.2",
     "stream-consume": "^0.1.0",
     "through2": "^2.0.0",

test/fixtures/soy/delTemplate.soy

@@ -0,0 +1,8 @@
+{namespace DelTemplate}
+
+/**
+ * @param content
+ */
+{deltemplate DelTemplate.Foo}
+	{$content}
+{/deltemplate}

test/lib/pipelines/compileSoy.js

@@ -100,6 +100,16 @@ describe('Compile Soy Pipeline', function() {
 		});
 	});
 
+	it('should not export delegated templates', function(done) {
+		var stream = vfs.src('test/fixtures/soy/delTemplate.soy')
+			.pipe(compileSoy());
+		stream.on('data', function(file) {
+			var contents = file.contents.toString();
+			assert.strictEqual(-1, contents.indexOf('exports.DelTemplate.Foo'));
+			done();
+		});
+	});
+
 	it('should automatically generate and export component class using SoyRenderer', function(done) {
     var stream = vfs.src('test/fixtures/soy/simple.soy')
       .pipe(compileSoy());