@adobe/helix-importer 1.2.2 → 1.3.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.3.0](https://github.com/adobe/helix-importer/compare/v1.2.2...v1.3.0) (2022-01-31)
+
+
+### Features
+
+* restore custom handlers ([a051c80](https://github.com/adobe/helix-importer/commit/a051c80e18d23c87b845c6fc023e81f788d5e9fc))
+
 ## [1.2.2](https://github.com/adobe/helix-importer/compare/v1.2.1...v1.2.2) (2022-01-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",
@@ -33,6 +33,7 @@
     "@semantic-release/git": "10.0.1",
     "c8": "7.11.0",
     "codecov": "3.8.3",
+    "dirname-filename-esm": "1.1.1",
     "eslint": "8.7.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.25.4",

package/src/importer/PageImporter.js

@@ -20,7 +20,6 @@ import parse from 'rehype-parse';
 import { toHtml } from 'hast-util-to-html';
 import rehype2remark from 'rehype-remark';
 import stringify from 'remark-stringify';
-import { all } from 'hast-util-to-mdast/lib/all.js';
 import fs from 'fs-extra';
 import { md2docx } from '@adobe/helix-md2docx';
 import Utils from '../utils/Utils.js';
@@ -56,9 +55,18 @@ export default class PageImporter {
       .use(parse, { emitParseErrors: true })
       .use(rehype2remark, {
         handlers: {
-          hlxembed: (h, node) => h(node, 'hlxembed', node.children[0].value),
-          u: (h, node) => h(node, 'u', all(h, node)),
-          table: (h, node) => h(node, 'table', toHtml(node)),
+          hlxembed: (h, node) => {
+            const children = node.children.map((child) => processor.stringify(child).trim());
+            return h(node, 'text', `${children.join()}\n`);
+          },
+          u: (h, node) => {
+            if (node.children && node.children.length > 0) {
+              const children = node.children.map((child) => processor.stringify(child).trim());
+              return h(node, 'html', `<u>${children.join()}</u>`);
+            }
+            return '';
+          },
+          table: (h, node) => h(node, 'html', toHtml(node)),
         },
       })
       .use(stringify, {
@@ -69,36 +77,6 @@ export default class PageImporter {
         rule: '-',
         ruleRepetition: 3,
         ruleSpaces: false,
-      })
-      .use(() => {
-        // use custom tag and rendering because text is always encoded by default
-        // we need the raw url
-        // processor.Compiler.prototype.visitors.hlxembed = (node) => node.value;
-      })
-      .use(() => {
-        // processor.Compiler.prototype.visitors.table = (node) => node.value;
-      })
-      .use(() => {
-        // processor.Compiler.prototype.visitors.u = (node) => {
-        //   // u handling: remove the u is the first element is a link
-        //   if (node.children && node.children.length > 0) {
-        //     const children = node.children.map((child) => processor.stringify(child));
-        //     if (node.children[0].type === 'link') {
-        //       // first element in the <u> is a link: remove the <u> - unsupported case
-        //       return `${children.join()}`;
-        //     }
-        //     return `<u>${children.join()}</u>`;
-        //   }
-        //   return '';
-        // };
-      })
-      .use(() => {
-        // const originalEmphasis = processor.Compiler.prototype.visitors.emphasis;
-        // processor.Compiler.prototype.visitors.emphasis = (node) => {
-        //   // @ts-ignore
-        //   const ori = originalEmphasis.apply(processor.Compiler(), [node]);
-        //   return ori;
-        // };
       });
 
     const file = await processor.process(resource.document.innerHTML);
@@ -256,19 +234,7 @@ export default class PageImporter {
   }
 
   postProcessMD(md) {
-    let ret = md.replace(/\\\\~/gm, '\\~');
-
-    const match = ret.match(/hlx_replaceTag\(.*?\)/gm);
-    if (match) {
-      const hlxReplaceTags = match.filter((i, p, s) => s.indexOf(i) === p);
-      hlxReplaceTags.forEach((r) => {
-        const by = r.substring(0, r.length - 1).split('(')[1];
-        const regex = new RegExp(r.replace('(', '\\(').replace(')', '\\)'), 'gm');
-        ret = ret.replace(regex, `<${by}>`);
-      });
-    }
-
-    return ret;
+    return md.replace(/\\\\~/gm, '\\~');
   }
 
   async download(url) {

package/src/utils/Blocks.js

@@ -38,13 +38,11 @@ export default class Blocks {
       const value = metadata[key];
       if (value) {
         if (Array.isArray(value)) {
-          let list = '';
           value.forEach((v) => {
-            // p tags in table are stripped out
-            // list must receive special hlx_replaceTag command to be post-processed
-            list += `hlx_replaceTag(p)${v}hlx_replaceTag(/p)`;
+            const p = document.createElement('p');
+            p.innerHTML = v;
+            valueCell.append(p);
           });
-          valueCell.textContent = list;
         } else if (typeof value === 'string') {
           valueCell.textContent = value;
         } else {
@@ -79,8 +77,6 @@ export default class Blocks {
                 const cellContent = [];
                 Array.from(cell.childNodes).forEach((c) => cellContent.push(c));
                 rowData.push(cellContent);
-              } else {
-                rowData.push(cell);
               }
             });
             data.push(rowData);

package/test/explorers/PagingExplorer.spec.js

@@ -202,4 +202,79 @@ describe('PagingExplorer tests', () => {
     const se = new Test(params);
     await se.explore();
   });
+
+  it('explorer params are honored', async () => {
+    const start = 2;
+    let callbackCalled = 0;
+    let processCalled = 0;
+    class Test extends PagingExplorer {
+      async fetch() {
+        return new Response('test');
+      }
+
+      process() {
+        processCalled += 1;
+        return [{
+          a: processCalled + start - 1,
+        }];
+      }
+    }
+
+    const se = new Test(params);
+    const results = await se.explore(2, () => {
+      callbackCalled += 1;
+    });
+
+    strictEqual(callbackCalled, 2, 'callback called twice');
+    deepStrictEqual(results, [{ a: 2 }, { a: 3 }], 'result is correct');
+  });
+
+  it('no text in response', async () => {
+    let processCalled = 0;
+    class Test extends PagingExplorer {
+      async fetch() {
+        if (processCalled < 2) {
+          return new Response('test');
+        }
+        return new Response('');
+      }
+
+      process() {
+        processCalled += 1;
+        return [{
+          a: processCalled,
+        }];
+      }
+    }
+
+    const se = new Test(params);
+    const results = await se.explore();
+
+    deepStrictEqual(results, [{ a: 1 }, { a: 2 }], 'result is correct');
+  });
+
+  it('no entries on page', async () => {
+    let processCalled = 0;
+    class Test extends PagingExplorer {
+      async fetch() {
+        return new Response('test');
+      }
+
+      process() {
+        if (processCalled < 2) {
+          processCalled += 1;
+          return [{
+            a: processCalled,
+          }];
+        } else {
+          return null;
+        }
+      }
+    }
+
+    const se = new Test(params);
+    const results = await se.explore();
+
+    deepStrictEqual(results, [{ a: 1 }, { a: 2 }], 'result is correct');
+  });
 });

package/test/importers/PageImporter.spec.js

@@ -12,9 +12,12 @@
 
 /* eslint-disable max-classes-per-file, class-methods-use-this */
 
+import path from 'path';
+import fs from 'fs-extra';
 import { strictEqual, ok } from 'assert';
 import { describe, it } from 'mocha';
 import { Response } from 'node-fetch';
+import { dirname } from 'dirname-filename-esm';
 
 import { docx2md } from '@adobe/helix-docx2md';
 
@@ -25,6 +28,9 @@ import MemoryHandler from '../../src/storage/MemoryHandler.js';
 import MockMediaHandler from '../mocks/MockMediaHandler.js';
 import NoopLogger from '../mocks/NoopLogger.js';
 
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = dirname(import.meta);
+
 const logger = new NoopLogger();
 
 describe('PageImporter tests', () => {
@@ -84,3 +90,58 @@ describe('PageImporter tests - various options', () => {
     strictEqual(md, test, 'valid backward conversion');
   });
 });
+
+describe('PageImporter tests - fixtures', () => {
+  const featureTest = async (feature) => {
+    class Test extends PageImporter {
+      async fetch() {
+        const html = await fs.readFile(path.resolve(__dirname, 'fixtures', `${feature}.spec.html`), 'utf-8');
+        return new Response(html);
+      }
+
+      async process(document) {
+        const pir = new PageImporterResource(feature, '', document.documentElement, null, null);
+        return [pir];
+      }
+    }
+
+    const storageHandler = new MemoryHandler(logger);
+    const config = {
+      storageHandler,
+      skipDocxConversion: true,
+      logger,
+    };
+    const se = new Test(config);
+    const results = await se.import(`https://www.sample.com/${feature}`);
+
+    strictEqual(results.length, 1, 'expect one result');
+
+    const md = await storageHandler.get(`/${feature}.md`);
+    const expectedMD = await fs.readFile(path.resolve(__dirname, 'fixtures', `${feature}.spec.md`), 'utf-8');
+    strictEqual(md.trim(), expectedMD.trim(), 'inported md is expected one');
+  };
+
+  it('import - tables', async () => {
+    await featureTest('table');
+  });
+
+  it('import - underlines', async () => {
+    await featureTest('u');
+  });
+
+  it('import - links', async () => {
+    await featureTest('link');
+  });
+
+  it('import - spans', async () => {
+    await featureTest('span');
+  });
+
+  it('import - emphasises', async () => {
+    await featureTest('em');
+  });
+
+  it('import - complex', async () => {
+    await featureTest('complex');
+  });
+});

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

@@ -0,0 +1,70 @@
+<div class="js-post-content blogPostMain">
+  <section class="blogPostBanner__container">
+<div class="blogPostBanner__imgContainer js-parallax">
+<h1 class="blogPostContent__title">How Sample Performance Management Improved in 2021</h1><img src="https://www.sample.com/blog/wp-content/uploads/How-Sample-Performance-Management-Improved-in-2021_1920x733-scaled.jpg">
+</div>
+
+</section>
+
+  <section class="blogPostContent__wrapper" aria-label="Sample blog post main content" role="main">
+    
+
+    <div class="blogPostContent__bg"></div>
+    <div class="bhrsection-padding">
+      <div class="bhrsection-container-sm">
+        <div class="blogPostContent__container blogPostContent__container--product-announcements js-page-color" data-page-color="#1d9336" data-page-color3="#edffc8">
+          
+          
+          
+          
+          <div class="blogPostContentDetail__container">
+            
+            <div class="blogPostContent blogPostContent--default">
+              <div class="essb_break_scroll"></div>								</div>
+            
+<div class="blogPostContent">
+              <p>Over the course of 2021, we've improved Sample® Performance Management with more flexibility and greater depth, giving you more choice for the when, who, and how of the performance management process at your organization. Here's a quick summary to let you know how to take advantage of these updates.</p>
+<h2>Scheduling Flexibility and Improved Search in Reports</h2>
+<p>These updates give greater flexibility in the cadence and dates you administer assessments and feedback. We separated scheduling for assessments and feedback, so each process can operate on separate timelines depending on your needs. For example, you might choose to have feedback sessions every four months while keeping formal assessments on a six-month schedule.</p>
+                            <div class="blogPostContent__fullWidthImgContainer">
+      <img class="blogPostContent__fullWidthImg lazyload " src="https://www.sample.com/blog/wp-content/uploads/Screen_Shot_2022-01-05_at_9.26.41_AM.png" alt="Screen_Shot_2022-01-05_at_9.26.41_AM">
+    </div>
+                    <p>We also made performance reports searchable by date range instead of tying them to individual Performance Management events.</p>
+<h2>Additional Assessment Flexibility</h2>
+<p>When an employee moves to a new team right before their scheduled assessment, their new manager might not have what they need to make accurate observations. To resolve this issue, you now have the option to <a href="https://help.sample.com/hc/en-us/articles/360060935131-skip-assessments">skip a regularly-scheduled assessment</a>.</p>
+                            <div class="blogPostContent__fullWidthImgContainer">
+      <img class="blogPostContent__fullWidthImg lazyload " src="https://www.sample.com/blog/wp-content/uploads/a66eddc3-4e16-49a9-b597-1151e233790d.png" alt="a66eddc3-4e16-49a9-b597-1151e233790d">
+    </div>
+                    <p>This doesn't mean someone who skips an assessment has to go without feedback for months. Scheduling <a href="https://help.sample.com/hc/en-us/articles/360060531312-impromptu-assessments">impromptu assessments</a> helps you keep employees informed during off-cycle evaluations, such as:</p>
+<ul>
+<li style="font-weight: 400;" aria-level="1">When considering employees for a promotion or raise</li>
+<li style="font-weight: 400;" aria-level="1">When they face disciplinary action</li>
+<li style="font-weight: 400;" aria-level="1">On their anniversary</li>
+<li style="font-weight: 400;" aria-level="1">As part of their onboarding process</li>
+</ul>
+                            <div class="blogPostContent__fullWidthImgContainer">
+      <img class="blogPostContent__fullWidthImg lazyload " src="https://www.sample.com/blog/wp-content/uploads/Impromptu-Assessment-1.png" alt="Impromptu Assessment (1)">
+    </div>
+                    <h2>Expanded Feedback</h2>
+<p>Great feedback can come from anyone who interacts with an employee, from their closest co-workers to employees in a different department who regularly rely on their efforts. We updated our Feedback feature to emphasize this breadth of feedback, expanding the maximum number of reviewers to 10 per employee.</p>
+<p>Feedback is also no longer limited to assessment periods, letting you ask in the moment for what you need. Here are a few examples:</p>
+<ul>
+<li style="font-weight: 400;" aria-level="1">After a big project, the manager wants to see how the team lead performed. They can send feedback requests to everyone involved in it. This could include team members, directors and executives they presented to, or other departments that they trained.</li>
+<li style="font-weight: 400;" aria-level="1">A manager thinks an employee is struggling and wants to know how well the employee works with their peers or with other departments. This feedback can help the manager understand an employee's situation before speaking with them.</li>
+<li style="font-weight: 400;" aria-level="1">An employee is up for a promotion, and the manager would like to understand how the employee works with others.</li>
+</ul>
+<h2>Sample Performance Management: Timely and Targeted</h2>
+<p>These updates help expand Performance Management's reach and help your managers and employees provide meaningful, accurate feedback through continuing conversations. For more information on each of these updates, click the links below:</p>
+<p><a href="https://help.sample.com/hc/en-us/articles/360060533412-Skip-and-Impromptu-Assessments-5-6-2021-">Skip and Impromptu Assessments</a></p>
+<p><a href="https://help.sample.com/hc/en-us/articles/4415512886669-We-ve-Added-Flexibility-to-Performance-Management-12-3-2021-">Impromptu Feedback</a></p>
+<p><a href="https://help.sample.com/hc/en-us/articles/4406463743501-More-Opportunities-for-Peer-Feedback-Participants-8-4-2021-">Feedback Request Limit Increase</a></p>
+<p><a href="https://help.sample.com/hc/en-us/articles/360057083332-Performance-Management-Settings-Update-2-25-2021-">Performance Settings Updates</a></p>
+        </div>
+                              
+                          </div>
+          
+        </div>
+      </div>
+    </div>
+  </section>
+  <table><tr><th>Related Posts</th></tr><tr><td><a class="blogPostsBlock__titleLink" href="https://www.sample.com/blog/how-sample-performance-management-improved-in-2021/" aria-label="How Sample Performance Management Improved in 2021">https://www.sample.com/blog/how-sample-performance-management-improved-in-2021/</a></td></tr><tr><td><a class="blogPostsBlock__titleLink" href="https://www.sample.com/blog/announcing-the-product-updates-webpage/" aria-label="Announcing the Product Updates Webpage">https://www.sample.com/blog/announcing-the-product-updates-webpage/</a></td></tr><tr><td><a class="blogPostsBlock__titleLink" href="https://www.sample.com/blog/take-a-look-back-at-2021/" aria-label="Take a Look Back at 2021">https://www.sample.com/blog/take-a-look-back-at-2021/</a></td></tr><tr><td><a class="blogPostsBlock__titleLink" href="https://www.sample.com/blog/whats-new-in-sample-vaccination-tracking-feature/" aria-label="What's New in Sample: Vaccination Tracking Feature">https://www.sample.com/blog/whats-new-in-sample-vaccination-tracking-feature/</a></td></tr></table><table><tr><th colspan="2">Metadata</th></tr><tr><td>Title</td><td>How Sample Performance Management Improved in 2021 - Sample Blog</td></tr><tr><td>Description</td><td>In 2021, we improved Sample® Performance Management with more flexibility and greater depth, giving you finer control of your performance management.</td></tr><tr><td>Category</td><td>Product Announcements</td></tr><tr><td>Author</td><td><a href="https://www.sample.com/blog/author/eserdar/" rel="author" class="fn" style="color: #1d9336;">Eric Serdar</a></td></tr><tr><td>Read Time</td><td>								8 min</td></tr><tr><td>Image</td><td><img src="https://www.sample.com/blog/wp-content/uploads/How-Sample-Performance-Management-Improved-in-2021_1200x628-1024x536.jpg"></td></tr></table></div>

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

@@ -0,0 +1,54 @@
+# How Sample Performance Management Improved in 2021
+
+![](https://www.sample.com/blog/wp-content/uploads/How-Sample-Performance-Management-Improved-in-2021_1920x733-scaled.jpg)
+
+Over the course of 2021, we've improved Sample® Performance Management with more flexibility and greater depth, giving you more choice for the when, who, and how of the performance management process at your organization. Here's a quick summary to let you know how to take advantage of these updates.
+
+## Scheduling Flexibility and Improved Search in Reports
+
+These updates give greater flexibility in the cadence and dates you administer assessments and feedback. We separated scheduling for assessments and feedback, so each process can operate on separate timelines depending on your needs. For example, you might choose to have feedback sessions every four months while keeping formal assessments on a six-month schedule.
+
+![Screen\_Shot\_2022-01-05\_at\_9.26.41\_AM](https://www.sample.com/blog/wp-content/uploads/Screen_Shot_2022-01-05_at_9.26.41_AM.png)
+
+We also made performance reports searchable by date range instead of tying them to individual Performance Management events.
+
+## Additional Assessment Flexibility
+
+When an employee moves to a new team right before their scheduled assessment, their new manager might not have what they need to make accurate observations. To resolve this issue, you now have the option to [skip a regularly-scheduled assessment](https://help.sample.com/hc/en-us/articles/360060935131-skip-assessments).
+
+![a66eddc3-4e16-49a9-b597-1151e233790d](https://www.sample.com/blog/wp-content/uploads/a66eddc3-4e16-49a9-b597-1151e233790d.png)
+
+This doesn't mean someone who skips an assessment has to go without feedback for months. Scheduling [impromptu assessments](https://help.sample.com/hc/en-us/articles/360060531312-impromptu-assessments) helps you keep employees informed during off-cycle evaluations, such as:
+
+-   When considering employees for a promotion or raise
+-   When they face disciplinary action
+-   On their anniversary
+-   As part of their onboarding process
+
+![Impromptu Assessment (1)](https://www.sample.com/blog/wp-content/uploads/Impromptu-Assessment-1.png)
+
+## Expanded Feedback
+
+Great feedback can come from anyone who interacts with an employee, from their closest co-workers to employees in a different department who regularly rely on their efforts. We updated our Feedback feature to emphasize this breadth of feedback, expanding the maximum number of reviewers to 10 per employee.
+
+Feedback is also no longer limited to assessment periods, letting you ask in the moment for what you need. Here are a few examples:
+
+-   After a big project, the manager wants to see how the team lead performed. They can send feedback requests to everyone involved in it. This could include team members, directors and executives they presented to, or other departments that they trained.
+-   A manager thinks an employee is struggling and wants to know how well the employee works with their peers or with other departments. This feedback can help the manager understand an employee's situation before speaking with them.
+-   An employee is up for a promotion, and the manager would like to understand how the employee works with others.
+
+## Sample Performance Management: Timely and Targeted
+
+These updates help expand Performance Management's reach and help your managers and employees provide meaningful, accurate feedback through continuing conversations. For more information on each of these updates, click the links below:
+
+[Skip and Impromptu Assessments](https://help.sample.com/hc/en-us/articles/360060533412-Skip-and-Impromptu-Assessments-5-6-2021-)
+
+[Impromptu Feedback](https://help.sample.com/hc/en-us/articles/4415512886669-We-ve-Added-Flexibility-to-Performance-Management-12-3-2021-)
+
+[Feedback Request Limit Increase](https://help.sample.com/hc/en-us/articles/4406463743501-More-Opportunities-for-Peer-Feedback-Participants-8-4-2021-)
+
+[Performance Settings Updates](https://help.sample.com/hc/en-us/articles/360057083332-Performance-Management-Settings-Update-2-25-2021-)
+
+<table><tbody><tr><th>Related Posts</th></tr><tr><td><a class="blogPostsBlock__titleLink" href="https://www.sample.com/blog/how-sample-performance-management-improved-in-2021/" aria-label="How Sample Performance Management Improved in 2021">https://www.sample.com/blog/how-sample-performance-management-improved-in-2021/</a></td></tr><tr><td><a class="blogPostsBlock__titleLink" href="https://www.sample.com/blog/announcing-the-product-updates-webpage/" aria-label="Announcing the Product Updates Webpage">https://www.sample.com/blog/announcing-the-product-updates-webpage/</a></td></tr><tr><td><a class="blogPostsBlock__titleLink" href="https://www.sample.com/blog/take-a-look-back-at-2021/" aria-label="Take a Look Back at 2021">https://www.sample.com/blog/take-a-look-back-at-2021/</a></td></tr><tr><td><a class="blogPostsBlock__titleLink" href="https://www.sample.com/blog/whats-new-in-sample-vaccination-tracking-feature/" aria-label="What&#x27;s New in Sample: Vaccination Tracking Feature">https://www.sample.com/blog/whats-new-in-sample-vaccination-tracking-feature/</a></td></tr></tbody></table>
+
+<table><tbody><tr><th colspan="2">Metadata</th></tr><tr><td>Title</td><td>How Sample Performance Management Improved in 2021 - Sample Blog</td></tr><tr><td>Description</td><td>In 2021, we improved Sample® Performance Management with more flexibility and greater depth, giving you finer control of your performance management.</td></tr><tr><td>Category</td><td>Product Announcements</td></tr><tr><td>Author</td><td><a href="https://www.sample.com/blog/author/eserdar/" rel="author" class="fn" style="color: #1d9336;">Eric Serdar</a></td></tr><tr><td>Read Time</td><td>8 min</td></tr><tr><td>Image</td><td><img src="https://www.sample.com/blog/wp-content/uploads/How-Sample-Performance-Management-Improved-in-2021_1200x628-1024x536.jpg"></td></tr></tbody></table>

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

@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <h1>EM sample</h1>
+    <p><strong><em>&nbsp;</em></strong></p><p>usefull</p>
+    <p><strong><em>emphasis</em></strong><strong><em> space </em></strong><strong><em>another emphasis</em></strong> <strong><em>last emphasis</em></strong></p>
+    <p><a href="https://www.sample.com">linkcontent</a><i>. </i></p>
+  </body>
+</html>

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

@@ -0,0 +1,7 @@
+# EM sample
+
+usefull
+
+***emphasis* *space* *another emphasis* *last emphasis***
+
+[linkcontent](https://www.sample.com).

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

@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <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>

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

@@ -0,0 +1,9 @@
+# Links sample
+
+[Link on a single online](http://wwww.sample.com/a)
+
+[Link without p](http://wwww.sample.com/b)
+
+http://wwww.sample.com/c
+
+http://wwww.sample.com/d

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

@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <h1>Spans sample</h1>
+    <p><span>spans </span> can be a mess, <span>especially</span><span> </span>when<span> </span>used for<span> </span><span>spaces</span>, or <span><b>mixed</b> with other tags</span>. <a href="http://wwww.sample.com/">Link with a <span>span</span>.</a></p>
+  </body>
+</html>

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

@@ -0,0 +1,3 @@
+# Spans sample
+
+spans can be a mess, especially when used for spaces, or **mixed** with other tags. [Link with a span.](http://wwww.sample.com/)

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

@@ -0,0 +1,31 @@
+<html>
+  <body>
+    <h1>Table sample</h1>
+    <table>
+      <tr><td colspan="2">Metadata</td></tr>
+      <tr><td>Title</td><td>This is the title of the page</td></tr>
+      <tr><td>Link</td><td><a href="https://www.sample.com"> A link</a></td></tr>
+      <tr>
+        <td>List</td>
+        <td><ul>
+          <li>Value 1</li>
+          <li>Value 2</li>
+          <li>Another value...</li>
+        </ul></td>
+      </tr>
+      <tr><td>Paragraphs</td><td><p>Paragraph 1 with some text</p><p>Paragraph 2 with some text too!</p></td></tr>
+    </table>
+    <table>
+      <tr><th colspan="2">Metadata</th></tr>
+      <tr><td>title</td><td>Some title</td></tr>
+      <tr>
+        <td>Tags</td>
+        <td>
+          <p>Creative</p>
+          <p>Experience Cloud</p>
+          <p>Photography</p>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>

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

@@ -0,0 +1,5 @@
+# Table sample
+
+<table><tbody><tr><td colspan="2">Metadata</td></tr><tr><td>Title</td><td>This is the title of the page</td></tr><tr><td>Link</td><td><span></span><a href="https://www.sample.com">A link</a></td></tr><tr><td>List</td><td><ul><li>Value 1</li><li>Value 2</li><li>Another value...</li></ul></td></tr><tr><td>Paragraphs</td><td><p>Paragraph 1 with some text</p><p>Paragraph 2 with some text too!</p></td></tr></tbody></table>
+
+<table><tbody><tr><th colspan="2">Metadata</th></tr><tr><td>title</td><td>Some title</td></tr><tr><td>Tags</td><td><p>Creative</p><p>Experience Cloud</p><p>Photography</p></td></tr></tbody></table>

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

@@ -0,0 +1,17 @@
+<html>
+  <body>
+    <h1>Underline combo sample</h1>
+    <p><u>Underline 1</u></p>
+    <p>Some normal text with random <u>underline</u> or <span><u>span with underline</u></span> or <u><span>underline with span</u>...</p>
+    <p><span><strong><u>Underline 2</u></strong></span></p>
+    <p><strong><u>Underline 3</u></strong></p>
+    <ul>
+      <li><u>li underline 1</u></li>
+      <li><u>li underline 2</u> also may have text here</li>
+      <li><u>li underline 3</u></li>
+    </ul>
+    <p>
+      <u><a href="https:/www.sample.com/a">Unlined link</a></u> or <a href="https:/www.sample.com/b"><u>Linked underline</u></a> ?
+    </p>
+  </body>
+</html>

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

@@ -0,0 +1,19 @@
+# Underline combo sample
+
+<u>Underline 1</u>
+
+Some normal text with random <u>underline</u> or <u>span with underline</u> or <u>underline with span</u>...
+
+**<u>Underline 2</u>**
+
+**<u>Underline 3</u>**
+
+-   <u>li underline 1</u>
+
+-   <u>li underline 2</u>
+
+    also may have text here
+
+-   <u>li underline 3</u>
+
+[Unlined link](https:/www.sample.com/a) or [<u>Linked underline</u>](https:/www.sample.com/b) ?

package/test/utils/Blocks.spec.js

@@ -96,6 +96,7 @@ describe('Blocks#convertBlocksToTables tests', () => {
         <div class="promotion">
           <div>
             <div><a href="https://blog.adobe.com/en/promotions/doc-cloud-education.html">https://blog.adobe.com/en/promotions/doc-cloud-education.html</a></div>
+            <div><span>with content</span></div>
           </div>
         </div>
       </main>`,
@@ -103,7 +104,10 @@ describe('Blocks#convertBlocksToTables tests', () => {
         <div>
           <table>
             <tr><th>Promotion</th></tr>
-            <tr><td><a href="https://blog.adobe.com/en/promotions/doc-cloud-education.html">https://blog.adobe.com/en/promotions/doc-cloud-education.html</a></td></tr>
+            <tr>
+              <td><a href="https://blog.adobe.com/en/promotions/doc-cloud-education.html">https://blog.adobe.com/en/promotions/doc-cloud-education.html</a></td>
+              <td><span>with content</span></td>
+            </tr>
           </table>
         </div>
       </main>`,
@@ -133,6 +137,6 @@ describe('Blocks#getMetadataBlock tests', () => {
   });
 
   it('getMetadataBlock lists', () => {
-    test({ title: 'Some title', Tags: ['Creative', 'Experience Cloud', 'Photography'] }, '<table><tr><th colspan="2">Metadata</th></tr><tr><td>title</td><td>Some title</td></tr><tr><td>Tags</td><td>hlx_replaceTag(p)Creativehlx_replaceTag(/p)hlx_replaceTag(p)Experience Cloudhlx_replaceTag(/p)hlx_replaceTag(p)Photographyhlx_replaceTag(/p)</td></tr></table>');
+    test({ title: 'Some title', Tags: ['Creative', 'Experience Cloud', 'Photography'] }, '<table><tr><th colspan="2">Metadata</th></tr><tr><td>title</td><td>Some title</td></tr><tr><td>Tags</td><td><p>Creative</p><p>Experience Cloud</p><p>Photography</p></td></tr></table>');
   });
 });