fix: Simplify underline handler

package.json

@@ -52,7 +52,6 @@
     "@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": "9.0.0",
     "jsdom": "21.0.0",
     "node-fetch": "3.3.0",

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,47 +65,17 @@ export default class PageImporter {
       .use(parse, { emitParseErrors: true })
       .use(rehype2remark, {
         handlers: {
-          hlxembed: (state, node) => {
-            const children = node.children.map((child) => processor.stringify(child).trim());
-            return {
-              type: 'paragraph',
-              children: [{
-                type: 'text',
-                value: children.join(''),
-              }],
-            };
-          },
           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 = {
-                      type: child.tagName,
-                      children: child.children,
-                    };
-                    return processor.stringify(n).trim();
-                  }
-                  return processor.stringify(child).trim();
-                } catch (e) {
-                  // cannot stringify the node, return html
-                  return toHtml(child);
-                }
-              });
-              return {
+              return [{
+                type: 'html',
+                value: '<u>',
+              },
+              ...state.all(node),
+              {
                 type: 'html',
-                value: `<u>${children.join('')}</u>`,
-              };
-              // todo: use this
-              // return [{
-              //   type: 'html',
-              //   value: '<u>',
-              // },
-              //   ...state.all(node),
-              // {
-              //   type: 'html',
-              //   value: '</u>',
-              // }];
+                value: '</u>',
+              }];
             }
             return '';
           },

test/importers/PageImporter.spec.js

@@ -147,7 +147,6 @@ describe('PageImporter tests - fixtures', () => {
 
     const md = await storageHandler.get(results[0].md);
     const expectedMD = await fs.readFile(path.resolve(__dirname, 'fixtures', `${feature}.spec.md`), 'utf-8');
-    console.log(md);
     strictEqual(md.trim(), expectedMD.trim(), 'imported md is expected one');
   };
 

test/importers/fixtures/link.spec.html

@@ -4,6 +4,5 @@ <h1>Links sample</h1>
     <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>

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

test/importers/fixtures/u.spec.md

@@ -8,10 +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) ?