@valbuild/server 0.18.0 → 0.19.0

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

@@ -246,6 +246,73 @@ 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;
+  function rec(node) {
+    if (typeof node === "string") {
+      texts[texts.length - 1] += node;
+    } else if (node.tag) {
+      var _node$tag, _node$children, _node$tag2;
+      if ((_node$tag = node.tag) !== null && _node$tag !== void 0 && _node$tag.startsWith("h")) {
+        const [, depth] = node.tag.match(HeaderRegEx);
+        for (let i = 0; i < Number(depth); i++) {
+          texts[texts.length - 1] += "#";
+        }
+        texts[texts.length - 1] += " ";
+      } 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] += "~~";
+        }
+      }
+      (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children.forEach(rec);
+      if (node.tag === "span") {
+        didAppendNewLines = false;
+        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$tag2 = node.tag) !== null && _node$tag2 !== void 0 && _node$tag2.startsWith("h")) {
+        didAppendNewLines = true;
+        texts[texts.length - 1] += "\n\n";
+      }
+    } else {
+      nodes.push(node);
+      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;
@@ -263,8 +330,20 @@ function isValidIdentifier(text) {
 function createPropertyAssignment(key, value) {
   return ts__default["default"].factory.createPropertyAssignment(isValidIdentifier(key) ? ts__default["default"].factory.createIdentifier(key) : ts__default["default"].factory.createStringLiteral(key), toExpression(value));
 }
-function createValFileReference(ref) {
-  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("val"), ts__default["default"].factory.createIdentifier("file")), undefined, [ts__default["default"].factory.createStringLiteral(ref)]);
+function createValFileReference(value) {
+  const args = [ts__default["default"].factory.createStringLiteral(value[core.FILE_REF_PROP])];
+  if (value.metadata) {
+    args.push(toExpression(value.metadata));
+  }
+  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 createValRichTextTaggedStringTemplate(value) {
+  const [[head, ...others], nodes] = richTextToTaggedStringTemplate(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)))));
+  }
+  return ts__default["default"].factory.createTaggedTemplateExpression(tag, undefined, ts__default["default"].factory.createNoSubstitutionTemplateLiteral(head, head));
 }
 function toExpression(value) {
   if (typeof value === "string") {
@@ -280,7 +359,9 @@ function toExpression(value) {
     return ts__default["default"].factory.createArrayLiteralExpression(value.map(toExpression));
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
-      return createValFileReference(value[core.FILE_REF_PROP]);
+      return createValFileReference(value);
+    } else if (isValRichTextValue(value)) {
+      return createValRichTextTaggedStringTemplate(value);
     }
     return ts__default["default"].factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => createPropertyAssignment(key, value)));
   } else {
@@ -507,7 +588,14 @@ function removeAtPath(document, rootNode, path) {
   return fp.pipe(getPointerFromPath(rootNode, path), fp.result.flatMap(([node, key]) => removeFromNode(document, node, key)));
 }
 function isValFileValue(value) {
-  return !!(typeof value === "object" && value && core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string");
+  return !!(typeof value === "object" && value &&
+  // TODO: replace the below with this:
+  // VAL_EXTENSION in value &&
+  // value[VAL_EXTENSION] === "file" &&
+  core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string");
+}
+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));
 }
 function addToNode(document, node, key, value) {
   if (ts__default["default"].isArrayLiteralExpression(node)) {
@@ -691,7 +779,12 @@ const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runti
     //   Buffer.from(content, "base64").toString("binary")
     // );
     // sourceFileHandler.moveFile(tempFilePath, "." + filePath);
-    sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("binary"), "binary");
+    // TODO: ensure that directory exists
+    if (content.startsWith("data:/image/svg+xml")) {
+      sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("utf8"), "utf8");
+    } else {
+      sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("binary"), "binary");
+    }
   }
   for (const [ref, patch] of Object.entries(derefRes.value.remotePatches)) {
     throw Error(`Cannot update remote ${ref} with ${JSON.stringify(patch)}: not implemented`);
@@ -773,7 +866,7 @@ class ValSourceFileHandler {
 
 const JsFileLookupMapping = [
 // NOTE: first one matching will be used
-[".cjs.d.ts", [".esm.js", ".mjs.js"]], [".cjs.js", [".esm.js", ".mjs.js"]], [".cjs", [".mjs"]], [".d.ts", [".js"]]];
+[".cjs.d.ts", [".esm.js", ".mjs.js"]], [".cjs.js", [".esm.js", ".mjs.js"]], [".cjs", [".mjs"]], [".d.ts", [".js", ".esm.js", ".mjs.js"]]];
 class ValModuleLoader {
   constructor(projectRoot, compilerOptions, sourceFileHandler, host = {
     ...ts__default["default"].sys,
@@ -1038,6 +1131,10 @@ const OperationJSONT = z__default["default"].discriminatedUnion("op", [z__defaul
   op: z__default["default"].literal("test"),
   path: z__default["default"].string(),
   value: JSONValueT
+}).strict(), z__default["default"].object({
+  op: z__default["default"].literal("file"),
+  path: z__default["default"].string(),
+  value: z__default["default"].string()
 }).strict()]);
 const PatchJSON = z__default["default"].array(OperationJSONT);
 
@@ -1772,7 +1869,7 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     }
     const localFile = path__namespace["default"].join(config.projectRoot, maybeRef);
     const buffer = fs__default["default"].readFileSync(localFile);
-    const sha256 = await getSHA256Hash(buffer);
+    const sha256 = await core.Internal.getSHA256Hash(buffer);
     const imageSize = sizeOf__default["default"](buffer);
     return {
       ...imageSize,
@@ -1864,12 +1961,6 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     remainingErrors
   };
 }
-const getSHA256Hash = async bits => {
-  const hashBuffer = await crypto__default["default"].subtle.digest("SHA-256", bits);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hash = hashArray.map(item => item.toString(16).padStart(2, "0")).join("");
-  return hash;
-};
 
 exports.LocalValServer = LocalValServer;
 exports.PatchJSON = PatchJSON;

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

@@ -246,6 +246,73 @@ 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;
+  function rec(node) {
+    if (typeof node === "string") {
+      texts[texts.length - 1] += node;
+    } else if (node.tag) {
+      var _node$tag, _node$children, _node$tag2;
+      if ((_node$tag = node.tag) !== null && _node$tag !== void 0 && _node$tag.startsWith("h")) {
+        const [, depth] = node.tag.match(HeaderRegEx);
+        for (let i = 0; i < Number(depth); i++) {
+          texts[texts.length - 1] += "#";
+        }
+        texts[texts.length - 1] += " ";
+      } 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] += "~~";
+        }
+      }
+      (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children.forEach(rec);
+      if (node.tag === "span") {
+        didAppendNewLines = false;
+        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$tag2 = node.tag) !== null && _node$tag2 !== void 0 && _node$tag2.startsWith("h")) {
+        didAppendNewLines = true;
+        texts[texts.length - 1] += "\n\n";
+      }
+    } else {
+      nodes.push(node);
+      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;
@@ -263,8 +330,20 @@ function isValidIdentifier(text) {
 function createPropertyAssignment(key, value) {
   return ts__default["default"].factory.createPropertyAssignment(isValidIdentifier(key) ? ts__default["default"].factory.createIdentifier(key) : ts__default["default"].factory.createStringLiteral(key), toExpression(value));
 }
-function createValFileReference(ref) {
-  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("val"), ts__default["default"].factory.createIdentifier("file")), undefined, [ts__default["default"].factory.createStringLiteral(ref)]);
+function createValFileReference(value) {
+  const args = [ts__default["default"].factory.createStringLiteral(value[core.FILE_REF_PROP])];
+  if (value.metadata) {
+    args.push(toExpression(value.metadata));
+  }
+  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 createValRichTextTaggedStringTemplate(value) {
+  const [[head, ...others], nodes] = richTextToTaggedStringTemplate(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)))));
+  }
+  return ts__default["default"].factory.createTaggedTemplateExpression(tag, undefined, ts__default["default"].factory.createNoSubstitutionTemplateLiteral(head, head));
 }
 function toExpression(value) {
   if (typeof value === "string") {
@@ -280,7 +359,9 @@ function toExpression(value) {
     return ts__default["default"].factory.createArrayLiteralExpression(value.map(toExpression));
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
-      return createValFileReference(value[core.FILE_REF_PROP]);
+      return createValFileReference(value);
+    } else if (isValRichTextValue(value)) {
+      return createValRichTextTaggedStringTemplate(value);
     }
     return ts__default["default"].factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => createPropertyAssignment(key, value)));
   } else {
@@ -507,7 +588,14 @@ function removeAtPath(document, rootNode, path) {
   return fp.pipe(getPointerFromPath(rootNode, path), fp.result.flatMap(([node, key]) => removeFromNode(document, node, key)));
 }
 function isValFileValue(value) {
-  return !!(typeof value === "object" && value && core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string");
+  return !!(typeof value === "object" && value &&
+  // TODO: replace the below with this:
+  // VAL_EXTENSION in value &&
+  // value[VAL_EXTENSION] === "file" &&
+  core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string");
+}
+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));
 }
 function addToNode(document, node, key, value) {
   if (ts__default["default"].isArrayLiteralExpression(node)) {
@@ -691,7 +779,12 @@ const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runti
     //   Buffer.from(content, "base64").toString("binary")
     // );
     // sourceFileHandler.moveFile(tempFilePath, "." + filePath);
-    sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("binary"), "binary");
+    // TODO: ensure that directory exists
+    if (content.startsWith("data:/image/svg+xml")) {
+      sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("utf8"), "utf8");
+    } else {
+      sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("binary"), "binary");
+    }
   }
   for (const [ref, patch] of Object.entries(derefRes.value.remotePatches)) {
     throw Error(`Cannot update remote ${ref} with ${JSON.stringify(patch)}: not implemented`);
@@ -773,7 +866,7 @@ class ValSourceFileHandler {
 
 const JsFileLookupMapping = [
 // NOTE: first one matching will be used
-[".cjs.d.ts", [".esm.js", ".mjs.js"]], [".cjs.js", [".esm.js", ".mjs.js"]], [".cjs", [".mjs"]], [".d.ts", [".js"]]];
+[".cjs.d.ts", [".esm.js", ".mjs.js"]], [".cjs.js", [".esm.js", ".mjs.js"]], [".cjs", [".mjs"]], [".d.ts", [".js", ".esm.js", ".mjs.js"]]];
 class ValModuleLoader {
   constructor(projectRoot, compilerOptions, sourceFileHandler, host = {
     ...ts__default["default"].sys,
@@ -1038,6 +1131,10 @@ const OperationJSONT = z__default["default"].discriminatedUnion("op", [z__defaul
   op: z__default["default"].literal("test"),
   path: z__default["default"].string(),
   value: JSONValueT
+}).strict(), z__default["default"].object({
+  op: z__default["default"].literal("file"),
+  path: z__default["default"].string(),
+  value: z__default["default"].string()
 }).strict()]);
 const PatchJSON = z__default["default"].array(OperationJSONT);
 
@@ -1772,7 +1869,7 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     }
     const localFile = path__namespace["default"].join(config.projectRoot, maybeRef);
     const buffer = fs__default["default"].readFileSync(localFile);
-    const sha256 = await getSHA256Hash(buffer);
+    const sha256 = await core.Internal.getSHA256Hash(buffer);
     const imageSize = sizeOf__default["default"](buffer);
     return {
       ...imageSize,
@@ -1864,12 +1961,6 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     remainingErrors
   };
 }
-const getSHA256Hash = async bits => {
-  const hashBuffer = await crypto__default["default"].subtle.digest("SHA-256", bits);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hash = hashArray.map(item => item.toString(16).padStart(2, "0")).join("");
-  return hash;
-};
 
 exports.LocalValServer = LocalValServer;
 exports.PatchJSON = PatchJSON;

package/dist/valbuild-server.esm.js

@@ -1,7 +1,7 @@
 import { newQuickJSWASMModule } from 'quickjs-emscripten';
 import ts from 'typescript';
 import { result, pipe } from '@valbuild/core/fp';
-import { FILE_REF_PROP, derefPatch, Internal, Schema } from '@valbuild/core';
+import { FILE_REF_PROP, VAL_EXTENSION, derefPatch, Internal, Schema } from '@valbuild/core';
 import { deepEqual, isNotRoot, PatchError, parseAndValidateArrayIndex, applyPatch, parsePatch, sourceToPatchPath } from '@valbuild/core/patch';
 import * as path from 'path';
 import path__default from 'path';
@@ -215,6 +215,73 @@ 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;
+  function rec(node) {
+    if (typeof node === "string") {
+      texts[texts.length - 1] += node;
+    } else if (node.tag) {
+      var _node$tag, _node$children, _node$tag2;
+      if ((_node$tag = node.tag) !== null && _node$tag !== void 0 && _node$tag.startsWith("h")) {
+        const [, depth] = node.tag.match(HeaderRegEx);
+        for (let i = 0; i < Number(depth); i++) {
+          texts[texts.length - 1] += "#";
+        }
+        texts[texts.length - 1] += " ";
+      } 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] += "~~";
+        }
+      }
+      (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children.forEach(rec);
+      if (node.tag === "span") {
+        didAppendNewLines = false;
+        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$tag2 = node.tag) !== null && _node$tag2 !== void 0 && _node$tag2.startsWith("h")) {
+        didAppendNewLines = true;
+        texts[texts.length - 1] += "\n\n";
+      }
+    } else {
+      nodes.push(node);
+      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;
@@ -232,8 +299,20 @@ function isValidIdentifier(text) {
 function createPropertyAssignment(key, value) {
   return ts.factory.createPropertyAssignment(isValidIdentifier(key) ? ts.factory.createIdentifier(key) : ts.factory.createStringLiteral(key), toExpression(value));
 }
-function createValFileReference(ref) {
-  return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("val"), ts.factory.createIdentifier("file")), undefined, [ts.factory.createStringLiteral(ref)]);
+function createValFileReference(value) {
+  const args = [ts.factory.createStringLiteral(value[FILE_REF_PROP])];
+  if (value.metadata) {
+    args.push(toExpression(value.metadata));
+  }
+  return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("val"), ts.factory.createIdentifier("file")), undefined, args);
+}
+function createValRichTextTaggedStringTemplate(value) {
+  const [[head, ...others], nodes] = richTextToTaggedStringTemplate(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)))));
+  }
+  return ts.factory.createTaggedTemplateExpression(tag, undefined, ts.factory.createNoSubstitutionTemplateLiteral(head, head));
 }
 function toExpression(value) {
   if (typeof value === "string") {
@@ -249,7 +328,9 @@ function toExpression(value) {
     return ts.factory.createArrayLiteralExpression(value.map(toExpression));
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
-      return createValFileReference(value[FILE_REF_PROP]);
+      return createValFileReference(value);
+    } else if (isValRichTextValue(value)) {
+      return createValRichTextTaggedStringTemplate(value);
     }
     return ts.factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => createPropertyAssignment(key, value)));
   } else {
@@ -476,7 +557,14 @@ function removeAtPath(document, rootNode, path) {
   return pipe(getPointerFromPath(rootNode, path), result.flatMap(([node, key]) => removeFromNode(document, node, key)));
 }
 function isValFileValue(value) {
-  return !!(typeof value === "object" && value && FILE_REF_PROP in value && typeof value[FILE_REF_PROP] === "string");
+  return !!(typeof value === "object" && value &&
+  // TODO: replace the below with this:
+  // VAL_EXTENSION in value &&
+  // value[VAL_EXTENSION] === "file" &&
+  FILE_REF_PROP in value && typeof value[FILE_REF_PROP] === "string");
+}
+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));
 }
 function addToNode(document, node, key, value) {
   if (ts.isArrayLiteralExpression(node)) {
@@ -660,7 +748,12 @@ const patchValFile = async (id, valConfigPath, patch, sourceFileHandler, runtime
     //   Buffer.from(content, "base64").toString("binary")
     // );
     // sourceFileHandler.moveFile(tempFilePath, "." + filePath);
-    sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("binary"), "binary");
+    // TODO: ensure that directory exists
+    if (content.startsWith("data:/image/svg+xml")) {
+      sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("utf8"), "utf8");
+    } else {
+      sourceFileHandler.writeFile("." + filePath, convertDataUrlToBase64(content).toString("binary"), "binary");
+    }
   }
   for (const [ref, patch] of Object.entries(derefRes.value.remotePatches)) {
     throw Error(`Cannot update remote ${ref} with ${JSON.stringify(patch)}: not implemented`);
@@ -742,7 +835,7 @@ class ValSourceFileHandler {
 
 const JsFileLookupMapping = [
 // NOTE: first one matching will be used
-[".cjs.d.ts", [".esm.js", ".mjs.js"]], [".cjs.js", [".esm.js", ".mjs.js"]], [".cjs", [".mjs"]], [".d.ts", [".js"]]];
+[".cjs.d.ts", [".esm.js", ".mjs.js"]], [".cjs.js", [".esm.js", ".mjs.js"]], [".cjs", [".mjs"]], [".d.ts", [".js", ".esm.js", ".mjs.js"]]];
 class ValModuleLoader {
   constructor(projectRoot, compilerOptions, sourceFileHandler, host = {
     ...ts.sys,
@@ -1007,6 +1100,10 @@ const OperationJSONT = z.discriminatedUnion("op", [z.object({
   op: z.literal("test"),
   path: z.string(),
   value: JSONValueT
+}).strict(), z.object({
+  op: z.literal("file"),
+  path: z.string(),
+  value: z.string()
 }).strict()]);
 const PatchJSON = z.array(OperationJSONT);
 
@@ -1741,7 +1838,7 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     }
     const localFile = path__default.join(config.projectRoot, maybeRef);
     const buffer = fs.readFileSync(localFile);
-    const sha256 = await getSHA256Hash(buffer);
+    const sha256 = await Internal.getSHA256Hash(buffer);
     const imageSize = sizeOf(buffer);
     return {
       ...imageSize,
@@ -1833,11 +1930,5 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     remainingErrors
   };
 }
-const getSHA256Hash = async bits => {
-  const hashBuffer = await crypto.subtle.digest("SHA-256", bits);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hash = hashArray.map(item => item.toString(16).padStart(2, "0")).join("");
-  return hash;
-};
 
 export { LocalValServer, PatchJSON, Service, ValFSHost, ValModuleLoader, ValSourceFileHandler, createFixPatch, createRequestHandler, createRequestListener, createService, decodeJwt, encodeJwt, formatSyntaxErrorTree, getCompilerOptions, getExpire, patchSourceFile, safeReadGit };

package/package.json

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

package/src/ValModuleLoader.ts

@@ -10,7 +10,7 @@ const JsFileLookupMapping: [resolvedFileExt: string, replacements: string[]][] =
     [".cjs.d.ts", [".esm.js", ".mjs.js"]],
     [".cjs.js", [".esm.js", ".mjs.js"]],
     [".cjs", [".mjs"]],
-    [".d.ts", [".js"]],
+    [".d.ts", [".js", ".esm.js", ".mjs.js"]],
   ];
 
 export const createModuleLoader = (

package/src/createFixPatch.ts

@@ -1,9 +1,13 @@
-import { FILE_REF_PROP, SourcePath, ValidationError } from "@valbuild/core";
+import {
+  FILE_REF_PROP,
+  Internal,
+  SourcePath,
+  ValidationError,
+} from "@valbuild/core";
 import { Patch, sourceToPatchPath } from "@valbuild/core/patch";
 import sizeOf from "image-size";
 import path from "path";
 import fs from "fs";
-import crypto from "crypto";
 
 // TODO: find a better name? transformFixesToPatch?
 export async function createFixPatch(
@@ -27,7 +31,7 @@ export async function createFixPatch(
     }
     const localFile = path.join(config.projectRoot, maybeRef);
     const buffer = fs.readFileSync(localFile);
-    const sha256 = await getSHA256Hash(buffer);
+    const sha256 = await Internal.getSHA256Hash(buffer);
     const imageSize = sizeOf(buffer);
     return {
       ...imageSize,
@@ -164,12 +168,3 @@ export async function createFixPatch(
     remainingErrors,
   };
 }
-
-const getSHA256Hash = async (bits: Uint8Array) => {
-  const hashBuffer = await crypto.subtle.digest("SHA-256", bits);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hash = hashArray
-    .map((item) => item.toString(16).padStart(2, "0"))
-    .join("");
-  return hash;
-};

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

@@ -3,6 +3,7 @@ import { TSOps } from "./ops";
 import { result, array, pipe } from "@valbuild/core/fp";
 import { PatchError, JSONValue } from "@valbuild/core/patch";
 import { ValSyntaxError } from "./syntax";
+import { FILE_REF_PROP, VAL_EXTENSION } from "@valbuild/core";
 
 function testSourceFile(expression: string): ts.SourceFile {
   return ts.createSourceFile(
@@ -449,6 +450,106 @@ describe("TSOps", () => {
       value: null,
       expected: result.err(PatchError),
     },
+    {
+      name: "val.richtext basic no nodes",
+      input: "val.richtext`Test`",
+      path: [],
+      value: {
+        [VAL_EXTENSION]: "richtext",
+        children: [{ tag: "p", children: ["Test 2"] }],
+      },
+      expected: result.ok("val.richtext `Test 2`"),
+    },
+    {
+      name: "val.richtext advanced no nodes",
+      input: "val.richtext`Test`",
+      path: [],
+      value: {
+        [VAL_EXTENSION]: "richtext",
+        children: [
+          { tag: "h1", children: ["Title 1"] },
+          { tag: "p", children: ["Test 2"] },
+        ],
+      },
+      expected: result.ok(`val.richtext \`# Title 1
+
+Test 2\``),
+    },
+    {
+      name: "val.richtext basic nodes",
+      input: "val.richtext`Test`",
+      path: [],
+      value: {
+        [VAL_EXTENSION]: "richtext",
+        children: [
+          { tag: "h1", children: ["Title 1"] },
+          { tag: "p", children: ["Test 2"] },
+          {
+            [VAL_EXTENSION]: "file",
+            [FILE_REF_PROP]: "/public/test",
+            metadata: { width: 100, height: 100, sha256: "123" },
+          },
+        ],
+      },
+      expected: result.ok(`val.richtext \`# Title 1
+
+Test 2
+
+\${val.file("/public/test", { width: 100, height: 100, sha256: "123" })}\``),
+    },
+    {
+      name: "val.richtext advanced nodes",
+      input: "val.richtext`Test`",
+      path: [],
+      value: {
+        [VAL_EXTENSION]: "richtext",
+        children: [
+          { tag: "h1", children: ["Title 1"] },
+          {
+            [VAL_EXTENSION]: "file",
+            [FILE_REF_PROP]: "/public/test1",
+            metadata: { width: 100, height: 100, sha256: "123" },
+          },
+          {
+            [VAL_EXTENSION]: "file",
+            [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 empty head",
+      input:
+        "{ text: val.richtext`${val.file('/public/test1', { height: 100 })}` }",
+      path: ["text"],
+      value: {
+        [VAL_EXTENSION]: "richtext",
+        children: [
+          {
+            [VAL_EXTENSION]: "file",
+            [FILE_REF_PROP]: "/public/test1",
+            metadata: { width: 100, height: 100, sha256: "123" },
+          },
+          {
+            [VAL_EXTENSION]: "file",
+            [FILE_REF_PROP]: "/public/test2",
+            metadata: { width: 100, height: 100, sha256: "123" },
+          },
+          { tag: "p", children: ["Test 2"] },
+        ],
+      },
+      expected:
+        result.ok(`{ text: val.richtext \`\${val.file("/public/test1", { width: 100, height: 100, sha256: "123" })}
+\${val.file("/public/test2", { width: 100, height: 100, sha256: "123" })}
+Test 2\` }`),
+    },
   ])("replace $name", ({ input, path, value, expected }) => {
     const src = testSourceFile(input);
     const ops = new TSOps(findRoot);

package/src/patch/ts/ops.ts

@@ -18,8 +18,15 @@ import {
   JSONValue,
   parseAndValidateArrayIndex,
 } from "@valbuild/core/patch";
-import { FILE_REF_PROP, FileSource } from "@valbuild/core";
+import {
+  AnyRichTextOptions,
+  FILE_REF_PROP,
+  FileSource,
+  RichTextSource,
+  VAL_EXTENSION,
+} from "@valbuild/core";
 import { JsonPrimitive } from "@valbuild/core/src/Json";
+import { richTextToTaggedStringTemplate } from "./richtext";
 
 type TSOpsResult<T> = result.Result<T, PatchError | ValSyntaxErrorTree>;
 
@@ -60,14 +67,53 @@ function createPropertyAssignment(key: string, value: JSONValue) {
   );
 }
 
-function createValFileReference(ref: string) {
+function createValFileReference(value: FileSource) {
+  const args: ts.Expression[] = [
+    ts.factory.createStringLiteral(value[FILE_REF_PROP]),
+  ];
+  if (value.metadata) {
+    args.push(toExpression(value.metadata));
+  }
+
   return ts.factory.createCallExpression(
     ts.factory.createPropertyAccessExpression(
       ts.factory.createIdentifier("val"),
       ts.factory.createIdentifier("file")
     ),
     undefined,
-    [ts.factory.createStringLiteral(ref)]
+    args
+  );
+}
+
+function createValRichTextTaggedStringTemplate(
+  value: RichTextSource<AnyRichTextOptions>
+): ts.Expression {
+  const [[head, ...others], nodes] = richTextToTaggedStringTemplate(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)
+          )
+        )
+      )
+    );
+  }
+  return ts.factory.createTaggedTemplateExpression(
+    tag,
+    undefined,
+    ts.factory.createNoSubstitutionTemplateLiteral(head, head)
   );
 }
 
@@ -85,7 +131,9 @@ function toExpression(value: JSONValue): ts.Expression {
     return ts.factory.createArrayLiteralExpression(value.map(toExpression));
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
-      return createValFileReference(value[FILE_REF_PROP]);
+      return createValFileReference(value);
+    } else if (isValRichTextValue(value)) {
+      return createValRichTextTaggedStringTemplate(value);
     }
     return ts.factory.createObjectLiteralExpression(
       Object.entries(value).map(([key, value]) =>
@@ -549,11 +597,28 @@ function isValFileValue(value: JSONValue): value is FileSource<{
   return !!(
     typeof value === "object" &&
     value &&
+    // TODO: replace the below with this:
+    // VAL_EXTENSION in value &&
+    // value[VAL_EXTENSION] === "file" &&
     FILE_REF_PROP in value &&
     typeof value[FILE_REF_PROP] === "string"
   );
 }
 
+function isValRichTextValue(
+  value: JSONValue
+): value is RichTextSource<AnyRichTextOptions> {
+  return !!(
+    typeof value === "object" &&
+    value &&
+    VAL_EXTENSION in value &&
+    value[VAL_EXTENSION] === "richtext" &&
+    "children" in value &&
+    typeof value.children === "object" &&
+    Array.isArray(value.children)
+  );
+}
+
 function addToNode(
   document: ts.SourceFile,
   node: ts.Expression,

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

@@ -0,0 +1,74 @@
+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"] },
+      ],
+    };
+    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

@@ -0,0 +1,73 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { AnyRichTextOptions, RichTextSource } from "@valbuild/core";
+
+const HeaderRegEx = /h([\d])/;
+
+export function richTextToTaggedStringTemplate(
+  source: RichTextSource<AnyRichTextOptions>
+) {
+  const texts: string[] = [""];
+  const nodes: any[] = [];
+  let didAppendNewLines = false;
+
+  function rec(node: any) {
+    if (typeof node === "string") {
+      texts[texts.length - 1] += node;
+    } else if (node.tag) {
+      if (node.tag?.startsWith("h")) {
+        const [, depth] = node.tag.match(HeaderRegEx);
+        for (let i = 0; i < Number(depth); i++) {
+          texts[texts.length - 1] += "#";
+        }
+        texts[texts.length - 1] += " ";
+      } 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] += "~~";
+        }
+      }
+
+      node.children?.forEach(rec);
+
+      if (node.tag === "span") {
+        didAppendNewLines = false;
+        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?.startsWith("h")) {
+        didAppendNewLines = true;
+        texts[texts.length - 1] += "\n\n";
+      }
+    } else {
+      nodes.push(node);
+      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];
+}

package/src/patch/validation.ts

@@ -67,6 +67,13 @@ const OperationJSONT: z.ZodType<OperationJSONT> = z.discriminatedUnion("op", [
       value: JSONValueT,
     })
     .strict(),
+  z
+    .object({
+      op: z.literal("file"),
+      path: z.string(),
+      value: z.string(),
+    })
+    .strict(),
 ]);
 
 export const PatchJSON: z.ZodType<PatchJSONT> = z.array(OperationJSONT);

package/src/patchValFile.ts

@@ -69,11 +69,20 @@ export const patchValFile = async (
     //   Buffer.from(content, "base64").toString("binary")
     // );
     // sourceFileHandler.moveFile(tempFilePath, "." + filePath);
-    sourceFileHandler.writeFile(
-      "." + filePath,
-      convertDataUrlToBase64(content).toString("binary"),
-      "binary"
-    );
+    // TODO: ensure that directory exists
+    if (content.startsWith("data:/image/svg+xml")) {
+      sourceFileHandler.writeFile(
+        "." + filePath,
+        convertDataUrlToBase64(content).toString("utf8"),
+        "utf8"
+      );
+    } else {
+      sourceFileHandler.writeFile(
+        "." + filePath,
+        convertDataUrlToBase64(content).toString("binary"),
+        "binary"
+      );
+    }
   }
 
   for (const [ref, patch] of Object.entries(derefRes.value.remotePatches)) {

package/tsconfig.json

@@ -5,7 +5,8 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "skipLibCheck": true
   },
   "exclude": ["test/**/*"]
 }