@valbuild/shared 0.62.6 → 0.63.0

package/internal/dist/valbuild-shared-internal.esm.js

@@ -1,5 +1,4 @@
-import { VAL_EXTENSION, Internal, FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, RT_IMAGE_TAG } from '@valbuild/core';
-import * as marked from 'marked';
+import { Internal, VAL_EXTENSION, FILE_REF_PROP } from '@valbuild/core';
 import { z } from 'zod';
 import { result } from '@valbuild/core/fp';
 
@@ -34,6 +33,28 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
+function ownKeys(e, r) {
+  var t = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
+  }
+  return t;
+}
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+    });
+  }
+  return e;
+}
+
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
@@ -101,22 +122,6 @@ function _createForOfIteratorHelper(o, allowArrayLike) {
   };
 }
 
-function _arrayWithoutHoles(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-}
-
-function _iterableToArray(iter) {
-  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-
-function _nonIterableSpread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-function _toConsumableArray(arr) {
-  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-}
-
 function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
@@ -881,184 +886,183 @@ function filenameToMimeType(filename) {
 
 function remirrorToRichTextSource(node) {
   var files = {};
-  var markdownIRBlocks = node.content.map(function (child) {
-    return createBlock(child, files);
-  });
-  return fromIRToRichTextSource(markdownIRBlocks, files);
+  var blocks = [];
+  var i = 0;
+  var _iterator = _createForOfIteratorHelper(node.content),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var child = _step.value;
+      var block = convertBlock([(i++).toString()], child, files);
+      blocks.push(block);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return {
+    blocks: blocks,
+    files: files
+  };
 }
-function createBlock(node, files) {
+function convertBlock(path, node, files) {
   if (node.type === "heading") {
     var _node$attrs, _node$content;
-    var headingTag = "";
     var depth = ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.level) || 1;
     if (Number.isNaN(depth)) {
       throw new Error("Invalid header depth");
     }
-    for (var i = 0; i < Number(depth); i++) {
-      headingTag += "#";
-    }
-    var headingText = ["".concat(headingTag, " ")];
     return {
-      type: "block",
-      children: headingText.concat.apply(headingText, _toConsumableArray(((_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.map(function (child) {
-        return transformLeafNode(child, files);
-      })) || []))
-    };
-  } else if (node.type === "paragraph") {
-    var _node$content2;
-    if (!node.content || ((_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.length) === 0) {
-      return {
-        type: "block",
-        children: ["<br />"]
-      };
-    }
-    return {
-      type: "block",
-      children: node.content.map(function (child) {
-        return transformLeafNode(child, files);
-      })
-    };
-  } else if (node.type === "bulletList" || node.type === "orderedList") {
-    var _node$content3;
-    return {
-      type: "block",
-      children: ((_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.flatMap(function (child, i) {
-        return formatListItemNode(getListPrefix(node), child, 0, files, i === 0);
+      tag: "h".concat(depth),
+      children: ((_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.map(function (child, i) {
+        return convertHeadingChild(path.concat("children", i.toString()), child, files);
       })) || []
     };
+  } else if (node.type === "paragraph") {
+    return convertParagraph(path, node, files);
+  } else if (node.type === "bulletList") {
+    return convertBulletList(path, node, files);
+  } else if (node.type === "orderedList") {
+    return convertOrderedList(path, node, files);
   } else {
     var exhaustiveCheck = node;
     throw new Error("Unhandled node type: ".concat("type" in exhaustiveCheck ? "exhaustiveCheck.type" : "unknown"));
   }
 }
-function fromIRToRichTextSource(markdownIRBlocks, files) {
-  var templateStrings = ["\n"];
-  var exprs = [];
-  for (var blockIdx = 0; blockIdx < markdownIRBlocks.length; blockIdx++) {
-    var block = markdownIRBlocks[blockIdx];
-    var _iterator = _createForOfIteratorHelper(block.children),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var child = _step.value;
-        if (typeof child === "string") {
-          templateStrings[templateStrings.length - 1] += child;
-        } else {
-          if (child._type === "file") {
-            exprs.push(child);
-          } else if (child._type === "link") {
-            exprs.push(child);
-          } else {
-            var exhaustiveCheck = child;
-            throw new Error("Unexpected node type: ".concat(JSON.stringify(exhaustiveCheck, null, 2)));
-          }
-          templateStrings.push("");
-        }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    if (blockIdx === markdownIRBlocks.length - 1) {
-      templateStrings[templateStrings.length - 1] += "\n";
-    } else {
-      templateStrings[templateStrings.length - 1] += "\n\n";
-    }
+function convertHeadingChild(path, node, files) {
+  if (node.type === "text") {
+    return convertTextNode(node);
+  } else if (node.type === "hardBreak") {
+    return {
+      tag: "br"
+    };
+  } else if (node.type === "image") {
+    return convertImageNode(path, node, files);
+  } else {
+    var exhaustiveCheck = node;
+    throw new Error("Unexpected heading child type: ".concat(JSON.stringify(exhaustiveCheck, null, 2)));
   }
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "richtext"), "templateStrings", templateStrings), "exprs", exprs), "files", files);
 }
-function formatText(node) {
-  var _node$marks;
-  var classes = ((_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.flatMap(function (mark) {
-    if (mark.type === "bold") {
-      return ["bold"];
-    } else if (mark.type === "italic") {
-      return ["italic"];
-    } else if (mark.type === "strike") {
-      return ["line-through"];
-    }
-    return [];
-  })) || [];
-  var text = node.text.trimStart();
-  var prefixWS = node.text.length - text.length;
-  text = text.trimEnd();
-  var suffixWS = node.text.length - text.length - prefixWS;
-  if (classes.includes("bold") && classes.includes("italic")) {
-    text = "***".concat(text, "***");
-  } else if (classes.includes("bold")) {
-    text = "**".concat(text, "**");
-  } else if (classes.includes("italic")) {
-    text = "_".concat(text, "_");
-  }
-  if (classes.includes("line-through")) {
-    text = "~~".concat(text, "~~");
-  }
-  // TODO:
-  // text = splitIntoChunks(text);
-  return "".concat(" ".repeat(prefixWS)).concat(text).concat(" ".repeat(suffixWS));
+function convertParagraph(path, child, files) {
+  var _child$content;
+  return {
+    tag: "p",
+    children: ((_child$content = child.content) === null || _child$content === void 0 ? void 0 : _child$content.map(function (child, i) {
+      if (child.type === "text") {
+        return convertTextNode(child);
+      } else if (child.type === "hardBreak") {
+        return {
+          tag: "br"
+        };
+      } else if (child.type === "image") {
+        return convertImageNode(path.concat("children", i.toString()), child, files);
+      }
+      var exhaustiveCheck = child;
+      throw new Error("Unexpected paragraph child type: ".concat(JSON.stringify(exhaustiveCheck, null, 2)));
+    })) || []
+  };
 }
-function transformLeafNode(node, files) {
+function convertTextNode(node) {
   if (node.type === "text") {
-    var _node$marks2;
-    var linkMark = (_node$marks2 = node.marks) === null || _node$marks2 === void 0 ? void 0 : _node$marks2.find(function (mark) {
+    var _node$marks, _node$marks2;
+    var styles = ((_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.flatMap(function (mark) {
+      if (mark.type !== "link") {
+        if (mark.type === "strike") {
+          return ["line-through"];
+        }
+        return [mark.type];
+      } else {
+        return [];
+      }
+    })) || [];
+    if ((_node$marks2 = node.marks) !== null && _node$marks2 !== void 0 && _node$marks2.some(function (mark) {
       return mark.type === "link";
-    });
-    if ((linkMark === null || linkMark === void 0 ? void 0 : linkMark.type) === "link") {
+    })) {
+      var _node$marks$find2;
+      if (styles.length > 0) {
+        var _node$marks$find;
+        return {
+          tag: "a",
+          href: ((_node$marks$find = node.marks.find(function (mark) {
+            return mark.type === "link";
+          })) === null || _node$marks$find === void 0 ? void 0 : _node$marks$find.attrs.href) || "",
+          children: [{
+            tag: "span",
+            styles: styles,
+            children: [node.text]
+          }]
+        };
+      }
       return {
-        _type: "link",
-        href: linkMark.attrs.href,
-        children: [formatText(node)]
+        tag: "a",
+        href: ((_node$marks$find2 = node.marks.find(function (mark) {
+          return mark.type === "link";
+        })) === null || _node$marks$find2 === void 0 ? void 0 : _node$marks$find2.attrs.href) || "",
+        children: [node.text]
       };
     }
-    return formatText(node);
-  } else if (node.type === "hardBreak") {
-    return "<br />";
-  } else if (node.type === "image") {
-    return fromRemirrorImageNode(node, files);
+    if (styles.length > 0) {
+      return {
+        tag: "span",
+        styles: styles,
+        children: [node.text]
+      };
+    }
+    return node.text;
   } else {
-    var exhaustiveCheck = node;
-    throw new Error("Unexpected node type: ".concat(JSON.stringify(exhaustiveCheck)));
+    var exhaustiveCheck = node.type;
+    throw new Error("Unexpected node type: ".concat(exhaustiveCheck));
   }
 }
-function formatListItemNode(listPrefix, node, indent, files) {
-  var _node$content4, _node$content5;
-  var isFirstTopLevelListItem = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  var newLine = isFirstTopLevelListItem ? "" : "\n";
-  var prefix = ["".concat(newLine).concat(" ".repeat(indent)).concat(listPrefix)];
-  if (!(((_node$content4 = node.content) === null || _node$content4 === void 0 || (_node$content4 = _node$content4[0]) === null || _node$content4 === void 0 ? void 0 : _node$content4.type) === "bulletList" || ((_node$content5 = node.content) === null || _node$content5 === void 0 || (_node$content5 = _node$content5[0]) === null || _node$content5 === void 0 ? void 0 : _node$content5.type) === "orderedList")) {
-    prefix.push(" ");
-  }
-  return prefix.concat((node.content || []).flatMap(function (child, i) {
-    if (child.type === "bulletList" || child.type === "orderedList") {
-      return (child.content || []).flatMap(function (subChild) {
-        return formatListItemNode(getListPrefix(child), subChild, indent + 4, files);
-      });
-    } else {
-      return (child.content || []).flatMap(function (subChild) {
-        var _child$content, _child$content2;
-        var res = [];
-        if ((_child$content = child.content) !== null && _child$content !== void 0 && _child$content.length && ((_child$content2 = child.content) === null || _child$content2 === void 0 ? void 0 : _child$content2.length) > 0 && i > 0) {
-          res.push("<br />\n");
-        }
-        res.push(transformLeafNode(subChild, files));
-        return res;
-      });
-    }
-  }));
+function convertListItem(path, child, files) {
+  var _child$content2;
+  return {
+    tag: "li",
+    children: ((_child$content2 = child.content) === null || _child$content2 === void 0 ? void 0 : _child$content2.map(function (child, i) {
+      if (child.type === "paragraph") {
+        return convertParagraph(path.concat("children", i.toString()), child, files);
+      } else if (child.type === "bulletList") {
+        return convertBulletList(path.concat("children", i.toString()), child, files);
+      } else if (child.type === "orderedList") {
+        return convertOrderedList(path.concat("children", i.toString()), child, files);
+      } else {
+        var exhaustiveCheck = child;
+        throw new Error("Unexpected list child type: ".concat(exhaustiveCheck));
+      }
+    })) || []
+  };
 }
-function getListPrefix(node) {
-  if (node.type === "bulletList") {
-    return "-";
-  } else if (node.type === "orderedList") {
-    return "1.";
-  } else {
-    var exhaustiveCheck = node;
-    throw new Error("Unhandled list node: ".concat(JSON.stringify(exhaustiveCheck)));
-  }
+function convertBulletList(path, node, files) {
+  var _node$content2;
+  return {
+    tag: "ul",
+    children: ((_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.map(function (child, i) {
+      if (child.type === "listItem") {
+        return convertListItem(path.concat("children", i.toString()), child, files);
+      } else {
+        var exhaustiveCheck = child.type;
+        throw new Error("Unexpected bullet list child type: ".concat(exhaustiveCheck));
+      }
+    })) || []
+  };
+}
+function convertOrderedList(path, node, files) {
+  var _node$content3;
+  return {
+    tag: "ol",
+    children: ((_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.map(function (child, i) {
+      if (child.type === "listItem") {
+        return convertListItem(path.concat("children", i.toString()), child, files);
+      } else {
+        var exhaustiveCheck = child.type;
+        throw new Error("Unexpected ordered list child type: ".concat(exhaustiveCheck));
+      }
+    })) || []
+  };
 }
 var textEncoder = new TextEncoder();
-function fromRemirrorImageNode(node, files) {
+function convertImageNode(path, node, files) {
   if (node.attrs && node.attrs.src.startsWith("data:")) {
     var sha256 = Internal.getSHA256Hash(textEncoder.encode(node.attrs.src));
     var mimeType = getMimeType(node.attrs.src);
@@ -1068,22 +1072,43 @@ function fromRemirrorImageNode(node, files) {
     var fileExt = mimeTypeToFileExt(mimeType);
     var fileName = node.attrs.fileName || "".concat(sha256, ".").concat(fileExt);
     var filePath = "/public/".concat(fileName);
-    files[filePath] = node.attrs.src;
-    return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, filePath), FILE_REF_SUBTYPE_TAG, RT_IMAGE_TAG), "metadata", {
-      width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
-      height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
-      sha256: sha256 || "",
-      mimeType: mimeType
-    });
+    var existingFilesEntry = files[filePath];
+    var thisPath = path
+    // file is added as src (see below):
+    .concat("src");
+    if (existingFilesEntry) {
+      existingFilesEntry.patchPaths.push(thisPath);
+    } else {
+      files[filePath] = {
+        value: node.attrs.src,
+        patchPaths: [thisPath]
+      };
+    }
+    return {
+      tag: "img",
+      src: _defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, filePath), "metadata", {
+        width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
+        height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
+        sha256: sha256 || "",
+        mimeType: mimeType
+      })
+    };
   } else if (node.attrs) {
     var _sha = getParam("sha256", node.attrs.src);
+    var patchId = getParam("patch_id", node.attrs.src);
     var noParamsSrc = node.attrs.src.split("?")[0];
-    return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, "/public".concat(node.attrs.src.split("?")[0])), FILE_REF_SUBTYPE_TAG, RT_IMAGE_TAG), "metadata", {
-      width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
-      height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
-      sha256: _sha || "",
-      mimeType: noParamsSrc && filenameToMimeType(noParamsSrc) || ""
-    });
+    var tag = {
+      tag: "img",
+      src: _objectSpread2(_defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, "/public".concat(node.attrs.src.split("?")[0])), "metadata", {
+        width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
+        height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
+        sha256: _sha || "",
+        mimeType: noParamsSrc && filenameToMimeType(noParamsSrc) || ""
+      }), patchId ? {
+        patch_id: patchId
+      } : {})
+    };
+    return tag;
   } else {
     throw new Error("Invalid image node (no attrs): " + JSON.stringify(node));
   }
@@ -1101,188 +1126,6 @@ function getParam(param, url) {
   return undefined;
 }
 
-var VAL_START_TAG_PREFIX = '<val value="';
-var VAL_START_TAG_SUFFIX = '">';
-var VAL_END_TAG = "</val>";
-function parseTokens(tokens, sourceNodes, cursor) {
-  var insideList = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var children = [];
-  function merge(token, clazz) {
-    var parsedTokens = parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0);
-    children.push({
-      tag: "span",
-      classes: [clazz].concat(parsedTokens.children.flatMap(function (child) {
-        return typeof child === "string" ? [] : child.classes;
-      })),
-      children: parsedTokens.children.flatMap(function (child) {
-        return typeof child === "string" ? child : child.children;
-      })
-    });
-  }
-  var _loop = function _loop() {
-      var token = tokens[cursor];
-      if (token.type === "heading") {
-        children.push({
-          tag: "h".concat(token.depth),
-          children: parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0).children
-        });
-      } else if (token.type === "paragraph") {
-        children.push({
-          tag: "p",
-          children: parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0).children
-        });
-      } else if (token.type === "strong") {
-        merge(token, "bold");
-      } else if (token.type === "em") {
-        merge(token, "italic");
-      } else if (token.type === "del") {
-        merge(token, "line-through");
-      } else if (token.type === "text") {
-        if ("tokens" in token && Array.isArray(token.tokens)) {
-          children.push.apply(children, _toConsumableArray(parseTokens(token.tokens, sourceNodes, cursor, insideList).children));
-        } else {
-          if (insideList && typeof token.raw === "string") {
-            var lines = token.raw.split("\n");
-            var tags = lines.flatMap(function (line, i) {
-              if (i === lines.length - 1) return [line];
-              if (i === lines.length - 1 && line === "") return [];
-              if (line === "") return {
-                tag: "br"
-              };
-              return [line, {
-                tag: "br"
-              }];
-            });
-            children.push.apply(children, _toConsumableArray(tags));
-          } else {
-            children.push(token.raw);
-          }
-        }
-      } else if (token.type === "list") {
-        children.push({
-          tag: token.ordered ? "ol" : "ul",
-          children: parseTokens(token.items, sourceNodes, 0).children
-        });
-      } else if (token.type === "list_item") {
-        children.push({
-          tag: "li",
-          children: parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0, true).children
-        });
-      } else if (token.type === "space") ; else if (token.type === "html") {
-        if (token.text === VAL_END_TAG) {
-          return {
-            v: {
-              children: children,
-              cursor: cursor
-            }
-          };
-        }
-        var suffixIndex = token.text.indexOf(VAL_START_TAG_SUFFIX);
-        if (token.text.startsWith(VAL_START_TAG_PREFIX) && suffixIndex > -1) {
-          var number = Number(token.text.slice(VAL_START_TAG_PREFIX.length, suffixIndex));
-          if (Number.isNaN(number)) {
-            throw Error("Illegal val intermediate node: ".concat(JSON.stringify(token)));
-          }
-          var _parseTokens = parseTokens(tokens.map(function (token) {
-              if (token.type === "link" || token.type === "list") {
-                return {
-                  type: "text",
-                  raw: token.raw,
-                  text: token.raw
-                };
-              }
-              return token;
-            }), sourceNodes, cursor + 1),
-            subChildren = _parseTokens.children,
-            subCursor = _parseTokens.cursor;
-          var sourceNode = sourceNodes[number];
-          if (sourceNode._type === "link") {
-            children.push({
-              tag: "a",
-              href: sourceNode.href,
-              children: subChildren
-            });
-          } else if (sourceNode._type === "file") {
-            var _sourceNode$metadata, _sourceNode$metadata2, _sourceNode$metadata3;
-            children.push({
-              tag: "img",
-              src: Internal.convertFileSource(sourceNode).url,
-              width: (_sourceNode$metadata = sourceNode.metadata) === null || _sourceNode$metadata === void 0 ? void 0 : _sourceNode$metadata.width,
-              height: (_sourceNode$metadata2 = sourceNode.metadata) === null || _sourceNode$metadata2 === void 0 ? void 0 : _sourceNode$metadata2.height,
-              mimeType: (_sourceNode$metadata3 = sourceNode.metadata) === null || _sourceNode$metadata3 === void 0 ? void 0 : _sourceNode$metadata3.mimeType
-            });
-          }
-          cursor = subCursor;
-        }
-        var br_html_regex = /<br\s*\/?>/gi; // matches <br>, <br/>, <br />; case insensitive
-        if (token.text.trim().match(br_html_regex)) {
-          var _tokens;
-          children.push({
-            tag: "br"
-          });
-          if (((_tokens = tokens[cursor + 1]) === null || _tokens === void 0 ? void 0 : _tokens.raw.trim()) === "") {
-            // if next token is a new line or white-spaces, skip it
-            // this typically means we have a <br> AND a new line, which, semantically, is just a <br>
-            cursor++;
-          }
-        }
-      } else if (token.type === "link") {
-        if (token.raw === token.href) {
-          // avoid auto-linking (provided by github flavoured markdown, but we want strikethrough so keep it enabled)
-          children.push(token.raw);
-        } else {
-          children.push({
-            tag: "a",
-            href: token.href,
-            children: parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0).children
-          });
-        }
-      } else if (token.type === "br") {
-        children.push({
-          tag: "br"
-        });
-      } else {
-        console.error("Could not parse markdown: unsupported token type: ".concat(token.type, ". Found: ").concat(token.raw));
-      }
-      cursor++;
-    },
-    _ret;
-  while (cursor < tokens.length) {
-    _ret = _loop();
-    if (_ret) return _ret.v;
-  }
-  return {
-    children: children,
-    cursor: cursor
-  };
-}
-function parseRichTextSource(_ref) {
-  var templateStrings = _ref.templateStrings,
-    nodes = _ref.exprs;
-  // TODO: validate that templateStrings does not contain VAL_NODE_PREFIX
-  var inputText = templateStrings.flatMap(function (templateString, i) {
-    var node = nodes[i];
-    if (node) {
-      if (node[VAL_EXTENSION] === "link") {
-        return templateString.concat("".concat(VAL_START_TAG_PREFIX).concat(i).concat(VAL_START_TAG_SUFFIX).concat(node.children[0]).concat(VAL_END_TAG));
-      } else {
-        return templateString.concat("".concat(VAL_START_TAG_PREFIX).concat(i).concat(VAL_START_TAG_SUFFIX).concat(VAL_END_TAG));
-      }
-    }
-    return templateString;
-  }).join("");
-  var tokenList = marked.lexer(inputText, {
-    gfm: true
-  });
-  var _parseTokens2 = parseTokens(tokenList, nodes, 0),
-    children = _parseTokens2.children,
-    cursor = _parseTokens2.cursor;
-  if (cursor !== tokenList.length) {
-    throw Error("Unexpectedly terminated markdown parsing. Possible reason: unclosed html tag?");
-  }
-  return _defineProperty(_defineProperty({}, VAL_EXTENSION, "richtext"), "children", children);
-}
-
 var RemirrorTextMark = z.object({
   type: z.union([z.literal("bold"), z.literal("strike"), z.literal("italic")])
 });
@@ -1326,7 +1169,7 @@ var RemirrorHeading = z.intersection(z.object({
   attrs: z.object({
     level: z.number()
   }),
-  content: z.array(z.union([RemirrorText, RemirrorBr]))
+  content: z.array(z.union([RemirrorText, RemirrorImage, RemirrorBr]))
 }).partial());
 var RemirrorBulletList = z.lazy(function () {
   return z.intersection(z.object({
@@ -1346,45 +1189,45 @@ var RemirrorListItem = z.lazy(function () {
   return z.intersection(z.object({
     type: z.literal("listItem")
   }), z.object({
+    attrs: z.object({
+      closed: z["boolean"](),
+      nested: z["boolean"]()
+    }).partial().optional(),
     content: z.array(z.union([RemirrorParagraph, RemirrorBulletList, RemirrorOrderedList]))
   }).partial());
 });
-var RemirrorParagraph = z.intersection(z.object({
-  type: z.literal("paragraph")
-}), z.object({
-  content: z.array(z.union([RemirrorText, RemirrorImage, RemirrorBr]))
-}).partial());
+var RemirrorParagraph = z.lazy(function () {
+  return z.intersection(z.object({
+    type: z.literal("paragraph")
+  }), z.object({
+    content: z.array(z.union([RemirrorText, RemirrorImage, RemirrorBr]))
+  }).partial());
+});
 var RemirrorJSON = z.object({
   type: z.literal("doc"),
   content: z.array(z.union([RemirrorParagraph, RemirrorHeading, RemirrorBulletList, RemirrorOrderedList]))
 });
 
-function ownKeys(e, r) {
-  var t = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var o = Object.getOwnPropertySymbols(e);
-    r && (o = o.filter(function (r) {
-      return Object.getOwnPropertyDescriptor(e, r).enumerable;
-    })), t.push.apply(t, o);
-  }
-  return t;
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
 }
-function _objectSpread2(e) {
-  for (var r = 1; r < arguments.length; r++) {
-    var t = null != arguments[r] ? arguments[r] : {};
-    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
-      _defineProperty(e, r, t[r]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
-      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
-    });
-  }
-  return e;
+
+function _iterableToArray(iter) {
+  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _toConsumableArray(arr) {
+  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
 
 function richTextToRemirror(richtext) {
   return {
     type: "doc",
-    content: richtext.children.map(function (child) {
+    content: richtext.map(function (child) {
       return toRemirrorNode(child);
     })
   };
@@ -1409,8 +1252,6 @@ function toRemirrorNode(child) {
       return convertUlToRemirror(child);
     case "ol":
       return convertOlToRemirror(child);
-    case "br":
-      return convertParagraphToRemirror([child]);
     default:
       {
         var _exhaustiveCheck = child;
@@ -1424,7 +1265,7 @@ function convertHeadingToRemirror(level, children) {
     attrs: {
       level: level
     },
-    content: children.flatMap(convertStringOrSpanNodeToRemirror)
+    content: children.flatMap(convertInlineToRemirror)
   };
 }
 function convertStringToRemirror(child) {
@@ -1433,14 +1274,23 @@ function convertStringToRemirror(child) {
     text: child
   };
 }
-function convertStringOrSpanNodeToRemirror(child) {
+function convertInlineToRemirror(child) {
   if (typeof child === "string") {
     return [convertStringToRemirror(child)];
   }
+  if (child.tag === "img") {
+    return [convertImageNodeToRemirror(child)];
+  }
+  if (child.tag === "br") {
+    return [createRemirrorBr()];
+  }
+  if (child.tag === "a") {
+    return convertLinkNodeToRemirror(child);
+  }
   return convertSpanNodeToRemirror(child);
 }
 function convertSpanNodeToRemirror(spanNode) {
-  if (spanNode.classes.length === 0 && spanNode.children.length === 1) {
+  if (spanNode.styles.length === 0 && spanNode.children.length === 1) {
     if (typeof spanNode.children[0] === "string") {
       return [convertStringToRemirror(spanNode.children[0])];
     } else {
@@ -1448,12 +1298,13 @@ function convertSpanNodeToRemirror(spanNode) {
       throw Error("Unexpected amount of children in span node: " + JSON.stringify(spanNode, null, 2));
     }
   }
+  var uniqueStyles = Array.from(new Set(spanNode.styles));
   return spanNode.children.map(function (child) {
     return {
       type: "text",
       text: child,
-      marks: spanNode.classes.map(function (className) {
-        switch (className) {
+      marks: uniqueStyles.map(function (style) {
+        switch (style) {
           case "bold":
             return {
               type: "bold"
@@ -1468,7 +1319,7 @@ function convertSpanNodeToRemirror(spanNode) {
             };
           default:
             {
-              var _exhaustiveCheck = className;
+              var _exhaustiveCheck = style;
               throw Error("Unexpected span class: " + _exhaustiveCheck);
             }
         }
@@ -1508,9 +1359,12 @@ function createRemirrorBr() {
   };
 }
 function convertLinkNodeToRemirror(linkNode) {
-  return linkNode.children.flatMap(convertStringOrSpanNodeToRemirror).map(function (remirrorText) {
-    return _objectSpread2(_objectSpread2({}, remirrorText), {}, {
-      marks: (remirrorText.marks || []).concat({
+  return linkNode.children.flatMap(convertInlineToRemirror).map(function (remirrorNode) {
+    if (remirrorNode.type !== "text") {
+      return remirrorNode;
+    }
+    return _objectSpread2(_objectSpread2({}, remirrorNode), {}, {
+      marks: (remirrorNode.marks || []).concat({
         type: "link",
         attrs: {
           href: linkNode.href,
@@ -1522,12 +1376,18 @@ function convertLinkNodeToRemirror(linkNode) {
   });
 }
 function convertImageNodeToRemirror(imageNode) {
+  var _fileSource$metadata, _fileSource$metadata2;
+  var fileSource = imageNode.src;
+  if (!(VAL_EXTENSION in fileSource) || fileSource[VAL_EXTENSION] !== "file") {
+    throw Error("Expected file source in image node");
+  }
+  var fileVal = Internal.convertFileSource(fileSource);
   return {
     type: "image",
     attrs: {
-      height: imageNode.height,
-      width: imageNode.width,
-      src: imageNode.src // at time of writing we are not sure if src as href or data url works, also: how to keep mimeType etc?
+      height: (_fileSource$metadata = fileSource.metadata) === null || _fileSource$metadata === void 0 ? void 0 : _fileSource$metadata.height,
+      width: (_fileSource$metadata2 = fileSource.metadata) === null || _fileSource$metadata2 === void 0 ? void 0 : _fileSource$metadata2.width,
+      src: fileVal.url
     }
   };
 }
@@ -1569,24 +1429,6 @@ function convertListItemToRemirrorParagraph(rtChildren) {
         lastChildContent.push(convertStringToRemirror(child));
       } else {
         switch (child.tag) {
-          case "a":
-            {
-              lastChildContent.push.apply(lastChildContent, _toConsumableArray(convertLinkNodeToRemirror(child)));
-              break;
-            }
-          case "br":
-            {
-              children.push({
-                type: "paragraph",
-                content: [] // create new paragraph
-              });
-              break;
-            }
-          case "span":
-            {
-              lastChildContent.push.apply(lastChildContent, _toConsumableArray(convertSpanNodeToRemirror(child)));
-              break;
-            }
           case "ol":
             {
               children.push(convertOlToRemirror(child));
@@ -1597,6 +1439,20 @@ function convertListItemToRemirrorParagraph(rtChildren) {
               children.push(convertUlToRemirror(child));
               break;
             }
+          case "p":
+            {
+              var newChild = convertParagraphToRemirror(child.children);
+              if (lastChild.type === "paragraph" && newChild.type === "paragraph") {
+                if (newChild.content) {
+                  lastChildContent.push.apply(lastChildContent, _toConsumableArray(newChild.content));
+                } else {
+                  // no content - skip
+                }
+              } else {
+                children.push(newChild);
+              }
+              break;
+            }
           default:
             {
               var _exhaustiveCheck = child;
@@ -2327,4 +2183,4 @@ function createSubscriberId(paths) {
   return paths.slice().sort().join("&");
 }
 
-export { EXT_TO_MIME_TYPES, MIME_TYPES_TO_EXT, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValStore, filenameToMimeType, getMimeType, mimeTypeToFileExt, parseRichTextSource, remirrorToRichTextSource, richTextToRemirror };
+export { EXT_TO_MIME_TYPES, MIME_TYPES_TO_EXT, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValStore, filenameToMimeType, getMimeType, mimeTypeToFileExt, remirrorToRichTextSource, richTextToRemirror };