@valbuild/shared 0.75.5 → 0.76.1

package/dist/declarations/src/internal/ApiRoutes.d.ts

@@ -1719,6 +1719,200 @@ export declare const Api: {
             }>]>;
         };
     };
+    "/upload/patches": {
+        POST: {
+            req: {
+                path: z.ZodOptional<z.ZodString>;
+                body: z.ZodObject<{
+                    parentRef: z.ZodUnion<[z.ZodObject<{
+                        type: z.ZodLiteral<"head">;
+                        headBaseSha: z.ZodString;
+                    }, "strip", z.ZodTypeAny, {
+                        type: "head";
+                        headBaseSha: string;
+                    }, {
+                        type: "head";
+                        headBaseSha: string;
+                    }>, z.ZodObject<{
+                        type: z.ZodLiteral<"patch">;
+                        patchId: z.ZodEffects<z.ZodString, PatchIdT, string>;
+                    }, "strip", z.ZodTypeAny, {
+                        type: "patch";
+                        patchId?: any;
+                    }, {
+                        type: "patch";
+                        patchId: string;
+                    }>]>;
+                    filePath: z.ZodString;
+                    data: z.ZodAny;
+                    type: z.ZodUnion<[z.ZodLiteral<"file">, z.ZodLiteral<"image">]>;
+                    metadata: z.ZodAny;
+                    remote: z.ZodBoolean;
+                }, "strip", z.ZodTypeAny, {
+                    type: "file" | "image";
+                    parentRef: {
+                        type: "head";
+                        headBaseSha: string;
+                    } | {
+                        type: "patch";
+                        patchId?: any;
+                    };
+                    filePath: string;
+                    remote: boolean;
+                    data?: any;
+                    metadata?: any;
+                }, {
+                    type: "file" | "image";
+                    parentRef: {
+                        type: "head";
+                        headBaseSha: string;
+                    } | {
+                        type: "patch";
+                        patchId: string;
+                    };
+                    filePath: string;
+                    remote: boolean;
+                    data?: any;
+                    metadata?: any;
+                }>;
+            };
+            res: z.ZodUnion<[z.ZodObject<{
+                status: z.ZodLiteral<400>;
+                json: z.ZodObject<{
+                    message: z.ZodString;
+                }, "strip", z.ZodTypeAny, {
+                    message: string;
+                }, {
+                    message: string;
+                }>;
+            }, "strip", z.ZodTypeAny, {
+                status: 400;
+                json: {
+                    message: string;
+                };
+            }, {
+                status: 400;
+                json: {
+                    message: string;
+                };
+            }>, z.ZodObject<{
+                status: z.ZodLiteral<200>;
+                json: z.ZodObject<{
+                    filePath: z.ZodString;
+                    patchId: z.ZodEffects<z.ZodString, PatchIdT, string>;
+                }, "strip", z.ZodTypeAny, {
+                    filePath: string;
+                    patchId?: any;
+                }, {
+                    patchId: string;
+                    filePath: string;
+                }>;
+            }, "strip", z.ZodTypeAny, {
+                status: 200;
+                json: {
+                    filePath: string;
+                    patchId?: any;
+                };
+            }, {
+                status: 200;
+                json: {
+                    patchId: string;
+                    filePath: string;
+                };
+            }>]>;
+        };
+    };
+    "/direct-file-upload-settings": {
+        POST: {
+            req: {
+                cookies: {
+                    val_session: z.ZodOptional<z.ZodString>;
+                };
+            };
+            res: z.ZodUnion<[z.ZodObject<{
+                status: z.ZodLiteral<400>;
+                json: z.ZodObject<{
+                    message: z.ZodString;
+                }, "strip", z.ZodTypeAny, {
+                    message: string;
+                }, {
+                    message: string;
+                }>;
+            }, "strip", z.ZodTypeAny, {
+                status: 400;
+                json: {
+                    message: string;
+                };
+            }, {
+                status: 400;
+                json: {
+                    message: string;
+                };
+            }>, z.ZodObject<{
+                status: z.ZodLiteral<401>;
+                json: z.ZodObject<{
+                    message: z.ZodString;
+                }, "strip", z.ZodTypeAny, {
+                    message: string;
+                }, {
+                    message: string;
+                }>;
+            }, "strip", z.ZodTypeAny, {
+                status: 401;
+                json: {
+                    message: string;
+                };
+            }, {
+                status: 401;
+                json: {
+                    message: string;
+                };
+            }>, z.ZodObject<{
+                status: z.ZodLiteral<500>;
+                json: z.ZodObject<{
+                    message: z.ZodString;
+                }, "strip", z.ZodTypeAny, {
+                    message: string;
+                }, {
+                    message: string;
+                }>;
+            }, "strip", z.ZodTypeAny, {
+                status: 500;
+                json: {
+                    message: string;
+                };
+            }, {
+                status: 500;
+                json: {
+                    message: string;
+                };
+            }>, z.ZodObject<{
+                status: z.ZodLiteral<200>;
+                json: z.ZodObject<{
+                    nonce: z.ZodNullable<z.ZodString>;
+                    baseUrl: z.ZodString;
+                }, "strip", z.ZodTypeAny, {
+                    nonce: string | null;
+                    baseUrl: string;
+                }, {
+                    nonce: string | null;
+                    baseUrl: string;
+                }>;
+            }, "strip", z.ZodTypeAny, {
+                status: 200;
+                json: {
+                    nonce: string | null;
+                    baseUrl: string;
+                };
+            }, {
+                status: 200;
+                json: {
+                    nonce: string | null;
+                    baseUrl: string;
+                };
+            }>]>;
+        };
+    };
     "/patches": {
         DELETE: {
             req: {
@@ -1853,8 +2047,8 @@ export declare const Api: {
                         patch: z.ZodType<PatchT, z.ZodTypeDef, PatchT>;
                     }, "strip", z.ZodTypeAny, {
                         path?: any;
-                        patchId?: any;
                         patch?: any;
+                        patchId?: any;
                     }, {
                         path: string;
                         patchId: string;
@@ -1863,8 +2057,8 @@ export declare const Api: {
                 }, "strip", z.ZodTypeAny, {
                     patches: {
                         path?: any;
-                        patchId?: any;
                         patch?: any;
+                        patchId?: any;
                     }[];
                     parentRef: {
                         type: "head";
@@ -2219,8 +2413,8 @@ export declare const Api: {
                             commitSha: string;
                         } | null;
                         path?: any;
-                        patchId?: any;
                         patch?: any;
+                        patchId?: any;
                     }, {
                         path: string;
                         createdAt: string;
@@ -2255,8 +2449,8 @@ export declare const Api: {
                             commitSha: string;
                         } | null;
                         path?: any;
-                        patchId?: any;
                         patch?: any;
+                        patchId?: any;
                     }[];
                     errors?: Record<PatchIdT, {
                         message: string;
@@ -2294,8 +2488,8 @@ export declare const Api: {
                             commitSha: string;
                         } | null;
                         path?: any;
-                        patchId?: any;
                         patch?: any;
+                        patchId?: any;
                     }[];
                     errors?: Record<PatchIdT, {
                         message: string;
@@ -3054,7 +3248,7 @@ export declare const Api: {
                 status: z.ZodLiteral<400>;
                 json: z.ZodUnion<[z.ZodObject<{
                     message: z.ZodString;
-                    details: z.ZodUnion<[z.ZodObject<{
+                    details: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
                         sourceFilePatchErrors: z.ZodRecord<z.ZodEffects<z.ZodString, ModuleFilePath, string>, z.ZodArray<z.ZodObject<{
                             message: z.ZodString;
                         }, "strip", z.ZodTypeAny, {
@@ -3089,10 +3283,10 @@ export declare const Api: {
                         message: string;
                     }, {
                         message: string;
-                    }>, "many">]>;
+                    }>, "many">]>>;
                 }, "strip", z.ZodTypeAny, {
                     message: string;
-                    details: {
+                    details?: {
                         message: string;
                     }[] | {
                         sourceFilePatchErrors: Record<ModuleFilePath, {
@@ -3101,10 +3295,10 @@ export declare const Api: {
                         binaryFilePatchErrors: Record<string, {
                             message: string;
                         }>;
-                    };
+                    } | undefined;
                 }, {
                     message: string;
-                    details: {
+                    details?: {
                         message: string;
                     }[] | {
                         sourceFilePatchErrors: Record<string, {
@@ -3113,7 +3307,7 @@ export declare const Api: {
                         binaryFilePatchErrors: Record<string, {
                             message: string;
                         }>;
-                    };
+                    } | undefined;
                 }>, z.ZodObject<{
                     message: z.ZodString;
                     errorCode: z.ZodUnion<[z.ZodLiteral<"project-not-configured">, z.ZodLiteral<"pat-error">]>;
@@ -3128,7 +3322,7 @@ export declare const Api: {
                 status: 400;
                 json: {
                     message: string;
-                    details: {
+                    details?: {
                         message: string;
                     }[] | {
                         sourceFilePatchErrors: Record<ModuleFilePath, {
@@ -3137,7 +3331,7 @@ export declare const Api: {
                         binaryFilePatchErrors: Record<string, {
                             message: string;
                         }>;
-                    };
+                    } | undefined;
                 } | {
                     message: string;
                     errorCode: "project-not-configured" | "pat-error";
@@ -3146,7 +3340,7 @@ export declare const Api: {
                 status: 400;
                 json: {
                     message: string;
-                    details: {
+                    details?: {
                         message: string;
                     }[] | {
                         sourceFilePatchErrors: Record<string, {
@@ -3155,7 +3349,7 @@ export declare const Api: {
                         binaryFilePatchErrors: Record<string, {
                             message: string;
                         }>;
-                    };
+                    } | undefined;
                 } | {
                     message: string;
                     errorCode: "project-not-configured" | "pat-error";

package/dist/declarations/src/internal/richtext/conversion/remirrorToRichTextSource.d.ts

@@ -7,10 +7,19 @@ export type RemoteRichTextOptions = {
     schema: SerializedImageSchema;
     remoteHost: string;
 };
+type RTFiles = Record<string, {
+    value: string;
+    filePathOrRef: string;
+    patchPaths: string[][];
+    metadata: {
+        mimeType: string;
+        height: number;
+        width: number;
+        alt?: string;
+    };
+}>;
 export declare function remirrorToRichTextSource(node: RemirrorJSON, configDirectory: ConfigDirectory, remoteOptions: RemoteRichTextOptions | null): {
     blocks: RichTextSource<AllRichTextOptions>;
-    files: Record<string, {
-        value: string;
-        patchPaths: string[][];
-    }>;
+    files: RTFiles;
 };
+export {};

package/internal/dist/valbuild-shared-internal.cjs.dev.js

@@ -294,6 +294,16 @@ function convertOrderedList(path, node, files, configDirectory, remoteOptions) {
     })) || []
   };
 }
+var convertToNumber = function convertToNumber(value) {
+  if (value === null || value === undefined) {
+    return 0;
+  }
+  if (typeof value === "number") {
+    return value;
+  }
+  var parsedValue = parseInt(value, 10);
+  return isNaN(parsedValue) ? 0 : parsedValue;
+};
 var textEncoder = new TextEncoder();
 function convertImageNode(path, node, files, configDirectory, remoteOptions) {
   if (node.attrs && node.attrs.src.startsWith("data:")) {
@@ -314,14 +324,6 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
     var thisPath = path
     // file is added as src (see below):
     .concat("src");
-    if (existingFilesEntry) {
-      existingFilesEntry.patchPaths.push(thisPath);
-    } else {
-      files[filePath] = {
-        value: node.attrs.src,
-        patchPaths: [thisPath]
-      };
-    }
     var remoteFileHash = core.Internal.remote.hashToRemoteFileHash(fullFileHash);
     var ref = remoteOptions ? core.Internal.remote.createRemoteRef(remoteOptions.remoteHost, _objectSpread2(_objectSpread2({}, remoteOptions), {}, {
       fileHash: remoteFileHash,
@@ -331,6 +333,21 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
       }, remoteFileHash, textEncoder),
       filePath: filePath.slice(1)
     })) : filePath;
+    if (existingFilesEntry) {
+      existingFilesEntry.patchPaths.push(thisPath);
+    } else {
+      // TODO: use ref instead on filePath?
+      files[filePath] = {
+        value: node.attrs.src,
+        filePathOrRef: ref,
+        metadata: {
+          height: convertToNumber(node.attrs.height),
+          width: convertToNumber(node.attrs.width),
+          mimeType: mimeType
+        },
+        patchPaths: [thisPath]
+      };
+    }
     return {
       tag: "img",
       src: _objectSpread2(_objectSpread2(_defineProperty({}, core.FILE_REF_PROP, ref), remoteOptions ? _defineProperty({}, core.VAL_EXTENSION, "remote") : _defineProperty(_defineProperty({}, core.VAL_EXTENSION, "file"), core.FILE_REF_SUBTYPE_TAG, "image")), {}, {
@@ -348,7 +365,14 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
     var remote = false;
     if (patchId) {
       remote = getParam("remote", url) === "true";
-      if (noParamsUrl.startsWith("/api/val/files/public")) {
+      if (remote) {
+        var remoteRef = getParam("ref", url);
+        if (remoteRef) {
+          noParamsUrl = decodeURIComponent(remoteRef);
+        } else {
+          console.error("Remote image URL does not contain ref: " + url);
+        }
+      } else if (noParamsUrl.startsWith("/api/val/files/public")) {
         noParamsUrl = noParamsUrl.slice("/api/val/files".length);
       } else {
         console.error("Patched image URL does not start with /api/val/files: " + url);
@@ -642,7 +666,7 @@ function convertLinkNodeToRemirror(linkNode) {
   });
 }
 function convertImageNodeToRemirror(imageNode) {
-  var _fileSource$metadata, _fileSource$metadata2;
+  var _fileSource$metadata, _fileSource$metadata2, _fileSource$metadata3;
   var fileSource = imageNode.src;
   if (!(core.VAL_EXTENSION in fileSource) || fileSource[core.VAL_EXTENSION] !== "file" && fileSource[core.VAL_EXTENSION] !== "remote") {
     throw Error("Expected file source in image node");
@@ -658,6 +682,7 @@ function convertImageNodeToRemirror(imageNode) {
     attrs: {
       height: (_fileSource$metadata = fileSource.metadata) === null || _fileSource$metadata === void 0 ? void 0 : _fileSource$metadata.height,
       width: (_fileSource$metadata2 = fileSource.metadata) === null || _fileSource$metadata2 === void 0 ? void 0 : _fileSource$metadata2.width,
+      alt: (_fileSource$metadata3 = fileSource.metadata) === null || _fileSource$metadata3 === void 0 ? void 0 : _fileSource$metadata3.alt,
       src: fileVal.url
     }
   };
@@ -1075,6 +1100,18 @@ function _asyncToGenerator(n) {
 var JSONValueT = zod.z.lazy(function () {
   return zod.z.union([zod.z.string(), zod.z.number(), zod.z["boolean"](), zod.z["null"](), zod.z.array(JSONValueT), zod.z.record(JSONValueT)]);
 });
+var FileOperation = function FileOperation(path) {
+  return zod.z.object({
+    op: zod.z.literal("file"),
+    path: path,
+    filePath: zod.z.string(),
+    value: JSONValueT,
+    // TODO: this should be string, but we believe we have a bug in Zod where setting this to z.string(), means that other types of patches also ends up requiring a string after we deploy a version
+    remote: zod.z["boolean"](),
+    nestedFilePath: zod.z.array(zod.z.string()).optional(),
+    metadata: JSONValueT.optional() // TODO: remove optional
+  });
+};
 
 /**
  * Raw JSON patch operation.
@@ -1108,13 +1145,7 @@ var OperationJSONT = zod.z.discriminatedUnion("op", [zod.z.object({
   op: zod.z.literal("test"),
   path: zod.z.string(),
   value: JSONValueT
-}).strict(), zod.z.object({
-  op: zod.z.literal("file"),
-  path: zod.z.string(),
-  filePath: zod.z.string(),
-  value: zod.z.string(),
-  remote: zod.z["boolean"]()
-}).strict()]);
+}).strict(), FileOperation(zod.z.string()).strict()]);
 var PatchJSON = zod.z.array(OperationJSONT);
 /**
  * Raw JSON patch operation.
@@ -1142,14 +1173,7 @@ var OperationT = zod.z.discriminatedUnion("op", [zod.z.object({
   op: zod.z.literal("test"),
   path: zod.z.array(zod.z.string()),
   value: JSONValueT
-}).strict(), zod.z.object({
-  op: zod.z.literal("file"),
-  path: zod.z.array(zod.z.string()),
-  filePath: zod.z.string(),
-  nestedFilePath: zod.z.array(zod.z.string()).optional(),
-  value: zod.z.string(),
-  remote: zod.z["boolean"]()
-}).strict()]);
+}).strict(), FileOperation(zod.z.array(zod.z.string())).strict()]);
 var Patch = zod.z.array(OperationT);
 var PatchId = zod.z.string().refine(function (_id) {
   return true;
@@ -1721,6 +1745,59 @@ var Api = {
       })])
     }
   },
+  // This has a path which is like this: /upload/patches/:patchId/files. Example: /upload/patches/76b9237a-7712-4d60-88b4-d273e6d6fe18/files
+  "/upload/patches": {
+    POST: {
+      req: {
+        path: zod.z.string().optional(),
+        body: zod.z.object({
+          parentRef: ParentRef,
+          filePath: zod.z.string(),
+          data: zod.z.any(),
+          // TODO: Json zod type
+          type: zod.z.union([zod.z.literal("file"), zod.z.literal("image")]),
+          metadata: zod.z.any(),
+          // TODO: Json zod type
+          remote: zod.z["boolean"]()
+        })
+      },
+      res: zod.z.union([zod.z.object({
+        status: zod.z.literal(400),
+        json: GenericError
+      }), zod.z.object({
+        status: zod.z.literal(200),
+        json: zod.z.object({
+          filePath: zod.z.string(),
+          patchId: PatchId
+        })
+      })])
+    }
+  },
+  "/direct-file-upload-settings": {
+    POST: {
+      req: {
+        cookies: {
+          val_session: zod.z.string().optional()
+        }
+      },
+      res: zod.z.union([zod.z.object({
+        status: zod.z.literal(400),
+        json: GenericError
+      }), zod.z.object({
+        status: zod.z.literal(401),
+        json: GenericError
+      }), zod.z.object({
+        status: zod.z.literal(500),
+        json: GenericError
+      }), zod.z.object({
+        status: zod.z.literal(200),
+        json: zod.z.object({
+          nonce: zod.z.string().nullable(),
+          baseUrl: zod.z.string()
+        })
+      })])
+    }
+  },
   "/patches": {
     DELETE: {
       req: {
@@ -1975,7 +2052,7 @@ var Api = {
           details: zod.z.union([zod.z.object({
             sourceFilePatchErrors: zod.z.record(ModuleFilePath, zod.z.array(GenericError)),
             binaryFilePatchErrors: zod.z.record(GenericError)
-          }), zod.z.array(GenericError)])
+          }), zod.z.array(GenericError)]).optional()
         }), zod.z.object({
           message: zod.z.string(),
           errorCode: zod.z.union([zod.z.literal("project-not-configured"), zod.z.literal("pat-error")])
@@ -2098,7 +2175,9 @@ var createValClient = function createValClient(host, config // We want to use th
               _context2.next = 11;
               break;
             }
-            console.error("Invalid request body", {
+            console.error("Got an invalid request body while validating client-side. This is most likely a Val bug.", {
+              path: path,
+              method: method,
               body: anyReq.body,
               error: reqBodyResult.error
             });
@@ -2174,7 +2253,7 @@ var createValClient = function createValClient(host, config // We want to use th
                         _context.next = 12;
                         break;
                       }
-                      console.log("Server responded with an error", json);
+                      console.error("Server responded with an error", json);
                       return _context.abrupt("return", {
                         status: 500,
                         json: _objectSpread2({

package/internal/dist/valbuild-shared-internal.cjs.prod.js

@@ -294,6 +294,16 @@ function convertOrderedList(path, node, files, configDirectory, remoteOptions) {
     })) || []
   };
 }
+var convertToNumber = function convertToNumber(value) {
+  if (value === null || value === undefined) {
+    return 0;
+  }
+  if (typeof value === "number") {
+    return value;
+  }
+  var parsedValue = parseInt(value, 10);
+  return isNaN(parsedValue) ? 0 : parsedValue;
+};
 var textEncoder = new TextEncoder();
 function convertImageNode(path, node, files, configDirectory, remoteOptions) {
   if (node.attrs && node.attrs.src.startsWith("data:")) {
@@ -314,14 +324,6 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
     var thisPath = path
     // file is added as src (see below):
     .concat("src");
-    if (existingFilesEntry) {
-      existingFilesEntry.patchPaths.push(thisPath);
-    } else {
-      files[filePath] = {
-        value: node.attrs.src,
-        patchPaths: [thisPath]
-      };
-    }
     var remoteFileHash = core.Internal.remote.hashToRemoteFileHash(fullFileHash);
     var ref = remoteOptions ? core.Internal.remote.createRemoteRef(remoteOptions.remoteHost, _objectSpread2(_objectSpread2({}, remoteOptions), {}, {
       fileHash: remoteFileHash,
@@ -331,6 +333,21 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
       }, remoteFileHash, textEncoder),
       filePath: filePath.slice(1)
     })) : filePath;
+    if (existingFilesEntry) {
+      existingFilesEntry.patchPaths.push(thisPath);
+    } else {
+      // TODO: use ref instead on filePath?
+      files[filePath] = {
+        value: node.attrs.src,
+        filePathOrRef: ref,
+        metadata: {
+          height: convertToNumber(node.attrs.height),
+          width: convertToNumber(node.attrs.width),
+          mimeType: mimeType
+        },
+        patchPaths: [thisPath]
+      };
+    }
     return {
       tag: "img",
       src: _objectSpread2(_objectSpread2(_defineProperty({}, core.FILE_REF_PROP, ref), remoteOptions ? _defineProperty({}, core.VAL_EXTENSION, "remote") : _defineProperty(_defineProperty({}, core.VAL_EXTENSION, "file"), core.FILE_REF_SUBTYPE_TAG, "image")), {}, {
@@ -348,7 +365,14 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
     var remote = false;
     if (patchId) {
       remote = getParam("remote", url) === "true";
-      if (noParamsUrl.startsWith("/api/val/files/public")) {
+      if (remote) {
+        var remoteRef = getParam("ref", url);
+        if (remoteRef) {
+          noParamsUrl = decodeURIComponent(remoteRef);
+        } else {
+          console.error("Remote image URL does not contain ref: " + url);
+        }
+      } else if (noParamsUrl.startsWith("/api/val/files/public")) {
         noParamsUrl = noParamsUrl.slice("/api/val/files".length);
       } else {
         console.error("Patched image URL does not start with /api/val/files: " + url);
@@ -642,7 +666,7 @@ function convertLinkNodeToRemirror(linkNode) {
   });
 }
 function convertImageNodeToRemirror(imageNode) {
-  var _fileSource$metadata, _fileSource$metadata2;
+  var _fileSource$metadata, _fileSource$metadata2, _fileSource$metadata3;
   var fileSource = imageNode.src;
   if (!(core.VAL_EXTENSION in fileSource) || fileSource[core.VAL_EXTENSION] !== "file" && fileSource[core.VAL_EXTENSION] !== "remote") {
     throw Error("Expected file source in image node");
@@ -658,6 +682,7 @@ function convertImageNodeToRemirror(imageNode) {
     attrs: {
       height: (_fileSource$metadata = fileSource.metadata) === null || _fileSource$metadata === void 0 ? void 0 : _fileSource$metadata.height,
       width: (_fileSource$metadata2 = fileSource.metadata) === null || _fileSource$metadata2 === void 0 ? void 0 : _fileSource$metadata2.width,
+      alt: (_fileSource$metadata3 = fileSource.metadata) === null || _fileSource$metadata3 === void 0 ? void 0 : _fileSource$metadata3.alt,
       src: fileVal.url
     }
   };
@@ -1075,6 +1100,18 @@ function _asyncToGenerator(n) {
 var JSONValueT = zod.z.lazy(function () {
   return zod.z.union([zod.z.string(), zod.z.number(), zod.z["boolean"](), zod.z["null"](), zod.z.array(JSONValueT), zod.z.record(JSONValueT)]);
 });
+var FileOperation = function FileOperation(path) {
+  return zod.z.object({
+    op: zod.z.literal("file"),
+    path: path,
+    filePath: zod.z.string(),
+    value: JSONValueT,
+    // TODO: this should be string, but we believe we have a bug in Zod where setting this to z.string(), means that other types of patches also ends up requiring a string after we deploy a version
+    remote: zod.z["boolean"](),
+    nestedFilePath: zod.z.array(zod.z.string()).optional(),
+    metadata: JSONValueT.optional() // TODO: remove optional
+  });
+};
 
 /**
  * Raw JSON patch operation.
@@ -1108,13 +1145,7 @@ var OperationJSONT = zod.z.discriminatedUnion("op", [zod.z.object({
   op: zod.z.literal("test"),
   path: zod.z.string(),
   value: JSONValueT
-}).strict(), zod.z.object({
-  op: zod.z.literal("file"),
-  path: zod.z.string(),
-  filePath: zod.z.string(),
-  value: zod.z.string(),
-  remote: zod.z["boolean"]()
-}).strict()]);
+}).strict(), FileOperation(zod.z.string()).strict()]);
 var PatchJSON = zod.z.array(OperationJSONT);
 /**
  * Raw JSON patch operation.
@@ -1142,14 +1173,7 @@ var OperationT = zod.z.discriminatedUnion("op", [zod.z.object({
   op: zod.z.literal("test"),
   path: zod.z.array(zod.z.string()),
   value: JSONValueT
-}).strict(), zod.z.object({
-  op: zod.z.literal("file"),
-  path: zod.z.array(zod.z.string()),
-  filePath: zod.z.string(),
-  nestedFilePath: zod.z.array(zod.z.string()).optional(),
-  value: zod.z.string(),
-  remote: zod.z["boolean"]()
-}).strict()]);
+}).strict(), FileOperation(zod.z.array(zod.z.string())).strict()]);
 var Patch = zod.z.array(OperationT);
 var PatchId = zod.z.string().refine(function (_id) {
   return true;
@@ -1721,6 +1745,59 @@ var Api = {
       })])
     }
   },
+  // This has a path which is like this: /upload/patches/:patchId/files. Example: /upload/patches/76b9237a-7712-4d60-88b4-d273e6d6fe18/files
+  "/upload/patches": {
+    POST: {
+      req: {
+        path: zod.z.string().optional(),
+        body: zod.z.object({
+          parentRef: ParentRef,
+          filePath: zod.z.string(),
+          data: zod.z.any(),
+          // TODO: Json zod type
+          type: zod.z.union([zod.z.literal("file"), zod.z.literal("image")]),
+          metadata: zod.z.any(),
+          // TODO: Json zod type
+          remote: zod.z["boolean"]()
+        })
+      },
+      res: zod.z.union([zod.z.object({
+        status: zod.z.literal(400),
+        json: GenericError
+      }), zod.z.object({
+        status: zod.z.literal(200),
+        json: zod.z.object({
+          filePath: zod.z.string(),
+          patchId: PatchId
+        })
+      })])
+    }
+  },
+  "/direct-file-upload-settings": {
+    POST: {
+      req: {
+        cookies: {
+          val_session: zod.z.string().optional()
+        }
+      },
+      res: zod.z.union([zod.z.object({
+        status: zod.z.literal(400),
+        json: GenericError
+      }), zod.z.object({
+        status: zod.z.literal(401),
+        json: GenericError
+      }), zod.z.object({
+        status: zod.z.literal(500),
+        json: GenericError
+      }), zod.z.object({
+        status: zod.z.literal(200),
+        json: zod.z.object({
+          nonce: zod.z.string().nullable(),
+          baseUrl: zod.z.string()
+        })
+      })])
+    }
+  },
   "/patches": {
     DELETE: {
       req: {
@@ -1975,7 +2052,7 @@ var Api = {
           details: zod.z.union([zod.z.object({
             sourceFilePatchErrors: zod.z.record(ModuleFilePath, zod.z.array(GenericError)),
             binaryFilePatchErrors: zod.z.record(GenericError)
-          }), zod.z.array(GenericError)])
+          }), zod.z.array(GenericError)]).optional()
         }), zod.z.object({
           message: zod.z.string(),
           errorCode: zod.z.union([zod.z.literal("project-not-configured"), zod.z.literal("pat-error")])
@@ -2098,7 +2175,9 @@ var createValClient = function createValClient(host, config // We want to use th
               _context2.next = 11;
               break;
             }
-            console.error("Invalid request body", {
+            console.error("Got an invalid request body while validating client-side. This is most likely a Val bug.", {
+              path: path,
+              method: method,
               body: anyReq.body,
               error: reqBodyResult.error
             });
@@ -2174,7 +2253,7 @@ var createValClient = function createValClient(host, config // We want to use th
                         _context.next = 12;
                         break;
                       }
-                      console.log("Server responded with an error", json);
+                      console.error("Server responded with an error", json);
                       return _context.abrupt("return", {
                         status: 500,
                         json: _objectSpread2({

package/internal/dist/valbuild-shared-internal.esm.js

@@ -290,6 +290,16 @@ function convertOrderedList(path, node, files, configDirectory, remoteOptions) {
     })) || []
   };
 }
+var convertToNumber = function convertToNumber(value) {
+  if (value === null || value === undefined) {
+    return 0;
+  }
+  if (typeof value === "number") {
+    return value;
+  }
+  var parsedValue = parseInt(value, 10);
+  return isNaN(parsedValue) ? 0 : parsedValue;
+};
 var textEncoder = new TextEncoder();
 function convertImageNode(path, node, files, configDirectory, remoteOptions) {
   if (node.attrs && node.attrs.src.startsWith("data:")) {
@@ -310,14 +320,6 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
     var thisPath = path
     // file is added as src (see below):
     .concat("src");
-    if (existingFilesEntry) {
-      existingFilesEntry.patchPaths.push(thisPath);
-    } else {
-      files[filePath] = {
-        value: node.attrs.src,
-        patchPaths: [thisPath]
-      };
-    }
     var remoteFileHash = Internal.remote.hashToRemoteFileHash(fullFileHash);
     var ref = remoteOptions ? Internal.remote.createRemoteRef(remoteOptions.remoteHost, _objectSpread2(_objectSpread2({}, remoteOptions), {}, {
       fileHash: remoteFileHash,
@@ -327,6 +329,21 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
       }, remoteFileHash, textEncoder),
       filePath: filePath.slice(1)
     })) : filePath;
+    if (existingFilesEntry) {
+      existingFilesEntry.patchPaths.push(thisPath);
+    } else {
+      // TODO: use ref instead on filePath?
+      files[filePath] = {
+        value: node.attrs.src,
+        filePathOrRef: ref,
+        metadata: {
+          height: convertToNumber(node.attrs.height),
+          width: convertToNumber(node.attrs.width),
+          mimeType: mimeType
+        },
+        patchPaths: [thisPath]
+      };
+    }
     return {
       tag: "img",
       src: _objectSpread2(_objectSpread2(_defineProperty({}, FILE_REF_PROP, ref), remoteOptions ? _defineProperty({}, VAL_EXTENSION, "remote") : _defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_SUBTYPE_TAG, "image")), {}, {
@@ -344,7 +361,14 @@ function convertImageNode(path, node, files, configDirectory, remoteOptions) {
     var remote = false;
     if (patchId) {
       remote = getParam("remote", url) === "true";
-      if (noParamsUrl.startsWith("/api/val/files/public")) {
+      if (remote) {
+        var remoteRef = getParam("ref", url);
+        if (remoteRef) {
+          noParamsUrl = decodeURIComponent(remoteRef);
+        } else {
+          console.error("Remote image URL does not contain ref: " + url);
+        }
+      } else if (noParamsUrl.startsWith("/api/val/files/public")) {
         noParamsUrl = noParamsUrl.slice("/api/val/files".length);
       } else {
         console.error("Patched image URL does not start with /api/val/files: " + url);
@@ -638,7 +662,7 @@ function convertLinkNodeToRemirror(linkNode) {
   });
 }
 function convertImageNodeToRemirror(imageNode) {
-  var _fileSource$metadata, _fileSource$metadata2;
+  var _fileSource$metadata, _fileSource$metadata2, _fileSource$metadata3;
   var fileSource = imageNode.src;
   if (!(VAL_EXTENSION in fileSource) || fileSource[VAL_EXTENSION] !== "file" && fileSource[VAL_EXTENSION] !== "remote") {
     throw Error("Expected file source in image node");
@@ -654,6 +678,7 @@ function convertImageNodeToRemirror(imageNode) {
     attrs: {
       height: (_fileSource$metadata = fileSource.metadata) === null || _fileSource$metadata === void 0 ? void 0 : _fileSource$metadata.height,
       width: (_fileSource$metadata2 = fileSource.metadata) === null || _fileSource$metadata2 === void 0 ? void 0 : _fileSource$metadata2.width,
+      alt: (_fileSource$metadata3 = fileSource.metadata) === null || _fileSource$metadata3 === void 0 ? void 0 : _fileSource$metadata3.alt,
       src: fileVal.url
     }
   };
@@ -1071,6 +1096,18 @@ function _asyncToGenerator(n) {
 var JSONValueT = z.lazy(function () {
   return z.union([z.string(), z.number(), z["boolean"](), z["null"](), z.array(JSONValueT), z.record(JSONValueT)]);
 });
+var FileOperation = function FileOperation(path) {
+  return z.object({
+    op: z.literal("file"),
+    path: path,
+    filePath: z.string(),
+    value: JSONValueT,
+    // TODO: this should be string, but we believe we have a bug in Zod where setting this to z.string(), means that other types of patches also ends up requiring a string after we deploy a version
+    remote: z["boolean"](),
+    nestedFilePath: z.array(z.string()).optional(),
+    metadata: JSONValueT.optional() // TODO: remove optional
+  });
+};
 
 /**
  * Raw JSON patch operation.
@@ -1104,13 +1141,7 @@ var 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(),
-  filePath: z.string(),
-  value: z.string(),
-  remote: z["boolean"]()
-}).strict()]);
+}).strict(), FileOperation(z.string()).strict()]);
 var PatchJSON = z.array(OperationJSONT);
 /**
  * Raw JSON patch operation.
@@ -1138,14 +1169,7 @@ var OperationT = z.discriminatedUnion("op", [z.object({
   op: z.literal("test"),
   path: z.array(z.string()),
   value: JSONValueT
-}).strict(), z.object({
-  op: z.literal("file"),
-  path: z.array(z.string()),
-  filePath: z.string(),
-  nestedFilePath: z.array(z.string()).optional(),
-  value: z.string(),
-  remote: z["boolean"]()
-}).strict()]);
+}).strict(), FileOperation(z.array(z.string())).strict()]);
 var Patch = z.array(OperationT);
 var PatchId = z.string().refine(function (_id) {
   return true;
@@ -1717,6 +1741,59 @@ var Api = {
       })])
     }
   },
+  // This has a path which is like this: /upload/patches/:patchId/files. Example: /upload/patches/76b9237a-7712-4d60-88b4-d273e6d6fe18/files
+  "/upload/patches": {
+    POST: {
+      req: {
+        path: z.string().optional(),
+        body: z.object({
+          parentRef: ParentRef,
+          filePath: z.string(),
+          data: z.any(),
+          // TODO: Json zod type
+          type: z.union([z.literal("file"), z.literal("image")]),
+          metadata: z.any(),
+          // TODO: Json zod type
+          remote: z["boolean"]()
+        })
+      },
+      res: z.union([z.object({
+        status: z.literal(400),
+        json: GenericError
+      }), z.object({
+        status: z.literal(200),
+        json: z.object({
+          filePath: z.string(),
+          patchId: PatchId
+        })
+      })])
+    }
+  },
+  "/direct-file-upload-settings": {
+    POST: {
+      req: {
+        cookies: {
+          val_session: z.string().optional()
+        }
+      },
+      res: z.union([z.object({
+        status: z.literal(400),
+        json: GenericError
+      }), z.object({
+        status: z.literal(401),
+        json: GenericError
+      }), z.object({
+        status: z.literal(500),
+        json: GenericError
+      }), z.object({
+        status: z.literal(200),
+        json: z.object({
+          nonce: z.string().nullable(),
+          baseUrl: z.string()
+        })
+      })])
+    }
+  },
   "/patches": {
     DELETE: {
       req: {
@@ -1971,7 +2048,7 @@ var Api = {
           details: z.union([z.object({
             sourceFilePatchErrors: z.record(ModuleFilePath, z.array(GenericError)),
             binaryFilePatchErrors: z.record(GenericError)
-          }), z.array(GenericError)])
+          }), z.array(GenericError)]).optional()
         }), z.object({
           message: z.string(),
           errorCode: z.union([z.literal("project-not-configured"), z.literal("pat-error")])
@@ -2094,7 +2171,9 @@ var createValClient = function createValClient(host, config // We want to use th
               _context2.next = 11;
               break;
             }
-            console.error("Invalid request body", {
+            console.error("Got an invalid request body while validating client-side. This is most likely a Val bug.", {
+              path: path,
+              method: method,
               body: anyReq.body,
               error: reqBodyResult.error
             });
@@ -2170,7 +2249,7 @@ var createValClient = function createValClient(host, config // We want to use th
                         _context.next = 12;
                         break;
                       }
-                      console.log("Server responded with an error", json);
+                      console.error("Server responded with an error", json);
                       return _context.abrupt("return", {
                         status: 500,
                         json: _objectSpread2({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.75.5",
+  "version": "0.76.1",
   "private": false,
   "description": "Val shared types and utilities",
   "scripts": {
@@ -29,7 +29,7 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.75.5",
+    "@valbuild/core": "~0.76.1",
     "zod": "^3.22.4",
     "zod-validation-error": "^3.3.0"
   },