Merge pull request #8 from posthtml/milestone-1.2.1

Milestone 1.2.1
posthtml · May 23, 2020 · d1ba137 · d1ba137
2 parents 10621af + 0860192
commit d1ba137
Show file tree

Hide file tree

Showing 4 changed files with 347 additions and 251 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -15,14 +15,20 @@ module.exports = (options = {}) => tree => {
     const all = []
 
     tree.match(matcher(options.tags.join()), node => {
+      const responseAssign = response => {
+        let [item] = response.tree;
+
+        if (typeof item === 'string') {
+          item = {content: [item]};
+        }
+
+        Object.assign(node, item);
+      }
+
       if (node.attrs && node.attrs[options.attribute]) {
         options.got.url = options.got.url || node.attrs[options.attribute]
 
         all.push(new Promise((resolve, reject) => {
-          if (options.preserveTag === false) {
-            node.tag = false
-          }
-
           Promise.resolve((() => {
             let plugins = []
             let content = tree.render(node);
@@ -33,10 +39,7 @@ module.exports = (options = {}) => tree => {
 
             return posthtml(plugins).process(content)
           })())
-            .then(response => {
-              const [item] = response.tree;
-              Object.assign(node, item);
-            })
+            .then(responseAssign)
             .then(got.bind(null, options.got))
             .then(({body}) => {
               let plugins = []
@@ -62,13 +65,13 @@ module.exports = (options = {}) => tree => {
 
               return posthtml(plugins).process(content)
             })
-            .then(response => {
-              const [item] = response.tree;
-              Object.assign(node, item);
-            })
+            .then(responseAssign)
             .then(() => {
-              resolve(node)
+              if (options.preserveTag === false) {
+                node.tag = false
+              }
             })
+            .then(resolve.bind(null, node))
             .catch(reject)
           })
         )