@valbuild/core 0.62.6 → 0.63.0

package/dist/{index-3193efd5.cjs.dev.js → index-796c5d0d.cjs.dev.js}

@@ -1,6 +1,28 @@
 'use strict';
 
 var result = require('./result-48320acd.cjs.dev.js');
+var marked = require('marked');
+var core = require('@valbuild/core');
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var marked__namespace = /*#__PURE__*/_interopNamespace(marked);
 
 function _arrayWithoutHoles(arr) {
   if (Array.isArray(arr)) return result._arrayLikeToArray(arr);
@@ -397,7 +419,7 @@ var VAL_EXTENSION = "_type";
  **/
 
 var FILE_REF_PROP = "_ref";
-var FILE_REF_SUBTYPE_TAG = "_tag";
+var FILE_REF_SUBTYPE_TAG = "_tag"; // TODO: used earlier by c.rt.image, when we remove c.rt we can remove this
 
 /**
  * A file source represents the path to a (local) file.
@@ -904,7 +926,7 @@ var ParserError = /*#__PURE__*/_createClass(function ParserError(message, span)
   this.message = message;
   this.span = span;
 });
-function parseTokens(inputTokens) {
+function parseTokens$1(inputTokens) {
   var tokens = inputTokens.slice();
   function slurpCall(first, isAnon) {
     var _tokens$, _tokens$2, _tokens$3, _tokens$7, _tokens$8, _args$slice$0$span;
@@ -1040,7 +1062,7 @@ function parse$1(input) {
     _tokenize2 = _slicedToArray(_tokenize, 2),
     tokens = _tokenize2[0];
     _tokenize2[1]; // TODO: we can use cursor to improve error messages / spans
-  return parseTokens(tokens);
+  return parseTokens$1(tokens);
 }
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -1769,6 +1791,14 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
   _createClass(RichTextSchema, [{
     key: "validate",
     value: function validate(path, src) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      if (src !== null && src !== void 0 && src.markdownish) {
+        return _defineProperty({}, path, [{
+          message: "Replace markdown with structured format",
+          value: src,
+          fixes: ["fix:deprecated-richtext"]
+        }]);
+      }
       return false; //TODO
     }
   }, {
@@ -2584,40 +2614,247 @@ function initSchema() {
   };
 }
 
-// Classes
+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",
+      styles: [clazz].concat(parsedTokens.children.flatMap(function (child) {
+        return typeof child === "string" ? [] : child.styles;
+      })),
+      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: "p",
+                children: [{
+                  tag: "br"
+                }]
+              }];
+              return [line, {
+                tag: "p",
+                children: [{
+                  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: [{
+            tag: "p",
+            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") {
+            // @ts-expect-error We are transitioning from markdown to structured objects, with structured objects we no longer want c.rt.image
+            delete sourceNode[core.FILE_REF_SUBTYPE_TAG];
+            children.push({
+              tag: "img",
+              src: sourceNode
+            });
+          }
+          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: "p",
+            children: [{
+              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: "p",
+          children: [{
+            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[core.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__namespace.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?");
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  children.markdownish = true; // Markdown is an intermediate format - we are planning on replacing it with a structured object format
+  return children;
+}
+
+//#region Classes
 
-/// Paragraph
+//#region Paragraph
 
-/// Break
+//#region Break
 
-/// Span
+//#region Span
 
-/// Image
+//#region Image
 
-/// Link
+//#region Link
 
-/// List
+//#region List
 
-/// Heading
+//#region Heading
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 
-/// Root and nodes
+// export type CustomInlineNode<O extends RichTextOptions> = NonNullable<
+//   NonNullable<O["inline"]>["custom"]
+// >[keyof NonNullable<NonNullable<O["inline"]>["custom"]>] extends Schema<
+//   infer Src
+// >
+//   ? ReplaceRawStringWithString<Src>
+//   : never;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 
-/// Main types
+//#region Block and Inline nodes:
 
-/**
- * RichTextSource is defined in ValModules
- **/
+//#region Main types
 
 /**
- * RichText is accessible by users (after conversion via useVal / fetchVal)
- * Internally it is a Selector
+ * RichText as defined in a ValModule
  **/
 
 function richtext(templateStrings) {
   for (var _len = arguments.length, nodes = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     nodes[_key - 1] = arguments[_key];
   }
-  return _defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "richtext"), "templateStrings", templateStrings), "exprs", nodes);
+  return parseRichTextSource({
+    templateStrings: templateStrings,
+    exprs: nodes
+    // eslint-disable-next-line @typescript-eslint/ban-types
+  });
 }
 var RT_IMAGE_TAG = "rt_image";
 function image(ref, metadata) {

package/dist/valbuild-core.cjs.dev.js

@@ -2,8 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-3193efd5.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('./index-796c5d0d.cjs.dev.js');
 require('./result-48320acd.cjs.dev.js');
+require('marked');
+require('@valbuild/core');
 
 
 

package/dist/valbuild-core.cjs.prod.js

@@ -2,8 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-596f28bb.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('./index-00decfd4.cjs.prod.js');
 require('./result-26f67b40.cjs.prod.js');
+require('marked');
+require('@valbuild/core');
 
 
 

package/dist/valbuild-core.esm.js

@@ -1,2 +1,4 @@
-export { A as ArraySchema, B as BooleanSchema, F as FATAL_ERROR_TYPES, k as FILE_REF_PROP, l as FILE_REF_SUBTYPE_TAG, u as FileSchema, G as GenericSelector, t as ImageSchema, I as Internal, L as LiteralSchema, r as NumberSchema, O as ObjectSchema, R as RT_IMAGE_TAG, o as RecordSchema, v as RichTextSchema, j as Schema, q as StringSchema, U as UnionSchema, V as VAL_EXTENSION, x as ValApi, n as derefPatch, w as deserializeSchema, i as expr, h as initVal, m as modules } from './index-316f5dd8.esm.js';
+export { A as ArraySchema, B as BooleanSchema, F as FATAL_ERROR_TYPES, k as FILE_REF_PROP, l as FILE_REF_SUBTYPE_TAG, u as FileSchema, G as GenericSelector, t as ImageSchema, I as Internal, L as LiteralSchema, r as NumberSchema, O as ObjectSchema, R as RT_IMAGE_TAG, o as RecordSchema, v as RichTextSchema, j as Schema, q as StringSchema, U as UnionSchema, V as VAL_EXTENSION, x as ValApi, n as derefPatch, w as deserializeSchema, i as expr, h as initVal, m as modules } from './index-370592bb.esm.js';
 import './result-a8316efa.esm.js';
+import 'marked';
+import '@valbuild/core';

package/expr/dist/valbuild-core-expr.cjs.dev.js

@@ -2,8 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-3193efd5.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-796c5d0d.cjs.dev.js');
 require('../../dist/result-48320acd.cjs.dev.js');
+require('marked');
+require('@valbuild/core');
 
 
 

package/expr/dist/valbuild-core-expr.cjs.prod.js

@@ -2,8 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-596f28bb.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-00decfd4.cjs.prod.js');
 require('../../dist/result-26f67b40.cjs.prod.js');
+require('marked');
+require('@valbuild/core');
 
 
 

package/expr/dist/valbuild-core-expr.esm.js

@@ -1,2 +1,4 @@
-export { C as Call, E as Expr, N as NilSym, S as StringLiteral, e as StringTemplate, f as Sym, g as evaluate, p as parse } from '../../dist/index-316f5dd8.esm.js';
+export { C as Call, E as Expr, N as NilSym, S as StringLiteral, e as StringTemplate, f as Sym, g as evaluate, p as parse } from '../../dist/index-370592bb.esm.js';
 import '../../dist/result-a8316efa.esm.js';
+import 'marked';
+import '@valbuild/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.62.6",
+  "version": "0.63.0",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "scripts": {
@@ -41,6 +41,7 @@
   },
   "devDependencies": {},
   "dependencies": {
+    "marked": "^9.0.3",
     "ts-toolbelt": "^9.6.0"
   },
   "files": [

package/patch/dist/valbuild-core-patch.cjs.dev.js

@@ -2,9 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-3193efd5.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-796c5d0d.cjs.dev.js');
 var result = require('../../dist/result-48320acd.cjs.dev.js');
 var util = require('../../dist/util-b213092b.cjs.dev.js');
+require('marked');
+require('@valbuild/core');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);

package/patch/dist/valbuild-core-patch.cjs.prod.js

@@ -2,9 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-596f28bb.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-00decfd4.cjs.prod.js');
 var result = require('../../dist/result-26f67b40.cjs.prod.js');
 var util = require('../../dist/util-030d8a1f.cjs.prod.js');
+require('marked');
+require('@valbuild/core');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);

package/patch/dist/valbuild-core-patch.esm.js

@@ -1,7 +1,9 @@
-import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-316f5dd8.esm.js';
-export { P as PatchError } from '../../dist/index-316f5dd8.esm.js';
+import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-370592bb.esm.js';
+export { P as PatchError } from '../../dist/index-370592bb.esm.js';
 import { f as isNonEmpty, e as err, o as ok, m as map, g as flatMap, i as isErr, h as flatMapReduce, j as filterOrElse, k as mapErr, l as map$1, n as all, p as flatten, q as allT } from '../../dist/result-a8316efa.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';
+import 'marked';
+import '@valbuild/core';
 
 function isNotRoot(path) {
   return isNonEmpty(path);