Read and parse sequentially, so that soy will always fail first, fixes #1

Author: Michael Hadley

src/__tests__/__snapshots__/validate-file.js.snap

@@ -1,5 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Validate file should fail; invalid namespace 1`] = `
+Array [
+  "Failed to parse soy template",
+]
+`;
+
 exports[`Validate file should fail; missing import 1`] = `
 Array [
   "It looks like the following component calls are missing an import:

src/__tests__/validate-file.js

@@ -29,4 +29,9 @@ describe('Validate file', () => {
       expect(result.status).toBe(false);
       expect(result.messages).toMatchSnapshot();
   }));
+
+  test('should fail; invalid namespace', () => validate('InvalidNamespace.soy').then(result => {
+      expect(result.status).toBe(false);
+      expect(result.messages).toMatchSnapshot();
+  }));
 });

src/index.js

@@ -4,6 +4,7 @@
 const chalk = require('chalk');
 const pkg = require('../package.json');
 const program = require('commander');
+const Promise = require('bluebird');
 const validateFile = require('./validate-file');
 
 function main() {
@@ -17,7 +18,7 @@ function main() {
   }
 
   Promise
-    .all(program.args.map(validate))
+    .map(program.args, validate)
     .then(validations => {
       const failed = validations.filter(validation => !validation.result.status);
 

src/util.js

@@ -1,4 +1,5 @@
 const chalk = require('chalk');
+const Promise = require('bluebird');
 
 function combineResults(first, second) {
   return toResult(
@@ -36,6 +37,13 @@ function parseTemplateName(rawName) {
   };
 }
 
+function sequence(...tasks) {
+  return Promise.reduce(tasks, (res, next) =>
+    next().then(value => [...res, value]),
+    []
+  );
+}
+
 function joinErrors(lines) {
   return lines
     .map(line => chalk.red(line))
@@ -47,5 +55,6 @@ module.exports = {
   difference,
   joinErrors,
   parseTemplateName,
+  sequence,
   toResult
 };

src/validate-file.js

@@ -4,7 +4,7 @@ const fs = Promise.promisifyAll(require('fs'));
 const babylon = require('babylon');
 const parseSoy = require('./soy-parser');
 const path = require('path');
-const {combineResults, toResult} = require('./util');
+const {combineResults, sequence, toResult} = require('./util');
 
 /* Error Types */
 
@@ -68,14 +68,10 @@ function runValidations(soyAst, jsAst) {
 }
 
 module.exports = function validateFile(filePath) {
-  return Promise
-    .all([
-      getSoyAst(filePath),
-      getJSAst(getJSPath(filePath))
-    ])
+  return sequence(() => getSoyAst(filePath), () => getJSAst(getJSPath(filePath)))
     .then(([soyAst, jsAst]) => runValidations(soyAst, jsAst))
     .catch(error => {
-      switch(error.type) {
+      switch (error.type) {
         case ERR_JS_READ:
           return toResult(true);
         case ERR_JS_PARSE:

test/fixtures/InvalidNamespace.soy

@@ -0,0 +1,14 @@
+ {namespace Test}
+
+/**
+ * Test
+ */
+{template .render}
+  {@param name: string}
+  {@param title: string}
+
+  <div>
+    <h1>{$title}</h1>
+    <h2>{$name}</h2>
+  </div>
+{/template}