@valbuild/server 0.20.1 → 0.21.0

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

@@ -246,99 +246,6 @@ function analyzeValModule(sourceFile) {
   return analysis;
 }
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-const HeaderRegEx = /^h([\d+])$/;
-function richTextToTaggedStringTemplate(source) {
-  const texts = [""];
-  const nodes = [];
-  let didAppendNewLines = false;
-  let listContext = null;
-  function rec(node) {
-    if (typeof node === "string") {
-      texts[texts.length - 1] += node;
-    } else if ("tag" in node && node.tag) {
-      var _node$children, _node$tag;
-      if (node.tag === "h1" || node.tag === "h2" || node.tag === "h3" || node.tag === "h4" || node.tag === "h5" || node.tag === "h6") {
-        var _node$tag$match;
-        const depth = Number((_node$tag$match = node.tag.match(HeaderRegEx)) === null || _node$tag$match === void 0 ? void 0 : _node$tag$match[1]);
-        if (Number.isNaN(depth)) {
-          throw new Error("Invalid header depth");
-        }
-        for (let i = 0; i < Number(depth); i++) {
-          texts[texts.length - 1] += "#";
-        }
-        texts[texts.length - 1] += " ";
-      } else if (node.tag === "p") ; else if (node.tag === "ul") {
-        listContext = "ul";
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag === "ol") {
-        listContext = "ol";
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag === "li") {
-        if (listContext === "ul") {
-          texts[texts.length - 1] += "\n- ";
-        } else if (listContext === "ol") {
-          texts[texts.length - 1] += "\n1. ";
-        } else {
-          throw new Error("Unexpected list context");
-        }
-      } else if (node.tag === "span") {
-        if (node.classes.includes("bold") && !node.classes.includes("italic")) {
-          texts[texts.length - 1] += "**";
-        }
-        if (node.classes.includes("italic") && !node.classes.includes("bold")) {
-          texts[texts.length - 1] += "*";
-        }
-        if (node.classes.includes("italic") && node.classes.includes("bold")) {
-          texts[texts.length - 1] += "***";
-        }
-        if (node.classes.includes("line-through")) {
-          texts[texts.length - 1] += "~~";
-        }
-      } else {
-        //exhaustive match
-        const exhaustiveCheck = node.tag;
-        throw new Error("Unexpected node tag: " + JSON.stringify(node, exhaustiveCheck, 2));
-      }
-      (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children.forEach(rec);
-      didAppendNewLines = false;
-      if (node.tag === "span") {
-        if (node.classes.includes("line-through")) {
-          texts[texts.length - 1] += "~~";
-        }
-        if (node.classes.includes("italic") && node.classes.includes("bold")) {
-          texts[texts.length - 1] += "***";
-        }
-        if (node.classes.includes("italic") && !node.classes.includes("bold")) {
-          texts[texts.length - 1] += "*";
-        }
-        if (node.classes.includes("bold") && !node.classes.includes("italic")) {
-          texts[texts.length - 1] += "**";
-        }
-      } else if (node.tag === "p") {
-        didAppendNewLines = true;
-        texts[texts.length - 1] += "\n\n";
-      } else if (node.tag === "ul" || node.tag === "ol") {
-        listContext = null;
-        texts[texts.length - 1] += "\n";
-      } else if ((_node$tag = node.tag) !== null && _node$tag !== void 0 && _node$tag.startsWith("h")) {
-        didAppendNewLines = true;
-        texts[texts.length - 1] += "\n\n";
-      }
-    } else {
-      nodes.push(node); // ImageSource
-      texts.push("\n");
-    }
-  }
-  source.children.forEach(rec);
-  if (texts[texts.length - 1] && didAppendNewLines) {
-    // remove last \n\n
-    texts[texts.length - 1] = texts[texts.length - 1].slice(0, -2);
-  }
-  return [texts, nodes];
-}
-
 function isValidIdentifier(text) {
   if (text.length === 0) {
     return false;
@@ -363,11 +270,20 @@ function createValFileReference(value) {
   }
   return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("val"), ts__default["default"].factory.createIdentifier("file")), undefined, args);
 }
+function createValLink(value) {
+  const args = [ts__default["default"].factory.createStringLiteral(value.children[0]), toExpression({
+    href: value.href
+  })];
+  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("val"), ts__default["default"].factory.createIdentifier("link")), undefined, args);
+}
 function createValRichTextTaggedStringTemplate(value) {
-  const [[head, ...others], nodes] = richTextToTaggedStringTemplate(value);
+  const {
+    templateStrings: [head, ...others],
+    exprs
+  } = value;
   const tag = ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("val"), ts__default["default"].factory.createIdentifier("richtext"));
-  if (nodes.length > 0) {
-    return ts__default["default"].factory.createTaggedTemplateExpression(tag, undefined, ts__default["default"].factory.createTemplateExpression(ts__default["default"].factory.createTemplateHead(head, head), others.map((s, i) => ts__default["default"].factory.createTemplateSpan(toExpression(nodes[i]), i < others.length - 1 ? ts__default["default"].factory.createTemplateMiddle(s, s) : ts__default["default"].factory.createTemplateTail(s, s)))));
+  if (exprs.length > 0) {
+    return ts__default["default"].factory.createTaggedTemplateExpression(tag, undefined, ts__default["default"].factory.createTemplateExpression(ts__default["default"].factory.createTemplateHead(head, head), others.map((s, i) => ts__default["default"].factory.createTemplateSpan(toExpression(exprs[i]), i < others.length - 1 ? ts__default["default"].factory.createTemplateMiddle(s, s) : ts__default["default"].factory.createTemplateTail(s, s)))));
   }
   return ts__default["default"].factory.createTaggedTemplateExpression(tag, undefined, ts__default["default"].factory.createNoSubstitutionTemplateLiteral(head, head));
 }
@@ -386,6 +302,8 @@ function toExpression(value) {
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
       return createValFileReference(value);
+    } else if (isValLinkValue(value)) {
+      return createValLink(value);
     } else if (isValRichTextValue(value)) {
       return createValRichTextTaggedStringTemplate(value);
     }
@@ -620,8 +538,11 @@ function isValFileValue(value) {
   // value[VAL_EXTENSION] === "file" &&
   core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string");
 }
+function isValLinkValue(value) {
+  return !!(typeof value === "object" && value && core.VAL_EXTENSION in value && value[core.VAL_EXTENSION] === "link");
+}
 function isValRichTextValue(value) {
-  return !!(typeof value === "object" && value && core.VAL_EXTENSION in value && value[core.VAL_EXTENSION] === "richtext" && "children" in value && typeof value.children === "object" && Array.isArray(value.children));
+  return !!(typeof value === "object" && value && core.VAL_EXTENSION in value && value[core.VAL_EXTENSION] === "richtext" && "templateStrings" in value && typeof value.templateStrings === "object" && Array.isArray(value.templateStrings));
 }
 function addToNode(document, node, key, value) {
   if (ts__default["default"].isArrayLiteralExpression(node)) {

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

@@ -246,99 +246,6 @@ function analyzeValModule(sourceFile) {
   return analysis;
 }
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-const HeaderRegEx = /^h([\d+])$/;
-function richTextToTaggedStringTemplate(source) {
-  const texts = [""];
-  const nodes = [];
-  let didAppendNewLines = false;
-  let listContext = null;
-  function rec(node) {
-    if (typeof node === "string") {
-      texts[texts.length - 1] += node;
-    } else if ("tag" in node && node.tag) {
-      var _node$children, _node$tag;
-      if (node.tag === "h1" || node.tag === "h2" || node.tag === "h3" || node.tag === "h4" || node.tag === "h5" || node.tag === "h6") {
-        var _node$tag$match;
-        const depth = Number((_node$tag$match = node.tag.match(HeaderRegEx)) === null || _node$tag$match === void 0 ? void 0 : _node$tag$match[1]);
-        if (Number.isNaN(depth)) {
-          throw new Error("Invalid header depth");
-        }
-        for (let i = 0; i < Number(depth); i++) {
-          texts[texts.length - 1] += "#";
-        }
-        texts[texts.length - 1] += " ";
-      } else if (node.tag === "p") ; else if (node.tag === "ul") {
-        listContext = "ul";
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag === "ol") {
-        listContext = "ol";
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag === "li") {
-        if (listContext === "ul") {
-          texts[texts.length - 1] += "\n- ";
-        } else if (listContext === "ol") {
-          texts[texts.length - 1] += "\n1. ";
-        } else {
-          throw new Error("Unexpected list context");
-        }
-      } else if (node.tag === "span") {
-        if (node.classes.includes("bold") && !node.classes.includes("italic")) {
-          texts[texts.length - 1] += "**";
-        }
-        if (node.classes.includes("italic") && !node.classes.includes("bold")) {
-          texts[texts.length - 1] += "*";
-        }
-        if (node.classes.includes("italic") && node.classes.includes("bold")) {
-          texts[texts.length - 1] += "***";
-        }
-        if (node.classes.includes("line-through")) {
-          texts[texts.length - 1] += "~~";
-        }
-      } else {
-        //exhaustive match
-        const exhaustiveCheck = node.tag;
-        throw new Error("Unexpected node tag: " + JSON.stringify(node, exhaustiveCheck, 2));
-      }
-      (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children.forEach(rec);
-      didAppendNewLines = false;
-      if (node.tag === "span") {
-        if (node.classes.includes("line-through")) {
-          texts[texts.length - 1] += "~~";
-        }
-        if (node.classes.includes("italic") && node.classes.includes("bold")) {
-          texts[texts.length - 1] += "***";
-        }
-        if (node.classes.includes("italic") && !node.classes.includes("bold")) {
-          texts[texts.length - 1] += "*";
-        }
-        if (node.classes.includes("bold") && !node.classes.includes("italic")) {
-          texts[texts.length - 1] += "**";
-        }
-      } else if (node.tag === "p") {
-        didAppendNewLines = true;
-        texts[texts.length - 1] += "\n\n";
-      } else if (node.tag === "ul" || node.tag === "ol") {
-        listContext = null;
-        texts[texts.length - 1] += "\n";
-      } else if ((_node$tag = node.tag) !== null && _node$tag !== void 0 && _node$tag.startsWith("h")) {
-        didAppendNewLines = true;
-        texts[texts.length - 1] += "\n\n";
-      }
-    } else {
-      nodes.push(node); // ImageSource
-      texts.push("\n");
-    }
-  }
-  source.children.forEach(rec);
-  if (texts[texts.length - 1] && didAppendNewLines) {
-    // remove last \n\n
-    texts[texts.length - 1] = texts[texts.length - 1].slice(0, -2);
-  }
-  return [texts, nodes];
-}
-
 function isValidIdentifier(text) {
   if (text.length === 0) {
     return false;
@@ -363,11 +270,20 @@ function createValFileReference(value) {
   }
   return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("val"), ts__default["default"].factory.createIdentifier("file")), undefined, args);
 }
+function createValLink(value) {
+  const args = [ts__default["default"].factory.createStringLiteral(value.children[0]), toExpression({
+    href: value.href
+  })];
+  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("val"), ts__default["default"].factory.createIdentifier("link")), undefined, args);
+}
 function createValRichTextTaggedStringTemplate(value) {
-  const [[head, ...others], nodes] = richTextToTaggedStringTemplate(value);
+  const {
+    templateStrings: [head, ...others],
+    exprs
+  } = value;
   const tag = ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("val"), ts__default["default"].factory.createIdentifier("richtext"));
-  if (nodes.length > 0) {
-    return ts__default["default"].factory.createTaggedTemplateExpression(tag, undefined, ts__default["default"].factory.createTemplateExpression(ts__default["default"].factory.createTemplateHead(head, head), others.map((s, i) => ts__default["default"].factory.createTemplateSpan(toExpression(nodes[i]), i < others.length - 1 ? ts__default["default"].factory.createTemplateMiddle(s, s) : ts__default["default"].factory.createTemplateTail(s, s)))));
+  if (exprs.length > 0) {
+    return ts__default["default"].factory.createTaggedTemplateExpression(tag, undefined, ts__default["default"].factory.createTemplateExpression(ts__default["default"].factory.createTemplateHead(head, head), others.map((s, i) => ts__default["default"].factory.createTemplateSpan(toExpression(exprs[i]), i < others.length - 1 ? ts__default["default"].factory.createTemplateMiddle(s, s) : ts__default["default"].factory.createTemplateTail(s, s)))));
   }
   return ts__default["default"].factory.createTaggedTemplateExpression(tag, undefined, ts__default["default"].factory.createNoSubstitutionTemplateLiteral(head, head));
 }
@@ -386,6 +302,8 @@ function toExpression(value) {
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
       return createValFileReference(value);
+    } else if (isValLinkValue(value)) {
+      return createValLink(value);
     } else if (isValRichTextValue(value)) {
       return createValRichTextTaggedStringTemplate(value);
     }
@@ -620,8 +538,11 @@ function isValFileValue(value) {
   // value[VAL_EXTENSION] === "file" &&
   core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string");
 }
+function isValLinkValue(value) {
+  return !!(typeof value === "object" && value && core.VAL_EXTENSION in value && value[core.VAL_EXTENSION] === "link");
+}
 function isValRichTextValue(value) {
-  return !!(typeof value === "object" && value && core.VAL_EXTENSION in value && value[core.VAL_EXTENSION] === "richtext" && "children" in value && typeof value.children === "object" && Array.isArray(value.children));
+  return !!(typeof value === "object" && value && core.VAL_EXTENSION in value && value[core.VAL_EXTENSION] === "richtext" && "templateStrings" in value && typeof value.templateStrings === "object" && Array.isArray(value.templateStrings));
 }
 function addToNode(document, node, key, value) {
   if (ts__default["default"].isArrayLiteralExpression(node)) {

package/dist/valbuild-server.esm.js

@@ -215,99 +215,6 @@ function analyzeValModule(sourceFile) {
   return analysis;
 }
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-const HeaderRegEx = /^h([\d+])$/;
-function richTextToTaggedStringTemplate(source) {
-  const texts = [""];
-  const nodes = [];
-  let didAppendNewLines = false;
-  let listContext = null;
-  function rec(node) {
-    if (typeof node === "string") {
-      texts[texts.length - 1] += node;
-    } else if ("tag" in node && node.tag) {
-      var _node$children, _node$tag;
-      if (node.tag === "h1" || node.tag === "h2" || node.tag === "h3" || node.tag === "h4" || node.tag === "h5" || node.tag === "h6") {
-        var _node$tag$match;
-        const depth = Number((_node$tag$match = node.tag.match(HeaderRegEx)) === null || _node$tag$match === void 0 ? void 0 : _node$tag$match[1]);
-        if (Number.isNaN(depth)) {
-          throw new Error("Invalid header depth");
-        }
-        for (let i = 0; i < Number(depth); i++) {
-          texts[texts.length - 1] += "#";
-        }
-        texts[texts.length - 1] += " ";
-      } else if (node.tag === "p") ; else if (node.tag === "ul") {
-        listContext = "ul";
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag === "ol") {
-        listContext = "ol";
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag === "li") {
-        if (listContext === "ul") {
-          texts[texts.length - 1] += "\n- ";
-        } else if (listContext === "ol") {
-          texts[texts.length - 1] += "\n1. ";
-        } else {
-          throw new Error("Unexpected list context");
-        }
-      } else if (node.tag === "span") {
-        if (node.classes.includes("bold") && !node.classes.includes("italic")) {
-          texts[texts.length - 1] += "**";
-        }
-        if (node.classes.includes("italic") && !node.classes.includes("bold")) {
-          texts[texts.length - 1] += "*";
-        }
-        if (node.classes.includes("italic") && node.classes.includes("bold")) {
-          texts[texts.length - 1] += "***";
-        }
-        if (node.classes.includes("line-through")) {
-          texts[texts.length - 1] += "~~";
-        }
-      } else {
-        //exhaustive match
-        const exhaustiveCheck = node.tag;
-        throw new Error("Unexpected node tag: " + JSON.stringify(node, exhaustiveCheck, 2));
-      }
-      (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children.forEach(rec);
-      didAppendNewLines = false;
-      if (node.tag === "span") {
-        if (node.classes.includes("line-through")) {
-          texts[texts.length - 1] += "~~";
-        }
-        if (node.classes.includes("italic") && node.classes.includes("bold")) {
-          texts[texts.length - 1] += "***";
-        }
-        if (node.classes.includes("italic") && !node.classes.includes("bold")) {
-          texts[texts.length - 1] += "*";
-        }
-        if (node.classes.includes("bold") && !node.classes.includes("italic")) {
-          texts[texts.length - 1] += "**";
-        }
-      } else if (node.tag === "p") {
-        didAppendNewLines = true;
-        texts[texts.length - 1] += "\n\n";
-      } else if (node.tag === "ul" || node.tag === "ol") {
-        listContext = null;
-        texts[texts.length - 1] += "\n";
-      } else if ((_node$tag = node.tag) !== null && _node$tag !== void 0 && _node$tag.startsWith("h")) {
-        didAppendNewLines = true;
-        texts[texts.length - 1] += "\n\n";
-      }
-    } else {
-      nodes.push(node); // ImageSource
-      texts.push("\n");
-    }
-  }
-  source.children.forEach(rec);
-  if (texts[texts.length - 1] && didAppendNewLines) {
-    // remove last \n\n
-    texts[texts.length - 1] = texts[texts.length - 1].slice(0, -2);
-  }
-  return [texts, nodes];
-}
-
 function isValidIdentifier(text) {
   if (text.length === 0) {
     return false;
@@ -332,11 +239,20 @@ function createValFileReference(value) {
   }
   return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("val"), ts.factory.createIdentifier("file")), undefined, args);
 }
+function createValLink(value) {
+  const args = [ts.factory.createStringLiteral(value.children[0]), toExpression({
+    href: value.href
+  })];
+  return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("val"), ts.factory.createIdentifier("link")), undefined, args);
+}
 function createValRichTextTaggedStringTemplate(value) {
-  const [[head, ...others], nodes] = richTextToTaggedStringTemplate(value);
+  const {
+    templateStrings: [head, ...others],
+    exprs
+  } = value;
   const tag = ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("val"), ts.factory.createIdentifier("richtext"));
-  if (nodes.length > 0) {
-    return ts.factory.createTaggedTemplateExpression(tag, undefined, ts.factory.createTemplateExpression(ts.factory.createTemplateHead(head, head), others.map((s, i) => ts.factory.createTemplateSpan(toExpression(nodes[i]), i < others.length - 1 ? ts.factory.createTemplateMiddle(s, s) : ts.factory.createTemplateTail(s, s)))));
+  if (exprs.length > 0) {
+    return ts.factory.createTaggedTemplateExpression(tag, undefined, ts.factory.createTemplateExpression(ts.factory.createTemplateHead(head, head), others.map((s, i) => ts.factory.createTemplateSpan(toExpression(exprs[i]), i < others.length - 1 ? ts.factory.createTemplateMiddle(s, s) : ts.factory.createTemplateTail(s, s)))));
   }
   return ts.factory.createTaggedTemplateExpression(tag, undefined, ts.factory.createNoSubstitutionTemplateLiteral(head, head));
 }
@@ -355,6 +271,8 @@ function toExpression(value) {
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
       return createValFileReference(value);
+    } else if (isValLinkValue(value)) {
+      return createValLink(value);
     } else if (isValRichTextValue(value)) {
       return createValRichTextTaggedStringTemplate(value);
     }
@@ -589,8 +507,11 @@ function isValFileValue(value) {
   // value[VAL_EXTENSION] === "file" &&
   FILE_REF_PROP in value && typeof value[FILE_REF_PROP] === "string");
 }
+function isValLinkValue(value) {
+  return !!(typeof value === "object" && value && VAL_EXTENSION in value && value[VAL_EXTENSION] === "link");
+}
 function isValRichTextValue(value) {
-  return !!(typeof value === "object" && value && VAL_EXTENSION in value && value[VAL_EXTENSION] === "richtext" && "children" in value && typeof value.children === "object" && Array.isArray(value.children));
+  return !!(typeof value === "object" && value && VAL_EXTENSION in value && value[VAL_EXTENSION] === "richtext" && "templateStrings" in value && typeof value.templateStrings === "object" && Array.isArray(value.templateStrings));
 }
 function addToNode(document, node, key, value) {
   if (ts.isArrayLiteralExpression(node)) {

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.20.1",
+  "version": "0.21.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -25,8 +25,8 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.20.1",
-    "@valbuild/ui": "~0.20.0",
+    "@valbuild/core": "~0.21.0",
+    "@valbuild/ui": "~0.21.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "quickjs-emscripten": "^0.21.1",

package/src/ProxyValServer.ts

@@ -422,6 +422,7 @@ export async function enable(
     res.sendStatus(400);
   }
 }
+
 export async function disable(
   req: express.Request,
   res: express.Response,

package/src/patch/ts/ops.test.ts

@@ -456,7 +456,8 @@ describe("TSOps", () => {
       path: [],
       value: {
         [VAL_EXTENSION]: "richtext",
-        children: [{ tag: "p", children: ["Test 2"] }],
+        templateStrings: ["Test 2"],
+        exprs: [],
       },
       expected: result.ok("val.richtext `Test 2`"),
     },
@@ -466,13 +467,10 @@ describe("TSOps", () => {
       path: [],
       value: {
         [VAL_EXTENSION]: "richtext",
-        children: [
-          { tag: "h1", children: ["Title 1"] },
-          { tag: "p", children: ["Test 2"] },
-        ],
+        templateStrings: ["# Title 1\nTest 2"],
+        exprs: [],
       },
       expected: result.ok(`val.richtext \`# Title 1
-
 Test 2\``),
     },
     {
@@ -481,9 +479,8 @@ Test 2\``),
       path: [],
       value: {
         [VAL_EXTENSION]: "richtext",
-        children: [
-          { tag: "h1", children: ["Title 1"] },
-          { tag: "p", children: ["Test 2"] },
+        templateStrings: ["# Title 1\nTest 2\n", ""],
+        exprs: [
           {
             [VAL_EXTENSION]: "file",
             [FILE_REF_PROP]: "/public/test",
@@ -492,9 +489,7 @@ Test 2\``),
         ],
       },
       expected: result.ok(`val.richtext \`# Title 1
-
 Test 2
-
 \${val.file("/public/test", { width: 100, height: 100, sha256: "123" })}\``),
     },
     {
@@ -503,8 +498,8 @@ Test 2
       path: [],
       value: {
         [VAL_EXTENSION]: "richtext",
-        children: [
-          { tag: "h1", children: ["Title 1"] },
+        templateStrings: ["# Title 1\n", "\n", "\nTest 2"],
+        exprs: [
           {
             [VAL_EXTENSION]: "file",
             [FILE_REF_PROP]: "/public/test1",
@@ -515,14 +510,36 @@ Test 2
             [FILE_REF_PROP]: "/public/test2",
             metadata: { width: 100, height: 100, sha256: "123" },
           },
-          { tag: "p", children: ["Test 2"] },
         ],
       },
       expected: result.ok(`val.richtext \`# Title 1
-
 \${val.file("/public/test1", { width: 100, height: 100, sha256: "123" })}
 \${val.file("/public/test2", { width: 100, height: 100, sha256: "123" })}
 Test 2\``),
+    },
+    {
+      name: "val.richtext link",
+      input: "val.richtext`Test`",
+      path: [],
+      value: {
+        [VAL_EXTENSION]: "richtext",
+        templateStrings: ["# Title 1\n", "\n", ""],
+        exprs: [
+          {
+            [VAL_EXTENSION]: "link",
+            href: "https://example.com",
+            children: ["https://example.com"],
+          },
+          {
+            [VAL_EXTENSION]: "file",
+            [FILE_REF_PROP]: "/public/test2",
+            metadata: { width: 100, height: 100, sha256: "123" },
+          },
+        ],
+      },
+      expected: result.ok(`val.richtext \`# Title 1
+\${val.link("https://example.com", { href: "https://example.com" })}
+\${val.file("/public/test2", { width: 100, height: 100, sha256: "123" })}\``),
     },
     {
       name: "val.richtext empty head",
@@ -531,7 +548,8 @@ Test 2\``),
       path: ["text"],
       value: {
         [VAL_EXTENSION]: "richtext",
-        children: [
+        templateStrings: ["", "\n", "\nTest 2"],
+        exprs: [
           {
             [VAL_EXTENSION]: "file",
             [FILE_REF_PROP]: "/public/test1",
@@ -542,7 +560,6 @@ Test 2\``),
             [FILE_REF_PROP]: "/public/test2",
             metadata: { width: 100, height: 100, sha256: "123" },
           },
-          { tag: "p", children: ["Test 2"] },
         ],
       },
       expected:

package/src/patch/ts/ops.ts

@@ -26,7 +26,7 @@ import {
   VAL_EXTENSION,
 } from "@valbuild/core";
 import { JsonPrimitive } from "@valbuild/core/src/Json";
-import { richTextToTaggedStringTemplate } from "./richtext";
+import { LinkSource } from "@valbuild/core/src/source/link";
 
 type TSOpsResult<T> = result.Result<T, PatchError | ValSyntaxErrorTree>;
 
@@ -85,15 +85,34 @@ function createValFileReference(value: FileSource) {
   );
 }
 
+function createValLink(value: LinkSource) {
+  const args: ts.Expression[] = [
+    ts.factory.createStringLiteral(value.children[0]),
+    toExpression({ href: value.href }),
+  ];
+
+  return ts.factory.createCallExpression(
+    ts.factory.createPropertyAccessExpression(
+      ts.factory.createIdentifier("val"),
+      ts.factory.createIdentifier("link")
+    ),
+    undefined,
+    args
+  );
+}
+
 function createValRichTextTaggedStringTemplate(
   value: RichTextSource<AnyRichTextOptions>
 ): ts.Expression {
-  const [[head, ...others], nodes] = richTextToTaggedStringTemplate(value);
+  const {
+    templateStrings: [head, ...others],
+    exprs,
+  } = value;
   const tag = ts.factory.createPropertyAccessExpression(
     ts.factory.createIdentifier("val"),
     ts.factory.createIdentifier("richtext")
   );
-  if (nodes.length > 0) {
+  if (exprs.length > 0) {
     return ts.factory.createTaggedTemplateExpression(
       tag,
       undefined,
@@ -101,7 +120,7 @@ function createValRichTextTaggedStringTemplate(
         ts.factory.createTemplateHead(head, head),
         others.map((s, i) =>
           ts.factory.createTemplateSpan(
-            toExpression(nodes[i]),
+            toExpression(exprs[i]),
             i < others.length - 1
               ? ts.factory.createTemplateMiddle(s, s)
               : ts.factory.createTemplateTail(s, s)
@@ -132,6 +151,8 @@ function toExpression(value: JSONValue): ts.Expression {
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
       return createValFileReference(value);
+    } else if (isValLinkValue(value)) {
+      return createValLink(value);
     } else if (isValRichTextValue(value)) {
       return createValRichTextTaggedStringTemplate(value);
     }
@@ -591,7 +612,7 @@ function removeAtPath(
   );
 }
 
-function isValFileValue(value: JSONValue): value is FileSource<{
+export function isValFileValue(value: JSONValue): value is FileSource<{
   [key: string]: JsonPrimitive;
 }> {
   return !!(
@@ -604,6 +625,14 @@ function isValFileValue(value: JSONValue): value is FileSource<{
     typeof value[FILE_REF_PROP] === "string"
   );
 }
+function isValLinkValue(value: JSONValue): value is LinkSource {
+  return !!(
+    typeof value === "object" &&
+    value &&
+    VAL_EXTENSION in value &&
+    value[VAL_EXTENSION] === "link"
+  );
+}
 
 function isValRichTextValue(
   value: JSONValue
@@ -613,9 +642,9 @@ function isValRichTextValue(
     value &&
     VAL_EXTENSION in value &&
     value[VAL_EXTENSION] === "richtext" &&
-    "children" in value &&
-    typeof value.children === "object" &&
-    Array.isArray(value.children)
+    "templateStrings" in value &&
+    typeof value.templateStrings === "object" &&
+    Array.isArray(value.templateStrings)
   );
 }
 

package/src/patch/ts/richtext.test.ts

@@ -1,100 +0,0 @@
-import { initVal } from "@valbuild/core";
-import { richTextToTaggedStringTemplate } from "./richtext";
-
-describe("patch richtext", () => {
-  test("basic richtext <-> markdown", () => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const input: any = {
-      _type: "richtext",
-      children: [
-        { tag: "h1", children: ["Title 1"] },
-        {
-          tag: "p",
-          children: [
-            {
-              tag: "span",
-              classes: ["bold"],
-              children: ["Bold text"],
-            },
-          ],
-        },
-        { _type: "file", _ref: "/public/image.png" },
-        { tag: "p", children: ["Paragraph 2"] },
-      ],
-    };
-    const r = richTextToTaggedStringTemplate(input);
-    expect(r).toStrictEqual([
-      ["# Title 1\n\n**Bold text**\n\n", "\nParagraph 2"],
-      [{ _type: "file", _ref: "/public/image.png" }],
-    ]);
-
-    const { val } = initVal();
-    const r2 = val.richtext(
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      r[0],
-      ...r[1]
-    );
-    expect(r2).toStrictEqual(input);
-  });
-
-  test("richtext <-> markdown", () => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const input: any = {
-      _type: "richtext",
-      children: [
-        { tag: "h1", children: ["Title 1"] },
-        { tag: "h2", children: ["Title 2"] },
-        {
-          tag: "p",
-          children: [
-            "Test 1 2 3. ",
-            {
-              tag: "span",
-              classes: ["bold"],
-              children: ["Bold text"],
-            },
-            ". More text. See image below",
-          ],
-        },
-        { _type: "file", _ref: "/public/image.png" },
-        { tag: "p", children: ["Paragraph 2"] },
-        {
-          tag: "ol",
-          children: [
-            { tag: "li", children: ["OL:Item 1"] },
-            { tag: "li", children: ["OL:Item 2"] },
-          ],
-        },
-        {
-          tag: "ul",
-          children: [
-            { tag: "li", children: ["UL:Item 2"] },
-            { tag: "li", children: ["UL:Item 3"] },
-          ],
-        },
-        { tag: "h3", children: ["Title 3"] },
-        {
-          tag: "ul",
-          children: [
-            {
-              tag: "li",
-              children: [
-                { tag: "span", classes: ["bold"], children: ["UL:Item 4"] },
-              ],
-            },
-          ],
-        },
-      ],
-    };
-    const r = richTextToTaggedStringTemplate(input);
-    const { val } = initVal();
-    const r2 = val.richtext(
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      r[0],
-      ...r[1]
-    );
-    expect(r2).toStrictEqual(input);
-  });
-});

package/src/patch/ts/richtext.ts

@@ -1,113 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import {
-  AnyRichTextOptions,
-  RichTextSource,
-  RichTextSourceNode,
-} from "@valbuild/core";
-
-const HeaderRegEx = /^h([\d+])$/;
-
-export function richTextToTaggedStringTemplate(
-  source: RichTextSource<AnyRichTextOptions>
-) {
-  const texts: string[] = [""];
-  const nodes: any[] = [];
-  let didAppendNewLines = false;
-  let listContext: "ul" | "ol" | null = null;
-
-  function rec(node: RichTextSourceNode<AnyRichTextOptions>) {
-    if (typeof node === "string") {
-      texts[texts.length - 1] += node;
-    } else if ("tag" in node && node.tag) {
-      if (
-        node.tag === "h1" ||
-        node.tag === "h2" ||
-        node.tag === "h3" ||
-        node.tag === "h4" ||
-        node.tag === "h5" ||
-        node.tag === "h6"
-      ) {
-        const depth = Number(node.tag.match(HeaderRegEx)?.[1]);
-        if (Number.isNaN(depth)) {
-          throw new Error("Invalid header depth");
-        }
-        for (let i = 0; i < Number(depth); i++) {
-          texts[texts.length - 1] += "#";
-        }
-        texts[texts.length - 1] += " ";
-      } else if (node.tag === "p") {
-        // Ignore
-      } else if (node.tag === "ul") {
-        listContext = "ul";
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag === "ol") {
-        listContext = "ol";
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag === "li") {
-        if (listContext === "ul") {
-          texts[texts.length - 1] += "\n- ";
-        } else if (listContext === "ol") {
-          texts[texts.length - 1] += "\n1. ";
-        } else {
-          throw new Error("Unexpected list context");
-        }
-      } else if (node.tag === "span") {
-        if (node.classes.includes("bold") && !node.classes.includes("italic")) {
-          texts[texts.length - 1] += "**";
-        }
-        if (node.classes.includes("italic") && !node.classes.includes("bold")) {
-          texts[texts.length - 1] += "*";
-        }
-        if (node.classes.includes("italic") && node.classes.includes("bold")) {
-          texts[texts.length - 1] += "***";
-        }
-        if (node.classes.includes("line-through")) {
-          texts[texts.length - 1] += "~~";
-        }
-      } else {
-        //exhaustive match
-        const exhaustiveCheck: never = node.tag;
-        throw new Error(
-          "Unexpected node tag: " + JSON.stringify(node, exhaustiveCheck, 2)
-        );
-      }
-
-      node.children?.forEach(rec);
-
-      didAppendNewLines = false;
-      if (node.tag === "span") {
-        if (node.classes.includes("line-through")) {
-          texts[texts.length - 1] += "~~";
-        }
-        if (node.classes.includes("italic") && node.classes.includes("bold")) {
-          texts[texts.length - 1] += "***";
-        }
-        if (node.classes.includes("italic") && !node.classes.includes("bold")) {
-          texts[texts.length - 1] += "*";
-        }
-        if (node.classes.includes("bold") && !node.classes.includes("italic")) {
-          texts[texts.length - 1] += "**";
-        }
-      } else if (node.tag === "p") {
-        didAppendNewLines = true;
-        texts[texts.length - 1] += "\n\n";
-      } else if (node.tag === "ul" || node.tag === "ol") {
-        listContext = null;
-        texts[texts.length - 1] += "\n";
-      } else if (node.tag?.startsWith("h")) {
-        didAppendNewLines = true;
-        texts[texts.length - 1] += "\n\n";
-      }
-    } else {
-      nodes.push(node); // ImageSource
-      texts.push("\n");
-    }
-  }
-  source.children.forEach(rec);
-
-  if (texts[texts.length - 1] && didAppendNewLines) {
-    // remove last \n\n
-    texts[texts.length - 1] = texts[texts.length - 1].slice(0, -2);
-  }
-  return [texts, nodes];
-}