@adobe/helix-docx2md 1.4.12 → 1.4.14

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.4.14](https://github.com/adobe/helix-docx2md/compare/v1.4.13...v1.4.14) (2023-08-14)
+
+
+### Bug Fixes
+
+* **deps:** update external major (major) ([#257](https://github.com/adobe/helix-docx2md/issues/257)) ([5d0eab8](https://github.com/adobe/helix-docx2md/commit/5d0eab84af84e0b3f605cd96df304386761456fe))
+
+## [1.4.13](https://github.com/adobe/helix-docx2md/compare/v1.4.12...v1.4.13) (2023-08-04)
+
+
+### Bug Fixes
+
+* type error in inline code ([#274](https://github.com/adobe/helix-docx2md/issues/274)) ([ddb3960](https://github.com/adobe/helix-docx2md/commit/ddb3960c73300e4c4c00462edf8c111fb053a505))
+
 ## [1.4.12](https://github.com/adobe/helix-docx2md/compare/v1.4.11...v1.4.12) (2023-07-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-docx2md",
-  "version": "1.4.12",
+  "version": "1.4.14",
   "description": "Helix library that converts word documents to markdown",
   "type": "module",
   "main": "./src/index.js",
@@ -40,32 +40,35 @@
     "@adobe/remark-gridtables": "1.0.4",
     "dirname-filename-esm": "1.1.1",
     "github-slugger": "2.0.0",
-    "mdast-util-to-markdown": "1.5.0",
-    "mdast-util-to-string": "3.2.0",
+    "mdast-util-to-markdown": "2.1.0",
+    "mdast-util-to-string": "4.0.0",
     "remark-gfm": "3.0.1",
     "remark-parse": "10.0.2",
     "remark-stringify": "10.0.3",
     "unified": "10.1.2",
-    "unist-util-find": "1.0.4",
-    "unist-util-visit": "4.1.2",
+    "unist-util-find": "3.0.0",
+    "unist-util-visit": "5.0.0",
     "yauzl": "2.10.0"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.2",
-    "@adobe/helix-mediahandler": "2.2.6",
+    "@adobe/helix-admin-support": "2.2.3",
+    "@adobe/helix-mediahandler": "2.2.9",
+    "@adobe/helix-onedrive-support": "10.3.5",
+    "@adobe/helix-shared-tokencache": "1.3.4",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "c8": "8.0.0",
+    "c8": "8.0.1",
     "dotenv": "16.3.1",
-    "eslint": "8.45.0",
+    "eslint": "8.47.0",
     "husky": "8.0.3",
     "junit-report-builder": "3.0.1",
-    "lint-staged": "13.2.3",
+    "lint-staged": "14.0.0",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "semantic-release": "21.0.7",
-    "unist-util-inspect": "7.0.2"
+    "unist-util-inspect": "8.0.0"
   },
   "lint-staged": {
     "*.js": "eslint"

package/src/dast2mdast/handlers/paragraph.js

@@ -111,7 +111,7 @@ function collapseInlineCode(ret, prev) {
             if (next > 0) {
               // move first chunk to new paragraph
               const kids = children.splice(0, next);
-              while (kids[kids.length - 1].type === 'break') {
+              while (kids[kids.length - 1]?.type === 'break') {
                 kids.pop();
               }
               ret.splice(p, 0, {

package/src/mdast2md/mdast-sanitize-autoembeds.js

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import { visit } from 'unist-util-visit';
-import find from 'unist-util-find';
+import { find } from 'unist-util-find';
 
 /**
  * Sanitizes auto embeds produced by word when entering a video link. The generated content consists

package/src/mdast2md/ordered-list/index.js

@@ -9,7 +9,15 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import toMarkdown from './to-markdown.js';
+import { listItem } from './list-item.js';
+
+function toMarkdown() {
+  return {
+    handlers: {
+      listItem,
+    },
+  };
+}
 
 export default function orderedListPlugin(options) {
   const data = this.data();

package/src/mdast2md/ordered-list/list-item.js

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2021 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.
+ */
+/**
+ * @param {State} state
+ * @returns {Exclude<Options['listItemIndent'], null | undefined>}
+ */
+export function checkListItemIndent(state) {
+  const style = state.options.listItemIndent || 'one';
+
+  if (style !== 'tab' && style !== 'one' && style !== 'mixed') {
+    throw new Error(
+      `Cannot serialize items with \`${
+        style
+      }\` for \`options.listItemIndent\`, expected \`tab\`, \`one\`, or \`mixed\``,
+    );
+  }
+
+  return style;
+}
+
+/**
+ * @param {State} state
+ * @returns {Exclude<Options['bullet'], null | undefined>}
+ */
+export function checkBullet(state) {
+  const marker = state.options.bullet || '*';
+
+  if (marker !== '*' && marker !== '+' && marker !== '-') {
+    throw new Error(
+      `Cannot serialize items with \`${
+        marker
+      }\` for \`options.bullet\`, expected \`*\`, \`+\`, or \`-\``,
+    );
+  }
+
+  return marker;
+}
+
+/**
+ * Renders a list item with 'number' support.
+ * copy of: https://github.com/syntax-tree/mdast-util-to-markdown/blob/main/lib/handle/list-item.js
+ *
+ * @param {ListItem} node
+ * @param {Parents | undefined} parent
+ * @param {State} state
+ * @param {Info} info
+ * @returns {string}
+ */
+export function listItem(node, parent, state, info) {
+  const listItemIndent = checkListItemIndent(state);
+  let bullet = state.bulletCurrent || checkBullet(state);
+
+  // Add the marker value for ordered lists.
+  if (parent && parent.type === 'list' && parent.ordered) {
+    if (node.bullet !== undefined) {
+      bullet = node.bullet;
+    } else {
+      bullet = (typeof parent.start === 'number' && parent.start > -1
+        ? parent.start
+        : 1)
+        + (state.options.incrementListMarker === false
+          ? 0
+          : parent.children.indexOf(node))
+        + bullet;
+    }
+  }
+
+  let size = bullet.length + 1;
+
+  if (
+    listItemIndent === 'tab'
+    || (listItemIndent === 'mixed'
+      && ((parent && parent.type === 'list' && parent.spread) || node.spread))
+  ) {
+    size = Math.ceil(size / 4) * 4;
+  }
+
+  /** @type {Map} */
+  function map(line, index, blank) {
+    if (index) {
+      return (blank ? '' : ' '.repeat(size)) + line;
+    }
+    return (blank ? bullet : bullet + ' '.repeat(size - bullet.length)) + line;
+  }
+
+  const tracker = state.createTracker(info);
+  tracker.move(bullet + ' '.repeat(size - bullet.length));
+  tracker.shift(size);
+  const exit = state.enter('listItem');
+  const value = state.indentLines(
+    state.containerFlow(node, tracker.current()),
+    map,
+  );
+  exit();
+
+  return value;
+}

package/src/mdast2md/ordered-list/to-markdown.js

@@ -1,67 +0,0 @@
-/*
- * Copyright 2021 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 { checkBullet } from 'mdast-util-to-markdown/lib/util/check-bullet.js';
-import { checkListItemIndent } from 'mdast-util-to-markdown/lib/util/check-list-item-indent.js';
-import { containerFlow as flow } from 'mdast-util-to-markdown/lib/util/container-flow.js';
-import { indentLines } from 'mdast-util-to-markdown/lib/util/indent-lines.js';
-
-/**
- * Renders a list item with 'number' support.
- * copy of: https://github.com/syntax-tree/mdast-util-to-markdown/blob/main/lib/handle/list-item.js
- */
-function listItem(node, parent, context) {
-  let bullet = checkBullet(context);
-  const listItemIndent = checkListItemIndent(context);
-  let size;
-
-  if (parent && parent.ordered) {
-    if (node.bullet !== undefined) {
-      bullet = node.bullet;
-    } else {
-      bullet = `${(parent.start > -1 ? parent.start : 1)
-        + (context.options.incrementListMarker === false
-          ? 0
-          : parent.children.indexOf(node))
-      }.`;
-    }
-  }
-
-  size = bullet.length + 1;
-
-  if (
-    listItemIndent === 'tab'
-    || (listItemIndent === 'mixed' && ((parent && parent.spread) || node.spread))
-  ) {
-    size = Math.ceil(size / 4) * 4;
-  }
-
-  function map(line, index, blank) {
-    if (index) {
-      return (blank ? '' : ' '.repeat(size)) + line;
-    }
-    return (blank ? bullet : bullet + ' '.repeat(size - bullet.length)) + line;
-  }
-
-  const exit = context.enter('listItem');
-  const value = indentLines(flow(node, context), map);
-  exit();
-
-  return value;
-}
-
-export default function toMarkdown() {
-  return {
-    handlers: {
-      listItem,
-    },
-  };
-}