@valbuild/shared 0.49.0 → 0.51.0

package/internal/dist/valbuild-shared-internal.cjs.prod.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var core = require('@valbuild/core');
 var marked = require('marked');
+var zod = require('zod');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -25,79 +26,24 @@ function _interopNamespace(e) {
 
 var marked__namespace = /*#__PURE__*/_interopNamespace(marked);
 
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-
-function _iterableToArrayLimit(r, l) {
-  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (null != t) {
-    var e,
-      n,
-      i,
-      u,
-      a = [],
-      f = !0,
-      o = !1;
-    try {
-      if (i = (t = t.call(r)).next, 0 === l) {
-        if (Object(t) !== t) return;
-        f = !1;
-      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
-    } catch (r) {
-      o = !0, n = r;
-    } finally {
-      try {
-        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
-      } finally {
-        if (o) throw n;
-      }
-    }
-    return a;
-  }
-}
-
-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];
-  return arr2;
-}
-
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-function _slicedToArray(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-}
-
-function _toPrimitive(input, hint) {
-  if (typeof input !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (typeof res !== "object") return res;
+function toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
     throw new TypeError("@@toPrimitive must return a primitive value.");
   }
-  return (hint === "string" ? String : Number)(input);
+  return ("string" === r ? String : Number)(t);
 }
 
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return typeof key === "symbol" ? key : String(key);
+function toPropertyKey(t) {
+  var i = toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : String(i);
 }
 
 function _defineProperty(obj, key, value) {
-  key = _toPropertyKey(key);
+  key = toPropertyKey(key);
   if (key in obj) {
     Object.defineProperty(obj, key, {
       value: value,
@@ -111,6 +57,21 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
+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];
+  return arr2;
+}
+
+function _unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(o);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+
 function _createForOfIteratorHelper(o, allowArrayLike) {
   var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
   if (!it) {
@@ -179,6 +140,46 @@ function _toConsumableArray(arr) {
   return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
 
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function _iterableToArrayLimit(r, l) {
+  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
+    try {
+      if (i = (t = t.call(r)).next, 0 === l) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      o = !0, n = r;
+    } finally {
+      try {
+        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
+      } finally {
+        if (o) throw n;
+      }
+    }
+    return a;
+  }
+}
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _slicedToArray(arr, i) {
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+
 var EXT_TO_MIME_TYPES = {
   x3d: "application/vnd.hzn-3d-crossword",
   "3gp": "video/3gpp",
@@ -901,16 +902,18 @@ function filenameToMimeType(filename) {
   }
 }
 
-var HeaderRegEx = /^h([\d+])$/;
-function lexicalToRichTextSource(node) {
-  var markdownIRBlocks = node.children.map(createBlock);
-  return fromIRToRichTextSource(markdownIRBlocks);
+function remirrorToRichTextSource(node) {
+  var files = {};
+  var markdownIRBlocks = node.content.map(function (child) {
+    return createBlock(child, files);
+  });
+  return fromIRToRichTextSource(markdownIRBlocks, files);
 }
-function createBlock(node) {
+function createBlock(node, files) {
   if (node.type === "heading") {
-    var _node$tag$match;
+    var _node$attrs, _node$content;
     var headingTag = "";
-    var depth = Number((_node$tag$match = node.tag.match(HeaderRegEx)) === null || _node$tag$match === void 0 ? void 0 : _node$tag$match[1]);
+    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");
     }
@@ -920,10 +923,13 @@ function createBlock(node) {
     var headingText = ["".concat(headingTag, " ")];
     return {
       type: "block",
-      children: headingText.concat.apply(headingText, _toConsumableArray(node.children.map(transformLeafNode)))
+      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") {
-    if (node.children.length === 0) {
+    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 />"]
@@ -931,26 +937,26 @@ function createBlock(node) {
     }
     return {
       type: "block",
-      children: node.children.map(function (child) {
-        return transformLeafNode(child);
+      children: node.content.map(function (child) {
+        return transformLeafNode(child, files);
       })
     };
-  } else if (node.type === "list") {
+  } else if (node.type === "bulletList" || node.type === "orderedList") {
+    var _node$content3;
     return {
       type: "block",
-      children: node.children.flatMap(function (child, i) {
-        return formatListItemNode(getListPrefix(node), child, 0, i === 0);
-      })
+      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);
+      })) || []
     };
   } else {
     var exhaustiveCheck = node;
     throw new Error("Unhandled node type: ".concat("type" in exhaustiveCheck ? "exhaustiveCheck.type" : "unknown"));
   }
 }
-function fromIRToRichTextSource(markdownIRBlocks) {
+function fromIRToRichTextSource(markdownIRBlocks, files) {
   var templateStrings = ["\n"];
   var exprs = [];
-  var files = {};
   for (var blockIdx = 0; blockIdx < markdownIRBlocks.length; blockIdx++) {
     var block = markdownIRBlocks[blockIdx];
     var _iterator = _createForOfIteratorHelper(block.children),
@@ -961,10 +967,10 @@ function fromIRToRichTextSource(markdownIRBlocks) {
         if (typeof child === "string") {
           templateStrings[templateStrings.length - 1] += child;
         } else {
-          if (child.type === "image") {
-            exprs.push(fromLexicalImageNode(child, files));
-          } else if (child.type === "link") {
-            exprs.push(fromLexicalLinkNode(child));
+          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)));
@@ -986,7 +992,17 @@ function fromIRToRichTextSource(markdownIRBlocks) {
   return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, core.VAL_EXTENSION, "richtext"), "templateStrings", templateStrings), "exprs", exprs), "files", files);
 }
 function formatText(node) {
-  var classes = typeof node.format === "number" ? fromLexicalFormat(node.format) : [];
+  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();
@@ -1005,87 +1021,94 @@ function formatText(node) {
   // text = splitIntoChunks(text);
   return "".concat(" ".repeat(prefixWS)).concat(text).concat(" ".repeat(suffixWS));
 }
-function transformLeafNode(node) {
+function transformLeafNode(node, files) {
   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) {
+      return mark.type === "link";
+    });
+    if ((linkMark === null || linkMark === void 0 ? void 0 : linkMark.type) === "link") {
+      return {
+        _type: "link",
+        href: linkMark.attrs.href,
+        children: [formatText(node)]
+      };
+    }
     return formatText(node);
-  } else if (node.type === "linebreak") {
-    return "\n";
+  } else if (node.type === "hardBreak") {
+    return "<br />";
+  } else if (node.type === "image") {
+    return fromRemirrorImageNode(node, files);
   } else {
-    return node;
+    var exhaustiveCheck = node;
+    throw new Error("Unexpected node type: ".concat(JSON.stringify(exhaustiveCheck)));
   }
 }
-function formatListItemNode(listPrefix, node, indent) {
-  var _node$children;
-  var isFirstTopLevelListItem = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+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$children = node.children) === null || _node$children === void 0 || (_node$children = _node$children[0]) === null || _node$children === void 0 ? void 0 : _node$children.type) !== "list") {
+  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.children.flatMap(function (child) {
-    if (child.type === "list") {
-      return child.children.flatMap(function (subChild) {
-        return formatListItemNode(getListPrefix(child), subChild, indent + 4);
+  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 [transformLeafNode(child)];
+      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 getListPrefix(node) {
-  if (node.listType === "bullet") {
+  if (node.type === "bulletList") {
     return "-";
-  } else if (node.listType === "number") {
+  } else if (node.type === "orderedList") {
     return "1.";
   } else {
-    throw new Error("Unhandled list type: ".concat(node.listType));
+    var exhaustiveCheck = node;
+    throw new Error("Unhandled list node: ".concat(JSON.stringify(exhaustiveCheck)));
   }
 }
-var FORMAT_MAPPING$1 = {
-  bold: 1,
-  // 0001
-  italic: 2,
-  // 0010
-  "line-through": 4 // 0100
-  // underline: 8, // 1000
-};
-
-function fromLexicalFormat(format) {
-  return Object.entries(FORMAT_MAPPING$1).flatMap(function (_ref2) {
-    var _ref3 = _slicedToArray(_ref2, 2),
-      key = _ref3[0],
-      value = _ref3[1];
-    if ((value & /* bitwise and */format) === value) {
-      return [key];
-    }
-    return [];
-  });
-}
 var textEncoder = new TextEncoder();
-function fromLexicalImageNode(node, files) {
-  if (node.src.startsWith("data:")) {
-    var sha256 = core.Internal.getSHA256Hash(textEncoder.encode(node.src));
-    var mimeType = getMimeType(node.src);
+function fromRemirrorImageNode(node, files) {
+  if (node.attrs && node.attrs.src.startsWith("data:")) {
+    var sha256 = core.Internal.getSHA256Hash(textEncoder.encode(node.attrs.src));
+    var mimeType = getMimeType(node.attrs.src);
     if (mimeType === undefined) {
-      throw new Error("Could not detect Mime Type for image: ".concat(node.src));
+      throw new Error("Could not detect Mime Type for image: ".concat(node.attrs.src));
     }
     var fileExt = mimeTypeToFileExt(mimeType);
-    var filePath = "/public/".concat(sha256, ".").concat(fileExt);
-    files[filePath] = node.src;
+    var fileName = node.attrs.fileName || "".concat(sha256, ".").concat(fileExt);
+    var filePath = "/public/".concat(fileName);
+    files[filePath] = node.attrs.src;
     return _defineProperty(_defineProperty(_defineProperty({}, core.VAL_EXTENSION, "file"), core.FILE_REF_PROP, filePath), "metadata", {
-      width: node.width || 0,
-      height: node.height || 0,
+      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 {
-    var _sha = getParam("sha256", node.src);
-    return _defineProperty(_defineProperty(_defineProperty({}, core.VAL_EXTENSION, "file"), core.FILE_REF_PROP, "/public".concat(node.src.split("?")[0])), "metadata", {
-      width: node.width || 0,
-      height: node.height || 0,
+  } else if (node.attrs) {
+    var _sha = getParam("sha256", node.attrs.src);
+    var noParamsSrc = node.attrs.src.split("?")[0];
+    return _defineProperty(_defineProperty(_defineProperty({}, core.VAL_EXTENSION, "file"), core.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: node.mimeType || ""
+      mimeType: noParamsSrc && filenameToMimeType(noParamsSrc) || ""
     });
+  } else {
+    throw new Error("Invalid image node (no attrs): " + JSON.stringify(node));
   }
 }
 function getParam(param, url) {
@@ -1100,196 +1123,6 @@ function getParam(param, url) {
   }
   return undefined;
 }
-function fromLexicalLinkNode(node) {
-  return _defineProperty(_defineProperty(_defineProperty({}, core.VAL_EXTENSION, "link"), "href", node.url), "children", node.children.map(formatText));
-}
-
-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;
-}
-
-/// Serialized Lexical Nodes:
-// TODO: replace with Lexical libs types - not currently exported?
-var COMMON_LEXICAL_PROPS = {
-  version: 1,
-  format: "",
-  indent: 0,
-  direction: null
-};
-function toLexicalNode(node) {
-  var useBreakNode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  if (typeof node === "string") {
-    return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-      type: "text",
-      format: "",
-      text: node
-    });
-  }
-  if ("tag" in node) {
-    switch (node.tag) {
-      case "h1":
-        return toLexicalHeadingNode(node);
-      case "h2":
-        return toLexicalHeadingNode(node);
-      case "h3":
-        return toLexicalHeadingNode(node);
-      case "h4":
-        return toLexicalHeadingNode(node);
-      case "h5":
-        return toLexicalHeadingNode(node);
-      case "h6":
-        return toLexicalHeadingNode(node);
-      case "li":
-        return toLexicalListItemNode(node);
-      case "p":
-        return toLexicalParagraphNode(node);
-      case "ul":
-        return toLexicalListNode(node);
-      case "ol":
-        return toLexicalListNode(node);
-      case "span":
-        return toLexicalTextNode(node);
-      case "a":
-        return toLexicalLinkNode(node);
-      case "img":
-        return toLexicalImageNode(node);
-      case "br":
-        if (useBreakNode) {
-          return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-            type: "linebreak"
-          });
-        }
-        return toLexicalPseudoLineBreakNode();
-      default:
-        throw Error("Unexpected node tag: " + JSON.stringify(node, null, 2));
-    }
-  } else {
-    throw Error("Unexpected node: " + JSON.stringify(node, null, 2));
-  }
-}
-function toLexicalImageNode(node) {
-  var url = node.src;
-  return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-    type: "image",
-    src: url,
-    width: node.width,
-    height: node.height,
-    mimeType: node.mimeType
-    // TODO: altText
-  });
-}
-
-function toLexicalLinkNode(link) {
-  return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-    type: "link",
-    url: link.href,
-    children: link.children.map(function (child) {
-      return toLexicalNode(child);
-    })
-  });
-}
-function richTextSourceToLexical(richtext) {
-  return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-    format: "",
-    type: "root",
-    children: richtext.children.map(function (child) {
-      return toLexicalNode(child);
-    })
-  });
-}
-function toLexicalHeadingNode(heading) {
-  return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-    type: "heading",
-    tag: heading.tag,
-    children: heading.children.map(function (child) {
-      return toLexicalNode(child);
-    })
-  });
-}
-function toLexicalParagraphNode(paragraph) {
-  return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-    type: "paragraph",
-    children: paragraph.children.map(function (child) {
-      return toLexicalNode(child, true);
-    })
-  });
-}
-
-// Lexical does not support line breaks, so we convert them to empty paragraphs
-function toLexicalPseudoLineBreakNode() {
-  return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-    type: "paragraph",
-    children: []
-  });
-}
-function toLexicalListItemNode(listItem) {
-  return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-    type: "listitem",
-    children: listItem.children.map(function (child) {
-      return toLexicalNode(child, true);
-    })
-  });
-}
-function toLexicalListNode(list) {
-  return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-    type: "list",
-    listType: list.tag === "ol" ? "number" : "bullet",
-    children: list.children.map(function (child) {
-      return toLexicalNode(child);
-    })
-  }, list.dir ? {
-    direction: list.dir
-  } : {
-    direction: null
-  });
-}
-var FORMAT_MAPPING = {
-  bold: 1,
-  // 0001
-  italic: 2,
-  // 0010
-  "line-through": 4 // 0100
-  // underline: 8, // 1000
-};
-
-function toLexicalFormat(classes) {
-  return classes.reduce(function (prev, curr) {
-    return prev | /* bitwise or */FORMAT_MAPPING[curr];
-  }, 0);
-}
-function toLexicalTextNode(spanNode) {
-  var child = spanNode.children[0];
-  if (typeof child === "string") {
-    return _objectSpread2(_objectSpread2({}, COMMON_LEXICAL_PROPS), {}, {
-      type: "text",
-      text: child,
-      format: toLexicalFormat(spanNode.classes)
-    });
-  } else {
-    // recurse the spans and merge their classes
-    return toLexicalTextNode(_objectSpread2(_objectSpread2({}, child), {}, {
-      classes: spanNode.classes.concat(child.classes)
-    }));
-  }
-}
 
 var VAL_START_TAG_PREFIX = '<val value="';
 var VAL_START_TAG_SUFFIX = '">';
@@ -1297,6 +1130,18 @@ 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") {
@@ -1310,23 +1155,11 @@ function parseTokens(tokens, sourceNodes, cursor) {
           children: parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0).children
         });
       } else if (token.type === "strong") {
-        children.push({
-          tag: "span",
-          classes: ["bold"],
-          children: parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0).children
-        });
+        merge(token, "bold");
       } else if (token.type === "em") {
-        children.push({
-          tag: "span",
-          classes: ["italic"],
-          children: parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0).children
-        });
+        merge(token, "italic");
       } else if (token.type === "del") {
-        children.push({
-          tag: "span",
-          classes: ["line-through"],
-          children: parseTokens(token.tokens ? token.tokens : [], sourceNodes, 0).children
-        });
+        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));
@@ -1335,6 +1168,11 @@ function parseTokens(tokens, sourceNodes, cursor) {
             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",
+                children: []
+              };
               return [line, {
                 tag: "br",
                 children: []
@@ -1404,10 +1242,16 @@ function parseTokens(tokens, sourceNodes, cursor) {
         }
         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",
             children: []
           });
+          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) {
@@ -1467,22 +1311,359 @@ function parseRichTextSource(_ref) {
   return _defineProperty(_defineProperty({}, core.VAL_EXTENSION, "richtext"), "children", children);
 }
 
+var RemirrorTextMark = zod.z.object({
+  type: zod.z.union([zod.z.literal("bold"), zod.z.literal("strike"), zod.z.literal("italic")])
+});
+var RemirrorLinkMark = zod.z.object({
+  type: zod.z.literal("link"),
+  attrs: zod.z.object({
+    href: zod.z.string(),
+    target: zod.z.union([zod.z.literal("_blank"), zod.z["null"]()]),
+    auto: zod.z["boolean"]()
+  })
+});
+var RemirrorText = zod.z.intersection(zod.z.object({
+  type: zod.z.literal("text"),
+  text: zod.z.string()
+}), zod.z.object({
+  marks: zod.z.array(zod.z.union([RemirrorTextMark, RemirrorLinkMark]))
+}).partial());
+var RemirrorBr = zod.z.intersection(zod.z.object({
+  type: zod.z.literal("hardBreak")
+}), zod.z.object({
+  marks: zod.z.array(RemirrorTextMark)
+}).partial());
+var RemirrorImage = zod.z.intersection(zod.z.object({
+  type: zod.z.literal("image")
+}), zod.z.object({
+  attrs: zod.z.intersection(zod.z.object({
+    src: zod.z.string()
+  }), zod.z.object({
+    align: zod.z.union([zod.z.literal("center"), zod.z.literal("end"), zod.z.literal("justify"), zod.z.literal("left"), zod.z.literal("match-parent"), zod.z.literal("right"), zod.z.literal("start"), zod.z["null"]()]),
+    alt: zod.z.union([zod.z.string(), zod.z["null"]()]),
+    height: zod.z.union([zod.z.string(), zod.z.number(), zod.z["null"]()]),
+    width: zod.z.union([zod.z.string(), zod.z.number(), zod.z["null"]()]),
+    rotate: zod.z.union([zod.z.string(), zod.z["null"]()]),
+    title: zod.z.union([zod.z.string(), zod.z["null"]()]),
+    fileName: zod.z.union([zod.z.string(), zod.z["null"]()])
+  }).partial())
+}).partial());
+var RemirrorHeading = zod.z.intersection(zod.z.object({
+  type: zod.z.literal("heading")
+}), zod.z.object({
+  attrs: zod.z.object({
+    level: zod.z.number()
+  }),
+  content: zod.z.array(zod.z.union([RemirrorText, RemirrorBr]))
+}).partial());
+var RemirrorBulletList = zod.z.lazy(function () {
+  return zod.z.intersection(zod.z.object({
+    type: zod.z.literal("bulletList")
+  }), zod.z.object({
+    content: zod.z.array(RemirrorListItem)
+  }).partial());
+});
+var RemirrorOrderedList = zod.z.lazy(function () {
+  return zod.z.intersection(zod.z.object({
+    type: zod.z.literal("orderedList")
+  }), zod.z.object({
+    content: zod.z.array(RemirrorListItem)
+  }).partial());
+});
+var RemirrorListItem = zod.z.lazy(function () {
+  return zod.z.intersection(zod.z.object({
+    type: zod.z.literal("listItem")
+  }), zod.z.object({
+    content: zod.z.array(zod.z.union([RemirrorParagraph, RemirrorBulletList, RemirrorOrderedList]))
+  }).partial());
+});
+var RemirrorParagraph = zod.z.intersection(zod.z.object({
+  type: zod.z.literal("paragraph")
+}), zod.z.object({
+  content: zod.z.array(zod.z.union([RemirrorText, RemirrorImage, RemirrorBr]))
+}).partial());
+var RemirrorJSON = zod.z.object({
+  type: zod.z.literal("doc"),
+  content: zod.z.array(zod.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 _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 richTextToRemirror(richtext) {
+  return {
+    type: "doc",
+    content: richtext.children.map(function (child) {
+      return toRemirrorNode(child);
+    })
+  };
+}
+function toRemirrorNode(child) {
+  switch (child.tag) {
+    case "h1":
+      return convertHeadingToRemirror(1, child.children);
+    case "h2":
+      return convertHeadingToRemirror(2, child.children);
+    case "h3":
+      return convertHeadingToRemirror(3, child.children);
+    case "h4":
+      return convertHeadingToRemirror(4, child.children);
+    case "h5":
+      return convertHeadingToRemirror(5, child.children);
+    case "h6":
+      return convertHeadingToRemirror(6, child.children);
+    case "p":
+      return convertParagraphToRemirror(child.children);
+    case "ul":
+      return convertUlToRemirror(child);
+    case "ol":
+      return convertOlToRemirror(child);
+    case "br":
+      return convertParagraphToRemirror([child]);
+    default:
+      {
+        var _exhaustiveCheck = child;
+        throw Error("Unexpected child node: " + JSON.stringify(_exhaustiveCheck));
+      }
+  }
+}
+function convertHeadingToRemirror(level, children) {
+  return {
+    type: "heading",
+    attrs: {
+      level: level
+    },
+    content: children.flatMap(convertStringOrSpanNodeToRemirror)
+  };
+}
+function convertStringToRemirror(child) {
+  return {
+    type: "text",
+    text: child
+  };
+}
+function convertStringOrSpanNodeToRemirror(child) {
+  if (typeof child === "string") {
+    return [convertStringToRemirror(child)];
+  }
+  return convertSpanNodeToRemirror(child);
+}
+function convertSpanNodeToRemirror(spanNode) {
+  if (spanNode.classes.length === 0 && spanNode.children.length === 1) {
+    if (typeof spanNode.children[0] === "string") {
+      return [convertStringToRemirror(spanNode.children[0])];
+    } else {
+      // TODO: replace with error logging and something more graceful?
+      throw Error("Unexpected amount of children in span node: " + JSON.stringify(spanNode, null, 2));
+    }
+  }
+  return spanNode.children.map(function (child) {
+    return {
+      type: "text",
+      text: child,
+      marks: spanNode.classes.map(function (className) {
+        switch (className) {
+          case "bold":
+            return {
+              type: "bold"
+            };
+          case "italic":
+            return {
+              type: "italic"
+            };
+          case "line-through":
+            return {
+              type: "strike"
+            };
+          default:
+            {
+              var _exhaustiveCheck = className;
+              throw Error("Unexpected span class: " + _exhaustiveCheck);
+            }
+        }
+      })
+    };
+  });
+}
+function convertParagraphToRemirror(children) {
+  return {
+    type: "paragraph",
+    content: children.flatMap(function (child) {
+      if (typeof child === "string") {
+        return [convertStringToRemirror(child)];
+      }
+      switch (child.tag) {
+        case "span":
+          return convertSpanNodeToRemirror(child);
+        case "a":
+          return convertLinkNodeToRemirror(child);
+        case "img":
+          return [convertImageNodeToRemirror(child)];
+        case "br":
+          return [createRemirrorBr()];
+        default:
+          {
+            var _exhaustiveCheck = child;
+            throw Error("Unexpected paragraph child: " + JSON.stringify(_exhaustiveCheck));
+          }
+      }
+    })
+  };
+}
+function createRemirrorBr() {
+  return {
+    type: "hardBreak",
+    marks: []
+  };
+}
+function convertLinkNodeToRemirror(linkNode) {
+  return linkNode.children.flatMap(convertStringOrSpanNodeToRemirror).map(function (remirrorText) {
+    return _objectSpread2(_objectSpread2({}, remirrorText), {}, {
+      marks: (remirrorText.marks || []).concat({
+        type: "link",
+        attrs: {
+          href: linkNode.href,
+          auto: false,
+          target: null
+        }
+      })
+    });
+  });
+}
+function convertImageNodeToRemirror(imageNode) {
+  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?
+    }
+  };
+}
+function convertUlToRemirror(ulNode) {
+  return {
+    type: "bulletList",
+    content: ulNode.children.map(convertListItemToRemirror)
+  };
+}
+function convertOlToRemirror(olNode) {
+  return {
+    type: "orderedList",
+    content: olNode.children.map(convertListItemToRemirror)
+  };
+}
+function convertListItemToRemirror(liNode) {
+  return {
+    type: "listItem",
+    content: convertListItemToRemirrorParagraph(liNode.children)
+  };
+}
+function convertListItemToRemirrorParagraph(rtChildren) {
+  var children = [];
+  var _iterator = _createForOfIteratorHelper(rtChildren),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var child = _step.value;
+      var lastChild = children[children.length - 1];
+      if (!lastChild) {
+        lastChild = {
+          type: "paragraph",
+          content: []
+        };
+        children.push(lastChild);
+      }
+      var lastChildContent = lastChild.content;
+      if (typeof child === "string") {
+        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));
+              break;
+            }
+          case "ul":
+            {
+              children.push(convertUlToRemirror(child));
+              break;
+            }
+          default:
+            {
+              var _exhaustiveCheck = child;
+              throw Error("Unexpected list item child: " + JSON.stringify(_exhaustiveCheck));
+            }
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return children;
+}
+
 var VAL_SESSION_COOKIE = core.Internal.VAL_SESSION_COOKIE;
 var VAL_STATE_COOKIE = core.Internal.VAL_STATE_COOKIE;
 var VAL_ENABLE_COOKIE_NAME = core.Internal.VAL_ENABLE_COOKIE_NAME;
 
-exports.COMMON_LEXICAL_PROPS = COMMON_LEXICAL_PROPS;
 exports.EXT_TO_MIME_TYPES = EXT_TO_MIME_TYPES;
 exports.MIME_TYPES_TO_EXT = MIME_TYPES_TO_EXT;
+exports.RemirrorBr = RemirrorBr;
+exports.RemirrorBulletList = RemirrorBulletList;
+exports.RemirrorHeading = RemirrorHeading;
+exports.RemirrorImage = RemirrorImage;
+exports.RemirrorJSON = RemirrorJSON;
+exports.RemirrorLinkMark = RemirrorLinkMark;
+exports.RemirrorListItem = RemirrorListItem;
+exports.RemirrorOrderedList = RemirrorOrderedList;
+exports.RemirrorParagraph = RemirrorParagraph;
+exports.RemirrorText = RemirrorText;
+exports.RemirrorTextMark = RemirrorTextMark;
 exports.VAL_ENABLE_COOKIE_NAME = VAL_ENABLE_COOKIE_NAME;
 exports.VAL_SESSION_COOKIE = VAL_SESSION_COOKIE;
 exports.VAL_STATE_COOKIE = VAL_STATE_COOKIE;
 exports.filenameToMimeType = filenameToMimeType;
-exports.fromLexicalFormat = fromLexicalFormat;
 exports.getMimeType = getMimeType;
-exports.lexicalToRichTextSource = lexicalToRichTextSource;
 exports.mimeTypeToFileExt = mimeTypeToFileExt;
 exports.parseRichTextSource = parseRichTextSource;
-exports.richTextSourceToLexical = richTextSourceToLexical;
-exports.toLexicalFormat = toLexicalFormat;
-exports.toLexicalNode = toLexicalNode;
+exports.remirrorToRichTextSource = remirrorToRichTextSource;
+exports.richTextToRemirror = richTextToRemirror;