@valbuild/server 0.75.4 → 0.76.0

package/dist/valbuild-server.esm.js

@@ -1,10 +1,10 @@
 import { newQuickJSWASMModule } from 'quickjs-emscripten';
 import ts from 'typescript';
 import { result, pipe } from '@valbuild/core/fp';
-import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, VAL_EXTENSION, derefPatch, Internal, Schema, ImageSchema, RichTextSchema, FileSchema, DEFAULT_CONTENT_HOST } from '@valbuild/core';
+import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, VAL_EXTENSION, derefPatch, Internal, Schema, ImageSchema, DEFAULT_CONTENT_HOST } 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';
+import * as path from 'path';
+import path__default from 'path';
 import fs, { promises } from 'fs';
 import { transform } from 'sucrase';
 import { VAL_CSS_PATH, VAL_APP_ID, VAL_OVERLAY_ID } from '@valbuild/ui';
@@ -788,7 +788,7 @@ class TSOps {
 }
 
 function getSyntheticContainingPath(rootDir) {
-  return fsPath__default.join(rootDir, "<val>"); // TODO: this is the synthetic path used when evaluating / patching modules. I am not sure <val> is the best choice: val.ts / js better? But that is weird too. At least now it is clear(er) that it is indeed a synthetic file (i.e. not an actual file)
+  return path__default.join(rootDir, "<val>"); // TODO: this is the synthetic path used when evaluating / patching modules. I am not sure <val> is the best choice: val.ts / js better? But that is weird too. At least now it is clear(er) that it is indeed a synthetic file (i.e. not an actual file)
 }
 
 const ops = new TSOps(document => {
@@ -959,8 +959,8 @@ globalThis.valModule = {
 };
 
 const getCompilerOptions = (rootDir, parseConfigHost) => {
-  const tsConfigPath = fsPath__default.resolve(rootDir, "tsconfig.json");
-  const jsConfigPath = fsPath__default.resolve(rootDir, "jsconfig.json");
+  const tsConfigPath = path__default.resolve(rootDir, "tsconfig.json");
+  const jsConfigPath = path__default.resolve(rootDir, "jsconfig.json");
   let configFilePath;
   if (parseConfigHost.fileExists(jsConfigPath)) {
     configFilePath = jsConfigPath;
@@ -991,7 +991,7 @@ class ValSourceFileHandler {
   constructor(projectRoot, compilerOptions, host = {
     ...ts.sys,
     writeFile: (fileName, data, encoding) => {
-      fs.mkdirSync(fsPath__default.dirname(fileName), {
+      fs.mkdirSync(path__default.dirname(fileName), {
         recursive: true
       });
       fs.writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
@@ -1018,7 +1018,7 @@ class ValSourceFileHandler {
     this.host.writeFile(filePath, content, encoding);
   }
   resolveSourceModulePath(containingFilePath, requestedModuleName) {
-    const resolutionRes = ts.resolveModuleName(requestedModuleName, fsPath__default.isAbsolute(containingFilePath) ? containingFilePath : fsPath__default.resolve(this.projectRoot, containingFilePath), this.compilerOptions, this.host, undefined, undefined, ts.ModuleKind.ESNext);
+    const resolutionRes = ts.resolveModuleName(requestedModuleName, path__default.isAbsolute(containingFilePath) ? containingFilePath : path__default.resolve(this.projectRoot, containingFilePath), this.compilerOptions, this.host, undefined, undefined, ts.ModuleKind.ESNext);
     const resolvedModule = resolutionRes.resolvedModule;
     if (!resolvedModule) {
       throw Error(`Could not resolve module "${requestedModuleName}", base: "${containingFilePath}": No resolved modules returned: ${JSON.stringify(resolutionRes)}`);
@@ -1041,7 +1041,7 @@ class ValModuleLoader {
   sourceFileHandler, host = {
     ...ts.sys,
     writeFile: (fileName, data, encoding) => {
-      fs.mkdirSync(fsPath__default.dirname(fileName), {
+      fs.mkdirSync(path__default.dirname(fileName), {
         recursive: true
       });
       fs.writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
@@ -1334,7 +1334,7 @@ export default new Proxy({}, {
 async function createService(projectRoot, opts, host = {
   ...ts.sys,
   writeFile: (fileName, data, encoding) => {
-    fs.mkdirSync(fsPath__default.dirname(fileName), {
+    fs.mkdirSync(path__default.dirname(fileName), {
       recursive: true
     });
     fs.writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
@@ -2215,94 +2215,6 @@ class ValOps {
 
   // #region createPatch
   async createPatch(path, patch, patchId, parentRef, authorId) {
-    const initTree = await this.initSources();
-    const schemas = initTree.schemas;
-    const moduleErrors = initTree.moduleErrors;
-    let sources = initTree.sources;
-    if (parentRef.type !== "head") {
-      // There's room for some optimizations here: we could do this once, then re-use every time we create a patch, then again we only create one patch at a time
-      const patchOps = await this.fetchPatches({
-        excludePatchOps: false
-      });
-      const patchAnalysis = this.analyzePatches(patchOps.patches);
-      const tree = await this.getSources({
-        ...patchAnalysis,
-        ...patchOps
-      });
-      sources = {
-        ...sources,
-        ...tree.sources
-      };
-    }
-    const source = sources[path];
-    const schema = schemas[path];
-    const moduleError = moduleErrors.find(e => e.path === path);
-    if (moduleError) {
-      console.error(`Cannot patch. Module at path: '${path}' has fatal errors: "${moduleError.message}"`);
-      return result.err({
-        errorType: "other",
-        error: {
-          message: `Cannot patch. Module at path: '${path}' has fatal errors: ` + moduleErrors.map(m => `"${m.message}"`).join(" and ")
-        }
-      });
-    }
-    if (source === undefined) {
-      console.error(`Cannot patch. Module source at path: '${path}' does not exist`);
-      return result.err({
-        errorType: "other",
-        error: {
-          message: `Cannot patch. Module source at path: '${path}' does not exist`
-        }
-      });
-    }
-    if (!schema) {
-      console.error(`Cannot patch. Module schema at path: '${path}' does not exist`);
-      return result.err({
-        errorType: "other",
-        error: {
-          message: `Cannot patch. Module schema at path: '${path}' does not exist`
-        }
-      });
-    }
-    const sourceFileOps = [];
-    const files = {};
-    for (const op of patch) {
-      if (op.op !== "file") {
-        sourceFileOps.push(op);
-      } else {
-        const {
-          value,
-          filePath
-        } = op;
-        if (files[filePath]) {
-          console.error(`Cannot have multiple files with same path in same patch. Path: ${filePath}`);
-          files[filePath] = {
-            error: new PatchError("Cannot have multiple files with same path in same patch")
-          };
-        } else if (typeof value !== "string") {
-          console.error(`Value is not a string. Path: ${filePath}. Value: ${value}`);
-          files[filePath] = {
-            error: new PatchError("Value is not a string")
-          };
-        } else {
-          const sha256 = Internal.getSHA256Hash(textEncoder$2.encode(value));
-          files[filePath] = {
-            value,
-            sha256,
-            path: op.path,
-            remote: op.remote
-          };
-          sourceFileOps.push({
-            op: "file",
-            path: op.path,
-            filePath,
-            nestedFilePath: op.nestedFilePath,
-            value: sha256,
-            remote: op.remote
-          });
-        }
-      }
-    }
     const saveRes = await this.saveSourceFilePatch(path, patch, patchId, parentRef, authorId);
     if (result.isErr(saveRes)) {
       console.error(`Could not save source patch at path: '${path}'. Error: ${saveRes.error.errorType === "other" ? saveRes.error.message : saveRes.error.errorType}`);
@@ -2316,95 +2228,8 @@ class ValOps {
         error: saveRes.error
       });
     }
-    const saveFileRes = await Promise.all(Object.entries(files).map(async ([filePath, data]) => {
-      if (data.error) {
-        return {
-          filePath,
-          error: data.error
-        };
-      } else {
-        var _lastRes;
-        let type;
-        const modulePath = Internal.patchPathToModulePath(data.path);
-        try {
-          const {
-            schema: schemaAtPath
-          } = Internal.resolvePath(modulePath, source, schema);
-          type = schemaAtPath instanceof ImageSchema || schemaAtPath instanceof RichTextSchema // if it's a rich text schema, we assume it's an image - hope this assumption holds!
-          ? "image" : schemaAtPath instanceof FileSchema ? "file" : schemaAtPath.serialize().type;
-        } catch (e) {
-          if (e instanceof Error) {
-            console.error(`Could not resolve file type at: ${modulePath}. Error: ${e.message}`);
-            return {
-              filePath,
-              error: new PatchError(`Could not resolve file type at: ${modulePath}. Error: ${e.message}`)
-            };
-          }
-          console.error(`Could not resolve file type at: ${modulePath}. Unknown error.`);
-          return {
-            filePath,
-            error: new PatchError(`Could not resolve file type at: ${modulePath}. Unknown error.`)
-          };
-        }
-        if (type !== "image" && type !== "file") {
-          console.error("Unknown file type (resolved from schema): " + type);
-          return {
-            filePath,
-            error: new PatchError("Unknown file type (resolved from schema): " + type)
-          };
-        }
-        const mimeType = getMimeTypeFromBase64(data.value);
-        if (!mimeType) {
-          console.error("Could not get mimeType from base 64 encoded value");
-          return {
-            filePath,
-            error: new PatchError("Could not get mimeType from base 64 encoded value. First chars were: " + data.value.slice(0, 20))
-          };
-        }
-        const buffer = bufferFromDataUrl(data.value);
-        if (!buffer) {
-          console.error("Could not create buffer from base 64 encoded value");
-          return {
-            filePath,
-            error: new PatchError("Could not create buffer from base 64 encoded value")
-          };
-        }
-        const metadataOps = createMetadataFromBuffer(type, mimeType, buffer);
-        if (metadataOps.errors) {
-          console.error(`Could not get metadata. Errors: ${metadataOps.errors.map(error => error.message).join(", ")}`);
-          return {
-            filePath,
-            error: new PatchError(`Could not get metadata. Errors: ${metadataOps.errors.map(error => error.message).join(", ")}`)
-          };
-        }
-        const MaxRetries = 3;
-        let lastRes;
-        for (let i = 0; i < MaxRetries; i++) {
-          lastRes = await this.saveBase64EncodedBinaryFileFromPatch(filePath, parentRef, patchId, data.value, type, metadataOps.metadata, data.remote);
-          if (!lastRes.error) {
-            return {
-              filePath
-            };
-          }
-        }
-        return {
-          filePath,
-          error: new PatchError(((_lastRes = lastRes) === null || _lastRes === void 0 || (_lastRes = _lastRes.error) === null || _lastRes === void 0 ? void 0 : _lastRes.message) || "Unexpectedly could not save patch file")
-        };
-      }
-    }));
-    const errors = saveFileRes.filter(f => !!f.error);
-    if (errors.length > 0) {
-      return result.err({
-        errorType: "other",
-        error: {
-          message: "Could not save patch: " + errors.map(e => e.error.message).join(", ")
-        }
-      });
-    }
     return result.ok({
       patchId,
-      files: saveFileRes,
       createdAt: new Date().toISOString()
     });
   }
@@ -2480,17 +2305,6 @@ function createMetadataFromBuffer(type, mimeType, buffer) {
     metadata
   };
 }
-const base64DataAttr = "data:";
-function getMimeTypeFromBase64(content) {
-  const dataIndex = content.indexOf(base64DataAttr);
-  const base64Index = content.indexOf(";base64,");
-  if (dataIndex > -1 || base64Index > -1) {
-    const mimeType = content.slice(dataIndex + base64DataAttr.length, base64Index);
-    const normalizedMimeType = mimeType === "image/jpg" ? "image/jpeg" : mimeType;
-    return normalizedMimeType;
-  }
-  return null;
-}
 function bufferFromDataUrl(dataUrl) {
   let base64Data;
   const base64Index = dataUrl.indexOf(";base64,");
@@ -2654,7 +2468,7 @@ class ValOpsFS extends ValOps {
         const mtimeInDir = {};
         if (fs.existsSync(dir)) {
           for (const file of fs.readdirSync(dir)) {
-            mtimeInDir[file] = fs.statSync(fsPath__default.join(dir, file)).mtime.getTime();
+            mtimeInDir[file] = fs.statSync(path__default.join(dir, file)).mtime.getTime();
           }
         }
         return new Promise(resolve => {
@@ -2667,7 +2481,7 @@ class ValOpsFS extends ValOps {
                 resolve("request-again");
               }
               for (const file of fs.readdirSync(dir)) {
-                const mtime = fs.statSync(fsPath__default.join(dir, file)).mtime.getTime();
+                const mtime = fs.statSync(path__default.join(dir, file)).mtime.getTime();
                 if (mtime !== mtimeInDir[file]) {
                   resolve("request-again");
                 }
@@ -2728,7 +2542,7 @@ class ValOpsFS extends ValOps {
         patchesDirHandle = handle;
       }),
       // we poll the files that Val depends on for changes
-      disableFilePolling ? new Promise(() => {}) : didFilesChangeUsingPolling([fsPath__default.join(this.rootDir, "val.config.ts"), fsPath__default.join(this.rootDir, "val.modules.ts"), fsPath__default.join(this.rootDir, "val.config.js"), fsPath__default.join(this.rootDir, "val.modules.js"), ...moduleFilePaths.map(p => fsPath__default.join(this.rootDir, p))], statFilePollingInterval, handle => {
+      disableFilePolling ? new Promise(() => {}) : didFilesChangeUsingPolling([path__default.join(this.rootDir, "val.config.ts"), path__default.join(this.rootDir, "val.modules.ts"), path__default.join(this.rootDir, "val.config.js"), path__default.join(this.rootDir, "val.modules.js"), ...moduleFilePaths.map(p => path__default.join(this.rootDir, p))], statFilePollingInterval, handle => {
         valFilesIntervalHandle = handle;
       }), new Promise(resolve => {
         fsWatcher = fs.watch(this.rootDir, {
@@ -2786,7 +2600,7 @@ class ValOpsFS extends ValOps {
     }
     const patches = {};
     const errors = [];
-    const parsedUnsortedFsPatches = patchJsonFiles.map(file => fsPath__default.basename(fsPath__default.dirname(file))).map(patchDir => [patchDir, this.parseJsonFile(this.getPatchFilePath(patchDir), FSPatch), this.host.fileExists(this.getPatchBaseFile(patchDir)) ? this.parseJsonFile(this.getPatchBaseFile(patchDir), FSPatchBase) : undefined]);
+    const parsedUnsortedFsPatches = patchJsonFiles.map(file => path__default.basename(path__default.dirname(file))).map(patchDir => [patchDir, this.parseJsonFile(this.getPatchFilePath(patchDir), FSPatch), this.host.fileExists(this.getPatchBaseFile(patchDir)) ? this.parseJsonFile(this.getPatchBaseFile(patchDir), FSPatchBase) : undefined]);
     parsedUnsortedFsPatches.forEach(([dir, parsedPatch, parsedBase]) => {
       if (parsedPatch.error) {
         errors.push({
@@ -2997,9 +2811,7 @@ class ValOpsFS extends ValOps {
       }
       const writeRes = this.host.tryWriteUf8File(this.getPatchFilePath(patchDir), JSON.stringify(data));
       if (writeRes.type === "error") {
-        return writeRes.errorType === "dir-already-exists" ? result.err({
-          errorType: "patch-head-conflict"
-        }) : result.err({
+        return result.err({
           errorType: "other",
           error: writeRes.error,
           message: "Failed to write patch file"
@@ -3024,7 +2836,7 @@ class ValOpsFS extends ValOps {
     }
   }
   async getSourceFile(path) {
-    const filePath = fsPath__default.join(this.rootDir, path);
+    const filePath = path__default.join(this.rootDir, path);
     if (!this.host.fileExists(filePath)) {
       return {
         error: {
@@ -3037,7 +2849,7 @@ class ValOpsFS extends ValOps {
     };
   }
   async saveSourceFile(path, data) {
-    const filePath = fsPath__default.join(this.rootDir, ...path.split("/"));
+    const filePath = path__default.join(this.rootDir, ...path.split("/"));
     try {
       this.host.writeUf8File(filePath, data);
       return {
@@ -3058,10 +2870,10 @@ class ValOpsFS extends ValOps {
       };
     }
   }
-  async saveBase64EncodedBinaryFileFromPatch(filePath, parentRef, patchId, data, _type, metadata, remote) {
+  async saveBase64EncodedBinaryFileFromPatch(filePath, parentRef, patchId, data, _type, metadata) {
     const patchDir = this.getParentPatchIdFromParentRef(parentRef);
-    const patchFilePath = this.getBinaryFilePath(filePath, patchDir, remote);
-    const metadataFilePath = this.getBinaryFileMetadataPath(filePath, patchDir, remote);
+    const patchFilePath = this.getBinaryFilePath(filePath, patchDir);
+    const metadataFilePath = this.getBinaryFileMetadataPath(filePath, patchDir);
     try {
       const buffer = bufferFromDataUrl(data);
       if (!buffer) {
@@ -3092,7 +2904,7 @@ class ValOpsFS extends ValOps {
       };
     }
   }
-  async getBase64EncodedBinaryFileMetadataFromPatch(filePath, type, patchId, remote) {
+  async getBase64EncodedBinaryFileMetadataFromPatch(filePath, type, patchId) {
     const patchDirRes = await this.getParentPatchIdFromPatchId(patchId);
     if (result.isErr(patchDirRes)) {
       return {
@@ -3101,7 +2913,7 @@ class ValOpsFS extends ValOps {
         }]
       };
     }
-    const metadataFilePath = this.getBinaryFileMetadataPath(filePath, patchDirRes.value, remote);
+    const metadataFilePath = this.getBinaryFileMetadataPath(filePath, patchDirRes.value);
     if (!this.host.fileExists(metadataFilePath)) {
       return {
         errors: [{
@@ -3141,10 +2953,7 @@ class ValOpsFS extends ValOps {
     if (!result.isOk(patchDirRes)) {
       return null;
     }
-    const absPath = this.getBinaryFilePath(filePath, patchDirRes.value,
-    // We save remote remote files using the filepath (so not the remote reference) and we also retrieve them using the filepath. Therefore remote is always false
-    false // remote = false
-    );
+    const absPath = this.getBinaryFilePath(filePath, patchDirRes.value);
     if (!this.host.fileExists(absPath)) {
       return null;
     }
@@ -3168,7 +2977,7 @@ class ValOpsFS extends ValOps {
   }
   async deleteAllPatches() {
     const patchesCacheDir = this.getPatchesDir();
-    const tmpDir = fsPath__default.join(this.rootDir, ValOpsFS.VAL_DIR, "patches-deleted-" + crypto.randomUUID());
+    const tmpDir = path__default.join(this.rootDir, ValOpsFS.VAL_DIR, "patches-deleted-" + crypto.randomUUID());
     try {
       this.host.moveDir(patchesCacheDir, tmpDir);
       this.host.deleteDir(tmpDir);
@@ -3283,13 +3092,11 @@ class ValOpsFS extends ValOps {
           };
           continue;
         }
-        console.log("Uploading remote file", ref);
         const res = await uploadRemoteFile(this.contentUrl, this.options.config.project, splitRemoteRefRes.bucket, splitRemoteRefRes.fileHash, getFileExt(splitRemoteRefRes.filePath), fileBuffer, auth);
         if (!res.success) {
           console.error("Failed to upload remote file", ref, res.error);
           throw new Error(`Failed to upload remote file: ${ref}. ${res.error}`);
         }
-        console.log("Completed remote file", ref);
         uploadedRemoteRefs.push(ref);
       }
     }
@@ -3306,7 +3113,7 @@ class ValOpsFS extends ValOps {
       patchId
     }] of localFileDescriptors) {
       const filePath = ref;
-      const absPath = fsPath__default.join(this.rootDir, ...filePath.split("/"));
+      const absPath = path__default.join(this.rootDir, ...filePath.split("/"));
       try {
         const patchDir = patchIdToPatchDirMap[patchId];
         if (!patchDir) {
@@ -3316,7 +3123,7 @@ class ValOpsFS extends ValOps {
           };
           continue;
         }
-        this.host.copyFile(this.getBinaryFilePath(filePath, patchDir, false), absPath);
+        this.host.copyFile(this.getBinaryFilePath(filePath, patchDir), absPath);
         updatedFiles.push(absPath);
       } catch (err) {
         errors[absPath] = {
@@ -3326,7 +3133,7 @@ class ValOpsFS extends ValOps {
       }
     }
     for (const [filePath, data] of Object.entries(preparedCommit.patchedSourceFiles)) {
-      const absPath = fsPath__default.join(this.rootDir, ...filePath.split("/"));
+      const absPath = path__default.join(this.rootDir, ...filePath.split("/"));
       try {
         this.host.writeUf8File(absPath, data);
         updatedFiles.push(absPath);
@@ -3366,7 +3173,7 @@ class ValOpsFS extends ValOps {
     };
   }
   async getBinaryFile(filePath) {
-    const absPath = fsPath__default.join(this.rootDir, ...filePath.split("/"));
+    const absPath = path__default.join(this.rootDir, ...filePath.split("/"));
     if (!this.host.fileExists(absPath)) {
       return null;
     }
@@ -3387,7 +3194,7 @@ class ValOpsFS extends ValOps {
     if (!mimeType) {
       return {
         errors: [{
-          message: `Could not guess mime type of file ext: ${fsPath__default.extname(filePath)}`,
+          message: `Could not guess mime type of file ext: ${path__default.extname(filePath)}`,
           filePath
         }]
       };
@@ -3425,38 +3232,22 @@ class ValOpsFS extends ValOps {
 
   // #region fs file path helpers
   getPatchesDir() {
-    return fsPath__default.join(this.rootDir, ValOpsFS.VAL_DIR, "patches");
+    return path__default.join(this.rootDir, ValOpsFS.VAL_DIR, "patches");
   }
   getFullPatchDir(patchDir) {
-    return fsPath__default.join(this.getPatchesDir(), patchDir);
+    return path__default.join(this.getPatchesDir(), patchDir);
   }
-  getBinaryFilePath(filePath, patchDir, remote) {
-    if (remote) {
-      const res = Internal.remote.splitRemoteRef(filePath);
-      if (res.status === "error") {
-        throw new Error("Failed to split remote ref: " + filePath);
-      }
-      const actualFilePath = res.filePath;
-      return fsPath__default.join(this.getFullPatchDir(patchDir), "files", actualFilePath, fsPath__default.basename(actualFilePath));
-    }
-    return fsPath__default.join(this.getFullPatchDir(patchDir), "files", filePath, fsPath__default.basename(filePath));
+  getBinaryFilePath(filePath, patchDir) {
+    return path__default.join(this.getFullPatchDir(patchDir), "files", filePath, path__default.basename(filePath));
   }
-  getBinaryFileMetadataPath(filePath, patchDir, remote) {
-    if (remote) {
-      const res = Internal.remote.splitRemoteRef(filePath);
-      if (res.status === "error") {
-        throw new Error("Failed to split remote ref (in metadata path): " + filePath);
-      }
-      const actualFilePath = res.filePath;
-      return fsPath__default.join(this.getFullPatchDir(patchDir), "files", actualFilePath, fsPath__default.basename(actualFilePath));
-    }
-    return fsPath__default.join(this.getFullPatchDir(patchDir), "files", filePath, "metadata.json");
+  getBinaryFileMetadataPath(filePath, patchDir) {
+    return path__default.join(this.getFullPatchDir(patchDir), "files", filePath, "metadata.json");
   }
   getPatchFilePath(patchDir) {
-    return fsPath__default.join(this.getFullPatchDir(patchDir), "patch.json");
+    return path__default.join(this.getFullPatchDir(patchDir), "patch.json");
   }
   getPatchBaseFile(patchDir) {
-    return fsPath__default.join(this.getFullPatchDir(patchDir), "base.json");
+    return path__default.join(this.getFullPatchDir(patchDir), "base.json");
   }
 }
 class FSOpsHost {
@@ -3489,28 +3280,24 @@ class FSOpsHost {
     return fs.readFileSync(path, "utf-8");
   }
   writeUf8File(path, data) {
-    fs.mkdirSync(fsPath__default.dirname(path), {
+    fs.mkdirSync(path__default.dirname(path), {
       recursive: true
     });
     fs.writeFileSync(path, data, "utf-8");
   }
   tryWriteUf8File(path, data) {
     try {
-      const parentDir = fsPath__default.join(fsPath__default.dirname(path), "../");
+      const parentDir = path__default.join(path__default.dirname(path), "../");
       fs.mkdirSync(parentDir, {
         recursive: true
       });
       // Make the parent dir separately. This is because we need mkdir to throw
       // if the directory already exists. If we use recursive: true, it doesn't
-      fs.mkdirSync(fsPath__default.dirname(path), {
+      fs.mkdirSync(path__default.dirname(path), {
         recursive: false
       });
     } catch (e) {
-      return {
-        type: "error",
-        errorType: "dir-already-exists",
-        error: e
-      };
+      // ignore
     }
     try {
       fs.writeFileSync(path, data, "utf-8");
@@ -3526,13 +3313,13 @@ class FSOpsHost {
     };
   }
   writeBinaryFile(path, data) {
-    fs.mkdirSync(fsPath__default.dirname(path), {
+    fs.mkdirSync(path__default.dirname(path), {
       recursive: true
     });
     fs.writeFileSync(path, new Uint8Array(data), "base64url");
   }
   copyFile(from, to) {
-    fs.mkdirSync(fsPath__default.dirname(to), {
+    fs.mkdirSync(path__default.dirname(to), {
       recursive: true
     });
     fs.copyFileSync(from, to);
@@ -3676,9 +3463,93 @@ class ValOpsHttp extends ValOps {
   async onInit() {
     // TODO: unused for now. Implement or remove
   }
-  async getCommitSummary(preparedCommit) {
+  async getPresignedAuthNonce(profileId, corsOrigin) {
     try {
       var _res$headers$get;
+      const res = await fetch(`${this.contentUrl}/v1/${this.project}/presigned-auth-nonce`, {
+        method: "POST",
+        headers: {
+          ...this.authHeaders,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          profileId,
+          corsOrigin
+        })
+      });
+      if (res.ok) {
+        const json = await res.json();
+        const parsed = z.object({
+          nonce: z.string(),
+          expiresAt: z.string()
+        }).safeParse(json);
+        if (parsed.success) {
+          const {
+            nonce
+          } = parsed.data;
+          return {
+            status: "success",
+            data: {
+              nonce,
+              baseUrl: `${this.contentUrl}/v1/${this.project}`
+            }
+          };
+        } else {
+          console.error("Could not parse presigned auth nonce response. Error: " + fromError(parsed.error));
+          return {
+            status: "error",
+            statusCode: 500,
+            error: {
+              message: "Could not get presigned auth nonce. The response that Val got from the server was not in the expected format. You might be running on an old version, or it might be a transient error or a configuration issue. Please try again later."
+            }
+          };
+        }
+      }
+      if (res.status === 401) {
+        return {
+          statusCode: 401,
+          status: "error",
+          error: {
+            message: "Could not get presigned auth nonce. Although your user is authorized, the application has authorization issues. Contact the developers on your team and ask them to verify the api keys."
+          }
+        };
+      }
+      if ((_res$headers$get = res.headers.get("Content-Type")) !== null && _res$headers$get !== void 0 && _res$headers$get.includes("application/json")) {
+        const json = await res.json();
+        if (json.message) {
+          console.error("Presigned auth nonce error:", json.message);
+          return {
+            status: "error",
+            statusCode: 500,
+            error: {
+              message: json.message
+            }
+          };
+        }
+      }
+      const unknownErrorMessage = `Could not get presigned auth nonce. HTTP error: ${res.status} ${res.statusText}`;
+      console.error(unknownErrorMessage);
+      return {
+        status: "error",
+        statusCode: 500,
+        error: {
+          message: unknownErrorMessage
+        }
+      };
+    } catch (e) {
+      console.error("Could not get presigned auth nonce (connection error?):", e);
+      return {
+        status: "error",
+        statusCode: 500,
+        error: {
+          message: `Could not get presigned auth nonce. Error: ${e instanceof Error ? e.message : JSON.stringify(e)}`
+        }
+      };
+    }
+  }
+  async getCommitSummary(preparedCommit) {
+    try {
+      var _res$headers$get2;
       const res = await fetch(`${this.contentUrl}/v1/${this.project}/commit-summary`, {
         method: "POST",
         headers: {
@@ -3714,7 +3585,7 @@ class ValOpsHttp extends ValOps {
         };
       }
       const unknownErrorMessage = `Could not get summary. HTTP error: ${res.status} ${res.statusText}`;
-      if ((_res$headers$get = res.headers.get("Content-Type")) !== null && _res$headers$get !== void 0 && _res$headers$get.includes("application/json")) {
+      if ((_res$headers$get2 = res.headers.get("Content-Type")) !== null && _res$headers$get2 !== void 0 && _res$headers$get2.includes("application/json")) {
         const json = await res.json();
         if (json.message) {
           console.error("Summary error:", json.message);
@@ -4042,7 +3913,7 @@ class ValOpsHttp extends ValOps {
         coreVersion: Internal.VERSION.core
       })
     }).then(async res => {
-      var _res$headers$get2;
+      var _res$headers$get3;
       if (res.ok) {
         const parsed = SavePatchResponse.safeParse(await res.json());
         if (parsed.success) {
@@ -4061,7 +3932,7 @@ class ValOpsHttp extends ValOps {
           message: "Conflict: " + (await res.text())
         });
       }
-      if ((_res$headers$get2 = res.headers.get("Content-Type")) !== null && _res$headers$get2 !== void 0 && _res$headers$get2.includes("application/json")) {
+      if ((_res$headers$get3 = res.headers.get("Content-Type")) !== null && _res$headers$get3 !== void 0 && _res$headers$get3.includes("application/json")) {
         const json = await res.json();
         return result.err({
           errorType: "other",
@@ -4079,23 +3950,12 @@ class ValOpsHttp extends ValOps {
       });
     });
   }
-  async saveBase64EncodedBinaryFileFromPatch(filePathOrRef, _parentRef,
-  // this is required for the FS implementation, but not for the HTTP implementation (patchId is enough)
-  patchId, data, type, metadata, remote) {
-    let filePath;
-    if (remote) {
-      const splitRemoteRefDataRes = Internal.remote.splitRemoteRef(filePathOrRef);
-      if (splitRemoteRefDataRes.status === "error") {
-        return {
-          error: {
-            message: `Could not split remote ref: ${splitRemoteRefDataRes.error}`
-          }
-        };
-      }
-      filePath = "/" + splitRemoteRefDataRes.filePath;
-    } else {
-      filePath = filePathOrRef;
-    }
+
+  /**
+   * @deprecated For HTTP ops use direct upload instead (i.e. client should upload the files directly) since hosting platforms (Vercel) might have low limits on the size of the request body.
+   */
+  async saveBase64EncodedBinaryFileFromPatch(filePathOrRef, parentRef, patchId, data, type, metadata) {
+    const filePath = filePathOrRef;
     return fetch(`${this.contentUrl}/v1/${this.project}/patches/${patchId}/files`, {
       method: "POST",
       headers: {
@@ -4104,10 +3964,11 @@ class ValOpsHttp extends ValOps {
       },
       body: JSON.stringify({
         filePath,
+        parentRef,
+        // Not currently used
         data,
         type,
-        metadata,
-        remote
+        metadata
       })
     }).then(async res => {
       if (res.ok) {
@@ -4354,7 +4215,7 @@ class ValOpsHttp extends ValOps {
     });
   }
   async getCommitMessage(preparedCommit) {
-    var _res$headers$get3;
+    var _res$headers$get4;
     const res = await fetch(`${this.contentUrl}/v1/${this.project}/commit-summary`, {
       method: "POST",
       headers: {
@@ -4372,7 +4233,7 @@ class ValOpsHttp extends ValOps {
         commitSummary: json.commitSummary
       };
     }
-    if ((_res$headers$get3 = res.headers.get("Content-Type")) !== null && _res$headers$get3 !== void 0 && _res$headers$get3.includes("application/json")) {
+    if ((_res$headers$get4 = res.headers.get("Content-Type")) !== null && _res$headers$get4 !== void 0 && _res$headers$get4.includes("application/json")) {
       const json = await res.json();
       return {
         error: {
@@ -4388,7 +4249,7 @@ class ValOpsHttp extends ValOps {
   }
   async commit(prepared, message, committer, filesDirectory, newBranch) {
     try {
-      var _res$headers$get4;
+      var _res$headers$get5;
       const existingBranch = this.branch;
       const res = await fetch(`${this.contentUrl}/v1/${this.project}/commit`, {
         method: "POST",
@@ -4425,7 +4286,7 @@ class ValOpsHttp extends ValOps {
           }
         };
       }
-      if ((_res$headers$get4 = res.headers.get("Content-Type")) !== null && _res$headers$get4 !== void 0 && _res$headers$get4.includes("application/json")) {
+      if ((_res$headers$get5 = res.headers.get("Content-Type")) !== null && _res$headers$get5 !== void 0 && _res$headers$get5.includes("application/json")) {
         const json = await res.json();
         if (json.isNotFastForward) {
           return {
@@ -4457,7 +4318,7 @@ class ValOpsHttp extends ValOps {
 
   // #region profiles
   async getProfiles() {
-    var _res$headers$get5;
+    var _res$headers$get6;
     const res = await fetch(`${this.contentUrl}/v1/${this.project}/profiles`, {
       headers: {
         ...this.authHeaders,
@@ -4472,7 +4333,7 @@ class ValOpsHttp extends ValOps {
       }
       return parsed.data.profiles;
     }
-    if ((_res$headers$get5 = res.headers.get("Content-Type")) !== null && _res$headers$get5 !== void 0 && _res$headers$get5.includes("application/json")) {
+    if ((_res$headers$get6 = res.headers.get("Content-Type")) !== null && _res$headers$get6 !== void 0 && _res$headers$get6.includes("application/json")) {
       const json = await res.json();
       throw Error(`Could not get profiles (status: ${res.status}): ${"message" in json ? json.message : "Unknown error"}`);
     }
@@ -4501,7 +4362,7 @@ async function getSettings(projectName, auth) {
     if (response.status === 404) {
       return {
         success: false,
-        message: `Project '${projectName}' not found: that the name of the project is correct and that you have access to it.`
+        message: `Project '${projectName}' not found: verify that the name of the project is correct and that you have access to it.`
       };
     }
     if (response.status !== 200) {
@@ -4531,7 +4392,7 @@ async function getSettings(projectName, auth) {
 }
 
 function getPersonalAccessTokenPath(root) {
-  return fsPath__default.join(fsPath__default.resolve(root), ".val", "pat.json");
+  return path__default.join(path__default.resolve(root), ".val", "pat.json");
 }
 function parsePersonalAccessTokenFile(content) {
   if (!content) {
@@ -4809,7 +4670,7 @@ const ValServer = (valModules, options, callbacks) => {
         };
       }
       const fs = await import('fs');
-      const patPath = getPersonalAccessTokenPath(fsPath__default.join(process.cwd()));
+      const patPath = getPersonalAccessTokenPath(path__default.join(process.cwd()));
       let patFile;
       try {
         patFile = await fs.promises.readFile(patPath, "utf-8");
@@ -5248,12 +5109,12 @@ const ValServer = (valModules, options, callbacks) => {
         const remoteFileAuth = remoteFileAuthRes.json.remoteFileAuth;
         const settingsRes = await getSettings(options.project, remoteFileAuth);
         if (!settingsRes.success) {
-          console.warn("Could not get public project id: " + settingsRes.message);
+          console.warn("Could not get remote files settings: " + settingsRes.message);
           return {
             status: 400,
             json: {
               errorCode: "error-could-not-get-settings",
-              message: `Could not get settings id: ${settingsRes.message}`
+              message: `Could not get remote files settings: ${settingsRes.message}`
             }
           };
         }
@@ -5335,6 +5196,105 @@ const ValServer = (valModules, options, callbacks) => {
         };
       }
     },
+    "/upload/patches": {
+      POST: async req => {
+        if (serverOps instanceof ValOpsHttp) {
+          return {
+            status: 400,
+            json: {
+              message: "Do not use this endpoint in HTTP mode"
+            }
+          };
+        }
+        const pathParts = req.path.split("/");
+        const patchId = pathParts[1];
+        const isValidPatchId = patchId.length === 36;
+        const isValidEndpoint = pathParts[0] === "" && isValidPatchId && pathParts[2] === "files";
+        if (!isValidEndpoint) {
+          return {
+            status: 400,
+            json: {
+              message: "Invalid endpoint"
+            }
+          };
+        }
+        const {
+          filePath,
+          parentRef,
+          type,
+          data,
+          metadata
+        } = req.body;
+        const saveRes = await serverOps.saveBase64EncodedBinaryFileFromPatch(filePath, parentRef, patchId, data, type, metadata);
+        if (saveRes.error) {
+          return {
+            status: 400,
+            json: {
+              message: saveRes.error.message
+            }
+          };
+        }
+        return {
+          status: 200,
+          json: {
+            filePath,
+            patchId
+          }
+        };
+      }
+    },
+    "/direct-file-upload-settings": {
+      POST: async req => {
+        const cookies = req.cookies;
+        const auth = getAuth(cookies);
+        if (auth.error) {
+          return {
+            status: 401,
+            json: {
+              message: auth.error
+            }
+          };
+        }
+        if (serverOps instanceof ValOpsFS) {
+          // In FS mode we do not use the remote server at all and just return an url that points to this server
+          // which has an endpoint that handles this
+          // A bit hacky perhaps, but we want to have as similar semantics as possible in client code when it comes to FS / HTTP
+          const host = `/api/val`;
+          return {
+            status: 200,
+            json: {
+              nonce: null,
+              baseUrl: `${host}/upload` // NOTE: this is the /upload/patches endpoint - the client will add /patches/:patchId/files to this and post to it
+            }
+          };
+        }
+        const httpOps = serverOps;
+        const profileId = "id" in auth && auth.id ? auth.id : undefined;
+        if (!profileId) {
+          return {
+            status: 401,
+            json: {
+              message: "Unauthorized"
+            }
+          };
+        }
+        const corsOrigin = "*"; // TODO: add cors origin
+        const presignedAuthNonce = await httpOps.getPresignedAuthNonce(profileId, corsOrigin);
+        if (presignedAuthNonce.status === "error") {
+          return {
+            status: presignedAuthNonce.statusCode,
+            json: presignedAuthNonce.error
+          };
+        }
+        return {
+          status: 200,
+          json: {
+            nonce: presignedAuthNonce.data.nonce,
+            baseUrl: presignedAuthNonce.data.baseUrl
+          }
+        };
+      }
+    },
     //#region patches
     "/patches": {
       PUT: async req => {
@@ -5376,7 +5336,7 @@ const ValServer = (valModules, options, callbacks) => {
                 status: 400,
                 json: {
                   type: "patch-error",
-                  message: "Could not create patch",
+                  message: createPatchRes.error.error.message,
                   errors: {
                     [patch.path]: [{
                       error: {
@@ -5838,8 +5798,22 @@ const ValServer = (valModules, options, callbacks) => {
             return remoteFileAuthRes;
           }
           const remoteFileAuth = (_remoteFileAuthRes = remoteFileAuthRes) === null || _remoteFileAuthRes === void 0 || (_remoteFileAuthRes = _remoteFileAuthRes.json) === null || _remoteFileAuthRes === void 0 ? void 0 : _remoteFileAuthRes.remoteFileAuth;
+          const saveRes = await serverOps.saveOrUploadFiles(preparedCommit, mode, remoteFileAuth);
+          if (Object.keys(saveRes.errors).length > 0) {
+            console.error("Val: Failed to save files", saveRes.errors);
+            return {
+              status: 400,
+              json: {
+                message: "Failed to save files",
+                details: Object.entries(saveRes.errors).map(([key, error]) => {
+                  return {
+                    message: `Got error: ${error} in ${key}`
+                  };
+                })
+              }
+            };
+          }
           const deleteRes = await serverOps.deleteAllPatches();
-          await serverOps.saveOrUploadFiles(preparedCommit, mode, remoteFileAuth);
           if (deleteRes.error) {
             console.error(`Val got an error while cleaning up patches after publish: ${deleteRes.error.message}`);
           }
@@ -6332,7 +6306,7 @@ async function initHandlerOptions(route, opts, config) {
 // TODO: remove
 async function safeReadGit(cwd) {
   async function findGitHead(currentDir, depth) {
-    const gitHeadPath = fsPath.join(currentDir, ".git", "HEAD");
+    const gitHeadPath = path.join(currentDir, ".git", "HEAD");
     if (depth > 1000) {
       console.error(`Reached max depth while scanning for .git folder. Current working dir: ${cwd}.`);
       return {
@@ -6356,7 +6330,7 @@ async function safeReadGit(cwd) {
         };
       }
     } catch (error) {
-      const parentDir = fsPath.dirname(currentDir);
+      const parentDir = path.dirname(currentDir);
 
       // We've reached the root directory
       if (parentDir === currentDir) {
@@ -6380,7 +6354,7 @@ async function safeReadGit(cwd) {
 }
 async function readCommit(gitDir, branchName) {
   try {
-    return (await promises.readFile(fsPath.join(gitDir, ".git", "refs", "heads", branchName), "utf-8")).trim();
+    return (await promises.readFile(path.join(gitDir, ".git", "refs", "heads", branchName), "utf-8")).trim();
   } catch (err) {
     return undefined;
   }
@@ -6656,10 +6630,10 @@ class ValFSHost {
     return this.currentDirectory;
   }
   getCanonicalFileName(fileName) {
-    if (fsPath__default.isAbsolute(fileName)) {
-      return fsPath__default.normalize(fileName);
+    if (path__default.isAbsolute(fileName)) {
+      return path__default.normalize(fileName);
     }
-    return fsPath__default.resolve(this.getCurrentDirectory(), fileName);
+    return path__default.resolve(this.getCurrentDirectory(), fileName);
   }
   fileExists(fileName) {
     return this.valFS.fileExists(fileName);
@@ -6826,11 +6800,11 @@ async function checkRemoteRef(remoteHost, ref, projectRoot, schema, metadata) {
 }
 function getCachedRemoteFileDir(projectRoot) {
   // store in projectRoot/.val/remote-file-cache
-  const remoteFileCacheDir = fsPath__default.join(projectRoot, ".val", "remote-file-cache");
+  const remoteFileCacheDir = path__default.join(projectRoot, ".val", "remote-file-cache");
   return remoteFileCacheDir;
 }
 function getCachedRemoteFilePath(fileExt, currentFileHash, remoteFileCacheDir) {
-  const remoteFilePath = fsPath__default.join(remoteFileCacheDir, currentFileHash + "." + fileExt);
+  const remoteFilePath = path__default.join(remoteFileCacheDir, currentFileHash + "." + fileExt);
   return remoteFilePath;
 }
 async function getFileBufferFromRemote(ref, fileExt, currentFileHash, projectRoot) {
@@ -7113,8 +7087,8 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
         });
         continue;
       }
-      const absoluteFilePath = fsPath__default.join(config.projectRoot, splitRemoteRefDataRes.filePath);
-      await fs.promises.mkdir(fsPath__default.dirname(absoluteFilePath), {
+      const absoluteFilePath = path__default.join(config.projectRoot, splitRemoteRefDataRes.filePath);
+      await fs.promises.mkdir(path__default.dirname(absoluteFilePath), {
         recursive: true
       });
       const res = await downloadFileFromRemote(url, absoluteFilePath);
@@ -7275,7 +7249,7 @@ async function getImageMetadata(projectRoot, validationError) {
     // TODO:
     throw Error("Cannot fix image without a file reference");
   }
-  const filename = fsPath__default.join(projectRoot, fileRef);
+  const filename = path__default.join(projectRoot, fileRef);
   const buffer = fs.readFileSync(filename);
   return extractImageMetadata(filename, buffer);
 }
@@ -7285,7 +7259,7 @@ async function getFileMetadata(projectRoot, validationError) {
     // TODO:
     throw Error("Cannot fix file without a file reference");
   }
-  const filename = fsPath__default.join(projectRoot, fileRef);
+  const filename = path__default.join(projectRoot, fileRef);
   fs.readFileSync(filename);
   return extractFileMetadata(fileRef);
 }