@takeshape/util 11.25.1 → 11.28.0

package/dist/draftjs-templates.d.ts

@@ -16,7 +16,7 @@ export type DraftjsImageParams = {
     alignment?: string;
     size?: string;
     assetId: string;
-    linkUrl: string;
+    linkUrl?: string;
     linkIsExternal: boolean;
     depth: number;
     key: number;

package/dist/draftjs-templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"draftjs-templates.d.ts","sourceRoot":"","sources":["../../src/draftjs-templates.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,oBAAoB,EAAC,MAAM,UAAU,CAAC;AAGnD,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,oBAAoB,CAAC;IACnC,QAAQ,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,kBAAkB,KAAG,qBAAqB,GAAG,SAmEpF,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,sBAAsB,KAAG,qBAcpE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAY,mBAAmB,KAAG,qBAsD9D,CAAC"}
+{"version":3,"file":"draftjs-templates.d.ts","sourceRoot":"","sources":["../../src/draftjs-templates.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,oBAAoB,EAAC,MAAM,UAAU,CAAC;AAGnD,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,oBAAoB,CAAC;IACnC,QAAQ,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,kBAAkB,KAAG,qBAAqB,GAAG,SAmEpF,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,sBAAsB,KAAG,qBAcpE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAY,mBAAmB,KAAG,qBAsD9D,CAAC"}

package/dist/draftjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"draftjs.d.ts","sourceRoot":"","sources":["../../src/draftjs.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,oBAAoB,EAA6B,KAAK,MAAM,EAAsB,MAAM,UAAU,CAAC;AAsBhH,MAAM,MAAM,OAAO,GAAG;IACpB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,SAAS,CAAC;AAE/C,KAAK,mBAAmB,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,GAAG,MAAM,CAAC;AA2BX,KAAK,2BAA2B,GAAG,MAAM,CACvC,MAAM,EACN;IACE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,mBAAmB,KAAK,MAAM,CAAC;IAC/C,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,mBAAmB,KAAK,MAAM,CAAC;CACjD,CACF,CAAC;AAiCF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,YAAY;YAEb,MAAM;YACN,MAAM;uBAIT,MAAM,UACL,MAAM;;;IAOf,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,YAAa,oBAAoB,KAAG,oBA2BlE,CAAC;AAEF,wBAAgB,WAAW,CACzB,OAAO,EAAE,oBAAoB,EAC7B,UAAU,CAAC,EAAE,2BAA2B,EACxC,WAAW,CAAC,EAAE,2BAA2B,GACxC,MAAM,CAwER;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CA0DvG;AAmBD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EACpC,MAAM,8BAAqB,GAC1B,MAAM,CAyDR;AA4MD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAgD7D;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEvD;AA8ND;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAkB5D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CA0G9D"}
+{"version":3,"file":"draftjs.d.ts","sourceRoot":"","sources":["../../src/draftjs.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,oBAAoB,EAA6B,KAAK,MAAM,EAAsB,MAAM,UAAU,CAAC;AAoBhH,MAAM,MAAM,OAAO,GAAG;IACpB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,SAAS,CAAC;AAE/C,KAAK,mBAAmB,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,GAAG,MAAM,CAAC;AA2BX,KAAK,2BAA2B,GAAG,MAAM,CACvC,MAAM,EACN;IACE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,mBAAmB,KAAK,MAAM,CAAC;IAC/C,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,mBAAmB,KAAK,MAAM,CAAC;CACjD,CACF,CAAC;AAiCF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,YAAY;YAEb,MAAM;YACN,MAAM;uBAIT,MAAM,UACL,MAAM;;;IAOf,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,YAAa,oBAAoB,KAAG,oBA2BlE,CAAC;AAEF,wBAAgB,WAAW,CACzB,OAAO,EAAE,oBAAoB,EAC7B,UAAU,CAAC,EAAE,2BAA2B,EACxC,WAAW,CAAC,EAAE,2BAA2B,GACxC,MAAM,CAwER;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CA0DvG;AAmBD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EACpC,MAAM,8BAAqB,GAC1B,MAAM,CAyDR;AAwND,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAgD7D;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEvD;AA0OD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAkB5D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CA0G9D"}

package/dist/draftjs.js

@@ -31,9 +31,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * to be shared between the draftjs / mdx implementations, which span the client / server differently.
  */
 
-// With @types/htmlparser2 it says parseDOM is not exported; excluding types for now
-// @ts-expect-error Untyped
-
 const SUPERSCRIPT_MARKER = 'TEMPORARY_SUPERSCRIPT_MARKER_TLfDNyf7VYKDduyL';
 const SUBSCRIPT_MARKER = 'TEMPORARY_SUBSCRIPT_MARKER_K5VrdPEzyQyy2RcY';
 const INSERT_MARKER = 'TEMPORARY_INSERT_MARKER_FSYdr8m8CS7YLb8y';
@@ -360,31 +357,31 @@ function parseFigureClass(className) {
 // eslint-disable-next-line complexity
 function htmlDomToDraftjsImage(dom, item, entityKeyGenerator) {
   for (const figure of dom) {
-    if (figure.type === 'tag' && figure.name === 'figure') {
+    if (figure.type === _htmlparser.ElementType.Tag && figure.name === 'figure') {
       let link;
       const figureChildOne = figure.children?.[0];
       const figureChildTwo = figure.children?.[1];
-      if (figureChildOne?.type === 'tag' && figureChildOne?.name === 'a') {
+      if (figureChildOne?.type === _htmlparser.ElementType.Tag && figureChildOne?.name === 'a') {
         link = figureChildOne;
       }
       let figcaption;
-      if (figureChildOne?.type === 'tag' && figureChildOne?.name === 'figcaption') {
+      if (figureChildOne?.type === _htmlparser.ElementType.Tag && figureChildOne?.name === 'figcaption') {
         figcaption = figureChildOne;
-      } else if (figureChildTwo?.type === 'tag' && figureChildTwo?.name === 'figcaption') {
+      } else if (figureChildTwo?.type === _htmlparser.ElementType.Tag && figureChildTwo?.name === 'figcaption') {
         figcaption = figure.children[1];
       }
       const img = link ? link.children[0] : figure.children[0];
-      if (img?.type !== 'tag' || img?.name !== 'img') {
+      if (img?.type !== _htmlparser.ElementType.Tag || img?.name !== 'img') {
         return;
       }
-      const figcaptionChild = figcaption?.children[0];
+      const figcaptionChild = figcaption?.type === _htmlparser.ElementType.Tag ? figcaption?.children[0] : undefined;
       let caption;
-      if (figcaptionChild?.type === 'tag' && figcaptionChild?.name === 'span' && figcaptionChild?.attribs.class === 'caption') {
+      if (figcaptionChild?.type === _htmlparser.ElementType.Tag && figcaptionChild?.name === 'span' && figcaptionChild?.attribs.class === 'caption') {
         caption = figcaptionChild;
       }
-      const captionChildThree = figcaption?.children[2];
+      const captionChildThree = figcaption?.type === _htmlparser.ElementType.Tag ? figcaption?.children[2] : undefined;
       let credit;
-      if (captionChildThree?.type === 'tag' && captionChildThree?.name === 'span' && captionChildThree?.attribs.class === 'credit') {
+      if (captionChildThree?.type === _htmlparser.ElementType.Tag && captionChildThree?.name === 'span' && captionChildThree?.attribs.class === 'credit') {
         credit = captionChildThree;
       }
       const {
@@ -392,8 +389,8 @@ function htmlDomToDraftjsImage(dom, item, entityKeyGenerator) {
         size
       } = parseFigureClass(figure.attribs.class);
       return (0, _draftjsTemplates.getDraftjsImage)({
-        captionText: caption?.children[0].data ?? '',
-        creditText: credit?.children[0].data ?? '',
+        captionText: caption?.children[0].type === _htmlparser.ElementType.Text ? caption.children[0].data ?? '' : '',
+        creditText: credit?.children[0].type === _htmlparser.ElementType.Text ? credit?.children[0].data ?? '' : '',
         alignment,
         size,
         assetId: getAssetIdFromImageSrc(img.attribs.src),
@@ -408,9 +405,9 @@ function htmlDomToDraftjsImage(dom, item, entityKeyGenerator) {
 }
 function htmlDomToOembed(dom, item, entityKeyGenerator) {
   for (const oembedDiv of dom) {
-    if (oembedDiv.type === 'tag' && oembedDiv.name === 'div' && oembedDiv.attribs.class === 'oembed') {
+    if (oembedDiv.type === _htmlparser.ElementType.Tag && oembedDiv.name === 'div' && oembedDiv.attribs.class === 'oembed') {
       const blockquote = oembedDiv.children[0];
-      if (blockquote?.type !== 'tag' || blockquote?.name !== 'blockquote') {
+      if (blockquote?.type !== _htmlparser.ElementType.Tag || blockquote?.name !== 'blockquote') {
         return;
       }
       const script = oembedDiv.children[2];
@@ -427,7 +424,12 @@ function htmlDomToOembed(dom, item, entityKeyGenerator) {
 }
 function mdxToDraftjsOembed(item, entityKeyGenerator) {
   if (item.content.startsWith(`<${mdxShortcodePrefix('Oembed')}`)) {
-    const dom = (0, _htmlparser.parseDOM)(item.content)[0];
+    const dom = (0, _htmlparser.parseDOM)(item.content, {
+      decodeEntities: true
+    })[0];
+    if (dom.type !== _htmlparser.ElementType.Tag) {
+      return;
+    }
     return (0, _draftjsTemplates.getDraftjsOembed)({
       html: (0, _unescape.default)(dom.attribs.html),
       width: dom.attribs.width ? Number(dom.attribs.width) : undefined,
@@ -447,7 +449,7 @@ function mdxToDraftjsOembed(item, entityKeyGenerator) {
 }
 function htmlDomToPullquote(dom, item) {
   for (const pullquote of dom) {
-    if (pullquote.type === 'tag' && pullquote.name === 'aside' && pullquote.attribs.style === pullquoteStyle) {
+    if (pullquote.type === _htmlparser.ElementType.Tag && pullquote.name === 'aside' && pullquote.attribs.style === pullquoteStyle) {
       const text = pullquote.children[0];
       if (text?.type !== 'text') {
         return;
@@ -520,7 +522,9 @@ function mdToDraftjs(mdx) {
       if (item === undefined) {
         return getDraftjsEmpty();
       }
-      const dom = (0, _htmlparser.parseDOM)(item.content);
+      const dom = (0, _htmlparser.parseDOM)(item.content, {
+        decodeEntities: false
+      });
       const image = htmlDomToDraftjsImage(dom, item, entityKeyGenerator);
       if (image) {
         Object.assign(entities, image.entities);
@@ -562,7 +566,12 @@ function mdxToBr(item) {
 }
 function mdxToLinkData(item) {
   if (item.content.startsWith('<TSExternalLink')) {
-    const dom = (0, _htmlparser.parseDOM)(item.content)[0];
+    const dom = (0, _htmlparser.parseDOM)(item.content, {
+      decodeEntities: false
+    })[0];
+    if (dom.type !== _htmlparser.ElementType.Tag) {
+      return;
+    }
     return {
       url: dom.attribs.href,
       target: '_blank',
@@ -572,7 +581,12 @@ function mdxToLinkData(item) {
 }
 function mdxToDraftjsImage(item, entityKeyGenerator) {
   if (item.content.startsWith(`<${mdxShortcodePrefix('Image')}`)) {
-    const dom = (0, _htmlparser.parseDOM)(item.content)[0];
+    const dom = (0, _htmlparser.parseDOM)(item.content, {
+      decodeEntities: false
+    })[0];
+    if (dom.type !== _htmlparser.ElementType.Tag) {
+      return;
+    }
     return (0, _draftjsTemplates.getDraftjsImage)({
       captionText: (0, _unescape.default)(dom.attribs.caption).replace(/<\/?p>/g, ''),
       creditText: (0, _unescape.default)(dom.attribs.credit).replace(/<\/?p>/g, ''),
@@ -589,7 +603,12 @@ function mdxToDraftjsImage(item, entityKeyGenerator) {
 }
 function mdxToDraftjsPullquote(item) {
   if (item.content.startsWith(`<${mdxShortcodePrefix('Pullquote')}`)) {
-    const dom = (0, _htmlparser.parseDOM)(item.content)[0];
+    const dom = (0, _htmlparser.parseDOM)(item.content, {
+      decodeEntities: false
+    })[0];
+    if (dom.type !== _htmlparser.ElementType.Tag) {
+      return;
+    }
     return (0, _draftjsTemplates.getDraftjsPullquote)({
       text: (0, _unescape.default)(dom.attribs.text),
       depth: item.level

package/es/draftjs.js

@@ -4,9 +4,7 @@
  */
 
 import { draftToMarkdown, markdownToDraft } from 'markdown-draft-js';
-// With @types/htmlparser2 it says parseDOM is not exported; excluding types for now
-// @ts-expect-error Untyped
-import { parseDOM } from 'htmlparser2';
+import { ElementType, parseDOM } from 'htmlparser2';
 import Url from 'url-parse';
 import render from 'dom-serializer';
 import shortid from 'shortid';
@@ -342,31 +340,31 @@ function parseFigureClass(className) {
 // eslint-disable-next-line complexity
 function htmlDomToDraftjsImage(dom, item, entityKeyGenerator) {
   for (const figure of dom) {
-    if (figure.type === 'tag' && figure.name === 'figure') {
+    if (figure.type === ElementType.Tag && figure.name === 'figure') {
       let link;
       const figureChildOne = figure.children?.[0];
       const figureChildTwo = figure.children?.[1];
-      if (figureChildOne?.type === 'tag' && figureChildOne?.name === 'a') {
+      if (figureChildOne?.type === ElementType.Tag && figureChildOne?.name === 'a') {
         link = figureChildOne;
       }
       let figcaption;
-      if (figureChildOne?.type === 'tag' && figureChildOne?.name === 'figcaption') {
+      if (figureChildOne?.type === ElementType.Tag && figureChildOne?.name === 'figcaption') {
         figcaption = figureChildOne;
-      } else if (figureChildTwo?.type === 'tag' && figureChildTwo?.name === 'figcaption') {
+      } else if (figureChildTwo?.type === ElementType.Tag && figureChildTwo?.name === 'figcaption') {
         figcaption = figure.children[1];
       }
       const img = link ? link.children[0] : figure.children[0];
-      if (img?.type !== 'tag' || img?.name !== 'img') {
+      if (img?.type !== ElementType.Tag || img?.name !== 'img') {
         return;
       }
-      const figcaptionChild = figcaption?.children[0];
+      const figcaptionChild = figcaption?.type === ElementType.Tag ? figcaption?.children[0] : undefined;
       let caption;
-      if (figcaptionChild?.type === 'tag' && figcaptionChild?.name === 'span' && figcaptionChild?.attribs.class === 'caption') {
+      if (figcaptionChild?.type === ElementType.Tag && figcaptionChild?.name === 'span' && figcaptionChild?.attribs.class === 'caption') {
         caption = figcaptionChild;
       }
-      const captionChildThree = figcaption?.children[2];
+      const captionChildThree = figcaption?.type === ElementType.Tag ? figcaption?.children[2] : undefined;
       let credit;
-      if (captionChildThree?.type === 'tag' && captionChildThree?.name === 'span' && captionChildThree?.attribs.class === 'credit') {
+      if (captionChildThree?.type === ElementType.Tag && captionChildThree?.name === 'span' && captionChildThree?.attribs.class === 'credit') {
         credit = captionChildThree;
       }
       const {
@@ -374,8 +372,8 @@ function htmlDomToDraftjsImage(dom, item, entityKeyGenerator) {
         size
       } = parseFigureClass(figure.attribs.class);
       return getDraftjsImage({
-        captionText: caption?.children[0].data ?? '',
-        creditText: credit?.children[0].data ?? '',
+        captionText: caption?.children[0].type === ElementType.Text ? caption.children[0].data ?? '' : '',
+        creditText: credit?.children[0].type === ElementType.Text ? credit?.children[0].data ?? '' : '',
         alignment,
         size,
         assetId: getAssetIdFromImageSrc(img.attribs.src),
@@ -390,9 +388,9 @@ function htmlDomToDraftjsImage(dom, item, entityKeyGenerator) {
 }
 function htmlDomToOembed(dom, item, entityKeyGenerator) {
   for (const oembedDiv of dom) {
-    if (oembedDiv.type === 'tag' && oembedDiv.name === 'div' && oembedDiv.attribs.class === 'oembed') {
+    if (oembedDiv.type === ElementType.Tag && oembedDiv.name === 'div' && oembedDiv.attribs.class === 'oembed') {
       const blockquote = oembedDiv.children[0];
-      if (blockquote?.type !== 'tag' || blockquote?.name !== 'blockquote') {
+      if (blockquote?.type !== ElementType.Tag || blockquote?.name !== 'blockquote') {
         return;
       }
       const script = oembedDiv.children[2];
@@ -409,7 +407,12 @@ function htmlDomToOembed(dom, item, entityKeyGenerator) {
 }
 function mdxToDraftjsOembed(item, entityKeyGenerator) {
   if (item.content.startsWith(`<${mdxShortcodePrefix('Oembed')}`)) {
-    const dom = parseDOM(item.content)[0];
+    const dom = parseDOM(item.content, {
+      decodeEntities: true
+    })[0];
+    if (dom.type !== ElementType.Tag) {
+      return;
+    }
     return getDraftjsOembed({
       html: unescape(dom.attribs.html),
       width: dom.attribs.width ? Number(dom.attribs.width) : undefined,
@@ -429,7 +432,7 @@ function mdxToDraftjsOembed(item, entityKeyGenerator) {
 }
 function htmlDomToPullquote(dom, item) {
   for (const pullquote of dom) {
-    if (pullquote.type === 'tag' && pullquote.name === 'aside' && pullquote.attribs.style === pullquoteStyle) {
+    if (pullquote.type === ElementType.Tag && pullquote.name === 'aside' && pullquote.attribs.style === pullquoteStyle) {
       const text = pullquote.children[0];
       if (text?.type !== 'text') {
         return;
@@ -502,7 +505,9 @@ export function mdToDraftjs(mdx) {
       if (item === undefined) {
         return getDraftjsEmpty();
       }
-      const dom = parseDOM(item.content);
+      const dom = parseDOM(item.content, {
+        decodeEntities: false
+      });
       const image = htmlDomToDraftjsImage(dom, item, entityKeyGenerator);
       if (image) {
         Object.assign(entities, image.entities);
@@ -544,7 +549,12 @@ function mdxToBr(item) {
 }
 function mdxToLinkData(item) {
   if (item.content.startsWith('<TSExternalLink')) {
-    const dom = parseDOM(item.content)[0];
+    const dom = parseDOM(item.content, {
+      decodeEntities: false
+    })[0];
+    if (dom.type !== ElementType.Tag) {
+      return;
+    }
     return {
       url: dom.attribs.href,
       target: '_blank',
@@ -554,7 +564,12 @@ function mdxToLinkData(item) {
 }
 function mdxToDraftjsImage(item, entityKeyGenerator) {
   if (item.content.startsWith(`<${mdxShortcodePrefix('Image')}`)) {
-    const dom = parseDOM(item.content)[0];
+    const dom = parseDOM(item.content, {
+      decodeEntities: false
+    })[0];
+    if (dom.type !== ElementType.Tag) {
+      return;
+    }
     return getDraftjsImage({
       captionText: unescape(dom.attribs.caption).replace(/<\/?p>/g, ''),
       creditText: unescape(dom.attribs.credit).replace(/<\/?p>/g, ''),
@@ -571,7 +586,12 @@ function mdxToDraftjsImage(item, entityKeyGenerator) {
 }
 function mdxToDraftjsPullquote(item) {
   if (item.content.startsWith(`<${mdxShortcodePrefix('Pullquote')}`)) {
-    const dom = parseDOM(item.content)[0];
+    const dom = parseDOM(item.content, {
+      decodeEntities: false
+    })[0];
+    if (dom.type !== ElementType.Tag) {
+      return;
+    }
     return getDraftjsPullquote({
       text: unescape(dom.attribs.text),
       depth: item.level

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/util",
-  "version": "11.25.1",
+  "version": "11.28.0",
   "description": "Shared utilities",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -25,7 +25,7 @@
     "dom-serializer": "0.2.2",
     "draft-js": "^0.11.7",
     "he": "^1.2.0",
-    "htmlparser2": "^3.10.0",
+    "htmlparser2": "^9.1.0",
     "lodash": "^4.17.21",
     "markdown-draft-js": "github:incompl/markdown-draft-js#deterministic-entity-keys-with-lib",
     "mime-types": "^2.1.27",
@@ -33,7 +33,7 @@
     "shortid": "^2.2.16",
     "tiny-invariant": "^1.2.0",
     "url-parse": "^1.5.3",
-    "@takeshape/routing": "11.25.1"
+    "@takeshape/routing": "11.28.0"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.9",