Merge pull request #55 from posthtml/expressions-options

Author: cossssmin

lib/index.js

@@ -1,15 +1,17 @@
+const got = require('got')
 const path = require('path')
 const isUrl = require('is-url')
-const got = require('got')
 const posthtml = require('posthtml')
+const merge = require('lodash.merge')
 const matcher = require('posthtml-match-helper')
 const expressions = require('posthtml-expressions')
 
 module.exports = (options = {}) => tree => {
-  options.tags = options.tags || ['fetch', 'remote']
-  options.attribute = options.attribute || 'url'
   options.got = options.got || {}
+  options.attribute = options.attribute || 'url'
+  options.expressions = options.expressions || {}
   options.preserveTag = options.preserveTag || false
+  options.tags = options.tags || ['fetch', 'remote']
 
   return new Promise((resolve, reject) => {
     const all = []
@@ -60,7 +62,16 @@ module.exports = (options = {}) => tree => {
               let content = body;
 
               try {
-                plugins.push(expressions({locals: {response: JSON.parse(body)}}))
+                plugins.push(
+                  expressions(
+                    merge(
+                      options.expressions,
+                      {
+                        locals: {response: JSON.parse(body)}
+                      }
+                  ))
+                )
+
                 content = tree.render(node.content)
               } catch {}
 

package-lock.json

@@ -33,6 +33,7 @@
   "dependencies": {
     "got": "^11.8.0",
     "is-url": "^1.2.4",
+    "lodash.merge": "^4.6.2",
     "posthtml": "^0.16.4",
     "posthtml-expressions": "^1.6.2",
     "posthtml-match-helper": "^1.0.1"

package.json

@@ -44,7 +44,7 @@ posthtml()
   .process('<fetch url="https://example.test">{{ response }}</fetch>')
   .then(result => console.log(result.html))
 
-  // response body
+  // => interpolated response body
 ```
 
 The response body will be available under the `response` local variable.
@@ -114,7 +114,7 @@ posthtml()
   .process('<fetch from="https://example.test">{{ response }}</fetch>')
   .then(result => {
     console.log(result.html)
-    // => ...interpolated response from https://example.test
+    // => interpolated response body
   })
 ```
 
@@ -137,13 +137,15 @@ posthtml()
   .process('<fetch url="https://example.test">{{ response }}</fetch>')
   .then(result => {
     console.log(result.html)
-    // => ...interpolated response from https://example.test
+    // => interpolated response body
   })
 ```
 
 ### `preserveTag`
 
-Allows you to leave an item. Default value `false`.
+Default: `false`
+
+When set to `true`, this option will preserve the `tag` around the response body.
 
 Example:
 
@@ -158,7 +160,32 @@ posthtml()
   .process('<fetch url="https://example.test">{{ response }}</fetch>')
   .then(result => {
     console.log(result.html)
-    // => <fetch url="https://example.test">...interpolated response from https://example.test</fetch>
+    // => <fetch url="https://example.test">interpolated response body</fetch>
+  })
+```
+
+### `expressions`
+
+Default: `{}`
+
+You can pass options to `posthtml-expressions`.
+
+Example:
+
+```js
+const posthtml = require('posthtml')
+const pf = require('posthtml-fetch')
+
+posthtml()
+  .use(pf({
+    expressions: {
+      delimiters: ['[[', ']]'],
+    }
+  }))
+  .process('<fetch url="https://example.test">[[ response ]]</fetch>')
+  .then(result => {
+    console.log(result.html)
+    // => interpolated response body
   })
 ```
 
@@ -193,7 +220,7 @@ posthtml()
   .process('<fetch url="https://example.test">{{ response }}</fetch>')
   .then(result => {
     console.log(result.html)
-    // => ...interpolated response from https://example.test
+    // => interpolated response body
   })
 ```
 

readme.md

@@ -0,0 +1 @@
+User name: Leanne Graham

test/expected/expressions-options.html

@@ -0,0 +1,3 @@
+<fetch url="https://jsonplaceholder.typicode.com/users/1">
+  User name: [[ response.name ]]
+</fetch>

test/fixtures/expressions-options.html

@@ -94,3 +94,7 @@ test('It works with custom attribute', async t => {
 test('It works with multiple call of fetch', async t => {
   await process(t, 'multiple-src')
 })
+
+test('It works with options passed to posthtml-expressions', async t => {
+  await process(t, 'expressions-options', {expressions: {delimiters: ['[[', ']]']}})
+})