@valbuild/core 0.65.3 → 0.67.0

package/dist/{index-09f6e387.cjs.prod.js → index-55eeef93.cjs.prod.js}

@@ -1,28 +1,6 @@
 'use strict';
 
 var result = require('./result-787e35f6.cjs.prod.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 _arrayWithHoles(r) {
   if (Array.isArray(r)) return r;
@@ -1079,7 +1057,7 @@ var ParserError = /*#__PURE__*/_createClass(function ParserError(message, span)
   this.message = message;
   this.span = span;
 });
-function parseTokens$1(inputTokens) {
+function parseTokens(inputTokens) {
   var tokens = inputTokens.slice();
   function slurpCall(first, isAnon) {
     var _tokens$, _tokens$2, _tokens$3, _tokens$7, _tokens$8, _args$slice$0$span;
@@ -1215,7 +1193,7 @@ function parse(input) {
     _tokenize2 = _slicedToArray(_tokenize, 2),
     tokens = _tokenize2[0];
     _tokenize2[1]; // TODO: we can use cursor to improve error messages / spans
-  return parseTokens$1(tokens);
+  return parseTokens(tokens);
 }
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -2282,7 +2260,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
 }(Schema);
-var richtext$1 = function richtext(options) {
+var richtext = function richtext(options) {
   return new RichTextSchema(options !== null && options !== void 0 ? options : {});
 };
 
@@ -2453,7 +2431,7 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
 }(Schema);
-var image$1 = function image(options) {
+var image = function image(options) {
   return new ImageSchema(options);
 };
 
@@ -3421,8 +3399,8 @@ function initSchema() {
     number: number,
     union: union,
     // oneOf,
-    richtext: richtext$1,
-    image: image$1,
+    richtext: richtext,
+    image: image,
     literal: literal,
     keyOf: keyOf,
     record: record,
@@ -3432,257 +3410,61 @@ function initSchema() {
   };
 }
 
-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
-
-//#region Paragraph
-
-//#region Break
-
-//#region Span
-
-//#region Image
-
-//#region Link
-
-//#region List
-
-//#region Heading
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-
-// 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
-
-//#region Block and Inline nodes:
-
-//#region Main types
-
 /**
- * RichText as defined in a ValModule
- **/
+ * A image source represents the path to a (local) image.
+ *
+ */
 
-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 parseRichTextSource({
-    templateStrings: templateStrings,
-    exprs: nodes
-    // eslint-disable-next-line @typescript-eslint/ban-types
-  });
-}
-var RT_IMAGE_TAG = "rt_image";
-function image(ref, metadata) {
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FILE_REF_PROP, ref), FILE_REF_SUBTYPE_TAG, RT_IMAGE_TAG), VAL_EXTENSION, "file"), "metadata", metadata);
-}
+var initImage = function initImage(config) {
+  var _config$files$directo, _config$files;
+  (_config$files$directo = config === null || config === void 0 || (_config$files = config.files) === null || _config$files === void 0 ? void 0 : _config$files.directory) !== null && _config$files$directo !== void 0 ? _config$files$directo : "/public/val";
 
-function link(text, _ref) {
-  var href = _ref.href;
-  return _defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "link"), "href", href), "children", [text]);
-}
+  /**
+   * Define the source of an image file.
+   *
+   * @example
+   * c.image("/public/val/example.png", {
+   *   width: 944,
+   *   height: 944,
+   *   mimeType: "image/png",
+   *})
+   *
+   * @param ref /public/val/example.png
+   * @param metadata Image metadata: width, height, mimeType and optionally a hotspot.
+   */
+
+  /**
+   * Define the source of an image file.
+   *
+   * NOTE: this will **not** validate since metadata has not been defined.
+   *
+   * Run `npx -p @valbuild/cli val validate --fix` to automatically add metadata.
+   *
+   * @example
+   * c.image("/public/val/example.png")
+   *
+   * @param ref /public/val/example.png
+   * @param metadata Image metadata: width, height, mimeType and optionally a hotspot.
+   */
+
+  /**
+   * Define the source of an image file.
+   *
+   * @example
+   * c.image("/public/val/example.png", {
+   *   width: 944,
+   *   height: 944,
+   *   mimeType: "image/png",
+   *})
+   *
+   * @param ref /public/val/example.png
+   * @param metadata Image metadata: width, height, mimeType and optionally a hotspot.
+   */
+  function image(ref, metadata) {
+    return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FILE_REF_PROP, ref), VAL_EXTENSION, "file"), FILE_REF_SUBTYPE_TAG, "image"), "metadata", metadata);
+  }
+  return image;
+};
 
 /* eslint-disable @typescript-eslint/ban-types */
 // import { i18n, I18n } from "./source/future/i18n";
@@ -3723,11 +3505,7 @@ var initVal = function initVal(config) {
       define: define,
       // remote,
       file: initFile(config),
-      richtext: richtext,
-      rt: {
-        image: image,
-        link: link
-      }
+      image: initImage(config)
     },
     s: s,
     config: config
@@ -5228,7 +5006,6 @@ exports.NilSym = NilSym;
 exports.NumberSchema = NumberSchema;
 exports.ObjectSchema = ObjectSchema;
 exports.PatchError = PatchError;
-exports.RT_IMAGE_TAG = RT_IMAGE_TAG;
 exports.RecordSchema = RecordSchema;
 exports.RichTextSchema = RichTextSchema;
 exports.Schema = Schema;

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

@@ -2,10 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-4145963f.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('./index-38cd75f9.cjs.dev.js');
 require('./result-bb1f436e.cjs.dev.js');
-require('marked');
-require('@valbuild/core');
 
 
 
@@ -24,7 +22,6 @@ exports.LiteralSchema = expr_dist_valbuildCoreExpr.LiteralSchema;
 exports.ModuleFilePathSep = expr_dist_valbuildCoreExpr.ModuleFilePathSep;
 exports.NumberSchema = expr_dist_valbuildCoreExpr.NumberSchema;
 exports.ObjectSchema = expr_dist_valbuildCoreExpr.ObjectSchema;
-exports.RT_IMAGE_TAG = expr_dist_valbuildCoreExpr.RT_IMAGE_TAG;
 exports.RecordSchema = expr_dist_valbuildCoreExpr.RecordSchema;
 exports.RichTextSchema = expr_dist_valbuildCoreExpr.RichTextSchema;
 exports.Schema = expr_dist_valbuildCoreExpr.Schema;

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

@@ -2,10 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-09f6e387.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('./index-55eeef93.cjs.prod.js');
 require('./result-787e35f6.cjs.prod.js');
-require('marked');
-require('@valbuild/core');
 
 
 
@@ -24,7 +22,6 @@ exports.LiteralSchema = expr_dist_valbuildCoreExpr.LiteralSchema;
 exports.ModuleFilePathSep = expr_dist_valbuildCoreExpr.ModuleFilePathSep;
 exports.NumberSchema = expr_dist_valbuildCoreExpr.NumberSchema;
 exports.ObjectSchema = expr_dist_valbuildCoreExpr.ObjectSchema;
-exports.RT_IMAGE_TAG = expr_dist_valbuildCoreExpr.RT_IMAGE_TAG;
 exports.RecordSchema = expr_dist_valbuildCoreExpr.RecordSchema;
 exports.RichTextSchema = expr_dist_valbuildCoreExpr.RichTextSchema;
 exports.Schema = expr_dist_valbuildCoreExpr.Schema;

package/dist/valbuild-core.esm.js

@@ -1,4 +1,2 @@
-export { A as ArraySchema, B as BooleanSchema, D as DateSchema, 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, K as KeyOfSchema, L as LiteralSchema, M as ModuleFilePathSep, 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, n as derefPatch, w as deserializeSchema, i as expr, h as initVal, m as modules } from './index-e38a9dcf.esm.js';
+export { A as ArraySchema, B as BooleanSchema, D as DateSchema, F as FATAL_ERROR_TYPES, k as FILE_REF_PROP, l as FILE_REF_SUBTYPE_TAG, t as FileSchema, G as GenericSelector, r as ImageSchema, I as Internal, K as KeyOfSchema, L as LiteralSchema, M as ModuleFilePathSep, q as NumberSchema, O as ObjectSchema, R as RecordSchema, u as RichTextSchema, j as Schema, o as StringSchema, U as UnionSchema, V as VAL_EXTENSION, n as derefPatch, v as deserializeSchema, i as expr, h as initVal, m as modules } from './index-062f9388.esm.js';
 import './result-168dfc1d.esm.js';
-import 'marked';
-import '@valbuild/core';

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

@@ -2,10 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-4145963f.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-38cd75f9.cjs.dev.js');
 require('../../dist/result-bb1f436e.cjs.dev.js');
-require('marked');
-require('@valbuild/core');
 
 
 

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

@@ -2,10 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-09f6e387.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-55eeef93.cjs.prod.js');
 require('../../dist/result-787e35f6.cjs.prod.js');
-require('marked');
-require('@valbuild/core');
 
 
 

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

@@ -1,4 +1,2 @@
-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-e38a9dcf.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-062f9388.esm.js';
 import '../../dist/result-168dfc1d.esm.js';
-import 'marked';
-import '@valbuild/core';

package/package.json

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

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

@@ -2,11 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-4145963f.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-38cd75f9.cjs.dev.js');
 var result = require('../../dist/result-bb1f436e.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,11 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-09f6e387.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-55eeef93.cjs.prod.js');
 var result = require('../../dist/result-787e35f6.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,9 +1,7 @@
-import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-e38a9dcf.esm.js';
-export { P as PatchError } from '../../dist/index-e38a9dcf.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-062f9388.esm.js';
+export { P as PatchError } from '../../dist/index-062f9388.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-168dfc1d.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';
-import 'marked';
-import '@valbuild/core';
 
 function isNotRoot(path) {
   return isNonEmpty(path);

package/dist/declarations/src/source/link.d.ts

@@ -1,9 +0,0 @@
-import { VAL_EXTENSION } from "./index.js";
-export type LinkSource = {
-    [VAL_EXTENSION]: "link";
-    href: string;
-    children: [string];
-};
-export declare function link(text: string, { href }: {
-    href: string;
-}): LinkSource;