@valbuild/server 0.133.0 → 0.134.0

package/CHANGELOG.md

@@ -1,5 +1,77 @@
 # @valbuild/server
 
+## 0.134.0
+
+### Patch Changes
+
+- [#708](https://github.com/valbuild/val/pull/708) [`be78a9b`](https://github.com/valbuild/val/commit/be78a9b51678439f7ecb1c7f3887f9e8e1261a13) Thanks [@freekh](https://github.com/freekh)! - Fix `gitCommit` and `gitBranch` in `val.config.ts` never reaching the server,
+  and make them the one way to say it.
+
+  `val.config.ts` has had `gitCommit` and `gitBranch` for as long as it has had
+  anything, and a deployed app that set them resolved to no repository at all.
+  Nothing failed and nothing was logged: the commit was simply never sent, and
+  every patch the project saved recorded none.
+
+  ```ts
+  // val.config.ts — the normal Vercel shape, and it did nothing
+  initVal({
+    project: "org/project",
+    gitCommit: process.env.VERCEL_GIT_COMMIT_SHA,
+    gitBranch: process.env.VERCEL_GIT_COMMIT_REF,
+  });
+  ```
+
+  The two halves never met. The server wanted a nested
+  `git: { commit, branch }`, `val.config.ts` offered two flat keys, and nothing
+  mapped one onto the other — so the only thing that worked was
+  `VAL_GIT_COMMIT` / `VAL_GIT_BRANCH` in the environment.
+
+  Rather than teach the server to read both, the nested option is gone:
+  `ValApiOptions` and TanStack's `ValHttpMode` now take `gitCommit` and
+  `gitBranch`, the same two names `ValConfig` uses. There is one name for this
+  now, wherever it is set. The framework bindings already hand the server
+  `{ versions, ...config }`, so a project's config keys arrive with nothing to
+  map, and a host passing them directly is saying the same thing in the same
+  words.
+
+  Flat because of where these values come from. A platform supplies them as
+  `process.env.VERCEL_GIT_COMMIT_SHA` and friends, typed `string | undefined`,
+  and two optional strings take that as it comes — a nested object makes every
+  caller write the ternary that turns two maybe-strings into one maybe-object.
+
+  **Breaking for a host that passed `git` itself**, which is the nested option on
+  `ValApiOptions` and on TanStack's `http` mode. An app that only configures
+  `val.config.ts` or the environment is unaffected.
+
+  ```ts
+  // before
+  initValServer(valModules, config, {
+    http: { apiKey, valSecret, git: { commit, branch } },
+  });
+
+  // after
+  initValServer(valModules, config, {
+    http: { apiKey, valSecret, gitCommit: commit, gitBranch: branch },
+  });
+  ```
+
+  **What a commit is for**, and why its absence is worth a release rather than a
+  shrug: publishing turns pending patches into new `.val.ts` text, and to patch a
+  file you must first read it — at a commit. A project with none is a project
+  whose publishes read whatever the content service last had, rather than the
+  revision the deployed code was built from.
+
+  **One more behaviour change.** A commit and a branch have always been taken
+  together or not at all, and that check now sees config-supplied values too. A
+  project that sets exactly one of `gitCommit` and `gitBranch` used to have both
+  quietly ignored and will now be refused at startup, naming the missing half.
+  That is the configuration that would otherwise fail later, at a publish.
+
+- Updated dependencies [[`1c31dcc`](https://github.com/valbuild/val/commit/1c31dcca7f1bb0199350567fd579de29f48bb26d), [`688b9e3`](https://github.com/valbuild/val/commit/688b9e36b821323cda6870cdff03dd36ec3e782f), [`16c49ea`](https://github.com/valbuild/val/commit/16c49ea6dd97c7a96bbfdf211af9bab5884579e2), [`eaa265e`](https://github.com/valbuild/val/commit/eaa265e78d9f6d2a1b685c38901612b8a3704eed)]:
+  - @valbuild/ui@0.134.0
+  - @valbuild/core@0.134.0
+  - @valbuild/shared@0.134.0
+
 ## 0.133.0
 
 ### Minor Changes

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

@@ -106,12 +106,28 @@ type ValServerOverrides = Partial<{
      * property of those bytes. `VAL_GIT_COMMIT` / `VAL_GIT_BRANCH` supply it
      * where a build system sets environment variables instead.
      *
-     * @example { commit: "e83c5163316f89bfbde7d9ab23ca2e25604af290", branch: "main" }
+     * FLAT, and the same two names `val.config.ts` uses, so that there is one
+     * way to say this rather than two. An app reads these off its platform --
+     * `process.env.VERCEL_GIT_COMMIT_SHA` and friends, which are typed
+     * `string | undefined` -- and a pair of optional strings takes that as it
+     * comes. A nested `{ commit, branch }` would make every caller write the
+     * ternary that turns two maybe-strings into one maybe-object. Sharing the
+     * names with `ValConfig` is what makes the bindings' `{ versions,
+     * ...config }` carry them here with nothing to map.
+     *
+     * Taken together or not at all: `initHandlerOptions` refuses one without
+     * the other rather than resolving half a repository.
+     *
+     * @example "e83c5163316f89bfbde7d9ab23ca2e25604af290"
      */
-    git?: {
-        commit: string;
-        branch: string;
-    };
+    gitCommit?: string;
+    /**
+     * The branch a publish mirrors into. See {@link ValApiOptions.gitCommit},
+     * which this is required with and meaningless without.
+     *
+     * @example "main"
+     */
+    gitBranch?: string;
     /**
      * The base url of Val.
      *

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

@@ -205,6 +205,14 @@ export declare function handleJsonValuesExtractEntry(ctx: FixHandlerContext): Pr
  * `fixableErrorMessage` rather than a plain error, because the error IS fixable
  * — just not by this command.
  */
+/**
+ * A view pointer that names a module its schema does not.
+ *
+ * Nothing to look up and nothing to ask: the schema names the module, so the
+ * one correct value is already known. `createFixPatch` writes it — this handler
+ * exists to send it there, and to say what `--fix` would do when it is off.
+ */
+export declare function handleViewCheckModule(ctx: FixHandlerContext): Promise<FixHandlerResult>;
 export declare function handleExternalUpload(): Promise<FixHandlerResult>;
 export declare const currentFixHandlers: Record<Exclude<ValidationFix, "keyof:check-keys" | "router:check-route" | "locale:check-locale" | "record:fill-keys">, FixHandler>;
 export declare const fixHandlers: Record<string, FixHandler>;

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

@@ -10913,7 +10913,7 @@ async function initHandlerOptions(route, opts, config) {
     valContentUrl
   });
   if (isProxyMode) {
-    var _opts$git, _opts$git2, _opts$versions, _opts$versions2;
+    var _opts$versions, _opts$versions2;
     /*
      * Why this app is in http mode, in the message that says what is missing.
      *
@@ -10945,11 +10945,23 @@ async function initHandlerOptions(route, opts, config) {
      * with no line of work to publish to, and a branch without a commit names
      * a line with no position in it; either alone would be a half-configured
      * repository that fails later, at a publish, rather than here.
+     *
+     * ONE NAME, wherever it comes from. `opts` is the bindings'
+     * `{ versions, ...config }`, so `opts.gitCommit` IS `val.config.ts`'s
+     * `gitCommit` -- there is nothing to map and no second place to look.
+     *
+     * It used to be a nested `git: { commit, branch }` here and two flat keys
+     * in `ValConfig`, and the two never met: nothing mapped one onto the
+     * other, so a project that set the documented config keys -- which is
+     * what every Vercel deployment does, from `VERCEL_GIT_COMMIT_SHA` --
+     * resolved to no repository at all. Nothing failed and nothing was
+     * logged; the commit was simply never sent, and every patch it saved
+     * recorded none.
      */
-    const maybeGitCommit = ((_opts$git = opts.git) === null || _opts$git === void 0 ? void 0 : _opts$git.commit) || process.env.VAL_GIT_COMMIT;
-    const maybeGitBranch = ((_opts$git2 = opts.git) === null || _opts$git2 === void 0 ? void 0 : _opts$git2.branch) || process.env.VAL_GIT_BRANCH;
+    const maybeGitCommit = opts.gitCommit || process.env.VAL_GIT_COMMIT;
+    const maybeGitBranch = opts.gitBranch || process.env.VAL_GIT_BRANCH;
     if (!!maybeGitCommit !== !!maybeGitBranch) {
-      throw new Error(`Val is configured with a git ${maybeGitCommit ? "commit" : "branch"} ` + `but no ${maybeGitCommit ? "branch" : "commit"}. Set both (the ` + "`git` option, or VAL_GIT_COMMIT and VAL_GIT_BRANCH) for a project " + "whose content is mirrored into a repository, or neither for one " + "whose content service is the store of record." + because);
+      throw new Error(`Val is configured with a git ${maybeGitCommit ? "commit" : "branch"} ` + `but no ${maybeGitCommit ? "branch" : "commit"}. Set both ` + "(`gitCommit` and `gitBranch` in val.config.ts, or VAL_GIT_COMMIT " + "and VAL_GIT_BRANCH) for a project whose content is mirrored into " + "a repository, or neither for one whose content service is the " + "store of record." + because);
     }
     if (!maybeValProject) {
       throw new Error("Proxy mode does not work unless the 'project' option in val.config is defined or the VAL_PROJECT env var is set." + because);
@@ -16335,6 +16347,44 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           fixes: undefined
         });
       }
+    } else if (fix === "view:check-module") {
+      // The schema is the authority: it names the module, and there is exactly
+      // one valid pointer. So this is written rather than reported — nobody has
+      // a decision to make here.
+      const [, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
+      if (moduleSource === undefined || moduleSchema === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Unexpected error while checking a view (no module source or schema)",
+          fixes: undefined
+        });
+        continue;
+      }
+      const {
+        schema: schemaAtPath
+      } = core.Internal.resolvePath(modulePath, moduleSource, moduleSchema);
+      if (schemaAtPath.type !== "view") {
+        remainingErrors.push({
+          ...validationError,
+          message: `Could not fix view: schema at ${sourcePath} is '${schemaAtPath.type}', not a view`,
+          fixes: undefined
+        });
+        continue;
+      }
+      if (apply) {
+        patch$1.push({
+          op: "replace",
+          path: core.Internal.createPatchPath(modulePath),
+          value: {
+            view: schemaAtPath.moduleFilePath
+          }
+        });
+      } else {
+        remainingErrors.push({
+          ...validationError,
+          message: `This view points at the wrong module. Expected '${schemaAtPath.moduleFilePath}'.`
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {
@@ -17078,6 +17128,25 @@ async function handleJsonValuesExtractEntry(ctx) {
  * `fixableErrorMessage` rather than a plain error, because the error IS fixable
  * — just not by this command.
  */
+/**
+ * A view pointer that names a module its schema does not.
+ *
+ * Nothing to look up and nothing to ask: the schema names the module, so the
+ * one correct value is already known. `createFixPatch` writes it — this handler
+ * exists to send it there, and to say what `--fix` would do when it is off.
+ */
+async function handleViewCheckModule(ctx) {
+  if (!ctx.fix) {
+    return {
+      success: true,
+      fixableErrorMessage: `${ctx.validationError.message}. ` + "Run 'val validate --fix' to point it at the module its schema names."
+    };
+  }
+  return {
+    success: true,
+    shouldApplyPatch: true
+  };
+}
 async function handleExternalUpload() {
   return {
     success: true,
@@ -17109,7 +17178,8 @@ const currentFixHandlers = {
   "images:check-all-files": handleCheckAllFiles,
   "files:check-all-files": handleCheckAllFiles,
   "jsonValues:extract-entry": handleJsonValuesExtractEntry,
-  "external:upload": handleExternalUpload
+  "external:upload": handleExternalUpload,
+  "view:check-module": handleViewCheckModule
 };
 const deprecatedFixHandlers = {
   "image:replace-metadata": handleFileMetadata

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

@@ -10913,7 +10913,7 @@ async function initHandlerOptions(route, opts, config) {
     valContentUrl
   });
   if (isProxyMode) {
-    var _opts$git, _opts$git2, _opts$versions, _opts$versions2;
+    var _opts$versions, _opts$versions2;
     /*
      * Why this app is in http mode, in the message that says what is missing.
      *
@@ -10945,11 +10945,23 @@ async function initHandlerOptions(route, opts, config) {
      * with no line of work to publish to, and a branch without a commit names
      * a line with no position in it; either alone would be a half-configured
      * repository that fails later, at a publish, rather than here.
+     *
+     * ONE NAME, wherever it comes from. `opts` is the bindings'
+     * `{ versions, ...config }`, so `opts.gitCommit` IS `val.config.ts`'s
+     * `gitCommit` -- there is nothing to map and no second place to look.
+     *
+     * It used to be a nested `git: { commit, branch }` here and two flat keys
+     * in `ValConfig`, and the two never met: nothing mapped one onto the
+     * other, so a project that set the documented config keys -- which is
+     * what every Vercel deployment does, from `VERCEL_GIT_COMMIT_SHA` --
+     * resolved to no repository at all. Nothing failed and nothing was
+     * logged; the commit was simply never sent, and every patch it saved
+     * recorded none.
      */
-    const maybeGitCommit = ((_opts$git = opts.git) === null || _opts$git === void 0 ? void 0 : _opts$git.commit) || process.env.VAL_GIT_COMMIT;
-    const maybeGitBranch = ((_opts$git2 = opts.git) === null || _opts$git2 === void 0 ? void 0 : _opts$git2.branch) || process.env.VAL_GIT_BRANCH;
+    const maybeGitCommit = opts.gitCommit || process.env.VAL_GIT_COMMIT;
+    const maybeGitBranch = opts.gitBranch || process.env.VAL_GIT_BRANCH;
     if (!!maybeGitCommit !== !!maybeGitBranch) {
-      throw new Error(`Val is configured with a git ${maybeGitCommit ? "commit" : "branch"} ` + `but no ${maybeGitCommit ? "branch" : "commit"}. Set both (the ` + "`git` option, or VAL_GIT_COMMIT and VAL_GIT_BRANCH) for a project " + "whose content is mirrored into a repository, or neither for one " + "whose content service is the store of record." + because);
+      throw new Error(`Val is configured with a git ${maybeGitCommit ? "commit" : "branch"} ` + `but no ${maybeGitCommit ? "branch" : "commit"}. Set both ` + "(`gitCommit` and `gitBranch` in val.config.ts, or VAL_GIT_COMMIT " + "and VAL_GIT_BRANCH) for a project whose content is mirrored into " + "a repository, or neither for one whose content service is the " + "store of record." + because);
     }
     if (!maybeValProject) {
       throw new Error("Proxy mode does not work unless the 'project' option in val.config is defined or the VAL_PROJECT env var is set." + because);
@@ -16335,6 +16347,44 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           fixes: undefined
         });
       }
+    } else if (fix === "view:check-module") {
+      // The schema is the authority: it names the module, and there is exactly
+      // one valid pointer. So this is written rather than reported — nobody has
+      // a decision to make here.
+      const [, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
+      if (moduleSource === undefined || moduleSchema === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Unexpected error while checking a view (no module source or schema)",
+          fixes: undefined
+        });
+        continue;
+      }
+      const {
+        schema: schemaAtPath
+      } = core.Internal.resolvePath(modulePath, moduleSource, moduleSchema);
+      if (schemaAtPath.type !== "view") {
+        remainingErrors.push({
+          ...validationError,
+          message: `Could not fix view: schema at ${sourcePath} is '${schemaAtPath.type}', not a view`,
+          fixes: undefined
+        });
+        continue;
+      }
+      if (apply) {
+        patch$1.push({
+          op: "replace",
+          path: core.Internal.createPatchPath(modulePath),
+          value: {
+            view: schemaAtPath.moduleFilePath
+          }
+        });
+      } else {
+        remainingErrors.push({
+          ...validationError,
+          message: `This view points at the wrong module. Expected '${schemaAtPath.moduleFilePath}'.`
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {
@@ -17078,6 +17128,25 @@ async function handleJsonValuesExtractEntry(ctx) {
  * `fixableErrorMessage` rather than a plain error, because the error IS fixable
  * — just not by this command.
  */
+/**
+ * A view pointer that names a module its schema does not.
+ *
+ * Nothing to look up and nothing to ask: the schema names the module, so the
+ * one correct value is already known. `createFixPatch` writes it — this handler
+ * exists to send it there, and to say what `--fix` would do when it is off.
+ */
+async function handleViewCheckModule(ctx) {
+  if (!ctx.fix) {
+    return {
+      success: true,
+      fixableErrorMessage: `${ctx.validationError.message}. ` + "Run 'val validate --fix' to point it at the module its schema names."
+    };
+  }
+  return {
+    success: true,
+    shouldApplyPatch: true
+  };
+}
 async function handleExternalUpload() {
   return {
     success: true,
@@ -17109,7 +17178,8 @@ const currentFixHandlers = {
   "images:check-all-files": handleCheckAllFiles,
   "files:check-all-files": handleCheckAllFiles,
   "jsonValues:extract-entry": handleJsonValuesExtractEntry,
-  "external:upload": handleExternalUpload
+  "external:upload": handleExternalUpload,
+  "view:check-module": handleViewCheckModule
 };
 const deprecatedFixHandlers = {
   "image:replace-metadata": handleFileMetadata

package/dist/valbuild-server.esm.js

@@ -10879,7 +10879,7 @@ async function initHandlerOptions(route, opts, config) {
     valContentUrl
   });
   if (isProxyMode) {
-    var _opts$git, _opts$git2, _opts$versions, _opts$versions2;
+    var _opts$versions, _opts$versions2;
     /*
      * Why this app is in http mode, in the message that says what is missing.
      *
@@ -10911,11 +10911,23 @@ async function initHandlerOptions(route, opts, config) {
      * with no line of work to publish to, and a branch without a commit names
      * a line with no position in it; either alone would be a half-configured
      * repository that fails later, at a publish, rather than here.
+     *
+     * ONE NAME, wherever it comes from. `opts` is the bindings'
+     * `{ versions, ...config }`, so `opts.gitCommit` IS `val.config.ts`'s
+     * `gitCommit` -- there is nothing to map and no second place to look.
+     *
+     * It used to be a nested `git: { commit, branch }` here and two flat keys
+     * in `ValConfig`, and the two never met: nothing mapped one onto the
+     * other, so a project that set the documented config keys -- which is
+     * what every Vercel deployment does, from `VERCEL_GIT_COMMIT_SHA` --
+     * resolved to no repository at all. Nothing failed and nothing was
+     * logged; the commit was simply never sent, and every patch it saved
+     * recorded none.
      */
-    const maybeGitCommit = ((_opts$git = opts.git) === null || _opts$git === void 0 ? void 0 : _opts$git.commit) || process.env.VAL_GIT_COMMIT;
-    const maybeGitBranch = ((_opts$git2 = opts.git) === null || _opts$git2 === void 0 ? void 0 : _opts$git2.branch) || process.env.VAL_GIT_BRANCH;
+    const maybeGitCommit = opts.gitCommit || process.env.VAL_GIT_COMMIT;
+    const maybeGitBranch = opts.gitBranch || process.env.VAL_GIT_BRANCH;
     if (!!maybeGitCommit !== !!maybeGitBranch) {
-      throw new Error(`Val is configured with a git ${maybeGitCommit ? "commit" : "branch"} ` + `but no ${maybeGitCommit ? "branch" : "commit"}. Set both (the ` + "`git` option, or VAL_GIT_COMMIT and VAL_GIT_BRANCH) for a project " + "whose content is mirrored into a repository, or neither for one " + "whose content service is the store of record." + because);
+      throw new Error(`Val is configured with a git ${maybeGitCommit ? "commit" : "branch"} ` + `but no ${maybeGitCommit ? "branch" : "commit"}. Set both ` + "(`gitCommit` and `gitBranch` in val.config.ts, or VAL_GIT_COMMIT " + "and VAL_GIT_BRANCH) for a project whose content is mirrored into " + "a repository, or neither for one whose content service is the " + "store of record." + because);
     }
     if (!maybeValProject) {
       throw new Error("Proxy mode does not work unless the 'project' option in val.config is defined or the VAL_PROJECT env var is set." + because);
@@ -16301,6 +16313,44 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           fixes: undefined
         });
       }
+    } else if (fix === "view:check-module") {
+      // The schema is the authority: it names the module, and there is exactly
+      // one valid pointer. So this is written rather than reported — nobody has
+      // a decision to make here.
+      const [, modulePath] = Internal.splitModuleFilePathAndModulePath(sourcePath);
+      if (moduleSource === undefined || moduleSchema === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Unexpected error while checking a view (no module source or schema)",
+          fixes: undefined
+        });
+        continue;
+      }
+      const {
+        schema: schemaAtPath
+      } = Internal.resolvePath(modulePath, moduleSource, moduleSchema);
+      if (schemaAtPath.type !== "view") {
+        remainingErrors.push({
+          ...validationError,
+          message: `Could not fix view: schema at ${sourcePath} is '${schemaAtPath.type}', not a view`,
+          fixes: undefined
+        });
+        continue;
+      }
+      if (apply) {
+        patch.push({
+          op: "replace",
+          path: Internal.createPatchPath(modulePath),
+          value: {
+            view: schemaAtPath.moduleFilePath
+          }
+        });
+      } else {
+        remainingErrors.push({
+          ...validationError,
+          message: `This view points at the wrong module. Expected '${schemaAtPath.moduleFilePath}'.`
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {
@@ -17044,6 +17094,25 @@ async function handleJsonValuesExtractEntry(ctx) {
  * `fixableErrorMessage` rather than a plain error, because the error IS fixable
  * — just not by this command.
  */
+/**
+ * A view pointer that names a module its schema does not.
+ *
+ * Nothing to look up and nothing to ask: the schema names the module, so the
+ * one correct value is already known. `createFixPatch` writes it — this handler
+ * exists to send it there, and to say what `--fix` would do when it is off.
+ */
+async function handleViewCheckModule(ctx) {
+  if (!ctx.fix) {
+    return {
+      success: true,
+      fixableErrorMessage: `${ctx.validationError.message}. ` + "Run 'val validate --fix' to point it at the module its schema names."
+    };
+  }
+  return {
+    success: true,
+    shouldApplyPatch: true
+  };
+}
 async function handleExternalUpload() {
   return {
     success: true,
@@ -17075,7 +17144,8 @@ const currentFixHandlers = {
   "images:check-all-files": handleCheckAllFiles,
   "files:check-all-files": handleCheckAllFiles,
   "jsonValues:extract-entry": handleJsonValuesExtractEntry,
-  "external:upload": handleExternalUpload
+  "external:upload": handleExternalUpload,
+  "view:check-module": handleViewCheckModule
 };
 const deprecatedFixHandlers = {
   "image:replace-metadata": handleFileMetadata

package/package.json

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