@adobe/helix-importer 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.4.1](https://github.com/adobe/helix-importer/compare/v1.4.0...v1.4.1) (2022-02-24)
+
+
+### Bug Fixes
+
+* some images come with wrong src in md ([#16](https://github.com/adobe/helix-importer/issues/16)) ([7f27432](https://github.com/adobe/helix-importer/commit/7f274326683313cd11c2a92bb1c01c1960de5fcd))
+
 # [1.4.0](https://github.com/adobe/helix-importer/compare/v1.3.0...v1.4.0) (2022-02-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-importer",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Helix Importer tool: create md / docx from html",
   "main": "src/index.js",
   "type": "module",

package/src/importer/PageImporter.js

@@ -25,6 +25,7 @@ import { md2docx } from '@adobe/helix-md2docx';
 import Utils from '../utils/Utils.js';
 import DOMUtils from '../utils/DOMUtils.js';
 import FileUtils from '../utils/FileUtils.js';
+import MDUtils from '../utils/MDUtils.js';
 
 export default class PageImporter {
   params;
@@ -143,14 +144,10 @@ export default class PageImporter {
       }
     });
 
-    const patchSrcInContent = (c, oldSrc, newSrc) => contents
-      .replace(new RegExp(`${oldSrc.replace('.', '\\.').replace('?', '\\?')}`, 'gm'), newSrc)
-      .replace(new RegExp(`${decodeURI(oldSrc).replace('.', '\\.')}`, 'gm'), newSrc);
-
     // adjust assets url (from relative to absolute)
     assets.forEach((asset) => {
       const u = new URL(decodeURI(asset.url), url);
-      contents = patchSrcInContent(contents, asset.url, u.toString());
+      contents = MDUtils.replaceSrcInMarkdown(contents, asset.url, u.toString());
     });
 
     if (resource.prepend) {

package/src/utils/MDUtils.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export default class MDUtils {
+  static replaceSrcInMarkdown = (md, oldSrc, newSrc) => {
+    if (decodeURI(oldSrc) !== oldSrc) {
+      return md.replace(new RegExp(`${decodeURI(oldSrc).replace('.', '\\.')}`, 'gm'), newSrc);
+    } else {
+      return md.replace(new RegExp(`${oldSrc.replace('.', '\\.').replace('?', '\\?')}`, 'gm'), newSrc);
+    }
+  };
+}

package/test/utils/MDUtils.spec.js

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import { strictEqual } from 'assert';
+import { describe, it } from 'mocha';
+
+import MDUtils from '../../src/utils/MDUtils.js';
+
+describe('MDUtils tests', () => {
+  it('MDUtils#replaceSrcInMarkdown do nothing', () => {
+    strictEqual(
+      MDUtils.replaceSrcInMarkdown('#A title\n![](https://www.sample.com/image.jpg)', 'https://www.sample.com/replace.jpg', 'https://www.sample.com/withimage.jpg'),
+      '#A title\n![](https://www.sample.com/image.jpg)',
+      'do nothing',
+    );
+  });
+
+  it('MDUtils#replaceSrcInMarkdown can replace', () => {
+    strictEqual(
+      MDUtils.replaceSrcInMarkdown('#A title\n![](https://www.sample.com/image.jpg)', 'https://www.sample.com/image.jpg', 'https://www.sample.com/withimage.jpg'),
+      '#A title\n![](https://www.sample.com/withimage.jpg)',
+      'basic replacement',
+    );
+
+    strictEqual(
+      MDUtils.replaceSrcInMarkdown('#A title\n![](/image.jpg)', '/image.jpg', 'https://www.sample.com/image.jpg'),
+      '#A title\n![](https://www.sample.com/image.jpg)',
+      'relative to absolute replacement',
+    );
+
+    strictEqual(
+      MDUtils.replaceSrcInMarkdown('![](/book/resources/_prod/img/hero/image.jpg)\n\n# Title for the page', '/book/resources/_prod/img/hero/image.jpg', 'https://www.sample.com/book/resources/_prod/img/hero/image.jpg'),
+      '![](https://www.sample.com/book/resources/_prod/img/hero/image.jpg)\n\n# Title for the page',
+      'relative to absolute replacement (no double replacement)',
+    );
+  });
+
+  it('MDUtils#replaceSrcInMarkdown can replace with encoding', () => {
+    strictEqual(
+      MDUtils.replaceSrcInMarkdown('#A title\n![](https://www.sample.com/imagé.jpg)', 'https://www.sample.com/imag%C3%A9.jpg', 'https://www.sample.com/withsomethingelse.jpg'),
+      '#A title\n![](https://www.sample.com/withsomethingelse.jpg)',
+      'encoded to replacement',
+    );
+  });
+});