@valbuild/server 0.52.0 → 0.54.0

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

@@ -93,7 +93,7 @@ function validateObjectProperties(nodes) {
  * validating its children.
  */
 function shallowValidateExpression(value) {
-  return ts__default["default"].isStringLiteralLike(value) || ts__default["default"].isNumericLiteral(value) || value.kind === ts__default["default"].SyntaxKind.TrueKeyword || value.kind === ts__default["default"].SyntaxKind.FalseKeyword || value.kind === ts__default["default"].SyntaxKind.NullKeyword || ts__default["default"].isArrayLiteralExpression(value) || ts__default["default"].isObjectLiteralExpression(value) || isValFileMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call val.file", value);
+  return ts__default["default"].isStringLiteralLike(value) || ts__default["default"].isNumericLiteral(value) || value.kind === ts__default["default"].SyntaxKind.TrueKeyword || value.kind === ts__default["default"].SyntaxKind.FalseKeyword || value.kind === ts__default["default"].SyntaxKind.NullKeyword || ts__default["default"].isArrayLiteralExpression(value) || ts__default["default"].isObjectLiteralExpression(value) || isValFileMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call c.file", value);
 }
 
 /**
@@ -135,7 +135,7 @@ function evaluateExpression(value) {
       }
     }));
   } else {
-    return fp.result.err(new ValSyntaxError("Expression must be a literal or call val.file", value));
+    return fp.result.err(new ValSyntaxError("Expression must be a literal or call c.file", value));
   }
 }
 function findObjectPropertyAssignment(value, key) {
@@ -150,27 +150,27 @@ function findObjectPropertyAssignment(value, key) {
   }));
 }
 function isValFileMethodCall(node) {
-  return ts__default["default"].isCallExpression(node) && ts__default["default"].isPropertyAccessExpression(node.expression) && ts__default["default"].isIdentifier(node.expression.expression) && node.expression.expression.text === "val" && node.expression.name.text === "file";
+  return ts__default["default"].isCallExpression(node) && ts__default["default"].isPropertyAccessExpression(node.expression) && ts__default["default"].isIdentifier(node.expression.expression) && node.expression.expression.text === "c" && node.expression.name.text === "file";
 }
 function findValFileNodeArg(node) {
   if (node.arguments.length === 0) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: missing ref argument`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
   } else if (node.arguments.length > 2) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: too many arguments ${node.arguments.length}}`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: too many arguments ${node.arguments.length}}`, node));
   } else if (!ts__default["default"].isStringLiteral(node.arguments[0])) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: ref must be a string literal`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: ref must be a string literal`, node));
   }
   const refNode = node.arguments[0];
   return fp.result.ok(refNode);
 }
 function findValFileMetadataArg(node) {
   if (node.arguments.length === 0) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: missing ref argument`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
   } else if (node.arguments.length > 2) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: too many arguments ${node.arguments.length}}`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: too many arguments ${node.arguments.length}}`, node));
   } else if (node.arguments.length === 2) {
     if (!ts__default["default"].isObjectLiteralExpression(node.arguments[1])) {
-      return fp.result.err(new ValSyntaxError(`Invalid val.file() call: metadata must be a object literal`, node));
+      return fp.result.err(new ValSyntaxError(`Invalid c.file() call: metadata must be a object literal`, node));
     }
     return fp.result.ok(node.arguments[1]);
   }
@@ -209,17 +209,17 @@ function validateArguments(node, validators) {
   return fp.result.allV([node.arguments.length === validators.length ? fp.result.voidOk : fp.result.err(new ValSyntaxError(`Expected ${validators.length} arguments`, node)), ...node.arguments.slice(0, validators.length).map((argument, index) => validators[index](argument))]);
 }
 function analyzeDefaultExport(node) {
-  const valContentCall = node.expression;
-  if (!ts__default["default"].isCallExpression(valContentCall)) {
-    return fp.result.err(new ValSyntaxError("Expected default expression to be a call expression", valContentCall));
+  const cDefine = node.expression;
+  if (!ts__default["default"].isCallExpression(cDefine)) {
+    return fp.result.err(new ValSyntaxError("Expected default expression to be a call expression", cDefine));
   }
-  if (!isPath(valContentCall.expression, ["val", "content"])) {
-    return fp.result.err(new ValSyntaxError("Expected default expression to be calling val.content", valContentCall.expression));
+  if (!isPath(cDefine.expression, ["c", "define"])) {
+    return fp.result.err(new ValSyntaxError("Expected default expression to be calling c.define", cDefine.expression));
   }
-  return fp.pipe(validateArguments(valContentCall, [id => {
+  return fp.pipe(validateArguments(cDefine, [id => {
     // TODO: validate ID value here?
     if (!ts__default["default"].isStringLiteralLike(id)) {
-      return fp.result.err(new ValSyntaxError("Expected first argument to val.content to be a string literal", id));
+      return fp.result.err(new ValSyntaxError("Expected first argument to c.define to be a string literal", id));
     }
     return fp.result.voidOk;
   }, () => {
@@ -227,7 +227,7 @@ function analyzeDefaultExport(node) {
   }, () => {
     return fp.result.voidOk;
   }]), fp.result.map(() => {
-    const [, schema, source] = valContentCall.arguments;
+    const [, schema, source] = cDefine.arguments;
     return {
       schema,
       source
@@ -268,20 +268,27 @@ function createValFileReference(value) {
   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);
+  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), ts__default["default"].factory.createIdentifier("file")), undefined, args);
+}
+function createValRichTextImage(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.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), "rt"), ts__default["default"].factory.createIdentifier("image")), 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);
+  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), "rt"), ts__default["default"].factory.createIdentifier("link")), undefined, args);
 }
 function createValRichTextTaggedStringTemplate(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"));
+  const tag = ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), ts__default["default"].factory.createIdentifier("richtext"));
   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)))));
   }
@@ -301,6 +308,9 @@ function toExpression(value) {
     return ts__default["default"].factory.createArrayLiteralExpression(value.map(toExpression));
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
+      if (isValRichTextImageValue(value)) {
+        return createValRichTextImage(value);
+      }
       return createValFileReference(value);
     } else if (isValLinkValue(value)) {
       return createValLink(value);
@@ -443,16 +453,16 @@ function replaceInNode(document, node, key, value) {
   } else if (isValFileMethodCall(node)) {
     if (key === core.FILE_REF_PROP) {
       if (typeof value !== "string") {
-        return fp.result.err(new patch.PatchError("Cannot replace val.file reference with non-string value"));
+        return fp.result.err(new patch.PatchError("Cannot replace c.file reference with non-string value"));
       }
       return fp.pipe(findValFileNodeArg(node), fp.result.map(refNode => replaceNodeValue(document, refNode, value)));
     } else {
       return fp.pipe(findValFileMetadataArg(node), fp.result.flatMap(metadataArgNode => {
         if (!metadataArgNode) {
-          return fp.result.err(new patch.PatchError("Cannot replace in val.file metadata when it does not exist"));
+          return fp.result.err(new patch.PatchError("Cannot replace in c.file metadata when it does not exist"));
         }
         if (key !== "metadata") {
-          return fp.result.err(new patch.PatchError(`Cannot replace val.file metadata key ${key} when it does not exist`));
+          return fp.result.err(new patch.PatchError(`Cannot replace c.file metadata key ${key} when it does not exist`));
         }
         return replaceInNode(document,
         // TODO: creating a fake object here might not be right - seems to work though
@@ -514,11 +524,11 @@ function removeFromNode(document, node, key) {
     }), fp.result.map(assignment => [removeAt(document, node.properties, node.properties.indexOf(assignment))[0], assignment.initializer]));
   } else if (isValFileMethodCall(node)) {
     if (key === core.FILE_REF_PROP) {
-      return fp.result.err(new patch.PatchError("Cannot remove a ref from val.file"));
+      return fp.result.err(new patch.PatchError("Cannot remove a ref from c.file"));
     } else {
       return fp.pipe(findValFileMetadataArg(node), fp.result.flatMap(metadataArgNode => {
         if (!metadataArgNode) {
-          return fp.result.err(new patch.PatchError("Cannot remove from val.file metadata when it does not exist"));
+          return fp.result.err(new patch.PatchError("Cannot remove from c.file metadata when it does not exist"));
         }
         return removeFromNode(document, metadataArgNode, key);
       }));
@@ -537,6 +547,13 @@ function isValFileValue(value) {
   // value[VAL_EXTENSION] === "file" &&
   core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string");
 }
+function isValRichTextImageValue(value) {
+  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" && typeof value[core.FILE_REF_SUBTYPE_TAG] === "string" && value[core.FILE_REF_SUBTYPE_TAG] === core.RT_IMAGE_TAG);
+}
 function isValLinkValue(value) {
   return !!(typeof value === "object" && value && core.VAL_EXTENSION in value && value[core.VAL_EXTENSION] === "link");
 }
@@ -560,16 +577,16 @@ function addToNode(document, node, key, value) {
   } else if (isValFileMethodCall(node)) {
     if (key === core.FILE_REF_PROP) {
       if (typeof value !== "string") {
-        return fp.result.err(new patch.PatchError(`Cannot add ${core.FILE_REF_PROP} key to val.file with non-string value`));
+        return fp.result.err(new patch.PatchError(`Cannot add ${core.FILE_REF_PROP} key to c.file with non-string value`));
       }
       return fp.pipe(findValFileNodeArg(node), fp.result.map(arg => replaceNodeValue(document, arg, value)));
     } else {
       return fp.pipe(findValFileMetadataArg(node), fp.result.flatMap(metadataArgNode => {
         if (metadataArgNode) {
-          return fp.result.err(new patch.PatchError("Cannot add metadata to val.file when it already exists"));
+          return fp.result.err(new patch.PatchError("Cannot add metadata to c.file when it already exists"));
         }
         if (key !== "metadata") {
-          return fp.result.err(new patch.PatchError(`Cannot add ${key} key to val.file: only metadata is allowed`));
+          return fp.result.err(new patch.PatchError(`Cannot add ${key} key to c.file: only metadata is allowed`));
         }
         return fp.result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
       }));
@@ -733,9 +750,9 @@ globalThis.valModule = {
       // if one of these are set it is a Val module, so must validate
       (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
         if (valModule.id !== id) {
-          fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
+          fatalErrors.push(`Wrong c.define id! Expected: '${id}', found: '${valModule.id}'`);
         } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
-          fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
+          fatalErrors.push(`Invalid c.define id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
         } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
         } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {

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

@@ -93,7 +93,7 @@ function validateObjectProperties(nodes) {
  * validating its children.
  */
 function shallowValidateExpression(value) {
-  return ts__default["default"].isStringLiteralLike(value) || ts__default["default"].isNumericLiteral(value) || value.kind === ts__default["default"].SyntaxKind.TrueKeyword || value.kind === ts__default["default"].SyntaxKind.FalseKeyword || value.kind === ts__default["default"].SyntaxKind.NullKeyword || ts__default["default"].isArrayLiteralExpression(value) || ts__default["default"].isObjectLiteralExpression(value) || isValFileMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call val.file", value);
+  return ts__default["default"].isStringLiteralLike(value) || ts__default["default"].isNumericLiteral(value) || value.kind === ts__default["default"].SyntaxKind.TrueKeyword || value.kind === ts__default["default"].SyntaxKind.FalseKeyword || value.kind === ts__default["default"].SyntaxKind.NullKeyword || ts__default["default"].isArrayLiteralExpression(value) || ts__default["default"].isObjectLiteralExpression(value) || isValFileMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call c.file", value);
 }
 
 /**
@@ -135,7 +135,7 @@ function evaluateExpression(value) {
       }
     }));
   } else {
-    return fp.result.err(new ValSyntaxError("Expression must be a literal or call val.file", value));
+    return fp.result.err(new ValSyntaxError("Expression must be a literal or call c.file", value));
   }
 }
 function findObjectPropertyAssignment(value, key) {
@@ -150,27 +150,27 @@ function findObjectPropertyAssignment(value, key) {
   }));
 }
 function isValFileMethodCall(node) {
-  return ts__default["default"].isCallExpression(node) && ts__default["default"].isPropertyAccessExpression(node.expression) && ts__default["default"].isIdentifier(node.expression.expression) && node.expression.expression.text === "val" && node.expression.name.text === "file";
+  return ts__default["default"].isCallExpression(node) && ts__default["default"].isPropertyAccessExpression(node.expression) && ts__default["default"].isIdentifier(node.expression.expression) && node.expression.expression.text === "c" && node.expression.name.text === "file";
 }
 function findValFileNodeArg(node) {
   if (node.arguments.length === 0) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: missing ref argument`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
   } else if (node.arguments.length > 2) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: too many arguments ${node.arguments.length}}`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: too many arguments ${node.arguments.length}}`, node));
   } else if (!ts__default["default"].isStringLiteral(node.arguments[0])) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: ref must be a string literal`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: ref must be a string literal`, node));
   }
   const refNode = node.arguments[0];
   return fp.result.ok(refNode);
 }
 function findValFileMetadataArg(node) {
   if (node.arguments.length === 0) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: missing ref argument`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
   } else if (node.arguments.length > 2) {
-    return fp.result.err(new ValSyntaxError(`Invalid val.file() call: too many arguments ${node.arguments.length}}`, node));
+    return fp.result.err(new ValSyntaxError(`Invalid c.file() call: too many arguments ${node.arguments.length}}`, node));
   } else if (node.arguments.length === 2) {
     if (!ts__default["default"].isObjectLiteralExpression(node.arguments[1])) {
-      return fp.result.err(new ValSyntaxError(`Invalid val.file() call: metadata must be a object literal`, node));
+      return fp.result.err(new ValSyntaxError(`Invalid c.file() call: metadata must be a object literal`, node));
     }
     return fp.result.ok(node.arguments[1]);
   }
@@ -209,17 +209,17 @@ function validateArguments(node, validators) {
   return fp.result.allV([node.arguments.length === validators.length ? fp.result.voidOk : fp.result.err(new ValSyntaxError(`Expected ${validators.length} arguments`, node)), ...node.arguments.slice(0, validators.length).map((argument, index) => validators[index](argument))]);
 }
 function analyzeDefaultExport(node) {
-  const valContentCall = node.expression;
-  if (!ts__default["default"].isCallExpression(valContentCall)) {
-    return fp.result.err(new ValSyntaxError("Expected default expression to be a call expression", valContentCall));
+  const cDefine = node.expression;
+  if (!ts__default["default"].isCallExpression(cDefine)) {
+    return fp.result.err(new ValSyntaxError("Expected default expression to be a call expression", cDefine));
   }
-  if (!isPath(valContentCall.expression, ["val", "content"])) {
-    return fp.result.err(new ValSyntaxError("Expected default expression to be calling val.content", valContentCall.expression));
+  if (!isPath(cDefine.expression, ["c", "define"])) {
+    return fp.result.err(new ValSyntaxError("Expected default expression to be calling c.define", cDefine.expression));
   }
-  return fp.pipe(validateArguments(valContentCall, [id => {
+  return fp.pipe(validateArguments(cDefine, [id => {
     // TODO: validate ID value here?
     if (!ts__default["default"].isStringLiteralLike(id)) {
-      return fp.result.err(new ValSyntaxError("Expected first argument to val.content to be a string literal", id));
+      return fp.result.err(new ValSyntaxError("Expected first argument to c.define to be a string literal", id));
     }
     return fp.result.voidOk;
   }, () => {
@@ -227,7 +227,7 @@ function analyzeDefaultExport(node) {
   }, () => {
     return fp.result.voidOk;
   }]), fp.result.map(() => {
-    const [, schema, source] = valContentCall.arguments;
+    const [, schema, source] = cDefine.arguments;
     return {
       schema,
       source
@@ -268,20 +268,27 @@ function createValFileReference(value) {
   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);
+  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), ts__default["default"].factory.createIdentifier("file")), undefined, args);
+}
+function createValRichTextImage(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.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), "rt"), ts__default["default"].factory.createIdentifier("image")), 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);
+  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), "rt"), ts__default["default"].factory.createIdentifier("link")), undefined, args);
 }
 function createValRichTextTaggedStringTemplate(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"));
+  const tag = ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), ts__default["default"].factory.createIdentifier("richtext"));
   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)))));
   }
@@ -301,6 +308,9 @@ function toExpression(value) {
     return ts__default["default"].factory.createArrayLiteralExpression(value.map(toExpression));
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
+      if (isValRichTextImageValue(value)) {
+        return createValRichTextImage(value);
+      }
       return createValFileReference(value);
     } else if (isValLinkValue(value)) {
       return createValLink(value);
@@ -443,16 +453,16 @@ function replaceInNode(document, node, key, value) {
   } else if (isValFileMethodCall(node)) {
     if (key === core.FILE_REF_PROP) {
       if (typeof value !== "string") {
-        return fp.result.err(new patch.PatchError("Cannot replace val.file reference with non-string value"));
+        return fp.result.err(new patch.PatchError("Cannot replace c.file reference with non-string value"));
       }
       return fp.pipe(findValFileNodeArg(node), fp.result.map(refNode => replaceNodeValue(document, refNode, value)));
     } else {
       return fp.pipe(findValFileMetadataArg(node), fp.result.flatMap(metadataArgNode => {
         if (!metadataArgNode) {
-          return fp.result.err(new patch.PatchError("Cannot replace in val.file metadata when it does not exist"));
+          return fp.result.err(new patch.PatchError("Cannot replace in c.file metadata when it does not exist"));
         }
         if (key !== "metadata") {
-          return fp.result.err(new patch.PatchError(`Cannot replace val.file metadata key ${key} when it does not exist`));
+          return fp.result.err(new patch.PatchError(`Cannot replace c.file metadata key ${key} when it does not exist`));
         }
         return replaceInNode(document,
         // TODO: creating a fake object here might not be right - seems to work though
@@ -514,11 +524,11 @@ function removeFromNode(document, node, key) {
     }), fp.result.map(assignment => [removeAt(document, node.properties, node.properties.indexOf(assignment))[0], assignment.initializer]));
   } else if (isValFileMethodCall(node)) {
     if (key === core.FILE_REF_PROP) {
-      return fp.result.err(new patch.PatchError("Cannot remove a ref from val.file"));
+      return fp.result.err(new patch.PatchError("Cannot remove a ref from c.file"));
     } else {
       return fp.pipe(findValFileMetadataArg(node), fp.result.flatMap(metadataArgNode => {
         if (!metadataArgNode) {
-          return fp.result.err(new patch.PatchError("Cannot remove from val.file metadata when it does not exist"));
+          return fp.result.err(new patch.PatchError("Cannot remove from c.file metadata when it does not exist"));
         }
         return removeFromNode(document, metadataArgNode, key);
       }));
@@ -537,6 +547,13 @@ function isValFileValue(value) {
   // value[VAL_EXTENSION] === "file" &&
   core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string");
 }
+function isValRichTextImageValue(value) {
+  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" && typeof value[core.FILE_REF_SUBTYPE_TAG] === "string" && value[core.FILE_REF_SUBTYPE_TAG] === core.RT_IMAGE_TAG);
+}
 function isValLinkValue(value) {
   return !!(typeof value === "object" && value && core.VAL_EXTENSION in value && value[core.VAL_EXTENSION] === "link");
 }
@@ -560,16 +577,16 @@ function addToNode(document, node, key, value) {
   } else if (isValFileMethodCall(node)) {
     if (key === core.FILE_REF_PROP) {
       if (typeof value !== "string") {
-        return fp.result.err(new patch.PatchError(`Cannot add ${core.FILE_REF_PROP} key to val.file with non-string value`));
+        return fp.result.err(new patch.PatchError(`Cannot add ${core.FILE_REF_PROP} key to c.file with non-string value`));
       }
       return fp.pipe(findValFileNodeArg(node), fp.result.map(arg => replaceNodeValue(document, arg, value)));
     } else {
       return fp.pipe(findValFileMetadataArg(node), fp.result.flatMap(metadataArgNode => {
         if (metadataArgNode) {
-          return fp.result.err(new patch.PatchError("Cannot add metadata to val.file when it already exists"));
+          return fp.result.err(new patch.PatchError("Cannot add metadata to c.file when it already exists"));
         }
         if (key !== "metadata") {
-          return fp.result.err(new patch.PatchError(`Cannot add ${key} key to val.file: only metadata is allowed`));
+          return fp.result.err(new patch.PatchError(`Cannot add ${key} key to c.file: only metadata is allowed`));
         }
         return fp.result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
       }));
@@ -733,9 +750,9 @@ globalThis.valModule = {
       // if one of these are set it is a Val module, so must validate
       (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
         if (valModule.id !== id) {
-          fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
+          fatalErrors.push(`Wrong c.define id! Expected: '${id}', found: '${valModule.id}'`);
         } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
-          fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
+          fatalErrors.push(`Invalid c.define id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
         } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
         } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {

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, VAL_EXTENSION, derefPatch, Internal, Schema } from '@valbuild/core';
+import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, RT_IMAGE_TAG, 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';
@@ -63,7 +63,7 @@ function validateObjectProperties(nodes) {
  * validating its children.
  */
 function shallowValidateExpression(value) {
-  return ts.isStringLiteralLike(value) || ts.isNumericLiteral(value) || value.kind === ts.SyntaxKind.TrueKeyword || value.kind === ts.SyntaxKind.FalseKeyword || value.kind === ts.SyntaxKind.NullKeyword || ts.isArrayLiteralExpression(value) || ts.isObjectLiteralExpression(value) || isValFileMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call val.file", value);
+  return ts.isStringLiteralLike(value) || ts.isNumericLiteral(value) || value.kind === ts.SyntaxKind.TrueKeyword || value.kind === ts.SyntaxKind.FalseKeyword || value.kind === ts.SyntaxKind.NullKeyword || ts.isArrayLiteralExpression(value) || ts.isObjectLiteralExpression(value) || isValFileMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call c.file", value);
 }
 
 /**
@@ -105,7 +105,7 @@ function evaluateExpression(value) {
       }
     }));
   } else {
-    return result.err(new ValSyntaxError("Expression must be a literal or call val.file", value));
+    return result.err(new ValSyntaxError("Expression must be a literal or call c.file", value));
   }
 }
 function findObjectPropertyAssignment(value, key) {
@@ -120,27 +120,27 @@ function findObjectPropertyAssignment(value, key) {
   }));
 }
 function isValFileMethodCall(node) {
-  return ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.expression) && node.expression.expression.text === "val" && node.expression.name.text === "file";
+  return ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.expression) && node.expression.expression.text === "c" && node.expression.name.text === "file";
 }
 function findValFileNodeArg(node) {
   if (node.arguments.length === 0) {
-    return result.err(new ValSyntaxError(`Invalid val.file() call: missing ref argument`, node));
+    return result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
   } else if (node.arguments.length > 2) {
-    return result.err(new ValSyntaxError(`Invalid val.file() call: too many arguments ${node.arguments.length}}`, node));
+    return result.err(new ValSyntaxError(`Invalid c.file() call: too many arguments ${node.arguments.length}}`, node));
   } else if (!ts.isStringLiteral(node.arguments[0])) {
-    return result.err(new ValSyntaxError(`Invalid val.file() call: ref must be a string literal`, node));
+    return result.err(new ValSyntaxError(`Invalid c.file() call: ref must be a string literal`, node));
   }
   const refNode = node.arguments[0];
   return result.ok(refNode);
 }
 function findValFileMetadataArg(node) {
   if (node.arguments.length === 0) {
-    return result.err(new ValSyntaxError(`Invalid val.file() call: missing ref argument`, node));
+    return result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
   } else if (node.arguments.length > 2) {
-    return result.err(new ValSyntaxError(`Invalid val.file() call: too many arguments ${node.arguments.length}}`, node));
+    return result.err(new ValSyntaxError(`Invalid c.file() call: too many arguments ${node.arguments.length}}`, node));
   } else if (node.arguments.length === 2) {
     if (!ts.isObjectLiteralExpression(node.arguments[1])) {
-      return result.err(new ValSyntaxError(`Invalid val.file() call: metadata must be a object literal`, node));
+      return result.err(new ValSyntaxError(`Invalid c.file() call: metadata must be a object literal`, node));
     }
     return result.ok(node.arguments[1]);
   }
@@ -179,17 +179,17 @@ function validateArguments(node, validators) {
   return result.allV([node.arguments.length === validators.length ? result.voidOk : result.err(new ValSyntaxError(`Expected ${validators.length} arguments`, node)), ...node.arguments.slice(0, validators.length).map((argument, index) => validators[index](argument))]);
 }
 function analyzeDefaultExport(node) {
-  const valContentCall = node.expression;
-  if (!ts.isCallExpression(valContentCall)) {
-    return result.err(new ValSyntaxError("Expected default expression to be a call expression", valContentCall));
+  const cDefine = node.expression;
+  if (!ts.isCallExpression(cDefine)) {
+    return result.err(new ValSyntaxError("Expected default expression to be a call expression", cDefine));
   }
-  if (!isPath(valContentCall.expression, ["val", "content"])) {
-    return result.err(new ValSyntaxError("Expected default expression to be calling val.content", valContentCall.expression));
+  if (!isPath(cDefine.expression, ["c", "define"])) {
+    return result.err(new ValSyntaxError("Expected default expression to be calling c.define", cDefine.expression));
   }
-  return pipe(validateArguments(valContentCall, [id => {
+  return pipe(validateArguments(cDefine, [id => {
     // TODO: validate ID value here?
     if (!ts.isStringLiteralLike(id)) {
-      return result.err(new ValSyntaxError("Expected first argument to val.content to be a string literal", id));
+      return result.err(new ValSyntaxError("Expected first argument to c.define to be a string literal", id));
     }
     return result.voidOk;
   }, () => {
@@ -197,7 +197,7 @@ function analyzeDefaultExport(node) {
   }, () => {
     return result.voidOk;
   }]), result.map(() => {
-    const [, schema, source] = valContentCall.arguments;
+    const [, schema, source] = cDefine.arguments;
     return {
       schema,
       source
@@ -238,20 +238,27 @@ function createValFileReference(value) {
   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);
+  return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("c"), ts.factory.createIdentifier("file")), undefined, args);
+}
+function createValRichTextImage(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.createPropertyAccessExpression(ts.factory.createIdentifier("c"), "rt"), ts.factory.createIdentifier("image")), 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);
+  return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("c"), "rt"), ts.factory.createIdentifier("link")), undefined, args);
 }
 function createValRichTextTaggedStringTemplate(value) {
   const {
     templateStrings: [head, ...others],
     exprs
   } = value;
-  const tag = ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("val"), ts.factory.createIdentifier("richtext"));
+  const tag = ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("c"), ts.factory.createIdentifier("richtext"));
   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)))));
   }
@@ -271,6 +278,9 @@ function toExpression(value) {
     return ts.factory.createArrayLiteralExpression(value.map(toExpression));
   } else if (typeof value === "object") {
     if (isValFileValue(value)) {
+      if (isValRichTextImageValue(value)) {
+        return createValRichTextImage(value);
+      }
       return createValFileReference(value);
     } else if (isValLinkValue(value)) {
       return createValLink(value);
@@ -413,16 +423,16 @@ function replaceInNode(document, node, key, value) {
   } else if (isValFileMethodCall(node)) {
     if (key === FILE_REF_PROP) {
       if (typeof value !== "string") {
-        return result.err(new PatchError("Cannot replace val.file reference with non-string value"));
+        return result.err(new PatchError("Cannot replace c.file reference with non-string value"));
       }
       return pipe(findValFileNodeArg(node), result.map(refNode => replaceNodeValue(document, refNode, value)));
     } else {
       return pipe(findValFileMetadataArg(node), result.flatMap(metadataArgNode => {
         if (!metadataArgNode) {
-          return result.err(new PatchError("Cannot replace in val.file metadata when it does not exist"));
+          return result.err(new PatchError("Cannot replace in c.file metadata when it does not exist"));
         }
         if (key !== "metadata") {
-          return result.err(new PatchError(`Cannot replace val.file metadata key ${key} when it does not exist`));
+          return result.err(new PatchError(`Cannot replace c.file metadata key ${key} when it does not exist`));
         }
         return replaceInNode(document,
         // TODO: creating a fake object here might not be right - seems to work though
@@ -484,11 +494,11 @@ function removeFromNode(document, node, key) {
     }), result.map(assignment => [removeAt(document, node.properties, node.properties.indexOf(assignment))[0], assignment.initializer]));
   } else if (isValFileMethodCall(node)) {
     if (key === FILE_REF_PROP) {
-      return result.err(new PatchError("Cannot remove a ref from val.file"));
+      return result.err(new PatchError("Cannot remove a ref from c.file"));
     } else {
       return pipe(findValFileMetadataArg(node), result.flatMap(metadataArgNode => {
         if (!metadataArgNode) {
-          return result.err(new PatchError("Cannot remove from val.file metadata when it does not exist"));
+          return result.err(new PatchError("Cannot remove from c.file metadata when it does not exist"));
         }
         return removeFromNode(document, metadataArgNode, key);
       }));
@@ -507,6 +517,13 @@ function isValFileValue(value) {
   // value[VAL_EXTENSION] === "file" &&
   FILE_REF_PROP in value && typeof value[FILE_REF_PROP] === "string");
 }
+function isValRichTextImageValue(value) {
+  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" && typeof value[FILE_REF_SUBTYPE_TAG] === "string" && value[FILE_REF_SUBTYPE_TAG] === RT_IMAGE_TAG);
+}
 function isValLinkValue(value) {
   return !!(typeof value === "object" && value && VAL_EXTENSION in value && value[VAL_EXTENSION] === "link");
 }
@@ -530,16 +547,16 @@ function addToNode(document, node, key, value) {
   } else if (isValFileMethodCall(node)) {
     if (key === FILE_REF_PROP) {
       if (typeof value !== "string") {
-        return result.err(new PatchError(`Cannot add ${FILE_REF_PROP} key to val.file with non-string value`));
+        return result.err(new PatchError(`Cannot add ${FILE_REF_PROP} key to c.file with non-string value`));
       }
       return pipe(findValFileNodeArg(node), result.map(arg => replaceNodeValue(document, arg, value)));
     } else {
       return pipe(findValFileMetadataArg(node), result.flatMap(metadataArgNode => {
         if (metadataArgNode) {
-          return result.err(new PatchError("Cannot add metadata to val.file when it already exists"));
+          return result.err(new PatchError("Cannot add metadata to c.file when it already exists"));
         }
         if (key !== "metadata") {
-          return result.err(new PatchError(`Cannot add ${key} key to val.file: only metadata is allowed`));
+          return result.err(new PatchError(`Cannot add ${key} key to c.file: only metadata is allowed`));
         }
         return result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
       }));
@@ -703,9 +720,9 @@ globalThis.valModule = {
       // if one of these are set it is a Val module, so must validate
       (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
         if (valModule.id !== id) {
-          fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
+          fatalErrors.push(`Wrong c.define id! Expected: '${id}', found: '${valModule.id}'`);
         } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
-          fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
+          fatalErrors.push(`Invalid c.define id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
         } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
         } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.52.0",
+  "version": "0.54.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -24,9 +24,9 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.52.0",
-    "@valbuild/shared": "~0.52.0",
-    "@valbuild/ui": "~0.52.0",
+    "@valbuild/core": "~0.54.0",
+    "@valbuild/shared": "~0.54.0",
+    "@valbuild/ui": "~0.54.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "queue": "^6.0.2",