Merge 6da3806 into 5897e85

haoxins · Feb 13, 2018 · b85c3bb · dpilafian · Feb 22, 2018 · b85c3bb
2 parents 5897e85 + 6da3806
commit b85c3bb
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -128,7 +128,7 @@ module.exports = function(opts) {
     }
 
     function includeHandler(inst) {
-      var args = /[^)"']*["']([^"']*)["'](,\s*({[\s\S]*})){0,1}\s*/.exec(inst.args)
+      var args = /^['|"]([^'|"]*)['|"](,\s*({[\s\S]*}|['|"]([^'|"]*)['|"]|\s*)|)/.exec(inst.args)
 
       if (args) {
         var includePath = path.resolve(filebase, args[1])
@@ -158,7 +158,19 @@ module.exports = function(opts) {
           contents: Buffer.from(includeContent)
         })
 
-        recFile = include(recFile, includeContent, args[3] ? JSON.parse(args[3]) : {})
+        var data = {};
+        if(args[4]){
+          var jsonfile = file.base + args[4];
+          if (fs.existsSync(jsonfile)) {
+            data = require(jsonfile)
+          } else {
+            return console.error('JSON file not exists:', jsonfile)
+          }
+        }else if(args[3]) {
+          data = JSON.parse(args[3]);
+        }
+
+        recFile = include(recFile, includeContent, data)
 
         return String(recFile.contents)
       }