@valbuild/server 0.63.1 → 0.63.5

package/dist/declarations/src/ValServer.d.ts

@@ -6,7 +6,7 @@ export type ValServerOptions = {
     route: string;
     valEnableRedirectUrl?: string;
     valDisableRedirectUrl?: string;
-    formatter?: (code: string, filePath: string) => string;
+    formatter?: (code: string, filePath: string) => string | Promise<string>;
     valBuildUrl?: string;
     valSecret?: string;
     apiKey?: string;
@@ -15,7 +15,6 @@ export type ValServerOptions = {
 export type ValServerConfig = ValServerOptions & ({
     mode: "fs";
     cwd: string;
-    formatter?: (code: string, filePath: string) => string;
 } | {
     mode: "http";
     valContentUrl: string;
@@ -60,6 +59,8 @@ export declare class ValServer {
     logout(): Promise<ValServerResult<VAL_SESSION_COOKIE | VAL_STATE_COOKIE>>;
     getPatches(query: {
         authors?: string[];
+        patchIds?: string[];
+        omitPatch?: string;
     }, cookies: Partial<Record<"val_session", string>>): Promise<ValServerJsonResult<ApiGetPatchResponse>>;
     deletePatches(query: {
         id?: string[];

package/dist/declarations/src/createValApiRouter.d.ts

@@ -113,7 +113,7 @@ type ValServerOverrides = Partial<{
      */
     disableCache?: boolean;
 }>;
-export declare function createValServer(valModules: ValModules, route: string, opts: ValApiOptions, callbacks: ValServerCallbacks, formatter?: (code: string, filePath: string) => string): Promise<ValServer>;
+export declare function createValServer(valModules: ValModules, route: string, opts: ValApiOptions, callbacks: ValServerCallbacks, formatter?: (code: string, filePath: string) => string | Promise<string>): Promise<ValServer>;
 export declare function safeReadGit(cwd: string): Promise<{
     commit?: string;
     branch?: string;

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

@@ -1537,10 +1537,10 @@ class ValOps {
         } else {
           const patchData = analysis.patches[patchId];
           if (!patchData) {
-            errors[path].push({
+            errors[path] = [{
               patchId: patchId,
               error: new patch.PatchError(`Patch not found`)
-            });
+            }];
             continue;
           }
           const applicableOps = [];
@@ -1837,7 +1837,7 @@ class ValOps {
         let sourceFileText = unescape(tsSourceFile.getText(tsSourceFile).replace(/\\u/g, "%u"));
         if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.formatter) {
           try {
-            sourceFileText = this.options.formatter(sourceFileText, path);
+            sourceFileText = await this.options.formatter(sourceFileText, path);
           } catch (err) {
             errors.push({
               message: "Could not format source file: " + (err instanceof Error ? err.message : "Unknown error")
@@ -2267,7 +2267,7 @@ class ValOpsFS extends ValOps {
         throw new Error("Could not parse patch id from file name. Files found: " + patchJsonFiles.join(", "));
       }
       const patchId = patchIdNum.toString();
-      if (includes && !includes.includes(patchId)) {
+      if (includes && includes.length > 0 && !includes.includes(patchId)) {
         continue;
       }
       const parsedFSPatchRes = this.parseJsonFile(this.getPatchFilePath(patchId), FSPatch);
@@ -2296,22 +2296,23 @@ class ValOpsFS extends ValOps {
       patches
     };
   }
-  async getPatchOpsById(patchIds) {
-    return this.readPatches(patchIds);
-  }
-  async findPatches(filters) {
+  async fetchPatches(filters) {
     const patches = {};
     const errors = {};
     const {
       errors: allErrors,
       patches: allPatches
-    } = await this.readPatches();
+    } = await this.readPatches(filters.patchIds);
     for (const [patchIdS, patch] of Object.entries(allPatches)) {
       const patchId = patchIdS;
       if (filters.authors && !(patch.authorId === null || filters.authors.includes(patch.authorId))) {
         continue;
       }
+      if (filters.moduleFilePaths && !filters.moduleFilePaths.includes(patch.path)) {
+        continue;
+      }
       patches[patchId] = {
+        patch: filters.omitPatch ? undefined : patch.patch,
         path: patch.path,
         createdAt: patch.createdAt,
         authorId: patch.authorId,
@@ -2774,9 +2775,6 @@ const GetPatches = z.z.object({
     message: z.z.string()
   })).optional()
 });
-const SearchPatches = z.z.object({
-  patches: z.z.array(BasePatchResponse)
-});
 const FilesResponse = z.z.object({
   files: z.z.array(z.z.union([z.z.object({
     filePath: z.z.string(),
@@ -2835,13 +2833,29 @@ class ValOpsHttp extends ValOps {
   async onInit() {
     // TODO: unused for now. Implement or remove
   }
-  async getPatchOpsById(patchIds) {
-    const params = new URLSearchParams();
-    params.set("branch", this.branch);
-    if (patchIds.length > 0) {
-      params.set("patch_ids", encodeURIComponent(patchIds.join(",")));
+  async fetchPatches(filters) {
+    const params = [];
+    params.push(["branch", this.branch]);
+    if (filters.patchIds) {
+      for (const patchId of filters.patchIds) {
+        params.push(["patch_id", patchId]);
+      }
     }
-    return fetch(`${this.hostUrl}/v1/${this.project}/patches${params.size > 0 ? "?" + params : ""}`, {
+    if (filters.authors) {
+      for (const author of filters.authors) {
+        params.push(["author_id", author]);
+      }
+    }
+    if (filters.omitPatch) {
+      params.push(["omit_patch", "true"]);
+    }
+    if (filters.moduleFilePaths) {
+      for (const moduleFilePath of filters.moduleFilePaths) {
+        params.push(["module_file_path", moduleFilePath]);
+      }
+    }
+    const searchParams = new URLSearchParams(params);
+    return fetch(`${this.hostUrl}/v1/${this.project}/patches${searchParams.size > 0 ? `?${searchParams.toString()}` : ""}`, {
       headers: {
         ...this.authHeaders,
         "Content-Type": "application/json"
@@ -2889,55 +2903,6 @@ class ValOpsHttp extends ValOps {
       };
     });
   }
-  async findPatches(filters) {
-    const params = new URLSearchParams();
-    params.set("branch", this.branch);
-    if (filters.authors && filters.authors.length > 0) {
-      params.set("author_ids", encodeURIComponent(filters.authors.join(",")));
-    }
-    return fetch(`${this.hostUrl}/v1/${this.project}/search/patches${params.size > 0 ? "?" + params : ""}`, {
-      headers: {
-        ...this.authHeaders,
-        "Content-Type": "application/json"
-      }
-    }).then(async res => {
-      const patches = {};
-      if (res.ok) {
-        const parsed = SearchPatches.safeParse(await res.json());
-        if (parsed.success) {
-          for (const patchesRes of parsed.data.patches) {
-            patches[patchesRes.patchId] = {
-              path: patchesRes.path,
-              authorId: patchesRes.authorId,
-              createdAt: patchesRes.createdAt,
-              appliedAt: patchesRes.applied && {
-                baseSha: patchesRes.applied.baseSha,
-                timestamp: patchesRes.applied.appliedAt,
-                git: {
-                  commitSha: patchesRes.applied.commitSha
-                }
-              }
-            };
-          }
-          return {
-            patches
-          };
-        }
-        return {
-          patches,
-          error: {
-            message: `Could not parse search patches response. Error: ${zodValidationError.fromError(parsed.error)}`
-          }
-        };
-      }
-      return {
-        patches,
-        error: {
-          message: "Could not find patches. HTTP error: " + res.status + " " + res.statusText
-        }
-      };
-    });
-  }
   async saveSourceFilePatch(path, patch, authorId) {
     return fetch(`${this.hostUrl}/v1/${this.project}/patches`, {
       method: "POST",
@@ -3652,8 +3617,10 @@ class ValServer {
       };
     }
     const authors = query.authors;
-    const patches = await this.serverOps.findPatches({
-      authors
+    const patches = await this.serverOps.fetchPatches({
+      authors,
+      patchIds: query.patchIds,
+      omitPatch: query.omitPatch === "true"
     });
     if (patches.errors && Object.keys(patches.errors).length > 0) {
       console.error("Val: Failed to get patches", patches.errors);
@@ -3665,23 +3632,9 @@ class ValServer {
         }
       };
     }
-    const res = {};
-    for (const [patchIdS, patchData] of Object.entries(patches.patches)) {
-      var _patchData$appliedAt;
-      const patchId = patchIdS;
-      if (!res[patchData.path]) {
-        res[patchData.path] = [];
-      }
-      res[patchData.path].push({
-        patch_id: patchId,
-        created_at: patchData.createdAt,
-        applied_at_base_sha: ((_patchData$appliedAt = patchData.appliedAt) === null || _patchData$appliedAt === void 0 ? void 0 : _patchData$appliedAt.baseSha) || null,
-        author: patchData.authorId ?? undefined
-      });
-    }
     return {
       status: 200,
-      json: res
+      json: patches
     };
   }
   async deletePatches(query, cookies) {
@@ -3817,11 +3770,15 @@ class ValServer {
     }
     let tree;
     let patchAnalysis = null;
+    let newPatchId = undefined;
     if ((_bodyRes$data = bodyRes.data) !== null && _bodyRes$data !== void 0 && _bodyRes$data.patchIds && ((_bodyRes$data2 = bodyRes.data) === null || _bodyRes$data2 === void 0 || (_bodyRes$data2 = _bodyRes$data2.patchIds) === null || _bodyRes$data2 === void 0 ? void 0 : _bodyRes$data2.length) > 0 || (_bodyRes$data3 = bodyRes.data) !== null && _bodyRes$data3 !== void 0 && _bodyRes$data3.addPatch) {
       var _bodyRes$data4, _bodyRes$data5;
       // TODO: validate patches_sha
       const patchIds = (_bodyRes$data4 = bodyRes.data) === null || _bodyRes$data4 === void 0 ? void 0 : _bodyRes$data4.patchIds;
-      const patchOps = patchIds && patchIds.length > 0 ? await this.serverOps.getPatchOpsById(patchIds) : {
+      const patchOps = patchIds && patchIds.length > 0 ? await this.serverOps.fetchPatches({
+        patchIds,
+        omitPatch: false
+      }) : {
         patches: {}
       };
       let patchErrors = undefined;
@@ -3862,6 +3819,7 @@ class ValServer {
         //     };
         //   }
         // }
+        newPatchId = createPatchRes.patchId;
         patchOps.patches[createPatchRes.patchId] = {
           path: newPatchModuleFilePath,
           patch: newPatchOps,
@@ -3923,7 +3881,8 @@ class ValServer {
       status: 200,
       json: {
         schemaSha,
-        modules
+        modules,
+        newPatchId
       }
     };
   }
@@ -3954,7 +3913,10 @@ class ValServer {
     const {
       patchIds
     } = bodyRes.data;
-    const patches = await this.serverOps.getPatchOpsById(patchIds);
+    const patches = await this.serverOps.fetchPatches({
+      patchIds,
+      omitPatch: false
+    });
     const analysis = this.serverOps.analyzePatches(patches.patches);
     const preparedCommit = await this.serverOps.prepare({
       ...analysis,
@@ -4550,7 +4512,9 @@ function createValApiRouter(route, valServerPromise, convert) {
       }, getCookies(req, [VAL_SESSION_COOKIE]))));
     } else if (method === "GET" && path.startsWith(PATCHES_PATH_PREFIX)) {
       return withTreePath(path, PATCHES_PATH_PREFIX)(async () => convert(await valServer.getPatches({
-        authors: url.searchParams.getAll("author")
+        authors: url.searchParams.getAll("author"),
+        patchIds: url.searchParams.getAll("patch_id"),
+        omitPatch: url.searchParams.get("omit_patch") || undefined
       }, getCookies(req, [VAL_SESSION_COOKIE]))));
     } else if (method === "DELETE" && path.startsWith(PATCHES_PATH_PREFIX)) {
       return withTreePath(path, PATCHES_PATH_PREFIX)(async () => convert(await valServer.deletePatches({

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

@@ -1537,10 +1537,10 @@ class ValOps {
         } else {
           const patchData = analysis.patches[patchId];
           if (!patchData) {
-            errors[path].push({
+            errors[path] = [{
               patchId: patchId,
               error: new patch.PatchError(`Patch not found`)
-            });
+            }];
             continue;
           }
           const applicableOps = [];
@@ -1837,7 +1837,7 @@ class ValOps {
         let sourceFileText = unescape(tsSourceFile.getText(tsSourceFile).replace(/\\u/g, "%u"));
         if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.formatter) {
           try {
-            sourceFileText = this.options.formatter(sourceFileText, path);
+            sourceFileText = await this.options.formatter(sourceFileText, path);
           } catch (err) {
             errors.push({
               message: "Could not format source file: " + (err instanceof Error ? err.message : "Unknown error")
@@ -2267,7 +2267,7 @@ class ValOpsFS extends ValOps {
         throw new Error("Could not parse patch id from file name. Files found: " + patchJsonFiles.join(", "));
       }
       const patchId = patchIdNum.toString();
-      if (includes && !includes.includes(patchId)) {
+      if (includes && includes.length > 0 && !includes.includes(patchId)) {
         continue;
       }
       const parsedFSPatchRes = this.parseJsonFile(this.getPatchFilePath(patchId), FSPatch);
@@ -2296,22 +2296,23 @@ class ValOpsFS extends ValOps {
       patches
     };
   }
-  async getPatchOpsById(patchIds) {
-    return this.readPatches(patchIds);
-  }
-  async findPatches(filters) {
+  async fetchPatches(filters) {
     const patches = {};
     const errors = {};
     const {
       errors: allErrors,
       patches: allPatches
-    } = await this.readPatches();
+    } = await this.readPatches(filters.patchIds);
     for (const [patchIdS, patch] of Object.entries(allPatches)) {
       const patchId = patchIdS;
       if (filters.authors && !(patch.authorId === null || filters.authors.includes(patch.authorId))) {
         continue;
       }
+      if (filters.moduleFilePaths && !filters.moduleFilePaths.includes(patch.path)) {
+        continue;
+      }
       patches[patchId] = {
+        patch: filters.omitPatch ? undefined : patch.patch,
         path: patch.path,
         createdAt: patch.createdAt,
         authorId: patch.authorId,
@@ -2774,9 +2775,6 @@ const GetPatches = z.z.object({
     message: z.z.string()
   })).optional()
 });
-const SearchPatches = z.z.object({
-  patches: z.z.array(BasePatchResponse)
-});
 const FilesResponse = z.z.object({
   files: z.z.array(z.z.union([z.z.object({
     filePath: z.z.string(),
@@ -2835,13 +2833,29 @@ class ValOpsHttp extends ValOps {
   async onInit() {
     // TODO: unused for now. Implement or remove
   }
-  async getPatchOpsById(patchIds) {
-    const params = new URLSearchParams();
-    params.set("branch", this.branch);
-    if (patchIds.length > 0) {
-      params.set("patch_ids", encodeURIComponent(patchIds.join(",")));
+  async fetchPatches(filters) {
+    const params = [];
+    params.push(["branch", this.branch]);
+    if (filters.patchIds) {
+      for (const patchId of filters.patchIds) {
+        params.push(["patch_id", patchId]);
+      }
     }
-    return fetch(`${this.hostUrl}/v1/${this.project}/patches${params.size > 0 ? "?" + params : ""}`, {
+    if (filters.authors) {
+      for (const author of filters.authors) {
+        params.push(["author_id", author]);
+      }
+    }
+    if (filters.omitPatch) {
+      params.push(["omit_patch", "true"]);
+    }
+    if (filters.moduleFilePaths) {
+      for (const moduleFilePath of filters.moduleFilePaths) {
+        params.push(["module_file_path", moduleFilePath]);
+      }
+    }
+    const searchParams = new URLSearchParams(params);
+    return fetch(`${this.hostUrl}/v1/${this.project}/patches${searchParams.size > 0 ? `?${searchParams.toString()}` : ""}`, {
       headers: {
         ...this.authHeaders,
         "Content-Type": "application/json"
@@ -2889,55 +2903,6 @@ class ValOpsHttp extends ValOps {
       };
     });
   }
-  async findPatches(filters) {
-    const params = new URLSearchParams();
-    params.set("branch", this.branch);
-    if (filters.authors && filters.authors.length > 0) {
-      params.set("author_ids", encodeURIComponent(filters.authors.join(",")));
-    }
-    return fetch(`${this.hostUrl}/v1/${this.project}/search/patches${params.size > 0 ? "?" + params : ""}`, {
-      headers: {
-        ...this.authHeaders,
-        "Content-Type": "application/json"
-      }
-    }).then(async res => {
-      const patches = {};
-      if (res.ok) {
-        const parsed = SearchPatches.safeParse(await res.json());
-        if (parsed.success) {
-          for (const patchesRes of parsed.data.patches) {
-            patches[patchesRes.patchId] = {
-              path: patchesRes.path,
-              authorId: patchesRes.authorId,
-              createdAt: patchesRes.createdAt,
-              appliedAt: patchesRes.applied && {
-                baseSha: patchesRes.applied.baseSha,
-                timestamp: patchesRes.applied.appliedAt,
-                git: {
-                  commitSha: patchesRes.applied.commitSha
-                }
-              }
-            };
-          }
-          return {
-            patches
-          };
-        }
-        return {
-          patches,
-          error: {
-            message: `Could not parse search patches response. Error: ${zodValidationError.fromError(parsed.error)}`
-          }
-        };
-      }
-      return {
-        patches,
-        error: {
-          message: "Could not find patches. HTTP error: " + res.status + " " + res.statusText
-        }
-      };
-    });
-  }
   async saveSourceFilePatch(path, patch, authorId) {
     return fetch(`${this.hostUrl}/v1/${this.project}/patches`, {
       method: "POST",
@@ -3652,8 +3617,10 @@ class ValServer {
       };
     }
     const authors = query.authors;
-    const patches = await this.serverOps.findPatches({
-      authors
+    const patches = await this.serverOps.fetchPatches({
+      authors,
+      patchIds: query.patchIds,
+      omitPatch: query.omitPatch === "true"
     });
     if (patches.errors && Object.keys(patches.errors).length > 0) {
       console.error("Val: Failed to get patches", patches.errors);
@@ -3665,23 +3632,9 @@ class ValServer {
         }
       };
     }
-    const res = {};
-    for (const [patchIdS, patchData] of Object.entries(patches.patches)) {
-      var _patchData$appliedAt;
-      const patchId = patchIdS;
-      if (!res[patchData.path]) {
-        res[patchData.path] = [];
-      }
-      res[patchData.path].push({
-        patch_id: patchId,
-        created_at: patchData.createdAt,
-        applied_at_base_sha: ((_patchData$appliedAt = patchData.appliedAt) === null || _patchData$appliedAt === void 0 ? void 0 : _patchData$appliedAt.baseSha) || null,
-        author: patchData.authorId ?? undefined
-      });
-    }
     return {
       status: 200,
-      json: res
+      json: patches
     };
   }
   async deletePatches(query, cookies) {
@@ -3817,11 +3770,15 @@ class ValServer {
     }
     let tree;
     let patchAnalysis = null;
+    let newPatchId = undefined;
     if ((_bodyRes$data = bodyRes.data) !== null && _bodyRes$data !== void 0 && _bodyRes$data.patchIds && ((_bodyRes$data2 = bodyRes.data) === null || _bodyRes$data2 === void 0 || (_bodyRes$data2 = _bodyRes$data2.patchIds) === null || _bodyRes$data2 === void 0 ? void 0 : _bodyRes$data2.length) > 0 || (_bodyRes$data3 = bodyRes.data) !== null && _bodyRes$data3 !== void 0 && _bodyRes$data3.addPatch) {
       var _bodyRes$data4, _bodyRes$data5;
       // TODO: validate patches_sha
       const patchIds = (_bodyRes$data4 = bodyRes.data) === null || _bodyRes$data4 === void 0 ? void 0 : _bodyRes$data4.patchIds;
-      const patchOps = patchIds && patchIds.length > 0 ? await this.serverOps.getPatchOpsById(patchIds) : {
+      const patchOps = patchIds && patchIds.length > 0 ? await this.serverOps.fetchPatches({
+        patchIds,
+        omitPatch: false
+      }) : {
         patches: {}
       };
       let patchErrors = undefined;
@@ -3862,6 +3819,7 @@ class ValServer {
         //     };
         //   }
         // }
+        newPatchId = createPatchRes.patchId;
         patchOps.patches[createPatchRes.patchId] = {
           path: newPatchModuleFilePath,
           patch: newPatchOps,
@@ -3923,7 +3881,8 @@ class ValServer {
       status: 200,
       json: {
         schemaSha,
-        modules
+        modules,
+        newPatchId
       }
     };
   }
@@ -3954,7 +3913,10 @@ class ValServer {
     const {
       patchIds
     } = bodyRes.data;
-    const patches = await this.serverOps.getPatchOpsById(patchIds);
+    const patches = await this.serverOps.fetchPatches({
+      patchIds,
+      omitPatch: false
+    });
     const analysis = this.serverOps.analyzePatches(patches.patches);
     const preparedCommit = await this.serverOps.prepare({
       ...analysis,
@@ -4550,7 +4512,9 @@ function createValApiRouter(route, valServerPromise, convert) {
       }, getCookies(req, [VAL_SESSION_COOKIE]))));
     } else if (method === "GET" && path.startsWith(PATCHES_PATH_PREFIX)) {
       return withTreePath(path, PATCHES_PATH_PREFIX)(async () => convert(await valServer.getPatches({
-        authors: url.searchParams.getAll("author")
+        authors: url.searchParams.getAll("author"),
+        patchIds: url.searchParams.getAll("patch_id"),
+        omitPatch: url.searchParams.get("omit_patch") || undefined
       }, getCookies(req, [VAL_SESSION_COOKIE]))));
     } else if (method === "DELETE" && path.startsWith(PATCHES_PATH_PREFIX)) {
       return withTreePath(path, PATCHES_PATH_PREFIX)(async () => convert(await valServer.deletePatches({

package/dist/valbuild-server.esm.js

@@ -1507,10 +1507,10 @@ class ValOps {
         } else {
           const patchData = analysis.patches[patchId];
           if (!patchData) {
-            errors[path].push({
+            errors[path] = [{
               patchId: patchId,
               error: new PatchError(`Patch not found`)
-            });
+            }];
             continue;
           }
           const applicableOps = [];
@@ -1807,7 +1807,7 @@ class ValOps {
         let sourceFileText = unescape(tsSourceFile.getText(tsSourceFile).replace(/\\u/g, "%u"));
         if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.formatter) {
           try {
-            sourceFileText = this.options.formatter(sourceFileText, path);
+            sourceFileText = await this.options.formatter(sourceFileText, path);
           } catch (err) {
             errors.push({
               message: "Could not format source file: " + (err instanceof Error ? err.message : "Unknown error")
@@ -2237,7 +2237,7 @@ class ValOpsFS extends ValOps {
         throw new Error("Could not parse patch id from file name. Files found: " + patchJsonFiles.join(", "));
       }
       const patchId = patchIdNum.toString();
-      if (includes && !includes.includes(patchId)) {
+      if (includes && includes.length > 0 && !includes.includes(patchId)) {
         continue;
       }
       const parsedFSPatchRes = this.parseJsonFile(this.getPatchFilePath(patchId), FSPatch);
@@ -2266,22 +2266,23 @@ class ValOpsFS extends ValOps {
       patches
     };
   }
-  async getPatchOpsById(patchIds) {
-    return this.readPatches(patchIds);
-  }
-  async findPatches(filters) {
+  async fetchPatches(filters) {
     const patches = {};
     const errors = {};
     const {
       errors: allErrors,
       patches: allPatches
-    } = await this.readPatches();
+    } = await this.readPatches(filters.patchIds);
     for (const [patchIdS, patch] of Object.entries(allPatches)) {
       const patchId = patchIdS;
       if (filters.authors && !(patch.authorId === null || filters.authors.includes(patch.authorId))) {
         continue;
       }
+      if (filters.moduleFilePaths && !filters.moduleFilePaths.includes(patch.path)) {
+        continue;
+      }
       patches[patchId] = {
+        patch: filters.omitPatch ? undefined : patch.patch,
         path: patch.path,
         createdAt: patch.createdAt,
         authorId: patch.authorId,
@@ -2744,9 +2745,6 @@ const GetPatches = z.object({
     message: z.string()
   })).optional()
 });
-const SearchPatches = z.object({
-  patches: z.array(BasePatchResponse)
-});
 const FilesResponse = z.object({
   files: z.array(z.union([z.object({
     filePath: z.string(),
@@ -2805,13 +2803,29 @@ class ValOpsHttp extends ValOps {
   async onInit() {
     // TODO: unused for now. Implement or remove
   }
-  async getPatchOpsById(patchIds) {
-    const params = new URLSearchParams();
-    params.set("branch", this.branch);
-    if (patchIds.length > 0) {
-      params.set("patch_ids", encodeURIComponent(patchIds.join(",")));
+  async fetchPatches(filters) {
+    const params = [];
+    params.push(["branch", this.branch]);
+    if (filters.patchIds) {
+      for (const patchId of filters.patchIds) {
+        params.push(["patch_id", patchId]);
+      }
     }
-    return fetch(`${this.hostUrl}/v1/${this.project}/patches${params.size > 0 ? "?" + params : ""}`, {
+    if (filters.authors) {
+      for (const author of filters.authors) {
+        params.push(["author_id", author]);
+      }
+    }
+    if (filters.omitPatch) {
+      params.push(["omit_patch", "true"]);
+    }
+    if (filters.moduleFilePaths) {
+      for (const moduleFilePath of filters.moduleFilePaths) {
+        params.push(["module_file_path", moduleFilePath]);
+      }
+    }
+    const searchParams = new URLSearchParams(params);
+    return fetch(`${this.hostUrl}/v1/${this.project}/patches${searchParams.size > 0 ? `?${searchParams.toString()}` : ""}`, {
       headers: {
         ...this.authHeaders,
         "Content-Type": "application/json"
@@ -2859,55 +2873,6 @@ class ValOpsHttp extends ValOps {
       };
     });
   }
-  async findPatches(filters) {
-    const params = new URLSearchParams();
-    params.set("branch", this.branch);
-    if (filters.authors && filters.authors.length > 0) {
-      params.set("author_ids", encodeURIComponent(filters.authors.join(",")));
-    }
-    return fetch(`${this.hostUrl}/v1/${this.project}/search/patches${params.size > 0 ? "?" + params : ""}`, {
-      headers: {
-        ...this.authHeaders,
-        "Content-Type": "application/json"
-      }
-    }).then(async res => {
-      const patches = {};
-      if (res.ok) {
-        const parsed = SearchPatches.safeParse(await res.json());
-        if (parsed.success) {
-          for (const patchesRes of parsed.data.patches) {
-            patches[patchesRes.patchId] = {
-              path: patchesRes.path,
-              authorId: patchesRes.authorId,
-              createdAt: patchesRes.createdAt,
-              appliedAt: patchesRes.applied && {
-                baseSha: patchesRes.applied.baseSha,
-                timestamp: patchesRes.applied.appliedAt,
-                git: {
-                  commitSha: patchesRes.applied.commitSha
-                }
-              }
-            };
-          }
-          return {
-            patches
-          };
-        }
-        return {
-          patches,
-          error: {
-            message: `Could not parse search patches response. Error: ${fromError(parsed.error)}`
-          }
-        };
-      }
-      return {
-        patches,
-        error: {
-          message: "Could not find patches. HTTP error: " + res.status + " " + res.statusText
-        }
-      };
-    });
-  }
   async saveSourceFilePatch(path, patch, authorId) {
     return fetch(`${this.hostUrl}/v1/${this.project}/patches`, {
       method: "POST",
@@ -3622,8 +3587,10 @@ class ValServer {
       };
     }
     const authors = query.authors;
-    const patches = await this.serverOps.findPatches({
-      authors
+    const patches = await this.serverOps.fetchPatches({
+      authors,
+      patchIds: query.patchIds,
+      omitPatch: query.omitPatch === "true"
     });
     if (patches.errors && Object.keys(patches.errors).length > 0) {
       console.error("Val: Failed to get patches", patches.errors);
@@ -3635,23 +3602,9 @@ class ValServer {
         }
       };
     }
-    const res = {};
-    for (const [patchIdS, patchData] of Object.entries(patches.patches)) {
-      var _patchData$appliedAt;
-      const patchId = patchIdS;
-      if (!res[patchData.path]) {
-        res[patchData.path] = [];
-      }
-      res[patchData.path].push({
-        patch_id: patchId,
-        created_at: patchData.createdAt,
-        applied_at_base_sha: ((_patchData$appliedAt = patchData.appliedAt) === null || _patchData$appliedAt === void 0 ? void 0 : _patchData$appliedAt.baseSha) || null,
-        author: patchData.authorId ?? undefined
-      });
-    }
     return {
       status: 200,
-      json: res
+      json: patches
     };
   }
   async deletePatches(query, cookies) {
@@ -3787,11 +3740,15 @@ class ValServer {
     }
     let tree;
     let patchAnalysis = null;
+    let newPatchId = undefined;
     if ((_bodyRes$data = bodyRes.data) !== null && _bodyRes$data !== void 0 && _bodyRes$data.patchIds && ((_bodyRes$data2 = bodyRes.data) === null || _bodyRes$data2 === void 0 || (_bodyRes$data2 = _bodyRes$data2.patchIds) === null || _bodyRes$data2 === void 0 ? void 0 : _bodyRes$data2.length) > 0 || (_bodyRes$data3 = bodyRes.data) !== null && _bodyRes$data3 !== void 0 && _bodyRes$data3.addPatch) {
       var _bodyRes$data4, _bodyRes$data5;
       // TODO: validate patches_sha
       const patchIds = (_bodyRes$data4 = bodyRes.data) === null || _bodyRes$data4 === void 0 ? void 0 : _bodyRes$data4.patchIds;
-      const patchOps = patchIds && patchIds.length > 0 ? await this.serverOps.getPatchOpsById(patchIds) : {
+      const patchOps = patchIds && patchIds.length > 0 ? await this.serverOps.fetchPatches({
+        patchIds,
+        omitPatch: false
+      }) : {
         patches: {}
       };
       let patchErrors = undefined;
@@ -3832,6 +3789,7 @@ class ValServer {
         //     };
         //   }
         // }
+        newPatchId = createPatchRes.patchId;
         patchOps.patches[createPatchRes.patchId] = {
           path: newPatchModuleFilePath,
           patch: newPatchOps,
@@ -3893,7 +3851,8 @@ class ValServer {
       status: 200,
       json: {
         schemaSha,
-        modules
+        modules,
+        newPatchId
       }
     };
   }
@@ -3924,7 +3883,10 @@ class ValServer {
     const {
       patchIds
     } = bodyRes.data;
-    const patches = await this.serverOps.getPatchOpsById(patchIds);
+    const patches = await this.serverOps.fetchPatches({
+      patchIds,
+      omitPatch: false
+    });
     const analysis = this.serverOps.analyzePatches(patches.patches);
     const preparedCommit = await this.serverOps.prepare({
       ...analysis,
@@ -4520,7 +4482,9 @@ function createValApiRouter(route, valServerPromise, convert) {
       }, getCookies(req, [VAL_SESSION_COOKIE]))));
     } else if (method === "GET" && path.startsWith(PATCHES_PATH_PREFIX)) {
       return withTreePath(path, PATCHES_PATH_PREFIX)(async () => convert(await valServer.getPatches({
-        authors: url.searchParams.getAll("author")
+        authors: url.searchParams.getAll("author"),
+        patchIds: url.searchParams.getAll("patch_id"),
+        omitPatch: url.searchParams.get("omit_patch") || undefined
       }, getCookies(req, [VAL_SESSION_COOKIE]))));
     } else if (method === "DELETE" && path.startsWith(PATCHES_PATH_PREFIX)) {
       return withTreePath(path, PATCHES_PATH_PREFIX)(async () => convert(await valServer.deletePatches({

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.63.1",
+  "version": "0.63.5",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -22,9 +22,9 @@
     "@types/jest": "^29.2.5"
   },
   "dependencies": {
-    "@valbuild/core": "~0.63.1",
-    "@valbuild/shared": "~0.63.1",
-    "@valbuild/ui": "~0.63.1",
+    "@valbuild/core": "~0.63.5",
+    "@valbuild/shared": "~0.63.5",
+    "@valbuild/ui": "~0.63.5",
     "image-size": "^1.0.2",
     "minimatch": "^3.0.4",
     "quickjs-emscripten": "^0.21.1",