@adobe/helix-importer 1.1.0 → 1.2.2

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.2.2](https://github.com/adobe/helix-importer/compare/v1.2.1...v1.2.2) (2022-01-25)
+
+
+### Bug Fixes
+
+* update md2docx ([#13](https://github.com/adobe/helix-importer/issues/13)) ([cf3f48f](https://github.com/adobe/helix-importer/commit/cf3f48f2dec1190dda03d9f97c0c41b8e212999a))
+
+## [1.2.1](https://github.com/adobe/helix-importer/compare/v1.2.0...v1.2.1) (2022-01-25)
+
+
+### Bug Fixes
+
+* export MemoryHandler ([#12](https://github.com/adobe/helix-importer/issues/12)) ([3a83a16](https://github.com/adobe/helix-importer/commit/3a83a1620b0eb4752698ee9b994e8b0fd7ce085f))
+
+# [1.2.0](https://github.com/adobe/helix-importer/compare/v1.1.0...v1.2.0) (2022-01-20)
+
+
+### Features
+
+* export new Blocks helper ([#7](https://github.com/adobe/helix-importer/issues/7)) ([0d7bfa7](https://github.com/adobe/helix-importer/commit/0d7bfa7bd7a98a6fb19f6aec6f8e29be0549e53e))
+
 # [1.1.0](https://github.com/adobe/helix-importer/compare/v1.0.0...v1.1.0) (2022-01-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "1.1.0",
+  "version": "1.2.2",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",
@@ -10,37 +10,53 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha test/**/*.spec.js",
-    "semantic-release": "semantic-release"
+    "test": "c8 mocha",
+    "test-ci": "c8 mocha && codecov",
+    "semantic-release": "semantic-release",
+    "prepare": "npx husky install"
+  },
+  "mocha": {
+    "recursive": "true",
+    "spec": "test/**/*.spec.js",
+    "reporter": "mocha-multi-reporters",
+    "reporter-options": "configFile=.mocha-multi.json"
+  },
+  "lint-staged": {
+    "*.js": "eslint"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
-    "@adobe/helix-docx2md": "1.0.5",
-    "@adobe/helix-mediahandler": "1.0.1",
+    "@adobe/helix-docx2md": "1.0.6",
+    "@adobe/helix-mediahandler": "1.0.2",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "eslint": "8.6.0",
+    "c8": "7.11.0",
+    "codecov": "3.8.3",
+    "eslint": "8.7.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.25.4",
-    "mocha": "9.1.4",
-    "mock-fs": "4.13.0",
+    "husky": "7.0.4",
+    "lint-staged": "12.3.1",
+    "mocha": "9.2.0",
+    "mocha-multi-reporters": "1.5.1",
+    "mock-fs": "5.1.2",
     "semantic-release": "19.0.2"
   },
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/helix-md2docx": "1.2.0",
+    "@adobe/helix-md2docx": "1.2.3",
     "form-data": "4.0.0",
     "fs-extra": "10.0.0",
     "hast-util-to-html": "8.0.3",
     "hast-util-to-mdast": "8.3.0",
     "jsdom": "19.0.0",
-    "node-fetch": "3.1.1",
-    "rehype-parse": "7.0.1",
-    "rehype-remark": "8.0.0",
-    "remark-stringify": "8.1.1",
+    "node-fetch": "3.2.0",
+    "rehype-parse": "8.0.3",
+    "rehype-remark": "9.1.2",
+    "remark-stringify": "10.0.2",
     "sanitize-filename": "1.6.3",
-    "unified": "9.2.0"
+    "unified": "10.1.1"
   }
 }

package/src/importer/PageImporter.js

@@ -15,7 +15,7 @@
 import { JSDOM } from 'jsdom';
 
 import path from 'path';
-import unified from 'unified';
+import { unified } from 'unified';
 import parse from 'rehype-parse';
 import { toHtml } from 'hast-util-to-html';
 import rehype2remark from 'rehype-remark';
@@ -50,7 +50,7 @@ export default class PageImporter {
     const { name } = resource;
     const { directory } = resource;
     const sanitizedName = FileUtils.sanitizeFilename(name);
-    this.logger.log(`Computing Markdonw for ${directory}/${sanitizedName}`);
+    this.logger.log(`Computing Markdown for ${directory}/${sanitizedName}`);
 
     const processor = unified()
       .use(parse, { emitParseErrors: true })
@@ -73,36 +73,36 @@ export default class PageImporter {
       .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;
+        // processor.Compiler.prototype.visitors.hlxembed = (node) => node.value;
       })
       .use(() => {
-        processor.Compiler.prototype.visitors.table = (node) => node.value;
+        // 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 '';
-        };
+        // 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 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);
-    let contents = file.contents.toString();
+    let contents = String(file);
 
     // process image links
     const { document } = resource;

package/src/index.js

@@ -17,7 +17,9 @@ import PageImporterParams from './importer/PageImporterParams.js';
 import PageImporterResource from './importer/PageImporterResource.js';
 
 import FSHandler from './storage/FSHandler.js';
+import MemoryHandler from './storage/MemoryHandler.js';
 
+import Blocks from './utils/Blocks.js';
 import CSV from './utils/CSV.js';
 import DOMUtils from './utils/DOMUtils.js';
 import FileUtils from './utils/FileUtils.js';
@@ -35,6 +37,8 @@ export {
   PageImporterParams,
   PageImporterResource,
   FSHandler,
+  MemoryHandler,
+  Blocks,
   CSV,
   DOMUtils,
   FileUtils,