Merge pull request #87 from clarfonthey/master

breaking: add cwd property to complement root

Author: Scrum

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

@@ -2,16 +2,25 @@
 
 const fs = require('fs');
 const path = require('path');
+const process = require('process');
 const posthtml = require('posthtml');
 const {parser} = require('posthtml-parser');
 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;
 
@@ -26,7 +35,9 @@ module.exports = (options = {}) => {
       }
 
       if (src) {
-        src = path.resolve(options.root, src);
+        src = path.isAbsolute(src)
+          ? path.join(options.root, src)
+          : path.resolve(cwd, src)
         source = fs.readFileSync(src, options.encoding);
 
         try {
@@ -46,6 +57,12 @@ 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;