@valbuild/server 0.144.7 → 0.144.9

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @valbuild/server
 
+## 0.144.9
+
+### Patch Changes
+
+- [#846](https://github.com/valbuild/val/pull/846) [`c44b561`](https://github.com/valbuild/val/commit/c44b5611cf9e557b6b744704703dbff0cb8b23b0) Thanks [@freekh](https://github.com/freekh)! - History is shown for projects hosted by Val Build and inside a proposal, where it lists the proposal's own saves. On the site of a project with proposals, a restore — one field, one module, or "Put everything back" — opens a new proposal with the restored values in it, so it is reviewed there before it is published.
+
+  History also reads a hosted project's first commit, which has no parent: "Go back to this point" failed on it.
+
+  "Go back to this point" on the site brings back the code as well as the content: the proposal it opens stages the files of the build the site served then, and serves that build at once.
+
+- Updated dependencies [[`c44b561`](https://github.com/valbuild/val/commit/c44b5611cf9e557b6b744704703dbff0cb8b23b0), [`a2125af`](https://github.com/valbuild/val/commit/a2125af79d2b2401c40bce3d8fcf0431bb101cbf)]:
+  - @valbuild/ui@0.144.9
+  - @valbuild/shared@0.144.9
+
+## 0.144.8
+
+### Patch Changes
+
+- [#844](https://github.com/valbuild/val/pull/844) [`b67c03e`](https://github.com/valbuild/val/commit/b67c03ee1876803c31098098ae0becf3f4ad6ade) Thanks [@freekh](https://github.com/freekh)! - Publishing a proposal now says what blocks it, and what to do about it:
+
+  - When the site's code changed after a proposal with code changes started, the Publish dialog offers **Update from the site**. It moves the proposal onto the site as it is now, and its code then needs building again ("Build required").
+  - When someone published changes to the same page since the proposal started, the dialog names the fields each side changed.
+
+- Updated dependencies [[`6fd8f79`](https://github.com/valbuild/val/commit/6fd8f791a83d37f95dc3ae12bd8025ccf81e4a7c), [`b67c03e`](https://github.com/valbuild/val/commit/b67c03ee1876803c31098098ae0becf3f4ad6ade)]:
+  - @valbuild/ui@0.144.8
+
 ## 0.144.7
 
 ### Patch Changes

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

@@ -294,8 +294,9 @@ export declare class ValOpsHttp extends ValOps {
      */
     private static proposalsApiAllowed;
     /**
-     * A write to a proposal's FILES -- staging code, or serving a build of it
-     * (valbuild/home `docs/hosted-publishing.md`, step 7) -- is made by the
+     * A write to a proposal's FILES -- staging code, serving a build of it
+     * (valbuild/home `docs/hosted-publishing.md`, step 7), or moving it onto the
+     * site's code (step 8, "Update from the site") -- is made by the
      * proposal's own server and nobody else's: the file tools act on the
      * proposal the Studio is open in (P11), and the site's files change only
      * when a proposal is merged. The proposal it names, or `null` when this

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

@@ -2751,6 +2751,21 @@ function withResolvedProject(config, project) {
   };
 }
 
+/**
+ * The branch History lists, or `null` where there is none to list.
+ *
+ * Not `config.gitBranch` alone, which is the git mirror's and absent for a
+ * managed project -- whose history content holds all the same, under the
+ * branch it reports for the project. In a proposal it is the proposal's, so
+ * its History is its own saves (valbuild/home `docs/hosted-publishing.md`,
+ * step 9). Never in `fs` mode, where `ValOpsFS` has no commits to list.
+ */
+function historyBranchOf(input) {
+  var _input$proposal;
+  if (input.mode !== "http") return null;
+  return ((_input$proposal = input.proposal) === null || _input$proposal === void 0 ? void 0 : _input$proposal.branch) ?? input.gitBranch ?? input.projectBranch;
+}
+
 /**
  * Which IP addresses this server may open a connection to.
  *
@@ -9615,7 +9630,8 @@ const CommitPatchesResponse = z.z.object({
  */
 const CommitModulesResponse = z.z.object({
   commitSha: z.z.string(),
-  parentCommitSha: z.z.string(),
+  // Null for a project's first commit: a hosted one's first publish has none.
+  parentCommitSha: z.z.string().nullable(),
   /**
    * Whether an `asOf` read covered the whole project.
    *
@@ -10130,12 +10146,13 @@ class ValOpsHttp extends ValOps {
     const one = /^\/[0-9a-f]{20}$/.test(path);
     if (one) return method === "GET" || method === "PATCH";
     if (method === "GET") return /^\/[0-9a-f]{20}\/(merge-checks|files)$/.test(path);
-    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build)$/.test(path);
+    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build|update-from-site|restore-code)$/.test(path);
   }
 
   /**
-   * A write to a proposal's FILES -- staging code, or serving a build of it
-   * (valbuild/home `docs/hosted-publishing.md`, step 7) -- is made by the
+   * A write to a proposal's FILES -- staging code, serving a build of it
+   * (valbuild/home `docs/hosted-publishing.md`, step 7), or moving it onto the
+   * site's code (step 8, "Update from the site") -- is made by the
    * proposal's own server and nobody else's: the file tools act on the
    * proposal the Studio is open in (P11), and the site's files change only
    * when a proposal is merged. The proposal it names, or `null` when this
@@ -10144,7 +10161,7 @@ class ValOpsHttp extends ValOps {
   static proposalFilesWrite(method, path) {
     var _exec;
     if (method !== "POST") return null;
-    return ((_exec = /^\/([0-9a-f]{20})\/(files|build)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
+    return ((_exec = /^\/([0-9a-f]{20})\/(files|build|update-from-site|restore-code)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
   }
 
   /**
@@ -14958,6 +14975,13 @@ const ValServer = (valModules, options, callbacks) => {
         const sourceMode = serverOps.sourceMode();
         // Spread like the two above: absent is "on the site".
         const proposal = serverOps.currentProposal();
+        const config = clientConfig(options);
+        const historyBranch = historyBranchOf({
+          mode,
+          proposal,
+          gitBranch: config.gitBranch ?? null,
+          projectBranch: serverOps.projectBranch()
+        });
         return {
           status: 200,
           json: {
@@ -14976,10 +15000,13 @@ const ValServer = (valModules, options, callbacks) => {
             ...(proposal ? {
               proposal
             } : {}),
+            ...(historyBranch ? {
+              historyBranch
+            } : {}),
             // Not `options.config` verbatim: in proxy mode the branch the
             // server resolved is filled in where the file did not name one.
             // See `clientConfig`.
-            config: clientConfig(options)
+            config
           }
         };
       }

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

@@ -2751,6 +2751,21 @@ function withResolvedProject(config, project) {
   };
 }
 
+/**
+ * The branch History lists, or `null` where there is none to list.
+ *
+ * Not `config.gitBranch` alone, which is the git mirror's and absent for a
+ * managed project -- whose history content holds all the same, under the
+ * branch it reports for the project. In a proposal it is the proposal's, so
+ * its History is its own saves (valbuild/home `docs/hosted-publishing.md`,
+ * step 9). Never in `fs` mode, where `ValOpsFS` has no commits to list.
+ */
+function historyBranchOf(input) {
+  var _input$proposal;
+  if (input.mode !== "http") return null;
+  return ((_input$proposal = input.proposal) === null || _input$proposal === void 0 ? void 0 : _input$proposal.branch) ?? input.gitBranch ?? input.projectBranch;
+}
+
 /**
  * Which IP addresses this server may open a connection to.
  *
@@ -9615,7 +9630,8 @@ const CommitPatchesResponse = z.z.object({
  */
 const CommitModulesResponse = z.z.object({
   commitSha: z.z.string(),
-  parentCommitSha: z.z.string(),
+  // Null for a project's first commit: a hosted one's first publish has none.
+  parentCommitSha: z.z.string().nullable(),
   /**
    * Whether an `asOf` read covered the whole project.
    *
@@ -10130,12 +10146,13 @@ class ValOpsHttp extends ValOps {
     const one = /^\/[0-9a-f]{20}$/.test(path);
     if (one) return method === "GET" || method === "PATCH";
     if (method === "GET") return /^\/[0-9a-f]{20}\/(merge-checks|files)$/.test(path);
-    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build)$/.test(path);
+    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build|update-from-site|restore-code)$/.test(path);
   }
 
   /**
-   * A write to a proposal's FILES -- staging code, or serving a build of it
-   * (valbuild/home `docs/hosted-publishing.md`, step 7) -- is made by the
+   * A write to a proposal's FILES -- staging code, serving a build of it
+   * (valbuild/home `docs/hosted-publishing.md`, step 7), or moving it onto the
+   * site's code (step 8, "Update from the site") -- is made by the
    * proposal's own server and nobody else's: the file tools act on the
    * proposal the Studio is open in (P11), and the site's files change only
    * when a proposal is merged. The proposal it names, or `null` when this
@@ -10144,7 +10161,7 @@ class ValOpsHttp extends ValOps {
   static proposalFilesWrite(method, path) {
     var _exec;
     if (method !== "POST") return null;
-    return ((_exec = /^\/([0-9a-f]{20})\/(files|build)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
+    return ((_exec = /^\/([0-9a-f]{20})\/(files|build|update-from-site|restore-code)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
   }
 
   /**
@@ -14958,6 +14975,13 @@ const ValServer = (valModules, options, callbacks) => {
         const sourceMode = serverOps.sourceMode();
         // Spread like the two above: absent is "on the site".
         const proposal = serverOps.currentProposal();
+        const config = clientConfig(options);
+        const historyBranch = historyBranchOf({
+          mode,
+          proposal,
+          gitBranch: config.gitBranch ?? null,
+          projectBranch: serverOps.projectBranch()
+        });
         return {
           status: 200,
           json: {
@@ -14976,10 +15000,13 @@ const ValServer = (valModules, options, callbacks) => {
             ...(proposal ? {
               proposal
             } : {}),
+            ...(historyBranch ? {
+              historyBranch
+            } : {}),
             // Not `options.config` verbatim: in proxy mode the branch the
             // server resolved is filled in where the file did not name one.
             // See `clientConfig`.
-            config: clientConfig(options)
+            config
           }
         };
       }

package/dist/valbuild-server.esm.js

@@ -2714,6 +2714,21 @@ function withResolvedProject(config, project) {
   };
 }
 
+/**
+ * The branch History lists, or `null` where there is none to list.
+ *
+ * Not `config.gitBranch` alone, which is the git mirror's and absent for a
+ * managed project -- whose history content holds all the same, under the
+ * branch it reports for the project. In a proposal it is the proposal's, so
+ * its History is its own saves (valbuild/home `docs/hosted-publishing.md`,
+ * step 9). Never in `fs` mode, where `ValOpsFS` has no commits to list.
+ */
+function historyBranchOf(input) {
+  var _input$proposal;
+  if (input.mode !== "http") return null;
+  return ((_input$proposal = input.proposal) === null || _input$proposal === void 0 ? void 0 : _input$proposal.branch) ?? input.gitBranch ?? input.projectBranch;
+}
+
 /**
  * Which IP addresses this server may open a connection to.
  *
@@ -9578,7 +9593,8 @@ const CommitPatchesResponse = z.object({
  */
 const CommitModulesResponse = z.object({
   commitSha: z.string(),
-  parentCommitSha: z.string(),
+  // Null for a project's first commit: a hosted one's first publish has none.
+  parentCommitSha: z.string().nullable(),
   /**
    * Whether an `asOf` read covered the whole project.
    *
@@ -10093,12 +10109,13 @@ class ValOpsHttp extends ValOps {
     const one = /^\/[0-9a-f]{20}$/.test(path);
     if (one) return method === "GET" || method === "PATCH";
     if (method === "GET") return /^\/[0-9a-f]{20}\/(merge-checks|files)$/.test(path);
-    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build)$/.test(path);
+    return method === "POST" && /^\/[0-9a-f]{20}\/(close|reopen|setup\/retry|merge|files|build|update-from-site|restore-code)$/.test(path);
   }
 
   /**
-   * A write to a proposal's FILES -- staging code, or serving a build of it
-   * (valbuild/home `docs/hosted-publishing.md`, step 7) -- is made by the
+   * A write to a proposal's FILES -- staging code, serving a build of it
+   * (valbuild/home `docs/hosted-publishing.md`, step 7), or moving it onto the
+   * site's code (step 8, "Update from the site") -- is made by the
    * proposal's own server and nobody else's: the file tools act on the
    * proposal the Studio is open in (P11), and the site's files change only
    * when a proposal is merged. The proposal it names, or `null` when this
@@ -10107,7 +10124,7 @@ class ValOpsHttp extends ValOps {
   static proposalFilesWrite(method, path) {
     var _exec;
     if (method !== "POST") return null;
-    return ((_exec = /^\/([0-9a-f]{20})\/(files|build)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
+    return ((_exec = /^\/([0-9a-f]{20})\/(files|build|update-from-site|restore-code)$/.exec(path)) === null || _exec === void 0 ? void 0 : _exec[1]) ?? null;
   }
 
   /**
@@ -14921,6 +14938,13 @@ const ValServer = (valModules, options, callbacks) => {
         const sourceMode = serverOps.sourceMode();
         // Spread like the two above: absent is "on the site".
         const proposal = serverOps.currentProposal();
+        const config = clientConfig(options);
+        const historyBranch = historyBranchOf({
+          mode,
+          proposal,
+          gitBranch: config.gitBranch ?? null,
+          projectBranch: serverOps.projectBranch()
+        });
         return {
           status: 200,
           json: {
@@ -14939,10 +14963,13 @@ const ValServer = (valModules, options, callbacks) => {
             ...(proposal ? {
               proposal
             } : {}),
+            ...(historyBranch ? {
+              historyBranch
+            } : {}),
             // Not `options.config` verbatim: in proxy mode the branch the
             // server resolved is filled in where the file did not name one.
             // See `clientConfig`.
-            config: clientConfig(options)
+            config
           }
         };
       }

package/package.json

@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.144.7",
+  "version": "0.144.9",
   "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.144.9",
     "@valbuild/core": "0.144.0",
-    "@valbuild/shared": "0.144.5",
-    "@valbuild/ui": "0.144.7"
+    "@valbuild/ui": "0.144.9"
   },
   "engines": {
     "node": "^20.19.0 || >=22"