@adobe/helix-importer 2.5.7 → 2.5.10

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [2.5.10](https://github.com/adobe/helix-importer/compare/v2.5.9...v2.5.10) (2023-01-19)
+
+
+### Bug Fixes
+
+* trigger releae ([d64999b](https://github.com/adobe/helix-importer/commit/d64999badb29281d1b2e2c14705af16dcbd78cbb))
+
+## [2.5.9](https://github.com/adobe/helix-importer/compare/v2.5.8...v2.5.9) (2023-01-19)
+
+
+### Bug Fixes
+
+* Simplify underline handler ([0aa1b14](https://github.com/adobe/helix-importer/commit/0aa1b1434404fb6cf157f8ad548a627492b44e6b))
+
+## [2.5.8](https://github.com/adobe/helix-importer/compare/v2.5.7...v2.5.8) (2023-01-19)
+
+
+### Bug Fixes
+
+* **deps:** update dependency hast-util-to-mdast to v9 ([#68](https://github.com/adobe/helix-importer/issues/68)) ([e09dcd1](https://github.com/adobe/helix-importer/commit/e09dcd1498c852cacf6403e562934fc79bba5093))
+
 ## [2.5.7](https://github.com/adobe/helix-importer/compare/v2.5.6...v2.5.7) (2023-01-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "2.5.7",
+  "version": "2.5.10",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",
@@ -52,12 +52,11 @@
     "@adobe/remark-gridtables": "1.0.1",
     "form-data": "4.0.0",
     "fs-extra": "11.1.0",
-    "hast-util-to-html": "8.0.4",
-    "hast-util-to-mdast": "8.4.1",
+    "hast-util-to-mdast": "9.0.0",
     "jsdom": "21.0.0",
     "node-fetch": "3.3.0",
     "rehype-parse": "8.0.4",
-    "rehype-remark": "9.1.2",
+    "rehype-remark": "github:adobe-rnd/rehype-remark#45735e80a3d3c805d3c4211ae035f718ddd10bcb",
     "remark-stringify": "10.0.2",
     "unified": "10.1.2"
   }

package/src/importer/PageImporter.js

@@ -17,7 +17,6 @@ import { JSDOM } from 'jsdom';
 import path from 'path';
 import { unified } from 'unified';
 import parse from 'rehype-parse';
-import { toHtml } from 'hast-util-to-html';
 import rehype2remark from 'rehype-remark';
 import stringify from 'remark-stringify';
 import fs from 'fs-extra';
@@ -66,25 +65,17 @@ export default class PageImporter {
       .use(parse, { emitParseErrors: true })
       .use(rehype2remark, {
         handlers: {
-          hlxembed: (h, node) => {
-            const children = node.children.map((child) => processor.stringify(child).trim());
-            return h(node, 'paragraph', [h(node, 'text', children.join())]);
-          },
-          u: (h, node) => {
+          u: (state, node) => {
             if (node.children && node.children.length > 0) {
-              const children = node.children.map((child) => {
-                try {
-                  if (child.type === 'element' && child.tagName !== 'span') {
-                    const n = h(child, child.tagName, child.children);
-                    return processor.stringify(n).trim();
-                  }
-                  return processor.stringify(child).trim();
-                } catch (e) {
-                  // cannot stringify the node, return html
-                  return toHtml(child);
-                }
-              });
-              return h(node, 'html', `<u>${children.join()}</u>`);
+              return [{
+                type: 'html',
+                value: '<u>',
+              },
+              ...state.all(node),
+              {
+                type: 'html',
+                value: '</u>',
+              }];
             }
             return '';
           },

package/src/importer/hast-to-mdast-gridtable-handlers.js

@@ -9,7 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { all } from 'hast-util-to-mdast';
 import {
   TYPE_BODY,
   TYPE_CELL,
@@ -20,11 +19,11 @@ import {
 } from '@adobe/mdast-util-gridtables';
 
 function convert(type) {
-  return (h, node) => h(node, type, all(h, node));
+  return (state, node) => ({ type, children: state.all(node) });
 }
 
-function table(h, node) {
-  let children = all(h, node);
+function table(state, node) {
+  let children = state.all(node);
 
   // people never create <thead> or <tbody>, but only use a <th> to mark the cell (row) as header
   // which is technically wrong, since also a column can be a header. however the default sanitized
@@ -52,22 +51,33 @@ function table(h, node) {
     }
     children = [];
     if (head.length) {
-      children.push(h(node, TYPE_HEADER, head));
+      children.push({
+        type: TYPE_HEADER,
+        children: head,
+      });
     }
     if (body.length) {
-      children.push(h(node, TYPE_BODY, body));
+      children.push({
+        type: TYPE_BODY,
+        children: body,
+      });
     }
   }
-  return h(node, TYPE_TABLE, children);
+  return {
+    type: TYPE_TABLE,
+    children,
+  };
 }
 
-function row(h, node) {
-  const mdast = h(node, TYPE_ROW, all(h, node));
-  mdast.hasHeaderCell = node.hasHeaderCell;
-  return mdast;
+function row(state, node) {
+  return {
+    type: TYPE_ROW,
+    children: state.all(node),
+    hasHeaderCell: node.hasHeaderCell,
+  };
 }
 
-function cell(h, node, parent) {
+function cell(state, node, parent) {
   const ATTR_MAP = {
     align: 'align',
     valign: 'valign',
@@ -87,7 +97,11 @@ function cell(h, node, parent) {
       }
     }
   }
-  return h(node, TYPE_CELL, props, all(h, node));
+  return {
+    type: TYPE_CELL,
+    children: state.all(node),
+    ...props,
+  };
 }
 
 export default {

package/test/importers/fixtures/link.spec.html

@@ -4,6 +4,5 @@
     <p><a href="http://wwww.sample.com/a">Link on a single online</a></p>
     <a href="http://wwww.sample.com/b">Link without p</a>
     <p>http://wwww.sample.com/c</p>
-    <hlxembed>http://wwww.sample.com/d</hlxembed>
   </body>
 </html>

package/test/importers/fixtures/link.spec.md

@@ -4,6 +4,4 @@
 
 [Link without p](http://wwww.sample.com/b)
 
-http://wwww.sample.com/c
-
-http://wwww.sample.com/d
+http://wwww.sample.com/c

package/test/importers/fixtures/u.spec.md

@@ -8,13 +8,16 @@ Some normal text with random <u>underline</u> or <u>span with underline</u> or <
 
 **<u>Underline 3</u>**
 
--   <u>li underline 1</u>
-
--   <u>li underline 2</u>
-
+-   <u>
+    li underline 1
+    </u>
+-   <u>
+    li underline 2
+    </u>
     also may have text here
-
--   <u>li underline 3</u>
+-   <u>
+    li underline 3
+    </u>
 
 [Unlined link](https:/www.sample.com/a) or [<u>Linked underline</u>](https:/www.sample.com/b) ?
 
@@ -22,4 +25,4 @@ Some normal text with random <u>underline</u> or <u>span with underline</u> or <
 
 [U and A are not friends](https://www.austinparks.org/)[Boys & Girls Clubs of the Austin Area](http://www.bgcaustin.org/)[The First Tee of Greater Austin](http://www.thefirstteeaustin.org/club/scripts/public/public.asp)
 
-[U and A are not friends](https://www.austinparks.org/)[Boys & Girls Clubs of the Austin Area](http://www.bgcaustin.org/)[The First Tee of Greater Austin](http://www.thefirstteeaustin.org/club/scripts/public/public.asp)
+[U and A are not friends](https://www.austinparks.org/)[Boys & Girls Clubs of the Austin Area](http://www.bgcaustin.org/)[The First Tee of Greater Austin](http://www.thefirstteeaustin.org/club/scripts/public/public.asp)