@adobe/helix-importer 3.4.41 → 3.4.43

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.4.43](https://github.com/adobe/helix-importer/compare/v3.4.42...v3.4.43) (2025-01-28)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-md2jcr to v1.0.4 ([#474](https://github.com/adobe/helix-importer/issues/474)) ([7ee88ee](https://github.com/adobe/helix-importer/commit/7ee88ee2891b3e69db6ba149a3dd008921f46204))
+
+## [3.4.42](https://github.com/adobe/helix-importer/compare/v3.4.41...v3.4.42) (2025-01-28)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-md2docx to v2.1.99 ([#472](https://github.com/adobe/helix-importer/issues/472)) ([a3ee8d6](https://github.com/adobe/helix-importer/commit/a3ee8d600e7cd3453ba65522863074e91e692b64))
+
 ## [3.4.41](https://github.com/adobe/helix-importer/compare/v3.4.40...v3.4.41) (2025-01-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "3.4.41",
+  "version": "3.4.43",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.8",
     "@adobe/helix-docx2md": "1.6.15",
-    "@adobe/helix-mediahandler": "2.5.47",
+    "@adobe/helix-mediahandler": "2.5.48",
     "@esm-bundle/chai": "4.3.4-fix.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/exec": "6.0.3",
@@ -42,8 +42,8 @@
     "eslint": "8.57.1",
     "husky": "9.1.7",
     "jsdom": "26.0.0",
-    "lint-staged": "15.4.1",
-    "mocha": "11.0.1",
+    "lint-staged": "15.4.3",
+    "mocha": "11.1.0",
     "mocha-multi-reporters": "1.5.1",
     "mock-fs": "5.4.1",
     "remark-parse": "11.0.0",
@@ -53,7 +53,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@adobe/helix-markdown-support": "7.1.10",
-    "@adobe/helix-md2docx": "2.1.98",
+    "@adobe/helix-md2docx": "2.1.99",
+    "@adobe/helix-md2jcr": "1.0.4",
     "@adobe/mdast-util-gridtables": "4.0.9",
     "@adobe/remark-gridtables": "3.0.9",
     "form-data": "4.0.1",

package/src/importer/HTML2x.js

@@ -41,7 +41,7 @@ async function html2x(
   url,
   doc,
   transformCfg,
-  config = { toMd: true, toDocx: false },
+  config = { toMd: true, toDocx: false, toJcr: false },
   params = {},
 ) {
   const transformer = transformCfg || {};
@@ -156,12 +156,14 @@ async function html2x(
     storageHandler,
     skipDocxConversion: !config.toDocx,
     skipMDFileCreation: !config.toMd,
+    skipJcrFileCreation: !config.toJcr,
     logger,
     mdast2docxOptions: {
       stylesXML: config.docxStylesXML,
       image2png: config.image2png,
     },
     createDocumentFromString: config.createDocumentFromString,
+    components: params.components,
   });
 
   const pirs = await importer.import(url);
@@ -191,6 +193,10 @@ async function html2x(
       const docx = await storageHandler.get(pir.docx);
       res.docx = docx;
     }
+    if (config.toJcr && pir.jcr) {
+      const jcr = await storageHandler.get(pir.jcr);
+      res.jcr = jcr;
+    }
     return res;
   };
 
@@ -247,7 +253,18 @@ async function html2docx(url, document, transformCfg, config, params = {}) {
   return html2x(url, doc, transformCfg, { ...config, toMd: true, toDocx: true }, params);
 }
 
+async function md2jcr(url, document, transformCfg, config, params = {}) {
+  let doc = document;
+  if (typeof doc === 'string') {
+    doc = parseStringDocument(document, config);
+  }
+  return html2x(url, doc, transformCfg, {
+    ...config, toMd: true, toDocx: false, toJcr: true,
+  }, params);
+}
+
 export {
+  md2jcr,
   html2md,
   html2docx,
   defaultTransformDOM,

package/src/importer/PageImporter.js

@@ -19,6 +19,7 @@ import { defaultHandlers, toMdast } from 'hast-util-to-mdast';
 import stringify from 'remark-stringify';
 import fs from 'fs-extra';
 import { md2docx } from '@adobe/helix-md2docx';
+import { md2jcr } from '@adobe/helix-md2jcr';
 import remarkGridTable from '@adobe/remark-gridtables';
 import {
   imageReferences,
@@ -73,6 +74,11 @@ export default class PageImporter {
     return this.params.storageHandler.put(docxPath, buffer);
   }
 
+  async convertToJcr(jcrPath, content) {
+    const buffer = await md2jcr(content, this.params.components);
+    return this.params.storageHandler.put(jcrPath, buffer);
+  }
+
   async createMarkdown(resource, url) {
     const { name } = resource;
     const { directory } = resource;
@@ -358,6 +364,13 @@ export default class PageImporter {
               // eslint-disable-next-line no-param-reassign
               entry.docx = docxPath;
             }
+
+            if (!this.params.skipJcrFileCreation) {
+              const jcrPath = `${res.path}.xml`;
+              await this.convertToJcr(jcrPath, res.content);
+              // eslint-disable-next-line no-param-reassign
+              entry.jcr = jcrPath;
+            }
           }
 
           results.push(entry);

package/src/index.js

@@ -25,7 +25,7 @@ import Utils from './utils/Utils.js';
 
 import WPUtils from './wp/WPUtils.js';
 
-import { html2md, html2docx } from './importer/HTML2x.js';
+import { html2md, html2docx, md2jcr } from './importer/HTML2x.js';
 
 import createMetadata from './importer/defaults/rules/createMetadata.js';
 import adjustImageUrls from './importer/defaults/rules/adjustImageUrls.js';
@@ -54,5 +54,6 @@ export {
   WPUtils,
   html2md,
   html2docx,
+  md2jcr,
   rules,
 };

package/test/importers/PageImporter.spec.js

@@ -176,6 +176,7 @@ describe('PageImporter tests - fixtures', () => {
     const config = {
       storageHandler,
       skipDocxConversion: true,
+      skipJcrFileCreation: true,
       logger,
       createDocumentFromString,
     };