@valbuild/core 0.20.2 → 0.21.0

package/dist/declarations/src/index.d.ts

@@ -1,10 +1,12 @@
 export { initVal } from "./initVal.js";
 export type { InitVal } from "./initVal.js";
 export { Schema, type SerializedSchema } from "./schema/index.js";
+export type { ImageMetadata } from "./schema/image.js";
+export type { LinkSource } from "./source/link.js";
 export type { ValModule, SerializedModule } from "./module.js";
 export type { SourceObject, SourcePrimitive, Source } from "./source/index.js";
 export type { FileSource } from "./source/file.js";
-export type { AnyRichTextOptions, Bold, Classes, HeadingNode, ImageNode, Italic, LineThrough, ListItemNode, OrderedListNode, ParagraphNode, RichText, RichTextNode, RichTextOptions, RichTextSource, RichTextSourceNode, RootNode, SourceNode, SpanNode, UnorderedListNode, } from "./source/richtext.js";
+export type { AnyRichTextOptions, Bold, Classes, HeadingNode, ImageNode, Italic, LineThrough, ListItemNode, LinkNode, OrderedListNode, ParagraphNode, BrNode, RichText, RichTextNode, RichTextOptions, RichTextSource, RootNode, SpanNode, UnorderedListNode, } from "./source/richtext.js";
 export { type Val, type SerializedVal, type ModuleId, type ModulePath, type SourcePath, type JsonOfSource, } from "./val/index.js";
 export type { Json, JsonPrimitive } from "./Json.js";
 export type { ValidationErrors, ValidationError, } from "./schema/validation/ValidationError.js";
@@ -21,7 +23,6 @@ import { createValPathOfItem } from "./selector/SelectorProxy.js";
 import { getVal } from "./future/fetchVal.js";
 import { Json } from "./Json.js";
 import { SerializedSchema } from "./schema/index.js";
-import { convertRichTextSource } from "./source/richtext.js";
 export { ValApi } from "./ValApi.js";
 export type ApiTreeResponse = {
     git: {
@@ -43,7 +44,6 @@ declare const Internal: {
         url: string;
         metadata?: import("./schema/image.js").ImageMetadata;
     };
-    convertRichTextSource: typeof convertRichTextSource;
     getSchema: typeof getSchema;
     getValPath: typeof getValPath;
     getVal: typeof getVal;

package/dist/declarations/src/initVal.d.ts

@@ -3,10 +3,12 @@ import { InitSchema } from "./initSchema.js";
 import { getValPath as getPath } from "./val/index.js";
 import { file } from "./source/file.js";
 import { richtext } from "./source/richtext.js";
+import { link } from "./source/link.js";
 type ValConstructor = {
     content: typeof content;
     getPath: typeof getPath;
     file: typeof file;
+    link: typeof link;
     richtext: typeof richtext;
 };
 export type InitVal = {

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

@@ -0,0 +1,9 @@
+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;

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

@@ -1,36 +1,61 @@
 import { FileSource } from "./file.js";
 import { VAL_EXTENSION } from "./index.js";
+import { LinkSource } from "./link.js";
+import { ImageMetadata } from "../schema/image.js";
 export type RichTextOptions = {
     headings?: ("h1" | "h2" | "h3" | "h4" | "h5" | "h6")[];
     img?: boolean;
+    a?: boolean;
     ul?: boolean;
     ol?: boolean;
     lineThrough?: boolean;
     bold?: boolean;
     italic?: boolean;
 };
-export type ParagraphNode<O extends RichTextOptions> = {
-    tag: "p";
-    children: (string | SpanNode<O>)[];
+export type AnyRichTextOptions = {
+    headings: ("h1" | "h2" | "h3" | "h4" | "h5" | "h6")[];
+    img: true;
+    a: true;
+    ul: true;
+    ol: true;
+    lineThrough: true;
+    bold: true;
+    italic: true;
 };
 export type LineThrough<O extends RichTextOptions> = O["lineThrough"] extends true ? "line-through" : never;
 export type Italic<O extends RichTextOptions> = O["italic"] extends true ? "italic" : never;
 export type Bold<O extends RichTextOptions> = O["bold"] extends true ? "bold" : never;
 export type Classes<O extends RichTextOptions> = LineThrough<O> | Italic<O> | Bold<O>;
+export type ParagraphNode<O extends RichTextOptions> = {
+    tag: "p";
+    children: (string | SpanNode<O> | BrNode | LinkNode<O> | ImageNode<O>)[];
+};
+export type BrNode = {
+    tag: "br";
+    children: [];
+};
 export type SpanNode<O extends RichTextOptions> = {
     tag: "span";
     classes: Classes<O>[];
     children: [string | SpanNode<O>];
 };
-export type ImageNode<O extends RichTextOptions> = O["img"] extends true ? {
+type ImageTagNode = {
     tag: "img";
     src: string;
     height?: number;
     width?: number;
-} : never;
+    children: [];
+};
+export type ImageNode<O extends RichTextOptions> = O["img"] extends true ? ImageTagNode : never;
+type LinkTagNode<O extends RichTextOptions> = {
+    tag: "a";
+    href: string;
+    children: (string | SpanNode<O>)[];
+};
+export type LinkNode<O extends RichTextOptions> = O["a"] extends true ? LinkTagNode<O> : never;
 export type ListItemNode<O extends RichTextOptions> = {
     tag: "li";
-    children: (string | SpanNode<O> | UnorderedListNode<O> | OrderedListNode<O>)[];
+    children: (string | SpanNode<O> | LinkNode<O> | BrNode | UnorderedListNode<O> | OrderedListNode<O>)[];
 };
 export type UnorderedListNode<O extends RichTextOptions> = O["ul"] extends true ? {
     tag: "ul";
@@ -42,38 +67,27 @@ export type OrderedListNode<O extends RichTextOptions> = O["ol"] extends true ?
     dir?: "ltr" | "rtl";
     children: ListItemNode<O>[];
 } : never;
-export type HeadingNode<O extends RichTextOptions> = O["headings"] extends any[] ? {
+export type HeadingNode<O extends RichTextOptions> = O["headings"] extends ("h1" | "h2" | "h3" | "h4" | "h5" | "h6")[] ? {
     tag: O["headings"][number];
     children: (string | SpanNode<O>)[];
 } : never;
-type ImageSource = FileSource<{
-    width: number;
-    height: number;
-    sha256: string;
-}>;
-export type SourceNode<O extends RichTextOptions> = O["img"] extends true ? ImageSource : never;
-export type AnyRichTextOptions = {
-    headings: ("h1" | "h2" | "h3" | "h4" | "h5" | "h6")[];
-    img: true;
-    ul: true;
-    ol: true;
-    lineThrough: true;
-    bold: true;
-    italic: true;
-};
-export type RichTextSourceNode<O extends RichTextOptions> = Exclude<RichTextNode<O>, {
-    tag: "img";
-}> | SourceNode<O>;
+export type RichTextNode<O extends RichTextOptions> = string | RootNode<O> | ListItemNode<O> | BrNode | SpanNode<O> | LinkNode<O> | ImageNode<O>;
+export type RootNode<O extends RichTextOptions> = HeadingNode<O> | ParagraphNode<O> | BrNode | UnorderedListNode<O> | OrderedListNode<O>;
+/**
+ * RichTextSource is defined in ValModules
+ **/
 export type RichTextSource<O extends RichTextOptions> = {
     [VAL_EXTENSION]: "richtext";
-    children: (HeadingNode<O> | ParagraphNode<O> | UnorderedListNode<O> | OrderedListNode<O> | SourceNode<O>)[];
+    templateStrings: string[];
+    exprs: ((O["img"] extends true ? FileSource<ImageMetadata> : never) | (O["a"] extends true ? LinkSource : never))[];
 };
-export type RichTextNode<O extends RichTextOptions> = string | HeadingNode<O> | ParagraphNode<O> | UnorderedListNode<O> | OrderedListNode<O> | ListItemNode<O> | SpanNode<O> | ImageNode<O>;
-export type RootNode<O extends RichTextOptions> = HeadingNode<O> | ParagraphNode<O> | UnorderedListNode<O> | OrderedListNode<O> | ImageNode<O>;
+/**
+ * RichText is accessible by users (after conversion via useVal / fetchVal)
+ * Internally it is a Selector
+ **/
 export type RichText<O extends RichTextOptions> = {
     [VAL_EXTENSION]: "richtext";
     children: RootNode<O>[];
 };
-export declare function convertRichTextSource<O extends RichTextOptions>(src: RichTextSource<O>): RichText<O>;
-export declare function richtext<O extends RichTextOptions, Nodes extends never | ImageSource>(templateStrings: TemplateStringsArray, ...expr: Nodes[]): RichTextSource<O>;
+export declare function richtext<O extends RichTextOptions>(templateStrings: TemplateStringsArray, ...nodes: (FileSource<ImageMetadata> | LinkSource)[]): RichTextSource<O>;
 export {};

package/dist/{index-601a7d73.cjs.prod.js → index-067cff4a.cjs.prod.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index$1 = require('./index-8706c87e.cjs.prod.js');
+var index$1 = require('./index-75b79c89.cjs.prod.js');
 var result = require('./result-26f67b40.cjs.prod.js');
 
 var WHITE_SPACE = ["\n", "\r", "\t", " "];

package/dist/{index-a6e642dd.cjs.dev.js → index-31991dd7.cjs.dev.js}

@@ -511,6 +511,9 @@ var image = function image(options) {
 var convertFileSource = function convertFileSource(src) {
   var _src$metadata;
   // TODO: /public should be configurable
+  if (!src[FILE_REF_PROP].startsWith("/public")) {
+    throw Error("Invalid reference: ".concat(src[FILE_REF_PROP], ". Did not start with /public"));
+  }
   return {
     url: src[FILE_REF_PROP].slice("/public".length) + "?sha256=".concat((_src$metadata = src.metadata) === null || _src$metadata === void 0 ? void 0 : _src$metadata.sha256),
     metadata: src.metadata

package/dist/{index-bccf1907.esm.js → index-4bb14a92.esm.js}

@@ -509,6 +509,9 @@ var image = function image(options) {
 var convertFileSource = function convertFileSource(src) {
   var _src$metadata;
   // TODO: /public should be configurable
+  if (!src[FILE_REF_PROP].startsWith("/public")) {
+    throw Error("Invalid reference: ".concat(src[FILE_REF_PROP], ". Did not start with /public"));
+  }
   return {
     url: src[FILE_REF_PROP].slice("/public".length) + "?sha256=".concat((_src$metadata = src.metadata) === null || _src$metadata === void 0 ? void 0 : _src$metadata.sha256),
     metadata: src.metadata
@@ -547,4 +550,4 @@ function getValPath(valOrSelector) {
   return valOrSelector[Path];
 }
 
-export { Call as C, Expr as E, FILE_REF_PROP as F, GetSchema as G, ImageSchema as I, NilSym as N, Path as P, Schema as S, VAL_EXTENSION as V, _inherits as _, _createSuper as a, _classCallCheck as b, _createClass as c, _defineProperty as d, _typeof as e, convertFileSource as f, getValPath as g, file as h, image as i, _objectSpread2 as j, _slicedToArray as k, isFile as l, GetSource as m, isSerializedVal as n, getSchema as o, isVal as p, GenericSelector as q, Sym as r, StringLiteral as s, StringTemplate as t, _toConsumableArray as u };
+export { Call as C, Expr as E, FILE_REF_PROP as F, GetSchema as G, ImageSchema as I, NilSym as N, Path as P, Schema as S, VAL_EXTENSION as V, _inherits as _, _createSuper as a, _classCallCheck as b, _createClass as c, _defineProperty as d, _typeof as e, file as f, getValPath as g, _objectSpread2 as h, image as i, _slicedToArray as j, isFile as k, GetSource as l, isSerializedVal as m, convertFileSource as n, getSchema as o, isVal as p, GenericSelector as q, Sym as r, StringLiteral as s, StringTemplate as t, _toConsumableArray as u };

package/dist/{index-8706c87e.cjs.prod.js → index-75b79c89.cjs.prod.js}

@@ -511,6 +511,9 @@ var image = function image(options) {
 var convertFileSource = function convertFileSource(src) {
   var _src$metadata;
   // TODO: /public should be configurable
+  if (!src[FILE_REF_PROP].startsWith("/public")) {
+    throw Error("Invalid reference: ".concat(src[FILE_REF_PROP], ". Did not start with /public"));
+  }
   return {
     url: src[FILE_REF_PROP].slice("/public".length) + "?sha256=".concat((_src$metadata = src.metadata) === null || _src$metadata === void 0 ? void 0 : _src$metadata.sha256),
     metadata: src.metadata

package/dist/{index-5d1ab97c.esm.js → index-870205b5.esm.js}

@@ -1,4 +1,4 @@
-import { j as _objectSpread2, k as _slicedToArray, c as _createClass, b as _classCallCheck, r as Sym, C as Call, s as StringLiteral, t as StringTemplate, e as _typeof, n as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, f as convertFileSource, d as _defineProperty, S as Schema, E as Expr, u as _toConsumableArray, N as NilSym } from './index-bccf1907.esm.js';
+import { h as _objectSpread2, j as _slicedToArray, c as _createClass, b as _classCallCheck, r as Sym, C as Call, s as StringLiteral, t as StringTemplate, e as _typeof, m as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, n as convertFileSource, d as _defineProperty, S as Schema, E as Expr, u as _toConsumableArray, N as NilSym } from './index-4bb14a92.esm.js';
 import { i as isErr, e as err, o as ok, a as isOk } from './result-b96df128.esm.js';
 
 var WHITE_SPACE = ["\n", "\r", "\t", " "];

package/dist/{index-486c7fbf.cjs.dev.js → index-d17f9503.cjs.dev.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index$1 = require('./index-a6e642dd.cjs.dev.js');
+var index$1 = require('./index-31991dd7.cjs.dev.js');
 var result = require('./result-48320acd.cjs.dev.js');
 
 var WHITE_SPACE = ["\n", "\r", "\t", " "];

package/dist/{ops-b0a33248.cjs.dev.js → ops-0f7617a0.cjs.dev.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-a6e642dd.cjs.dev.js');
+var index = require('./index-31991dd7.cjs.dev.js');
 var result = require('./result-48320acd.cjs.dev.js');
 
 function hasOwn(obj, prop) {

package/dist/{ops-def81fc3.cjs.prod.js → ops-451ffb3f.cjs.prod.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-8706c87e.cjs.prod.js');
+var index = require('./index-75b79c89.cjs.prod.js');
 var result = require('./result-26f67b40.cjs.prod.js');
 
 function hasOwn(obj, prop) {

package/dist/{ops-22b624eb.esm.js → ops-9b396073.esm.js}

@@ -1,4 +1,4 @@
-import { e as _typeof, n as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, f as convertFileSource, d as _defineProperty, m as GetSource, P as Path, G as GetSchema, S as Schema, E as Expr, _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, k as _slicedToArray, j as _objectSpread2, u as _toConsumableArray, I as ImageSchema } from './index-bccf1907.esm.js';
+import { e as _typeof, m as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, n as convertFileSource, d as _defineProperty, l as GetSource, P as Path, G as GetSchema, S as Schema, E as Expr, _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, j as _slicedToArray, h as _objectSpread2, u as _toConsumableArray, I as ImageSchema } from './index-4bb14a92.esm.js';
 import { _ as _createForOfIteratorHelper } from './result-b96df128.esm.js';
 
 function hasOwn(obj, prop) {

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

@@ -2,32 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-a6e642dd.cjs.dev.js');
-var ops = require('./ops-b0a33248.cjs.dev.js');
-var marked = require('marked');
-var expr_dist_valbuildCoreExpr = require('./index-486c7fbf.cjs.dev.js');
+var index = require('./index-31991dd7.cjs.dev.js');
+var ops = require('./ops-0f7617a0.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('./index-d17f9503.cjs.dev.js');
 var result = require('./result-48320acd.cjs.dev.js');
 
-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);
-
 var NumberSchema = /*#__PURE__*/function (_Schema) {
   index._inherits(NumberSchema, _Schema);
   var _super = index._createSuper(NumberSchema);
@@ -394,143 +373,44 @@ function initSchema() {
   };
 }
 
-// export type FontFamily<O extends RichTextOptions> =
-//   O["fontFamily"] extends Record<string, unknown>
-//     ? `font-${keyof O["fontFamily"] & string}`
-//     : never;
-// export type FontSize<O extends RichTextOptions> = O["fontSize"] extends Record<
-//   string,
-//   unknown
-// >
-//   ? `text-${keyof O["fontSize"] & string}`
-//   : never;
-// | FontFamily<O>
-// | FontSize<O>;
-// export type AnchorNode<O extends RichTextOptions> = never; // TODO:
-// O["link"] extends true
-//   ? {
-//       tag: "a";
-//       href: string;
-//       children: [string];
-//     }
-//   : never;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-// export type BlockQuoteNode<O extends RichTextOptions> =
-//   O["blockQuote"] extends true
-//     ? { tag: "blockquote"; children: [string] }
-//     : never;
-// TODO: rename to RichTextSelector?
-function parseTokens(tokens) {
-  return tokens.flatMap(function (token) {
-    if (token.type === "heading") {
-      return [{
-        tag: "h".concat(token.depth),
-        children: parseTokens(token.tokens ? token.tokens : [])
-      }];
-    }
-    if (token.type === "paragraph") {
-      return [{
-        tag: "p",
-        children: parseTokens(token.tokens ? token.tokens : [])
-      }];
-    }
-    if (token.type === "strong") {
-      return [{
-        tag: "span",
-        classes: ["bold"],
-        children: parseTokens(token.tokens ? token.tokens : [])
-      }];
-    }
-    if (token.type === "em") {
-      return [{
-        tag: "span",
-        classes: ["italic"],
-        children: parseTokens(token.tokens ? token.tokens : [])
-      }];
-    }
-    if (token.type === "del") {
-      return [{
-        tag: "span",
-        classes: ["line-through"],
-        children: parseTokens(token.tokens ? token.tokens : [])
-      }];
-    }
-    if (token.type === "text") {
-      if ("tokens" in token && Array.isArray(token.tokens)) {
-        return parseTokens(token.tokens);
-      }
-      return [token.text];
-    }
-    if (token.type === "list") {
-      return [{
-        tag: token.ordered ? "ol" : "ul",
-        children: parseTokens(token.items)
-      }];
-    }
-    if (token.type === "list_item") {
-      return [{
-        tag: "li",
-        children: parseTokens(token.tokens ? token.tokens : [])
-      }];
-    }
-    if (token.type === "space") {
-      return [];
-    }
-    if (token.type === "code") {
-      return [{
-        tag: "span",
-        classes: [],
-        children: [token.text]
-      }];
-    }
-    // console.error(
-    //   `Could not parse markdown: unsupported token type: ${token.type}. Found: ${token.raw}`
-    // );
-    return [token.raw];
-  });
-}
+// Classes
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function nodeToTag(node) {
-  if (node[index.VAL_EXTENSION] === "file") {
-    return node;
-  }
-  throw Error("Unexpected node: ".concat(JSON.stringify(node)));
-}
-function imgSrcToImgTag(imageSrc) {
-  var _imageSrc$metadata, _imageSrc$metadata2;
-  var converted = index.convertFileSource(imageSrc);
-  return {
-    tag: "img",
-    src: converted.url,
-    width: (_imageSrc$metadata = imageSrc.metadata) === null || _imageSrc$metadata === void 0 ? void 0 : _imageSrc$metadata.width,
-    height: (_imageSrc$metadata2 = imageSrc.metadata) === null || _imageSrc$metadata2 === void 0 ? void 0 : _imageSrc$metadata2.height
-  };
-}
-function convertRichTextSource(src) {
+/// Paragraph
+
+/// Break
+
+/// Span
+
+/// Image
+
+/// Link
+
+/// List
+
+/// Heading
+
+/// Root and nodes
+
+/// Main types
+/**
+ * RichTextSource is defined in ValModules
+ **/
+/**
+ * RichText is accessible by users (after conversion via useVal / fetchVal)
+ * Internally it is a Selector
+ **/
+function richtext(templateStrings) {
   var _ref;
-  return _ref = {}, index._defineProperty(_ref, index.VAL_EXTENSION, "richtext"), index._defineProperty(_ref, "children", src.children.map(function (source) {
-    if (index.VAL_EXTENSION in source && source[index.VAL_EXTENSION] === "file") {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return imgSrcToImgTag(source);
-    }
-    return source;
-  })), _ref;
+  for (var _len = arguments.length, nodes = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    nodes[_key - 1] = arguments[_key];
+  }
+  return _ref = {}, index._defineProperty(_ref, index.VAL_EXTENSION, "richtext"), index._defineProperty(_ref, "templateStrings", templateStrings), index._defineProperty(_ref, "exprs", nodes), _ref;
 }
-function richtext(templateStrings) {
+
+function link(text, _ref) {
   var _ref2;
-  for (var _len = arguments.length, expr = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    expr[_key - 1] = arguments[_key];
-  }
-  return _ref2 = {}, index._defineProperty(_ref2, index.VAL_EXTENSION, "richtext"), index._defineProperty(_ref2, "children", templateStrings.flatMap(function (templateString, i) {
-    var lex = marked__namespace.lexer(templateString, {
-      gfm: true
-    });
-    if (expr[i]) {
-      return parseTokens(lex).concat(nodeToTag(expr[i]));
-    }
-    return parseTokens(lex);
-  })), _ref2;
+  var href = _ref.href;
+  return _ref2 = {}, index._defineProperty(_ref2, index.VAL_EXTENSION, "link"), index._defineProperty(_ref2, "href", href), index._defineProperty(_ref2, "children", [text]), _ref2;
 }
 
 // import { i18n, I18n } from "./source/future/i18n";
@@ -566,7 +446,8 @@ var initVal = function initVal() {
       // remote,
       getPath: index.getValPath,
       file: index.file,
-      richtext: richtext
+      richtext: richtext,
+      link: link
     },
     s: index._objectSpread2({}, s)
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1304,7 +1185,6 @@ function _parse() {
 
 var Internal = {
   convertFileSource: index.convertFileSource,
-  convertRichTextSource: convertRichTextSource,
   getSchema: index.getSchema,
   getValPath: index.getValPath,
   getVal: getVal,