Merge branch 'master' into master

Author: konnng-dev

README.md

@@ -30,7 +30,9 @@ posthtml([ include({ encoding: 'utf8' }) ])
 
 ### Options
 
-__root__: Root folder path for include. Default `./`
+__root__: Root directory for include. Default `process.cwd()`
+
+__cwd__: Current working directory for include. Default `process.cwd()`
 
 __encoding__: Default `utf-8`
 

lib/index.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 const fs = require('fs');
 const path = require('path');
@@ -8,10 +8,16 @@ const {match} = require('posthtml/lib/api');
 const expressions = require('posthtml-expressions');
 
 module.exports = (options = {}) => {
-  options.root = options.root || './';
+  options.root = options.root ? path.resolve(options.root) : process.cwd();
   options.encoding = options.encoding || 'utf-8';
 
   return function posthtmlInclude(tree) {
+    const cwd = options.cwd ?
+      path.resolve(options.cwd) :
+      (tree.options.from ?
+        path.dirname(path.resolve(tree.options.from)) :
+        process.cwd());
+
     tree.parser = tree.parser || parser;
     tree.match = tree.match || match;
 
@@ -20,17 +26,23 @@ module.exports = (options = {}) => {
       let content;
       let subtree;
       let source;
-      let posthtmlExpressionsOptions = options.posthtmlExpressionsOptions || {locals: false};
+      let posthtmlExpressionsOptions = options.posthtmlExpressionsOptions || {
+        locals: false
+      };
       if (options.delimiters) {
         posthtmlExpressionsOptions.delimiters = options.delimiters;
       }
 
       if (src) {
-        src = path.resolve(options.root, src);
+        src = path.isAbsolute(src) ?
+          path.resolve(cwd, src) :
+          path.join(options.root, src);
         source = fs.readFileSync(src, options.encoding);
 
         try {
-          const localsRaw = node.attrs.locals || (node.content ? node.content.join().replace(/\n/g, '') : false);
+          const localsRaw =
+            node.attrs.locals ||
+            (node.content ? node.content.join().replace(/\n/g, '') : false);
           const localsJson = JSON.parse(localsRaw);
           posthtmlExpressionsOptions = {
             ...posthtmlExpressionsOptions,
@@ -46,10 +58,18 @@ module.exports = (options = {}) => {
         }
 
         subtree = tree.parser(source);
+        subtree.options = subtree.options || {};
+        subtree.options.from = path.isAbsolute(src) ?
+          src :
+          (tree.options.from ?
+            path.relative(tree.options.from, src) :
+            src);
         subtree.match = tree.match;
         subtree.parser = tree.parser;
         subtree.messages = tree.messages;
-        content = source.includes('include') ? posthtmlInclude(subtree) : subtree;
+        content = source.includes('include') ?
+          posthtmlInclude(subtree) :
+          subtree;
 
         if (tree.messages) {
           tree.messages.push({

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "posthtml-include",
-  "version": "1.7.4",
+  "version": "2.0.0",
   "description": "Include files in HTML",
   "license": "MIT",
   "author": "Ivan Voischev <[email protected]>",