Fixed conditional parser

Parses conditional before include Added common test with curly brackets
haoxins · Jul 3, 2015 · 3fe6863 · 3fe6863
1 parent 974f6d1
commit 3fe6863
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 40 deletions.
diff --git a/index.js b/index.js
@@ -1,12 +1,13 @@
 'use strict';
 
-var concat = require('concat-stream'),
-  flatten = require('flatnest').flatten,
-  merge = require('merge').recursive,
-  through = require('through2'),
-  gutil = require('gulp-util'),
-  path = require('path'),
-  fs = require('fs');
+var concat = require('concat-stream');
+var flatten = require('flatnest').flatten;
+var merge = require('merge').recursive;
+var through = require('through2');
+var gutil = require('gulp-util');
+var path = require('path');
+var fs = require('fs');
+var parseConditional = require('./lib/conditional');
 
 module.exports = function(options) {
   var prefix, suffix, basepath, filters, context;
@@ -59,38 +60,13 @@ module.exports = function(options) {
     return content.replace(regex, '');
   }
 
-  function parseConditionalIncludes(content, data) {
-    // parse @@if (something) { include('...') }
-    var regexp = new RegExp(prefix + '[ ]*if.*\\{[^{}]*\\}\\s*' + suffix),
-      matches = regexp.exec(content),
-      included = false;
-
-    if (!data.content) data.content = content;
-
-    while (matches) {
-      var match = matches[0],
-        includeContent = /\{([^{}]*)\}/.exec(match)[1];
-
-      // jshint ignore: start
-      var exp = /if(.*)\{/.exec(match)[1];
-      included = new Function('var context = this; with (context) { return ' + exp + '; }').call(data);
-      // jshint ignore: end
-
-      if (included) {
-        content = content.replace(match, includeContent);
-      } else {
-        content = content.replace(match, '');
-      }
-
-      matches = regexp.exec(content);
-    }
-
-    return content;
-  }
-
   function include(file, text, data) {
     data = merge(true, context, data || {});
     text = stripCommentedIncludes(text);
+    text = parseConditional(text, data, {
+      prefix: prefix,
+      suffix: suffix
+    });
 
     // grab keys & sort by longest keys 1st to iterate in that order
     var variables = flatten(data);
@@ -141,8 +117,6 @@ module.exports = function(options) {
       matches = includeRegExp.exec(text);
     }
 
-    text = parseConditionalIncludes(text, data);
-
     file.contents = new Buffer(text);
     return file;
   }

diff --git a/test/fixtures/index-01.html b/test/fixtures/index-01.html
@@ -2,9 +2,9 @@
 <html>
   <body>
   @@include('view.html')
-  @@include('./var.html', {
+  @@ if(true) {@@include('./var.html', {
     "name": "haoxin",
     "age": 12345
-  })
+  })}
   </body>
 </html>