@valbuild/server 0.136.1 → 0.136.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @valbuild/server
 
+## 0.136.2
+
+### Patch Changes
+
+- [#720](https://github.com/valbuild/val/pull/720) [`f76cd56`](https://github.com/valbuild/val/commit/f76cd56b9f1c1bcc0a608a7a4de24b1e776adccb) Thanks [@freekh](https://github.com/freekh)! - A managed project published from the Studio keeps its images, and a project created from a template can publish from the Studio at all.
+
+  - A publish from the Studio carries over every file under `public/` that the site already serves, so the favicon and images no longer disappear after the first Studio publish. When content published the live build, it already holds those files and nothing is uploaded again. When it didn't (a project cloned from a template), the Studio reads them from the site it runs on and builds with them.
+  - An image uploaded in the Studio is now part of the build that publishes it. For a managed project, `/save` returns the files the commit wrote (`binaryFiles`), the same way it already returns the `.val.ts` text.
+  - `/save` also returns the project's branch for a managed project, and the Studio's build uses it. A project cloned from a template was wired at no commit and no branch, so its first Studio publish went out branchless and the platform refused it.
+  - When neither content nor the platform can say which public files the live site serves, the Studio refuses to publish and says so, rather than publishing a site without them.
+
+- Updated dependencies [[`f76cd56`](https://github.com/valbuild/val/commit/f76cd56b9f1c1bcc0a608a7a4de24b1e776adccb)]:
+  - @valbuild/ui@0.136.2
+  - @valbuild/shared@0.136.2
+
 ## 0.136.1
 
 ### Patch Changes

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

@@ -433,6 +433,18 @@ export declare abstract class ValOps {
      * an older service.
      */
     sourceMode(): "managed" | "connected" | null;
+    /**
+     * The branch the content service keeps this project's commits on, or `null`
+     * where there is no such service, or it has not said yet.
+     *
+     * For the Studio's in-tab build of a managed project, which has to name the
+     * branch its build was made at. Its other source is the `val.server.ts` the
+     * last build was wired with -- and a project cloned from a template seed has
+     * one wired at NO commit and no branch, so its first publish went out
+     * branchless and the loader refused it for a project whose pointer follows a
+     * branch. This is the project's own word for it.
+     */
+    projectBranch(): string | null;
     /**
      * Forward one call to the content service's publish API, as this project.
      *

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

@@ -141,6 +141,8 @@ export declare class ValOpsHttp extends ValOps {
      * has just arrived.
      */
     sourceMode(): "managed" | "connected" | null;
+    /** Remembered with {@link sourceMode}, from the same response. */
+    projectBranch(): string | null;
     /**
      * The short-lived publish token, and when it stops being usable.
      *

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

@@ -4595,6 +4595,21 @@ class ValOps {
     return null;
   }
 
+  /**
+   * The branch the content service keeps this project's commits on, or `null`
+   * where there is no such service, or it has not said yet.
+   *
+   * For the Studio's in-tab build of a managed project, which has to name the
+   * branch its build was made at. Its other source is the `val.server.ts` the
+   * last build was wired with -- and a project cloned from a template seed has
+   * one wired at NO commit and no branch, so its first publish went out
+   * branchless and the loader refused it for a project whose pointer follows a
+   * branch. This is the project's own word for it.
+   */
+  projectBranch() {
+    return null;
+  }
+
   /**
    * Forward one call to the content service's publish API, as this project.
    *
@@ -7519,6 +7534,42 @@ class FSOpsHost {
   }
 }
 
+/**
+ * The bytes of the local binary files a commit is about to write, base64.
+ *
+ * For the Studio's in-tab build of a managed project, which publishes the site:
+ * an image uploaded in this save is in no earlier build, so unless the build
+ * is given it the published page links a file that 404s. Remote files are left
+ * out -- they are served from their own URL and never were part of a build.
+ *
+ * A file that cannot be read is NAMED rather than dropped, and does not stop
+ * the save: the commit is what makes an edit durable, and the build is the
+ * step that can refuse.
+ *
+ * Read BEFORE the commit, because after it the files are no longer the
+ * patch's to read. Generic over the patch id so it asks for exactly the one
+ * method it uses, and a test can hand it a plain object.
+ */
+async function readCommittedBinaryFiles(ops, descriptors) {
+  const files = {};
+  const unread = [];
+  await Promise.all(Object.entries(descriptors).map(async ([filePath, {
+    patchId,
+    remote
+  }]) => {
+    if (remote) return;
+    const bytes = await ops.getBase64EncodedBinaryFileFromPatch(filePath, patchId, remote).catch(error => {
+      console.error("Could not read a committed file", filePath, error);
+      return null;
+    });
+    if (bytes === null) unread.push(filePath);else files[filePath] = bytes.toString("base64");
+  }));
+  return {
+    files,
+    unread: unread.sort()
+  };
+}
+
 /**
  * Which unpublished changes a failed save has to throw away to make progress.
  *
@@ -8001,6 +8052,12 @@ class ValOpsHttp extends ValOps {
     return ((_this$projectExpectat2 = this.projectExpectation) === null || _this$projectExpectat2 === void 0 ? void 0 : _this$projectExpectat2.sourceMode) ?? null;
   }
 
+  /** Remembered with {@link sourceMode}, from the same response. */
+  projectBranch() {
+    var _this$projectExpectat3;
+    return ((_this$projectExpectat3 = this.projectExpectation) === null || _this$projectExpectat3 === void 0 ? void 0 : _this$projectExpectat3.branch) ?? null;
+  }
+
   /**
    * The short-lived publish token, and when it stops being usable.
    *
@@ -13757,6 +13814,12 @@ const ValServer = (valModules, options, callbacks) => {
               }
             }
             const message = body.message || "Val CMS update (" + Object.keys(analysis.patchesByModule).length + " files changed)";
+            /*
+             * Before the commit, because after it the files are no longer the
+             * patch's to read. See `binaryFiles` on the route.
+             */
+            const managedBranch = serverOps.sourceMode() === "managed" ? serverOps.projectBranch() : null;
+            const committedBinaries = serverOps.sourceMode() === "managed" ? await readCommittedBinaryFiles(serverOps, preparedCommit.patchedBinaryFilesDescriptors) : null;
             const commitToGit = () => {
               var _options$config$files;
               return serverOps.commit(preparedCommit, message, auth.id, ((_options$config$files = options.config.files) === null || _options$config$files === void 0 ? void 0 : _options$config$files.directory) || "/public/val", undefined,
@@ -13823,6 +13886,15 @@ const ValServer = (valModules, options, callbacks) => {
                  */
                 ...(serverOps.sourceMode() === "managed" ? {
                   sourceFiles: preparedCommit.patchedSourceFiles
+                } : {}),
+                ...(managedBranch !== null ? {
+                  branch: managedBranch
+                } : {}),
+                ...(committedBinaries !== null ? {
+                  binaryFiles: committedBinaries.files,
+                  ...(committedBinaries.unread.length > 0 ? {
+                    binaryFilesUnread: committedBinaries.unread
+                  } : {})
                 } : {})
               }
             };

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

@@ -4595,6 +4595,21 @@ class ValOps {
     return null;
   }
 
+  /**
+   * The branch the content service keeps this project's commits on, or `null`
+   * where there is no such service, or it has not said yet.
+   *
+   * For the Studio's in-tab build of a managed project, which has to name the
+   * branch its build was made at. Its other source is the `val.server.ts` the
+   * last build was wired with -- and a project cloned from a template seed has
+   * one wired at NO commit and no branch, so its first publish went out
+   * branchless and the loader refused it for a project whose pointer follows a
+   * branch. This is the project's own word for it.
+   */
+  projectBranch() {
+    return null;
+  }
+
   /**
    * Forward one call to the content service's publish API, as this project.
    *
@@ -7519,6 +7534,42 @@ class FSOpsHost {
   }
 }
 
+/**
+ * The bytes of the local binary files a commit is about to write, base64.
+ *
+ * For the Studio's in-tab build of a managed project, which publishes the site:
+ * an image uploaded in this save is in no earlier build, so unless the build
+ * is given it the published page links a file that 404s. Remote files are left
+ * out -- they are served from their own URL and never were part of a build.
+ *
+ * A file that cannot be read is NAMED rather than dropped, and does not stop
+ * the save: the commit is what makes an edit durable, and the build is the
+ * step that can refuse.
+ *
+ * Read BEFORE the commit, because after it the files are no longer the
+ * patch's to read. Generic over the patch id so it asks for exactly the one
+ * method it uses, and a test can hand it a plain object.
+ */
+async function readCommittedBinaryFiles(ops, descriptors) {
+  const files = {};
+  const unread = [];
+  await Promise.all(Object.entries(descriptors).map(async ([filePath, {
+    patchId,
+    remote
+  }]) => {
+    if (remote) return;
+    const bytes = await ops.getBase64EncodedBinaryFileFromPatch(filePath, patchId, remote).catch(error => {
+      console.error("Could not read a committed file", filePath, error);
+      return null;
+    });
+    if (bytes === null) unread.push(filePath);else files[filePath] = bytes.toString("base64");
+  }));
+  return {
+    files,
+    unread: unread.sort()
+  };
+}
+
 /**
  * Which unpublished changes a failed save has to throw away to make progress.
  *
@@ -8001,6 +8052,12 @@ class ValOpsHttp extends ValOps {
     return ((_this$projectExpectat2 = this.projectExpectation) === null || _this$projectExpectat2 === void 0 ? void 0 : _this$projectExpectat2.sourceMode) ?? null;
   }
 
+  /** Remembered with {@link sourceMode}, from the same response. */
+  projectBranch() {
+    var _this$projectExpectat3;
+    return ((_this$projectExpectat3 = this.projectExpectation) === null || _this$projectExpectat3 === void 0 ? void 0 : _this$projectExpectat3.branch) ?? null;
+  }
+
   /**
    * The short-lived publish token, and when it stops being usable.
    *
@@ -13757,6 +13814,12 @@ const ValServer = (valModules, options, callbacks) => {
               }
             }
             const message = body.message || "Val CMS update (" + Object.keys(analysis.patchesByModule).length + " files changed)";
+            /*
+             * Before the commit, because after it the files are no longer the
+             * patch's to read. See `binaryFiles` on the route.
+             */
+            const managedBranch = serverOps.sourceMode() === "managed" ? serverOps.projectBranch() : null;
+            const committedBinaries = serverOps.sourceMode() === "managed" ? await readCommittedBinaryFiles(serverOps, preparedCommit.patchedBinaryFilesDescriptors) : null;
             const commitToGit = () => {
               var _options$config$files;
               return serverOps.commit(preparedCommit, message, auth.id, ((_options$config$files = options.config.files) === null || _options$config$files === void 0 ? void 0 : _options$config$files.directory) || "/public/val", undefined,
@@ -13823,6 +13886,15 @@ const ValServer = (valModules, options, callbacks) => {
                  */
                 ...(serverOps.sourceMode() === "managed" ? {
                   sourceFiles: preparedCommit.patchedSourceFiles
+                } : {}),
+                ...(managedBranch !== null ? {
+                  branch: managedBranch
+                } : {}),
+                ...(committedBinaries !== null ? {
+                  binaryFiles: committedBinaries.files,
+                  ...(committedBinaries.unread.length > 0 ? {
+                    binaryFilesUnread: committedBinaries.unread
+                  } : {})
                 } : {})
               }
             };

package/dist/valbuild-server.esm.js

@@ -4561,6 +4561,21 @@ class ValOps {
     return null;
   }
 
+  /**
+   * The branch the content service keeps this project's commits on, or `null`
+   * where there is no such service, or it has not said yet.
+   *
+   * For the Studio's in-tab build of a managed project, which has to name the
+   * branch its build was made at. Its other source is the `val.server.ts` the
+   * last build was wired with -- and a project cloned from a template seed has
+   * one wired at NO commit and no branch, so its first publish went out
+   * branchless and the loader refused it for a project whose pointer follows a
+   * branch. This is the project's own word for it.
+   */
+  projectBranch() {
+    return null;
+  }
+
   /**
    * Forward one call to the content service's publish API, as this project.
    *
@@ -7485,6 +7500,42 @@ class FSOpsHost {
   }
 }
 
+/**
+ * The bytes of the local binary files a commit is about to write, base64.
+ *
+ * For the Studio's in-tab build of a managed project, which publishes the site:
+ * an image uploaded in this save is in no earlier build, so unless the build
+ * is given it the published page links a file that 404s. Remote files are left
+ * out -- they are served from their own URL and never were part of a build.
+ *
+ * A file that cannot be read is NAMED rather than dropped, and does not stop
+ * the save: the commit is what makes an edit durable, and the build is the
+ * step that can refuse.
+ *
+ * Read BEFORE the commit, because after it the files are no longer the
+ * patch's to read. Generic over the patch id so it asks for exactly the one
+ * method it uses, and a test can hand it a plain object.
+ */
+async function readCommittedBinaryFiles(ops, descriptors) {
+  const files = {};
+  const unread = [];
+  await Promise.all(Object.entries(descriptors).map(async ([filePath, {
+    patchId,
+    remote
+  }]) => {
+    if (remote) return;
+    const bytes = await ops.getBase64EncodedBinaryFileFromPatch(filePath, patchId, remote).catch(error => {
+      console.error("Could not read a committed file", filePath, error);
+      return null;
+    });
+    if (bytes === null) unread.push(filePath);else files[filePath] = bytes.toString("base64");
+  }));
+  return {
+    files,
+    unread: unread.sort()
+  };
+}
+
 /**
  * Which unpublished changes a failed save has to throw away to make progress.
  *
@@ -7967,6 +8018,12 @@ class ValOpsHttp extends ValOps {
     return ((_this$projectExpectat2 = this.projectExpectation) === null || _this$projectExpectat2 === void 0 ? void 0 : _this$projectExpectat2.sourceMode) ?? null;
   }
 
+  /** Remembered with {@link sourceMode}, from the same response. */
+  projectBranch() {
+    var _this$projectExpectat3;
+    return ((_this$projectExpectat3 = this.projectExpectation) === null || _this$projectExpectat3 === void 0 ? void 0 : _this$projectExpectat3.branch) ?? null;
+  }
+
   /**
    * The short-lived publish token, and when it stops being usable.
    *
@@ -13723,6 +13780,12 @@ const ValServer = (valModules, options, callbacks) => {
               }
             }
             const message = body.message || "Val CMS update (" + Object.keys(analysis.patchesByModule).length + " files changed)";
+            /*
+             * Before the commit, because after it the files are no longer the
+             * patch's to read. See `binaryFiles` on the route.
+             */
+            const managedBranch = serverOps.sourceMode() === "managed" ? serverOps.projectBranch() : null;
+            const committedBinaries = serverOps.sourceMode() === "managed" ? await readCommittedBinaryFiles(serverOps, preparedCommit.patchedBinaryFilesDescriptors) : null;
             const commitToGit = () => {
               var _options$config$files;
               return serverOps.commit(preparedCommit, message, auth.id, ((_options$config$files = options.config.files) === null || _options$config$files === void 0 ? void 0 : _options$config$files.directory) || "/public/val", undefined,
@@ -13789,6 +13852,15 @@ const ValServer = (valModules, options, callbacks) => {
                  */
                 ...(serverOps.sourceMode() === "managed" ? {
                   sourceFiles: preparedCommit.patchedSourceFiles
+                } : {}),
+                ...(managedBranch !== null ? {
+                  branch: managedBranch
+                } : {}),
+                ...(committedBinaries !== null ? {
+                  binaryFiles: committedBinaries.files,
+                  ...(committedBinaries.unread.length > 0 ? {
+                    binaryFilesUnread: committedBinaries.unread
+                  } : {})
                 } : {})
               }
             };

package/package.json

@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.136.1",
+  "version": "0.136.2",
   "devDependencies": {
     "@prettier/sync": "^0.6.1",
     "@types/jest": "^30.0.0",
@@ -30,9 +30,9 @@
     "typescript": "^6.0.3",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0",
+    "@valbuild/shared": "0.136.2",
     "@valbuild/core": "0.136.1",
-    "@valbuild/shared": "0.136.1",
-    "@valbuild/ui": "0.136.1"
+    "@valbuild/ui": "0.136.2"
   },
   "engines": {
     "node": "^20.19.0 || >=22"