@valbuild/server 0.66.0 → 0.67.0

package/dist/declarations/src/patch/ts/syntax.d.ts

@@ -38,8 +38,11 @@ export declare function deepValidateExpression(value: ts.Expression): result.Res
 export declare function evaluateExpression(value: ts.Expression): result.Result<JSONValue, ValSyntaxErrorTree>;
 export declare function findObjectPropertyAssignment(value: ts.ObjectLiteralExpression, key: string): result.Result<LiteralPropertyAssignment | undefined, ValSyntaxErrorTree>;
 export declare function isValFileMethodCall(node: ts.Expression): node is ts.CallExpression;
+export declare function isValImageMethodCall(node: ts.Expression): node is ts.CallExpression;
 export declare function findValFileNodeArg(node: ts.CallExpression): result.Result<ts.StringLiteral, ValSyntaxErrorTree>;
+export declare function findValImageNodeArg(node: ts.CallExpression): result.Result<ts.StringLiteral, ValSyntaxErrorTree>;
 export declare function findValFileMetadataArg(node: ts.CallExpression): result.Result<ts.ObjectLiteralExpression | undefined, ValSyntaxErrorTree>;
+export declare function findValImageMetadataArg(node: ts.CallExpression): result.Result<ts.ObjectLiteralExpression | undefined, ValSyntaxErrorTree>;
 /**
  * Given a list of expressions, validates that all the expressions are not
  * spread elements. In other words, it ensures that the expressions are the

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

@@ -95,7 +95,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 c.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) || isValImageMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call c.file", value);
 }
 
 /**
@@ -136,6 +136,23 @@ function evaluateExpression(value) {
         });
       }
     }));
+  } else if (isValImageMethodCall(value)) {
+    return fp.pipe(findValImageNodeArg(value), fp.result.flatMap(ref => {
+      if (value.arguments.length === 2) {
+        return fp.pipe(evaluateExpression(value.arguments[1]), fp.result.map(metadata => ({
+          [core.FILE_REF_PROP]: ref.text,
+          _type: "file",
+          [core.FILE_REF_SUBTYPE_TAG]: "image",
+          metadata
+        })));
+      } else {
+        return fp.result.ok({
+          [core.FILE_REF_PROP]: ref.text,
+          _type: "file",
+          [core.FILE_REF_SUBTYPE_TAG]: "image"
+        });
+      }
+    }));
   } else {
     return fp.result.err(new ValSyntaxError("Expression must be a literal or call c.file", value));
   }
@@ -154,6 +171,9 @@ 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 === "c" && node.expression.name.text === "file";
 }
+function isValImageMethodCall(node) {
+  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 === "image";
+}
 function findValFileNodeArg(node) {
   if (node.arguments.length === 0) {
     return fp.result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
@@ -165,6 +185,17 @@ function findValFileNodeArg(node) {
   const refNode = node.arguments[0];
   return fp.result.ok(refNode);
 }
+function findValImageNodeArg(node) {
+  if (node.arguments.length === 0) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() call: missing ref argument`, node));
+  } else if (node.arguments.length > 2) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() call: too many arguments ${node.arguments.length}}`, node));
+  } else if (!ts__default["default"].isStringLiteral(node.arguments[0])) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() 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 c.file() call: missing ref argument`, node));
@@ -178,6 +209,19 @@ function findValFileMetadataArg(node) {
   }
   return fp.result.ok(undefined);
 }
+function findValImageMetadataArg(node) {
+  if (node.arguments.length === 0) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() call: missing ref argument`, node));
+  } else if (node.arguments.length > 2) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() 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 c.image() call: metadata must be a object literal`, node));
+    }
+    return fp.result.ok(node.arguments[1]);
+  }
+  return fp.result.ok(undefined);
+}
 
 /**
  * Given a list of expressions, validates that all the expressions are not
@@ -272,24 +316,31 @@ function createValFileReference(value) {
   }
   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) {
+function createValImageReference(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.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), "rt"), ts__default["default"].factory.createIdentifier("link")), undefined, args);
+  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), ts__default["default"].factory.createIdentifier("image")), undefined, args);
 }
 function toExpression(value) {
   if (typeof value === "string") {
     // TODO: Use configuration/heuristics to determine use of single quote or double quote
     return ts__default["default"].factory.createStringLiteral(value);
   } else if (typeof value === "number") {
+    // TODO: do we want to do something like this for very large numbers?
+    // if (value > Number.MAX_SAFE_INTEGER) {
+    //   return ts.factory.createBigIntLiteral(`${value}n`);
+    // }
+    // if (value < Number.MIN_SAFE_INTEGER) {
+    //   return ts.factory.createPrefixUnaryExpression(
+    //     ts.SyntaxKind.MinusToken,
+    //     ts.factory.createBigIntLiteral(`${value}n`),
+    //   );
+    // }
+    if (value < 0) {
+      return ts__default["default"].factory.createPrefixUnaryExpression(ts__default["default"].SyntaxKind.MinusToken, ts__default["default"].factory.createNumericLiteral(Math.abs(value)));
+    }
     return ts__default["default"].factory.createNumericLiteral(value);
   } else if (typeof value === "boolean") {
     return value ? ts__default["default"].factory.createTrue() : ts__default["default"].factory.createFalse();
@@ -299,12 +350,10 @@ 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);
+    }
+    if (isValImageValue(value)) {
+      return createValImageReference(value);
     }
     return ts__default["default"].factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => createPropertyAssignment(key, value)));
   } else {
@@ -458,6 +507,25 @@ function replaceInNode(document, node, key, value) {
         ts__default["default"].factory.createObjectLiteralExpression([ts__default["default"].factory.createPropertyAssignment(key, metadataArgNode)]), key, value);
       }));
     }
+  } else if (isValImageMethodCall(node)) {
+    if (key === core.FILE_REF_PROP) {
+      if (typeof value !== "string") {
+        return fp.result.err(new patch.PatchError("Cannot replace c.image reference with non-string value"));
+      }
+      return fp.pipe(findValImageNodeArg(node), fp.result.map(refNode => replaceNodeValue(document, refNode, value)));
+    } else {
+      return fp.pipe(findValImageMetadataArg(node), fp.result.flatMap(metadataArgNode => {
+        if (!metadataArgNode) {
+          return fp.result.err(new patch.PatchError("Cannot replace in c.image metadata when it does not exist"));
+        }
+        if (key !== "metadata") {
+          return fp.result.err(new patch.PatchError(`Cannot replace c.image 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
+        ts__default["default"].factory.createObjectLiteralExpression([ts__default["default"].factory.createPropertyAssignment(key, metadataArgNode)]), key, value);
+      }));
+    }
   } else {
     return fp.result.err(shallowValidateExpression(node) ?? new patch.PatchError("Cannot replace in non-object/array"));
   }
@@ -479,6 +547,11 @@ function getFromNode(node, key) {
       return findValFileNodeArg(node);
     }
     return findValFileMetadataArg(node);
+  } else if (isValImageMethodCall(node)) {
+    if (key === core.FILE_REF_PROP) {
+      return findValImageNodeArg(node);
+    }
+    return findValImageMetadataArg(node);
   } else {
     return fp.result.err(shallowValidateExpression(node) ?? new patch.PatchError("Cannot access non-object/array"));
   }
@@ -522,6 +595,17 @@ function removeFromNode(document, node, key) {
         return removeFromNode(document, metadataArgNode, key);
       }));
     }
+  } else if (isValImageMethodCall(node)) {
+    if (key === core.FILE_REF_PROP) {
+      return fp.result.err(new patch.PatchError("Cannot remove a ref from c.file"));
+    } else {
+      return fp.pipe(findValImageMetadataArg(node), fp.result.flatMap(metadataArgNode => {
+        if (!metadataArgNode) {
+          return fp.result.err(new patch.PatchError("Cannot remove from c.image metadata when it does not exist"));
+        }
+        return removeFromNode(document, metadataArgNode, key);
+      }));
+    }
   } else {
     return fp.result.err(shallowValidateExpression(node) ?? new patch.PatchError("Cannot remove from non-object/array"));
   }
@@ -534,17 +618,14 @@ function isValFileValue(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");
+  core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string" && value[core.FILE_REF_SUBTYPE_TAG] !== "image");
 }
-function isValRichTextImageValue(value) {
+function isValImageValue(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");
+  core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string" && value[core.FILE_REF_SUBTYPE_TAG] === "image");
 }
 function addToNode(document, node, key, value) {
   if (ts__default["default"].isArrayLiteralExpression(node)) {
@@ -577,6 +658,23 @@ function addToNode(document, node, key, value) {
         return fp.result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
       }));
     }
+  } else if (isValImageMethodCall(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 c.image with non-string value`));
+      }
+      return fp.pipe(findValImageNodeArg(node), fp.result.map(arg => replaceNodeValue(document, arg, value)));
+    } else {
+      return fp.pipe(findValImageMetadataArg(node), fp.result.flatMap(metadataArgNode => {
+        if (metadataArgNode) {
+          return fp.result.err(new patch.PatchError("Cannot add metadata to c.image when it already exists"));
+        }
+        if (key !== "metadata") {
+          return fp.result.err(new patch.PatchError(`Cannot add ${key} key to c.image: only metadata is allowed`));
+        }
+        return fp.result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
+      }));
+    }
   } else {
     return fp.result.err(shallowValidateExpression(node) ?? new patch.PatchError("Cannot add to non-object/array"));
   }
@@ -2846,7 +2944,7 @@ class FSOpsHost {
   // TODO: do we want async operations here?
   deleteDir(dir) {
     if (this.directoryExists(dir)) {
-      fs__default["default"].rmdirSync(dir, {
+      fs__default["default"].rmSync(dir, {
         recursive: true
       });
     }

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

@@ -95,7 +95,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 c.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) || isValImageMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call c.file", value);
 }
 
 /**
@@ -136,6 +136,23 @@ function evaluateExpression(value) {
         });
       }
     }));
+  } else if (isValImageMethodCall(value)) {
+    return fp.pipe(findValImageNodeArg(value), fp.result.flatMap(ref => {
+      if (value.arguments.length === 2) {
+        return fp.pipe(evaluateExpression(value.arguments[1]), fp.result.map(metadata => ({
+          [core.FILE_REF_PROP]: ref.text,
+          _type: "file",
+          [core.FILE_REF_SUBTYPE_TAG]: "image",
+          metadata
+        })));
+      } else {
+        return fp.result.ok({
+          [core.FILE_REF_PROP]: ref.text,
+          _type: "file",
+          [core.FILE_REF_SUBTYPE_TAG]: "image"
+        });
+      }
+    }));
   } else {
     return fp.result.err(new ValSyntaxError("Expression must be a literal or call c.file", value));
   }
@@ -154,6 +171,9 @@ 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 === "c" && node.expression.name.text === "file";
 }
+function isValImageMethodCall(node) {
+  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 === "image";
+}
 function findValFileNodeArg(node) {
   if (node.arguments.length === 0) {
     return fp.result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
@@ -165,6 +185,17 @@ function findValFileNodeArg(node) {
   const refNode = node.arguments[0];
   return fp.result.ok(refNode);
 }
+function findValImageNodeArg(node) {
+  if (node.arguments.length === 0) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() call: missing ref argument`, node));
+  } else if (node.arguments.length > 2) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() call: too many arguments ${node.arguments.length}}`, node));
+  } else if (!ts__default["default"].isStringLiteral(node.arguments[0])) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() 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 c.file() call: missing ref argument`, node));
@@ -178,6 +209,19 @@ function findValFileMetadataArg(node) {
   }
   return fp.result.ok(undefined);
 }
+function findValImageMetadataArg(node) {
+  if (node.arguments.length === 0) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() call: missing ref argument`, node));
+  } else if (node.arguments.length > 2) {
+    return fp.result.err(new ValSyntaxError(`Invalid c.image() 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 c.image() call: metadata must be a object literal`, node));
+    }
+    return fp.result.ok(node.arguments[1]);
+  }
+  return fp.result.ok(undefined);
+}
 
 /**
  * Given a list of expressions, validates that all the expressions are not
@@ -272,24 +316,31 @@ function createValFileReference(value) {
   }
   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) {
+function createValImageReference(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.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), "rt"), ts__default["default"].factory.createIdentifier("link")), undefined, args);
+  return ts__default["default"].factory.createCallExpression(ts__default["default"].factory.createPropertyAccessExpression(ts__default["default"].factory.createIdentifier("c"), ts__default["default"].factory.createIdentifier("image")), undefined, args);
 }
 function toExpression(value) {
   if (typeof value === "string") {
     // TODO: Use configuration/heuristics to determine use of single quote or double quote
     return ts__default["default"].factory.createStringLiteral(value);
   } else if (typeof value === "number") {
+    // TODO: do we want to do something like this for very large numbers?
+    // if (value > Number.MAX_SAFE_INTEGER) {
+    //   return ts.factory.createBigIntLiteral(`${value}n`);
+    // }
+    // if (value < Number.MIN_SAFE_INTEGER) {
+    //   return ts.factory.createPrefixUnaryExpression(
+    //     ts.SyntaxKind.MinusToken,
+    //     ts.factory.createBigIntLiteral(`${value}n`),
+    //   );
+    // }
+    if (value < 0) {
+      return ts__default["default"].factory.createPrefixUnaryExpression(ts__default["default"].SyntaxKind.MinusToken, ts__default["default"].factory.createNumericLiteral(Math.abs(value)));
+    }
     return ts__default["default"].factory.createNumericLiteral(value);
   } else if (typeof value === "boolean") {
     return value ? ts__default["default"].factory.createTrue() : ts__default["default"].factory.createFalse();
@@ -299,12 +350,10 @@ 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);
+    }
+    if (isValImageValue(value)) {
+      return createValImageReference(value);
     }
     return ts__default["default"].factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => createPropertyAssignment(key, value)));
   } else {
@@ -458,6 +507,25 @@ function replaceInNode(document, node, key, value) {
         ts__default["default"].factory.createObjectLiteralExpression([ts__default["default"].factory.createPropertyAssignment(key, metadataArgNode)]), key, value);
       }));
     }
+  } else if (isValImageMethodCall(node)) {
+    if (key === core.FILE_REF_PROP) {
+      if (typeof value !== "string") {
+        return fp.result.err(new patch.PatchError("Cannot replace c.image reference with non-string value"));
+      }
+      return fp.pipe(findValImageNodeArg(node), fp.result.map(refNode => replaceNodeValue(document, refNode, value)));
+    } else {
+      return fp.pipe(findValImageMetadataArg(node), fp.result.flatMap(metadataArgNode => {
+        if (!metadataArgNode) {
+          return fp.result.err(new patch.PatchError("Cannot replace in c.image metadata when it does not exist"));
+        }
+        if (key !== "metadata") {
+          return fp.result.err(new patch.PatchError(`Cannot replace c.image 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
+        ts__default["default"].factory.createObjectLiteralExpression([ts__default["default"].factory.createPropertyAssignment(key, metadataArgNode)]), key, value);
+      }));
+    }
   } else {
     return fp.result.err(shallowValidateExpression(node) ?? new patch.PatchError("Cannot replace in non-object/array"));
   }
@@ -479,6 +547,11 @@ function getFromNode(node, key) {
       return findValFileNodeArg(node);
     }
     return findValFileMetadataArg(node);
+  } else if (isValImageMethodCall(node)) {
+    if (key === core.FILE_REF_PROP) {
+      return findValImageNodeArg(node);
+    }
+    return findValImageMetadataArg(node);
   } else {
     return fp.result.err(shallowValidateExpression(node) ?? new patch.PatchError("Cannot access non-object/array"));
   }
@@ -522,6 +595,17 @@ function removeFromNode(document, node, key) {
         return removeFromNode(document, metadataArgNode, key);
       }));
     }
+  } else if (isValImageMethodCall(node)) {
+    if (key === core.FILE_REF_PROP) {
+      return fp.result.err(new patch.PatchError("Cannot remove a ref from c.file"));
+    } else {
+      return fp.pipe(findValImageMetadataArg(node), fp.result.flatMap(metadataArgNode => {
+        if (!metadataArgNode) {
+          return fp.result.err(new patch.PatchError("Cannot remove from c.image metadata when it does not exist"));
+        }
+        return removeFromNode(document, metadataArgNode, key);
+      }));
+    }
   } else {
     return fp.result.err(shallowValidateExpression(node) ?? new patch.PatchError("Cannot remove from non-object/array"));
   }
@@ -534,17 +618,14 @@ function isValFileValue(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");
+  core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string" && value[core.FILE_REF_SUBTYPE_TAG] !== "image");
 }
-function isValRichTextImageValue(value) {
+function isValImageValue(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");
+  core.FILE_REF_PROP in value && typeof value[core.FILE_REF_PROP] === "string" && value[core.FILE_REF_SUBTYPE_TAG] === "image");
 }
 function addToNode(document, node, key, value) {
   if (ts__default["default"].isArrayLiteralExpression(node)) {
@@ -577,6 +658,23 @@ function addToNode(document, node, key, value) {
         return fp.result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
       }));
     }
+  } else if (isValImageMethodCall(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 c.image with non-string value`));
+      }
+      return fp.pipe(findValImageNodeArg(node), fp.result.map(arg => replaceNodeValue(document, arg, value)));
+    } else {
+      return fp.pipe(findValImageMetadataArg(node), fp.result.flatMap(metadataArgNode => {
+        if (metadataArgNode) {
+          return fp.result.err(new patch.PatchError("Cannot add metadata to c.image when it already exists"));
+        }
+        if (key !== "metadata") {
+          return fp.result.err(new patch.PatchError(`Cannot add ${key} key to c.image: only metadata is allowed`));
+        }
+        return fp.result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
+      }));
+    }
   } else {
     return fp.result.err(shallowValidateExpression(node) ?? new patch.PatchError("Cannot add to non-object/array"));
   }
@@ -2846,7 +2944,7 @@ class FSOpsHost {
   // TODO: do we want async operations here?
   deleteDir(dir) {
     if (this.directoryExists(dir)) {
-      fs__default["default"].rmdirSync(dir, {
+      fs__default["default"].rmSync(dir, {
         recursive: true
       });
     }

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, FILE_REF_SUBTYPE_TAG, RT_IMAGE_TAG, VAL_EXTENSION, derefPatch, Internal, Schema, ImageSchema, RichTextSchema, FileSchema } from '@valbuild/core';
+import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, derefPatch, Internal, Schema, ImageSchema, RichTextSchema, FileSchema, VAL_EXTENSION } from '@valbuild/core';
 import { deepEqual, isNotRoot, PatchError, parseAndValidateArrayIndex, applyPatch, JSONOps, deepClone, sourceToPatchPath } from '@valbuild/core/patch';
 import * as fsPath from 'path';
 import fsPath__default from 'path';
@@ -65,7 +65,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 c.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) || isValImageMethodCall(value) ? undefined : new ValSyntaxError("Expression must be a literal or call c.file", value);
 }
 
 /**
@@ -106,6 +106,23 @@ function evaluateExpression(value) {
         });
       }
     }));
+  } else if (isValImageMethodCall(value)) {
+    return pipe(findValImageNodeArg(value), result.flatMap(ref => {
+      if (value.arguments.length === 2) {
+        return pipe(evaluateExpression(value.arguments[1]), result.map(metadata => ({
+          [FILE_REF_PROP]: ref.text,
+          _type: "file",
+          [FILE_REF_SUBTYPE_TAG]: "image",
+          metadata
+        })));
+      } else {
+        return result.ok({
+          [FILE_REF_PROP]: ref.text,
+          _type: "file",
+          [FILE_REF_SUBTYPE_TAG]: "image"
+        });
+      }
+    }));
   } else {
     return result.err(new ValSyntaxError("Expression must be a literal or call c.file", value));
   }
@@ -124,6 +141,9 @@ function findObjectPropertyAssignment(value, key) {
 function isValFileMethodCall(node) {
   return ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.expression) && node.expression.expression.text === "c" && node.expression.name.text === "file";
 }
+function isValImageMethodCall(node) {
+  return ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.expression) && node.expression.expression.text === "c" && node.expression.name.text === "image";
+}
 function findValFileNodeArg(node) {
   if (node.arguments.length === 0) {
     return result.err(new ValSyntaxError(`Invalid c.file() call: missing ref argument`, node));
@@ -135,6 +155,17 @@ function findValFileNodeArg(node) {
   const refNode = node.arguments[0];
   return result.ok(refNode);
 }
+function findValImageNodeArg(node) {
+  if (node.arguments.length === 0) {
+    return result.err(new ValSyntaxError(`Invalid c.image() call: missing ref argument`, node));
+  } else if (node.arguments.length > 2) {
+    return result.err(new ValSyntaxError(`Invalid c.image() call: too many arguments ${node.arguments.length}}`, node));
+  } else if (!ts.isStringLiteral(node.arguments[0])) {
+    return result.err(new ValSyntaxError(`Invalid c.image() 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 c.file() call: missing ref argument`, node));
@@ -148,6 +179,19 @@ function findValFileMetadataArg(node) {
   }
   return result.ok(undefined);
 }
+function findValImageMetadataArg(node) {
+  if (node.arguments.length === 0) {
+    return result.err(new ValSyntaxError(`Invalid c.image() call: missing ref argument`, node));
+  } else if (node.arguments.length > 2) {
+    return result.err(new ValSyntaxError(`Invalid c.image() 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 c.image() call: metadata must be a object literal`, node));
+    }
+    return result.ok(node.arguments[1]);
+  }
+  return result.ok(undefined);
+}
 
 /**
  * Given a list of expressions, validates that all the expressions are not
@@ -242,24 +286,31 @@ function createValFileReference(value) {
   }
   return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("c"), ts.factory.createIdentifier("file")), undefined, args);
 }
-function createValRichTextImage(value) {
+function createValImageReference(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.createPropertyAccessExpression(ts.factory.createIdentifier("c"), "rt"), ts.factory.createIdentifier("link")), undefined, args);
+  return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("c"), ts.factory.createIdentifier("image")), undefined, args);
 }
 function toExpression(value) {
   if (typeof value === "string") {
     // TODO: Use configuration/heuristics to determine use of single quote or double quote
     return ts.factory.createStringLiteral(value);
   } else if (typeof value === "number") {
+    // TODO: do we want to do something like this for very large numbers?
+    // if (value > Number.MAX_SAFE_INTEGER) {
+    //   return ts.factory.createBigIntLiteral(`${value}n`);
+    // }
+    // if (value < Number.MIN_SAFE_INTEGER) {
+    //   return ts.factory.createPrefixUnaryExpression(
+    //     ts.SyntaxKind.MinusToken,
+    //     ts.factory.createBigIntLiteral(`${value}n`),
+    //   );
+    // }
+    if (value < 0) {
+      return ts.factory.createPrefixUnaryExpression(ts.SyntaxKind.MinusToken, ts.factory.createNumericLiteral(Math.abs(value)));
+    }
     return ts.factory.createNumericLiteral(value);
   } else if (typeof value === "boolean") {
     return value ? ts.factory.createTrue() : ts.factory.createFalse();
@@ -269,12 +320,10 @@ 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);
+    }
+    if (isValImageValue(value)) {
+      return createValImageReference(value);
     }
     return ts.factory.createObjectLiteralExpression(Object.entries(value).map(([key, value]) => createPropertyAssignment(key, value)));
   } else {
@@ -428,6 +477,25 @@ function replaceInNode(document, node, key, value) {
         ts.factory.createObjectLiteralExpression([ts.factory.createPropertyAssignment(key, metadataArgNode)]), key, value);
       }));
     }
+  } else if (isValImageMethodCall(node)) {
+    if (key === FILE_REF_PROP) {
+      if (typeof value !== "string") {
+        return result.err(new PatchError("Cannot replace c.image reference with non-string value"));
+      }
+      return pipe(findValImageNodeArg(node), result.map(refNode => replaceNodeValue(document, refNode, value)));
+    } else {
+      return pipe(findValImageMetadataArg(node), result.flatMap(metadataArgNode => {
+        if (!metadataArgNode) {
+          return result.err(new PatchError("Cannot replace in c.image metadata when it does not exist"));
+        }
+        if (key !== "metadata") {
+          return result.err(new PatchError(`Cannot replace c.image 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
+        ts.factory.createObjectLiteralExpression([ts.factory.createPropertyAssignment(key, metadataArgNode)]), key, value);
+      }));
+    }
   } else {
     return result.err(shallowValidateExpression(node) ?? new PatchError("Cannot replace in non-object/array"));
   }
@@ -449,6 +517,11 @@ function getFromNode(node, key) {
       return findValFileNodeArg(node);
     }
     return findValFileMetadataArg(node);
+  } else if (isValImageMethodCall(node)) {
+    if (key === FILE_REF_PROP) {
+      return findValImageNodeArg(node);
+    }
+    return findValImageMetadataArg(node);
   } else {
     return result.err(shallowValidateExpression(node) ?? new PatchError("Cannot access non-object/array"));
   }
@@ -492,6 +565,17 @@ function removeFromNode(document, node, key) {
         return removeFromNode(document, metadataArgNode, key);
       }));
     }
+  } else if (isValImageMethodCall(node)) {
+    if (key === FILE_REF_PROP) {
+      return result.err(new PatchError("Cannot remove a ref from c.file"));
+    } else {
+      return pipe(findValImageMetadataArg(node), result.flatMap(metadataArgNode => {
+        if (!metadataArgNode) {
+          return result.err(new PatchError("Cannot remove from c.image metadata when it does not exist"));
+        }
+        return removeFromNode(document, metadataArgNode, key);
+      }));
+    }
   } else {
     return result.err(shallowValidateExpression(node) ?? new PatchError("Cannot remove from non-object/array"));
   }
@@ -504,17 +588,14 @@ function isValFileValue(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");
+  FILE_REF_PROP in value && typeof value[FILE_REF_PROP] === "string" && value[FILE_REF_SUBTYPE_TAG] !== "image");
 }
-function isValRichTextImageValue(value) {
+function isValImageValue(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");
+  FILE_REF_PROP in value && typeof value[FILE_REF_PROP] === "string" && value[FILE_REF_SUBTYPE_TAG] === "image");
 }
 function addToNode(document, node, key, value) {
   if (ts.isArrayLiteralExpression(node)) {
@@ -547,6 +628,23 @@ function addToNode(document, node, key, value) {
         return result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
       }));
     }
+  } else if (isValImageMethodCall(node)) {
+    if (key === FILE_REF_PROP) {
+      if (typeof value !== "string") {
+        return result.err(new PatchError(`Cannot add ${FILE_REF_PROP} key to c.image with non-string value`));
+      }
+      return pipe(findValImageNodeArg(node), result.map(arg => replaceNodeValue(document, arg, value)));
+    } else {
+      return pipe(findValImageMetadataArg(node), result.flatMap(metadataArgNode => {
+        if (metadataArgNode) {
+          return result.err(new PatchError("Cannot add metadata to c.image when it already exists"));
+        }
+        if (key !== "metadata") {
+          return result.err(new PatchError(`Cannot add ${key} key to c.image: only metadata is allowed`));
+        }
+        return result.ok([insertAt(document, node.arguments, node.arguments.length, toExpression(value))]);
+      }));
+    }
   } else {
     return result.err(shallowValidateExpression(node) ?? new PatchError("Cannot add to non-object/array"));
   }
@@ -2816,7 +2914,7 @@ class FSOpsHost {
   // TODO: do we want async operations here?
   deleteDir(dir) {
     if (this.directoryExists(dir)) {
-      fs.rmdirSync(dir, {
+      fs.rmSync(dir, {
         recursive: true
       });
     }

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.66.0",
+  "version": "0.67.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -23,9 +23,9 @@
     "@types/jest": "^29.2.5"
   },
   "dependencies": {
-    "@valbuild/core": "~0.66.0",
-    "@valbuild/shared": "~0.66.0",
-    "@valbuild/ui": "~0.66.0",
+    "@valbuild/core": "~0.67.0",
+    "@valbuild/shared": "~0.67.0",
+    "@valbuild/ui": "~0.67.0",
     "chokidar": "^4.0.1",
     "image-size": "^1.0.2",
     "minimatch": "^3.0.4",