Merge pull request #73 from glook/master

Allow to merge locals with posthtml-expressions config locals

Author: Scrum

lib/index.js

@@ -21,7 +21,6 @@ module.exports = (options = {}) => {
       let subtree;
       let source;
       const posthtmlExpressionsOptions = options.posthtmlExpressionsOptions || {locals: false};
-
       if (options.delimiters) {
         posthtmlExpressionsOptions.delimiters = options.delimiters;
       }
@@ -32,7 +31,8 @@ module.exports = (options = {}) => {
 
         try {
           const localsRaw = node.attrs.locals || (node.content ? node.content.join().replace(/\n/g, '') : false);
-          posthtmlExpressionsOptions.locals = JSON.parse(localsRaw);
+          const localsJson = JSON.parse(localsRaw);
+          posthtmlExpressionsOptions.locals = posthtmlExpressionsOptions.locals ? Object.assign(localsJson, posthtmlExpressionsOptions.locals) : localsJson;
         } catch {}
 
         if (posthtmlExpressionsOptions.locals) {

test/expected/global-variables.html

@@ -0,0 +1,3 @@
+<div>Should merge global locals</div>
+<div>local</div>
+<div>global</div>

test/fixtures/global-variables.html

@@ -0,0 +1,6 @@
+<div>Should merge global locals</div>
+<include src="./test/fixtures/includes/6.html">
+  {
+  "localVariable": "local"
+  }
+</include>

test/fixtures/includes/6.html

@@ -0,0 +1,2 @@
+<div>{{ localVariable }}</div>
+<div>{{ globalVariable }}</div>

test/test.js

@@ -53,6 +53,13 @@ test('Shoult not cut children elements', t => {
   return process(t, 'not-clear-rest')
 })
 
+test('Should merge global locals', t => {
+  return process(t, 'global-variables', {
+    posthtmlExpressionsOptions: {
+      locals: {globalVariable: 'global'}
+    }})
+})
+
 test('addDependency message', t => {
   const includePath = require('path').resolve('./test/fixtures/blocks/button/button.html')