@valbuild/server 0.150.0 → 0.150.1

package/CHANGELOG.md

@@ -1,5 +1,59 @@
 # @valbuild/server
 
+## 0.150.1
+
+### Patch Changes
+
+- [#894](https://github.com/valbuild/val/pull/894) [`9171baa`](https://github.com/valbuild/val/commit/9171baad7beb1b2a355c70724d2339467b126e02) Thanks [@freekh](https://github.com/freekh)! - `val validate` no longer fails a project just because some of its files are
+  local while the project stores files remotely (`files: { remote: true }` or
+  `.remote()`). Every project made from a template starts like that, and the
+  site serves those files from `public/` until they are uploaded. They are now
+  reported as **warnings**, grouped into one block per file with the command
+  that uploads them:
+
+  ```
+  content/images.val.ts  ⚠ 7 warnings  (12ms)
+  │
+  │  ⚠  Local files in a project with remote files. Your site serves them from public/ for now; they move to remote storage when uploaded.
+  │
+  │     content/images.val.ts:7:5  /public/val/images/image-0_00000.png
+  │     content/images.val.ts:8:5  /public/val/images/image-1_00001.png
+  │     content/images.val.ts:9:5  /public/val/images/image-2_00002.png
+  │     content/images.val.ts:10:5  /public/val/images/image-3_00003.png
+  │     content/images.val.ts:11:5  /public/val/images/image-4_00004.png
+  │     … 2 more
+  │
+  │     → val validate --fix uploads them (needs val login)
+  │
+
+  ✔ No validation errors · 7 warnings in 1 file
+  ```
+
+  - `--strict` on `val validate` and `val publish` makes warnings fail too.
+  - `val validate --fix` still fails when it cannot upload them, for example
+    when you are not logged in.
+  - A local file that does not exist is still an error.
+  - The language server shows these as warnings.
+  - In the Studio, **Check everything** on the Validate page lists them with a
+    **Fix** button that uploads them, so a hosted project, which
+    has no command line, can move its template's images and files to remote
+    storage. That covers images, files and videos (a video's poster, captions
+    and HLS stream go up with it), images inside rich text included, and the
+    fields that picked a gallery image or a video from a set are updated with
+    it.
+  - On a hosted project, **Check everything** no longer reports the template's
+    images and videos as "The file is gone", and no longer offers a Fix that
+    would remove them from their gallery or video set.
+
+  Fixable errors are now printed with `✘`, like every other error, instead of
+  the `⚠` warnings use. They were always errors and still make `val validate`
+  fail.
+
+- Updated dependencies [[`9171baa`](https://github.com/valbuild/val/commit/9171baad7beb1b2a355c70724d2339467b126e02), [`fd9ee2a`](https://github.com/valbuild/val/commit/fd9ee2ad76ef45bc6c4801aaccaae6e183960f11)]:
+  - @valbuild/core@0.150.1
+  - @valbuild/shared@0.150.1
+  - @valbuild/ui@0.150.1
+
 ## 0.150.0
 
 ### Patch Changes

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var core = require('@valbuild/core');
-var ValRouterCore = require('../../dist/ValRouterCore-fec2cbca.cjs.dev.js');
+var ValRouterCore = require('../../dist/ValRouterCore-f9016ae0.cjs.dev.js');
 require('@valbuild/shared/internal');
 require('zod');
 require('zod-validation-error');

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var core = require('@valbuild/core');
-var ValRouterCore = require('../../dist/ValRouterCore-dfb7b578.cjs.prod.js');
+var ValRouterCore = require('../../dist/ValRouterCore-2e82ae18.cjs.prod.js');
 require('@valbuild/shared/internal');
 require('zod');
 require('zod-validation-error');

package/browser/dist/valbuild-server-browser.esm.js

@@ -1,5 +1,5 @@
 import { DEFAULT_CONTENT_HOST } from '@valbuild/core';
-import { j as ValOpsMemory, E as bytesToBase64, y as ValServer, z as createValRequestHandler } from '../../dist/ValRouterCore-2579e663.esm.js';
+import { j as ValOpsMemory, E as bytesToBase64, y as ValServer, z as createValRequestHandler } from '../../dist/ValRouterCore-b3c6a562.esm.js';
 import '@valbuild/shared/internal';
 import 'zod';
 import 'zod-validation-error';

package/dist/{ValRouterCore-dfb7b578.cjs.prod.js → ValRouterCore-2e82ae18.cjs.prod.js}

@@ -4391,6 +4391,20 @@ class ValOps {
     return null;
   }
 
+  /**
+   * Whether {@link getBinaryFile} can read a PUBLISHED file at all, so that
+   * `null` from it means the file is gone rather than out of reach.
+   *
+   * Not in http mode without a repository -- a hosted project. Its published
+   * binaries are kept in the patch store, and a template's files were never in
+   * a patch: they are in the built site's `public/`, which the content service
+   * never had. A check that read `null` there as "gone" reported every image
+   * and video a template ships with, and offered to remove them.
+   */
+  canReadPublishedFiles() {
+    return true;
+  }
+
   /**
    * Does a press of Publish run as a publish job (valbuild/home,
    * docs/app-mode.md, "Publishing is a queued job")? Never for a project
@@ -9102,7 +9116,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         // TypeScript compiler. See `patch/ts/publishKit.ts`.
         const {
           getJsonEntryAtCommit
-        } = await Promise.resolve().then(function () { return require('./getJsonEntryAtCommit-6bbe1c9d.cjs.prod.js'); });
+        } = await Promise.resolve().then(function () { return require('./getJsonEntryAtCommit-5552ac46.cjs.prod.js'); });
         const res = await getJsonEntryAtCommit(serverOps, req.query.commit_sha, req.query.path, req.query.key);
         if (fp.result.isErr(res)) {
           return historyErrorResponse(res.error);
@@ -10408,6 +10422,11 @@ class ValOpsMemory extends ValOps {
       metadata: file.metadata
     };
   }
+
+  /** See {@link ValOps.canReadPublishedFiles}: `getBinaryFile` never can. */
+  canReadPublishedFiles() {
+    return false;
+  }
   async getBinaryFile(_filePathOrRef) {
     // Null rather than a throw: callers treat this as "no such file", and a
     // read of a local file in a remote-files project is a miss, not a fault.

package/dist/{ValRouterCore-2579e663.esm.js → ValRouterCore-b3c6a562.esm.js}

@@ -4385,6 +4385,20 @@ class ValOps {
     return null;
   }
 
+  /**
+   * Whether {@link getBinaryFile} can read a PUBLISHED file at all, so that
+   * `null` from it means the file is gone rather than out of reach.
+   *
+   * Not in http mode without a repository -- a hosted project. Its published
+   * binaries are kept in the patch store, and a template's files were never in
+   * a patch: they are in the built site's `public/`, which the content service
+   * never had. A check that read `null` there as "gone" reported every image
+   * and video a template ships with, and offered to remove them.
+   */
+  canReadPublishedFiles() {
+    return true;
+  }
+
   /**
    * Does a press of Publish run as a publish job (valbuild/home,
    * docs/app-mode.md, "Publishing is a queued job")? Never for a project
@@ -9096,7 +9110,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         // TypeScript compiler. See `patch/ts/publishKit.ts`.
         const {
           getJsonEntryAtCommit
-        } = await import('./getJsonEntryAtCommit-66544899.esm.js');
+        } = await import('./getJsonEntryAtCommit-ad6deabd.esm.js');
         const res = await getJsonEntryAtCommit(serverOps, req.query.commit_sha, req.query.path, req.query.key);
         if (result.isErr(res)) {
           return historyErrorResponse(res.error);
@@ -10402,6 +10416,11 @@ class ValOpsMemory extends ValOps {
       metadata: file.metadata
     };
   }
+
+  /** See {@link ValOps.canReadPublishedFiles}: `getBinaryFile` never can. */
+  canReadPublishedFiles() {
+    return false;
+  }
   async getBinaryFile(_filePathOrRef) {
     // Null rather than a throw: callers treat this as "no such file", and a
     // read of a local file in a remote-files project is a miss, not a fault.

package/dist/{ValRouterCore-fec2cbca.cjs.dev.js → ValRouterCore-f9016ae0.cjs.dev.js}

@@ -4391,6 +4391,20 @@ class ValOps {
     return null;
   }
 
+  /**
+   * Whether {@link getBinaryFile} can read a PUBLISHED file at all, so that
+   * `null` from it means the file is gone rather than out of reach.
+   *
+   * Not in http mode without a repository -- a hosted project. Its published
+   * binaries are kept in the patch store, and a template's files were never in
+   * a patch: they are in the built site's `public/`, which the content service
+   * never had. A check that read `null` there as "gone" reported every image
+   * and video a template ships with, and offered to remove them.
+   */
+  canReadPublishedFiles() {
+    return true;
+  }
+
   /**
    * Does a press of Publish run as a publish job (valbuild/home,
    * docs/app-mode.md, "Publishing is a queued job")? Never for a project
@@ -9102,7 +9116,7 @@ const ValServer = (valModules, options, callbacks, platform) => {
         // TypeScript compiler. See `patch/ts/publishKit.ts`.
         const {
           getJsonEntryAtCommit
-        } = await Promise.resolve().then(function () { return require('./getJsonEntryAtCommit-80bf8f02.cjs.dev.js'); });
+        } = await Promise.resolve().then(function () { return require('./getJsonEntryAtCommit-b8469ec5.cjs.dev.js'); });
         const res = await getJsonEntryAtCommit(serverOps, req.query.commit_sha, req.query.path, req.query.key);
         if (fp.result.isErr(res)) {
           return historyErrorResponse(res.error);
@@ -10408,6 +10422,11 @@ class ValOpsMemory extends ValOps {
       metadata: file.metadata
     };
   }
+
+  /** See {@link ValOps.canReadPublishedFiles}: `getBinaryFile` never can. */
+  canReadPublishedFiles() {
+    return false;
+  }
   async getBinaryFile(_filePathOrRef) {
     // Null rather than a throw: callers treat this as "no such file", and a
     // read of a local file in a remote-files project is a miss, not a fault.

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

@@ -483,6 +483,17 @@ export declare abstract class ValOps {
      * an older service.
      */
     sourceMode(): "managed" | "connected" | null;
+    /**
+     * Whether {@link getBinaryFile} can read a PUBLISHED file at all, so that
+     * `null` from it means the file is gone rather than out of reach.
+     *
+     * Not in http mode without a repository -- a hosted project. Its published
+     * binaries are kept in the patch store, and a template's files were never in
+     * a patch: they are in the built site's `public/`, which the content service
+     * never had. A check that read `null` there as "gone" reported every image
+     * and video a template ships with, and offered to remove them.
+     */
+    canReadPublishedFiles(): boolean;
     /**
      * Does a press of Publish run as a publish job (valbuild/home,
      * docs/app-mode.md, "Publishing is a queued job")? Never for a project

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

@@ -186,6 +186,8 @@ export declare class ValOpsHttp extends ValOps {
      * has just arrived.
      */
     sourceMode(): "managed" | "connected" | null;
+    /** See {@link ValOps.canReadPublishedFiles}: not without a repository. */
+    canReadPublishedFiles(): boolean;
     /** Remembered with {@link sourceMode}, from the same response. */
     projectBranch(): string | null;
     /**

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

@@ -296,6 +296,8 @@ export declare class ValOpsMemory extends ValOps {
     }>>;
     getBase64EncodedBinaryFileFromPatch(filePath: string, patchId: PatchId, _remote?: boolean): Promise<Uint8Array | null>;
     protected getBase64EncodedBinaryFileMetadataFromPatch<T extends "file" | "image">(filePath: string, type: T, patchId: PatchId, _remote?: boolean): Promise<OpsMetadata<T>>;
+    /** See {@link ValOps.canReadPublishedFiles}: `getBinaryFile` never can. */
+    canReadPublishedFiles(): boolean;
     getBinaryFile(_filePathOrRef: string): Promise<Uint8Array | null>;
     protected getBinaryFileMetadata<T extends "file" | "image">(_filePath: string, _type: T): Promise<OpsMetadata<T>>;
     listCommits(): Promise<result.Result<CommitPage, HistoryError>>;

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

@@ -101,6 +101,7 @@ export type FixHandlerResult = {
     shouldApplyPatch?: boolean;
     appliedFix?: boolean;
     fixableErrorMessage?: string;
+    warning?: ValidationWarning;
     /**
      * Patches to OTHER modules than the one the fix is about, for the caller to
      * apply alongside the fix's own patch (and only when it applies that one).
@@ -116,6 +117,11 @@ export type FixHandlerResult = {
     remoteFilesCounter?: number;
     events?: ValidationEvent[];
 };
+export type ValidationWarning = {
+    message: string;
+    files: string[];
+    hint?: string;
+};
 /** A patch, and the module it is for. */
 export type ModulePatch = {
     moduleFilePath: ModuleFilePath;
@@ -146,7 +152,18 @@ export type ValidationEvent = {
     keyError?: boolean;
     /** See `isRepairedOnSave`: the Studio would not hold a publish for it. */
     repairedOnSave?: boolean;
-} | {
+}
+/**
+ * Reported, and not counted as an error: `val validate` exits 0 on warnings
+ * alone unless `--strict`. So a module with warnings and no errors is still
+ * `file-valid`, which means "no errors"; the CLI shows it with its warnings
+ * rather than in the list of valid modules.
+ */
+ | ({
+    type: "validation-warning";
+    sourcePath: string;
+    keyError?: boolean;
+} & ValidationWarning) | {
     type: "unknown-fix";
     sourcePath: string;
     fixes: string[];

package/dist/{getJsonEntryAtCommit-6bbe1c9d.cjs.prod.js → getJsonEntryAtCommit-5552ac46.cjs.prod.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var ts = require('typescript');
-var ValRouterCore = require('./ValRouterCore-dfb7b578.cjs.prod.js');
+var ValRouterCore = require('./ValRouterCore-2e82ae18.cjs.prod.js');
 var fp = require('@valbuild/core/fp');
 var jsonValuesModule = require('./jsonValuesModule-d1bb8d8f.cjs.prod.js');
 require('@valbuild/core');

package/dist/{getJsonEntryAtCommit-66544899.esm.js → getJsonEntryAtCommit-ad6deabd.esm.js}

@@ -1,5 +1,5 @@
 import ts from 'typescript';
-import { F as bytesToUtf8, G as posixPath } from './ValRouterCore-2579e663.esm.js';
+import { F as bytesToUtf8, G as posixPath } from './ValRouterCore-b3c6a562.esm.js';
 import { result } from '@valbuild/core/fp';
 import { a as analyzeValModule, c as analyzeJsonValuesEntries } from './jsonValuesModule-427d68c8.esm.js';
 import '@valbuild/core';

package/dist/{getJsonEntryAtCommit-80bf8f02.cjs.dev.js → getJsonEntryAtCommit-b8469ec5.cjs.dev.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var ts = require('typescript');
-var ValRouterCore = require('./ValRouterCore-fec2cbca.cjs.dev.js');
+var ValRouterCore = require('./ValRouterCore-f9016ae0.cjs.dev.js');
 var fp = require('@valbuild/core/fp');
 var jsonValuesModule = require('./jsonValuesModule-8ae503a8.cjs.dev.js');
 require('@valbuild/core');

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

@@ -12,7 +12,7 @@ var path = require('path');
 var fs = require('fs');
 var vm = require('node:vm');
 var node_module = require('node:module');
-var ValRouterCore = require('./ValRouterCore-fec2cbca.cjs.dev.js');
+var ValRouterCore = require('./ValRouterCore-f9016ae0.cjs.dev.js');
 var server = require('@valbuild/ui/server');
 var z = require('zod');
 var zodValidationError = require('zod-validation-error');
@@ -5587,6 +5587,11 @@ class ValOpsHttp extends ValRouterCore.ValOps {
     return ((_this$projectExpectat2 = this.projectExpectation) === null || _this$projectExpectat2 === void 0 ? void 0 : _this$projectExpectat2.sourceMode) ?? null;
   }
 
+  /** See {@link ValOps.canReadPublishedFiles}: not without a repository. */
+  canReadPublishedFiles() {
+    return this.git !== null;
+  }
+
   /** Remembered with {@link sourceMode}, from the same response. */
   projectBranch() {
     var _this$projectExpectat3;
@@ -10546,6 +10551,23 @@ function diskFixFiles(projectRoot) {
 
 const textEncoder = new TextEncoder();
 
+/**
+ * What an upload fix answers when `--fix` is off and the files it would upload
+ * are all there: a warning, not an error (`WARNING_FIXES` in
+ * `@valbuild/shared`). Asked only after the files were found, so a missing one
+ * is still reported as the error it is.
+ */
+function localFilesWarning(files) {
+  return {
+    success: true,
+    warning: {
+      message: internal.LOCAL_FILE_IN_REMOTE_PROJECT_WARNING,
+      files,
+      hint: internal.LOCAL_FILE_IN_REMOTE_PROJECT_HINT
+    }
+  };
+}
+
 /**
  * Everything an upload to Val Remote needs before it has any bytes: the
  * developer's token, the project's public id and a bucket. Opened once per
@@ -11002,12 +11024,6 @@ function movablePathsOf(video, schema) {
   }) => !setBacked || at[0] !== "path");
 }
 async function handleVideoUploadRemote(ctx) {
-  if (!ctx.fix) {
-    return {
-      success: false,
-      errorMessage: `Video needs to be uploaded to Val Remote (use --fix to upload)`
-    };
-  }
   const resolved = resolveVideo(ctx);
   if (!resolved.success) {
     return resolved.result;
@@ -11046,6 +11062,11 @@ async function handleVideoUploadRemote(ctx) {
       errorMessage: `File ${missing} does not exist`
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning(toUpload.map(({
+      path: ref
+    }) => ref));
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -11816,13 +11837,6 @@ async function handleVideosetCheckRemote(ctx) {
  * stays, and the entry is written back with their refs.
  */
 async function handleVideosetUploadRemote(ctx) {
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Video needs to be uploaded to Val Remote (use --fix to upload)`
-    };
-  }
   const key = ctx.validationError.value;
   if (typeof key !== "string") {
     return {
@@ -11869,6 +11883,9 @@ async function handleVideosetUploadRemote(ctx) {
       errorMessage: `File ${missing} does not exist`
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning([...(keyIsLocal ? [key] : []), ...entryFiles.map(file => file.path)]);
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -13047,7 +13064,12 @@ async function checkModuleForStudio(ops, input) {
   // not judge without the bytes — which is every image that has metadata at
   // all. Reading them is what turns "has metadata" into "has the RIGHT
   // metadata".
-  const fileErrors = await ops.validateFiles(schemas, sources, validation.files, input.fileLastUpdatedByPatchId);
+  // A published file this server cannot read is not judged at all: in a
+  // hosted project a template's files are in the built site, not the content
+  // service (`ValOps.canReadPublishedFiles`), and reading them reported every
+  // one as unreadable.
+  const readableFiles = ops.canReadPublishedFiles() ? validation.files : Object.fromEntries(Object.entries(validation.files).filter(([, file]) => input.fileLastUpdatedByPatchId[file.path] !== undefined));
+  const fileErrors = await ops.validateFiles(schemas, sources, readableFiles, input.fileLastUpdatedByPatchId);
   for (const [sourcePath, found] of Object.entries(fileErrors)) {
     add(sourcePath, found);
   }
@@ -13105,6 +13127,10 @@ function isEntries(source) {
  *   is never compared with the file (`videosetCheckAllFilesPatch` says why).
  * - **A remote entry** is asked of its host, as any remote file is, but only
  *   whether the host has it (`existenceOnly`).
+ * - **A local entry this server cannot read** is skipped: in a hosted project
+ *   a template's files are in the built site, not the content service
+ *   (`ValOps.canReadPublishedFiles`), and "gone" would be a lie whose fix
+ *   deletes the entry. Its `*:upload-remote` row is what moves it.
  */
 async function checkMediaDirEntries(ops, input, onlyKey) {
   const errors = {};
@@ -13131,9 +13157,15 @@ async function checkMediaDirEntries(ops, input, onlyKey) {
       };
       continue;
     }
+    const fromPatch = input.fileLastUpdatedByPatchId[entry.localPath] ?? null;
+    if (fromPatch === null && !ops.canReadPublishedFiles()) {
+      // Nowhere to read it from -- a hosted project's template files are in
+      // the built site, not the content service -- so nothing to say about
+      // it. Never "gone": that row's fix removes the entry.
+      continue;
+    }
     if (type === "videos") {
       // A video: there or not, and nothing else. See above.
-      const fromPatch = input.fileLastUpdatedByPatchId[entry.localPath] ?? null;
       const reader = await ops.openBinaryFile(entry.localPath, fromPatch);
       if (reader === null) {
         errors[entryPath] = [{
@@ -14034,6 +14066,9 @@ async function uploadRemoteFileCore(ctx, fileRef, metadata, schema) {
       }]
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning([fileRef]);
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -14080,13 +14115,6 @@ async function uploadRemoteFileCore(ctx, fileRef, metadata, schema) {
 }
 async function handleRemoteFileUpload(ctx) {
   var _resolvedRemoteFileAt;
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Remote file needs to be uploaded (use --fix to upload)`
-    };
-  }
   const [, modulePath] = core.Internal.splitModuleFilePathAndModulePath(ctx.sourcePath);
   if (!ctx.valModule.source || !ctx.valModule.schema) {
     return {
@@ -14104,7 +14132,11 @@ async function handleRemoteFileUpload(ctx) {
       errorMessage: `Expected file to be defined at: ${ctx.sourcePath} but no file was found`
     };
   }
-  const resolveRemoteFileSchema = resolvedRemoteFileAtSourcePath.schema;
+
+  // A rich text image's `src` resolves to the RICH TEXT schema when the schema
+  // is serialized, as it is here: the image schema is its `img` option.
+  const resolvedSchema = resolvedRemoteFileAtSourcePath.schema;
+  const resolveRemoteFileSchema = (resolvedSchema === null || resolvedSchema === void 0 ? void 0 : resolvedSchema.type) === "richtext" ? internal.richTextImageSchema(resolvedSchema) : resolvedSchema;
   if (!resolveRemoteFileSchema) {
     return {
       success: false,
@@ -14138,13 +14170,6 @@ async function handleRemoteFileUpload(ctx) {
 // media options.
 async function handleRemoteGalleryFileUpload(ctx) {
   var _ctx$validationError$, _ctx$remoteFiles$ctx$;
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Remote file needs to be uploaded (use --fix to upload)`
-    };
-  }
   const fix = (_ctx$validationError$ = ctx.validationError.fixes) === null || _ctx$validationError$ === void 0 ? void 0 : _ctx$validationError$[0];
   const mediaType = fix === "files:upload-remote" ? "file" : "image";
 
@@ -14186,30 +14211,7 @@ async function handleRemoteGalleryFileUpload(ctx) {
       errorMessage: `Expected a gallery record at the parent of ${ctx.sourcePath}, got ${(recordSchema === null || recordSchema === void 0 ? void 0 : recordSchema.type) ?? "nothing"}`
     };
   }
-  const {
-    accept,
-    dir
-  } = recordSchema;
-  const schema = mediaType === "image" ? {
-    type: "image",
-    opt: false,
-    options: {
-      ...(accept ? {
-        accept
-      } : {}),
-      ...(dir ? {
-        dir
-      } : {})
-    }
-  } : {
-    type: "file",
-    opt: false,
-    options: {
-      ...(accept ? {
-        accept
-      } : {})
-    }
-  };
+  const schema = core.Internal.galleryEntryMediaSchema(mediaType, recordSchema);
   const uploaded = await uploadRemoteFileCore(ctx, fileRef, metadata, schema);
   const ref = (_ctx$remoteFiles$ctx$ = ctx.remoteFiles[ctx.sourcePath]) === null || _ctx$remoteFiles$ctx$ === void 0 ? void 0 : _ctx$remoteFiles$ctx$.ref;
   if (!uploaded.success || !uploaded.shouldApplyPatch || ref === undefined) {

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

@@ -12,7 +12,7 @@ var path = require('path');
 var fs = require('fs');
 var vm = require('node:vm');
 var node_module = require('node:module');
-var ValRouterCore = require('./ValRouterCore-dfb7b578.cjs.prod.js');
+var ValRouterCore = require('./ValRouterCore-2e82ae18.cjs.prod.js');
 var server = require('@valbuild/ui/server');
 var z = require('zod');
 var zodValidationError = require('zod-validation-error');
@@ -5587,6 +5587,11 @@ class ValOpsHttp extends ValRouterCore.ValOps {
     return ((_this$projectExpectat2 = this.projectExpectation) === null || _this$projectExpectat2 === void 0 ? void 0 : _this$projectExpectat2.sourceMode) ?? null;
   }
 
+  /** See {@link ValOps.canReadPublishedFiles}: not without a repository. */
+  canReadPublishedFiles() {
+    return this.git !== null;
+  }
+
   /** Remembered with {@link sourceMode}, from the same response. */
   projectBranch() {
     var _this$projectExpectat3;
@@ -10546,6 +10551,23 @@ function diskFixFiles(projectRoot) {
 
 const textEncoder = new TextEncoder();
 
+/**
+ * What an upload fix answers when `--fix` is off and the files it would upload
+ * are all there: a warning, not an error (`WARNING_FIXES` in
+ * `@valbuild/shared`). Asked only after the files were found, so a missing one
+ * is still reported as the error it is.
+ */
+function localFilesWarning(files) {
+  return {
+    success: true,
+    warning: {
+      message: internal.LOCAL_FILE_IN_REMOTE_PROJECT_WARNING,
+      files,
+      hint: internal.LOCAL_FILE_IN_REMOTE_PROJECT_HINT
+    }
+  };
+}
+
 /**
  * Everything an upload to Val Remote needs before it has any bytes: the
  * developer's token, the project's public id and a bucket. Opened once per
@@ -11002,12 +11024,6 @@ function movablePathsOf(video, schema) {
   }) => !setBacked || at[0] !== "path");
 }
 async function handleVideoUploadRemote(ctx) {
-  if (!ctx.fix) {
-    return {
-      success: false,
-      errorMessage: `Video needs to be uploaded to Val Remote (use --fix to upload)`
-    };
-  }
   const resolved = resolveVideo(ctx);
   if (!resolved.success) {
     return resolved.result;
@@ -11046,6 +11062,11 @@ async function handleVideoUploadRemote(ctx) {
       errorMessage: `File ${missing} does not exist`
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning(toUpload.map(({
+      path: ref
+    }) => ref));
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -11816,13 +11837,6 @@ async function handleVideosetCheckRemote(ctx) {
  * stays, and the entry is written back with their refs.
  */
 async function handleVideosetUploadRemote(ctx) {
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Video needs to be uploaded to Val Remote (use --fix to upload)`
-    };
-  }
   const key = ctx.validationError.value;
   if (typeof key !== "string") {
     return {
@@ -11869,6 +11883,9 @@ async function handleVideosetUploadRemote(ctx) {
       errorMessage: `File ${missing} does not exist`
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning([...(keyIsLocal ? [key] : []), ...entryFiles.map(file => file.path)]);
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -13047,7 +13064,12 @@ async function checkModuleForStudio(ops, input) {
   // not judge without the bytes — which is every image that has metadata at
   // all. Reading them is what turns "has metadata" into "has the RIGHT
   // metadata".
-  const fileErrors = await ops.validateFiles(schemas, sources, validation.files, input.fileLastUpdatedByPatchId);
+  // A published file this server cannot read is not judged at all: in a
+  // hosted project a template's files are in the built site, not the content
+  // service (`ValOps.canReadPublishedFiles`), and reading them reported every
+  // one as unreadable.
+  const readableFiles = ops.canReadPublishedFiles() ? validation.files : Object.fromEntries(Object.entries(validation.files).filter(([, file]) => input.fileLastUpdatedByPatchId[file.path] !== undefined));
+  const fileErrors = await ops.validateFiles(schemas, sources, readableFiles, input.fileLastUpdatedByPatchId);
   for (const [sourcePath, found] of Object.entries(fileErrors)) {
     add(sourcePath, found);
   }
@@ -13105,6 +13127,10 @@ function isEntries(source) {
  *   is never compared with the file (`videosetCheckAllFilesPatch` says why).
  * - **A remote entry** is asked of its host, as any remote file is, but only
  *   whether the host has it (`existenceOnly`).
+ * - **A local entry this server cannot read** is skipped: in a hosted project
+ *   a template's files are in the built site, not the content service
+ *   (`ValOps.canReadPublishedFiles`), and "gone" would be a lie whose fix
+ *   deletes the entry. Its `*:upload-remote` row is what moves it.
  */
 async function checkMediaDirEntries(ops, input, onlyKey) {
   const errors = {};
@@ -13131,9 +13157,15 @@ async function checkMediaDirEntries(ops, input, onlyKey) {
       };
       continue;
     }
+    const fromPatch = input.fileLastUpdatedByPatchId[entry.localPath] ?? null;
+    if (fromPatch === null && !ops.canReadPublishedFiles()) {
+      // Nowhere to read it from -- a hosted project's template files are in
+      // the built site, not the content service -- so nothing to say about
+      // it. Never "gone": that row's fix removes the entry.
+      continue;
+    }
     if (type === "videos") {
       // A video: there or not, and nothing else. See above.
-      const fromPatch = input.fileLastUpdatedByPatchId[entry.localPath] ?? null;
       const reader = await ops.openBinaryFile(entry.localPath, fromPatch);
       if (reader === null) {
         errors[entryPath] = [{
@@ -14034,6 +14066,9 @@ async function uploadRemoteFileCore(ctx, fileRef, metadata, schema) {
       }]
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning([fileRef]);
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -14080,13 +14115,6 @@ async function uploadRemoteFileCore(ctx, fileRef, metadata, schema) {
 }
 async function handleRemoteFileUpload(ctx) {
   var _resolvedRemoteFileAt;
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Remote file needs to be uploaded (use --fix to upload)`
-    };
-  }
   const [, modulePath] = core.Internal.splitModuleFilePathAndModulePath(ctx.sourcePath);
   if (!ctx.valModule.source || !ctx.valModule.schema) {
     return {
@@ -14104,7 +14132,11 @@ async function handleRemoteFileUpload(ctx) {
       errorMessage: `Expected file to be defined at: ${ctx.sourcePath} but no file was found`
     };
   }
-  const resolveRemoteFileSchema = resolvedRemoteFileAtSourcePath.schema;
+
+  // A rich text image's `src` resolves to the RICH TEXT schema when the schema
+  // is serialized, as it is here: the image schema is its `img` option.
+  const resolvedSchema = resolvedRemoteFileAtSourcePath.schema;
+  const resolveRemoteFileSchema = (resolvedSchema === null || resolvedSchema === void 0 ? void 0 : resolvedSchema.type) === "richtext" ? internal.richTextImageSchema(resolvedSchema) : resolvedSchema;
   if (!resolveRemoteFileSchema) {
     return {
       success: false,
@@ -14138,13 +14170,6 @@ async function handleRemoteFileUpload(ctx) {
 // media options.
 async function handleRemoteGalleryFileUpload(ctx) {
   var _ctx$validationError$, _ctx$remoteFiles$ctx$;
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Remote file needs to be uploaded (use --fix to upload)`
-    };
-  }
   const fix = (_ctx$validationError$ = ctx.validationError.fixes) === null || _ctx$validationError$ === void 0 ? void 0 : _ctx$validationError$[0];
   const mediaType = fix === "files:upload-remote" ? "file" : "image";
 
@@ -14186,30 +14211,7 @@ async function handleRemoteGalleryFileUpload(ctx) {
       errorMessage: `Expected a gallery record at the parent of ${ctx.sourcePath}, got ${(recordSchema === null || recordSchema === void 0 ? void 0 : recordSchema.type) ?? "nothing"}`
     };
   }
-  const {
-    accept,
-    dir
-  } = recordSchema;
-  const schema = mediaType === "image" ? {
-    type: "image",
-    opt: false,
-    options: {
-      ...(accept ? {
-        accept
-      } : {}),
-      ...(dir ? {
-        dir
-      } : {})
-    }
-  } : {
-    type: "file",
-    opt: false,
-    options: {
-      ...(accept ? {
-        accept
-      } : {})
-    }
-  };
+  const schema = core.Internal.galleryEntryMediaSchema(mediaType, recordSchema);
   const uploaded = await uploadRemoteFileCore(ctx, fileRef, metadata, schema);
   const ref = (_ctx$remoteFiles$ctx$ = ctx.remoteFiles[ctx.sourcePath]) === null || _ctx$remoteFiles$ctx$ === void 0 ? void 0 : _ctx$remoteFiles$ctx$.ref;
   if (!uploaded.success || !uploaded.shouldApplyPatch || ref === undefined) {

package/dist/valbuild-server.esm.js

@@ -10,12 +10,12 @@ import path from 'path';
 import fs from 'fs';
 import vm from 'node:vm';
 import { Module } from 'node:module';
-import { r as resolveExistingJsonPath, f as findNestedJsonValuesRecords, v as validateJsonValuesEntries, i as isJsonValuesRootOp, a as rebaseContentOp, c as classifyJsonValuesOp, V as ValOps, b as bufferFromDataUrl, g as getFieldsForType, u as uploadRemoteFile, d as getFileExt, e as guessMimeTypeFromPath, h as createMetadataFromBuffer, j as ValOpsMemory, k as isHlsMasterPlaylist, s as sumHlsSegmentDurations, p as parseHlsMasterVariants, l as largestHlsVariant, m as fallbackRefOf, n as mapHlsUris, o as movedRemoteHost, q as needsHostCheck, t as rewriteRefHost, w as fallbackRemoteHost, x as checkRemoteFiles, y as ValServer, z as createValRequestHandler, A as getNewJsonEntryPaths, B as formatPatchSourceError } from './ValRouterCore-2579e663.esm.js';
-export { I as InMemoryPatchStore, j as ValOpsMemory, C as askOncePerHost, c as classifyJsonValuesOp, B as formatPatchSourceError, d as getFileExt, D as getSettings, a as rebaseContentOp, u as uploadRemoteFile } from './ValRouterCore-2579e663.esm.js';
+import { r as resolveExistingJsonPath, f as findNestedJsonValuesRecords, v as validateJsonValuesEntries, i as isJsonValuesRootOp, a as rebaseContentOp, c as classifyJsonValuesOp, V as ValOps, b as bufferFromDataUrl, g as getFieldsForType, u as uploadRemoteFile, d as getFileExt, e as guessMimeTypeFromPath, h as createMetadataFromBuffer, j as ValOpsMemory, k as isHlsMasterPlaylist, s as sumHlsSegmentDurations, p as parseHlsMasterVariants, l as largestHlsVariant, m as fallbackRefOf, n as mapHlsUris, o as movedRemoteHost, q as needsHostCheck, t as rewriteRefHost, w as fallbackRemoteHost, x as checkRemoteFiles, y as ValServer, z as createValRequestHandler, A as getNewJsonEntryPaths, B as formatPatchSourceError } from './ValRouterCore-b3c6a562.esm.js';
+export { I as InMemoryPatchStore, j as ValOpsMemory, C as askOncePerHost, c as classifyJsonValuesOp, B as formatPatchSourceError, d as getFileExt, D as getSettings, a as rebaseContentOp, u as uploadRemoteFile } from './ValRouterCore-b3c6a562.esm.js';
 import { createUIRequestHandler } from '@valbuild/ui/server';
 import z$1, { z } from 'zod';
 import { fromError } from 'zod-validation-error';
-import { Patch, schemaErrorsOf, PatchSets, joinSharedChanges, schemaTypesOfPath, sideFiles, sideSource, JSONValue, PlanRefusalError, PatchId as PatchId$1, SerializedSchema, getErrorMessageFromUnknownJson, newestCommitSha, traverseSchemaSource, richTextImageSchema, forEachRichTextImage, isStudioFix } from '@valbuild/shared/internal';
+import { Patch, schemaErrorsOf, PatchSets, joinSharedChanges, schemaTypesOfPath, sideFiles, sideSource, JSONValue, PlanRefusalError, PatchId as PatchId$1, SerializedSchema, getErrorMessageFromUnknownJson, newestCommitSha, LOCAL_FILE_IN_REMOTE_PROJECT_WARNING, LOCAL_FILE_IN_REMOTE_PROJECT_HINT, traverseSchemaSource, richTextImageSchema, forEachRichTextImage, isStudioFix } from '@valbuild/shared/internal';
 import os from 'os';
 import crypto$1, { createHash } from 'crypto';
 import { Buffer as Buffer$1 } from 'buffer';
@@ -5551,6 +5551,11 @@ class ValOpsHttp extends ValOps {
     return ((_this$projectExpectat2 = this.projectExpectation) === null || _this$projectExpectat2 === void 0 ? void 0 : _this$projectExpectat2.sourceMode) ?? null;
   }
 
+  /** See {@link ValOps.canReadPublishedFiles}: not without a repository. */
+  canReadPublishedFiles() {
+    return this.git !== null;
+  }
+
   /** Remembered with {@link sourceMode}, from the same response. */
   projectBranch() {
     var _this$projectExpectat3;
@@ -10510,6 +10515,23 @@ function diskFixFiles(projectRoot) {
 
 const textEncoder = new TextEncoder();
 
+/**
+ * What an upload fix answers when `--fix` is off and the files it would upload
+ * are all there: a warning, not an error (`WARNING_FIXES` in
+ * `@valbuild/shared`). Asked only after the files were found, so a missing one
+ * is still reported as the error it is.
+ */
+function localFilesWarning(files) {
+  return {
+    success: true,
+    warning: {
+      message: LOCAL_FILE_IN_REMOTE_PROJECT_WARNING,
+      files,
+      hint: LOCAL_FILE_IN_REMOTE_PROJECT_HINT
+    }
+  };
+}
+
 /**
  * Everything an upload to Val Remote needs before it has any bytes: the
  * developer's token, the project's public id and a bucket. Opened once per
@@ -10966,12 +10988,6 @@ function movablePathsOf(video, schema) {
   }) => !setBacked || at[0] !== "path");
 }
 async function handleVideoUploadRemote(ctx) {
-  if (!ctx.fix) {
-    return {
-      success: false,
-      errorMessage: `Video needs to be uploaded to Val Remote (use --fix to upload)`
-    };
-  }
   const resolved = resolveVideo(ctx);
   if (!resolved.success) {
     return resolved.result;
@@ -11010,6 +11026,11 @@ async function handleVideoUploadRemote(ctx) {
       errorMessage: `File ${missing} does not exist`
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning(toUpload.map(({
+      path: ref
+    }) => ref));
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -11780,13 +11801,6 @@ async function handleVideosetCheckRemote(ctx) {
  * stays, and the entry is written back with their refs.
  */
 async function handleVideosetUploadRemote(ctx) {
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Video needs to be uploaded to Val Remote (use --fix to upload)`
-    };
-  }
   const key = ctx.validationError.value;
   if (typeof key !== "string") {
     return {
@@ -11833,6 +11847,9 @@ async function handleVideosetUploadRemote(ctx) {
       errorMessage: `File ${missing} does not exist`
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning([...(keyIsLocal ? [key] : []), ...entryFiles.map(file => file.path)]);
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -13011,7 +13028,12 @@ async function checkModuleForStudio(ops, input) {
   // not judge without the bytes — which is every image that has metadata at
   // all. Reading them is what turns "has metadata" into "has the RIGHT
   // metadata".
-  const fileErrors = await ops.validateFiles(schemas, sources, validation.files, input.fileLastUpdatedByPatchId);
+  // A published file this server cannot read is not judged at all: in a
+  // hosted project a template's files are in the built site, not the content
+  // service (`ValOps.canReadPublishedFiles`), and reading them reported every
+  // one as unreadable.
+  const readableFiles = ops.canReadPublishedFiles() ? validation.files : Object.fromEntries(Object.entries(validation.files).filter(([, file]) => input.fileLastUpdatedByPatchId[file.path] !== undefined));
+  const fileErrors = await ops.validateFiles(schemas, sources, readableFiles, input.fileLastUpdatedByPatchId);
   for (const [sourcePath, found] of Object.entries(fileErrors)) {
     add(sourcePath, found);
   }
@@ -13069,6 +13091,10 @@ function isEntries(source) {
  *   is never compared with the file (`videosetCheckAllFilesPatch` says why).
  * - **A remote entry** is asked of its host, as any remote file is, but only
  *   whether the host has it (`existenceOnly`).
+ * - **A local entry this server cannot read** is skipped: in a hosted project
+ *   a template's files are in the built site, not the content service
+ *   (`ValOps.canReadPublishedFiles`), and "gone" would be a lie whose fix
+ *   deletes the entry. Its `*:upload-remote` row is what moves it.
  */
 async function checkMediaDirEntries(ops, input, onlyKey) {
   const errors = {};
@@ -13095,9 +13121,15 @@ async function checkMediaDirEntries(ops, input, onlyKey) {
       };
       continue;
     }
+    const fromPatch = input.fileLastUpdatedByPatchId[entry.localPath] ?? null;
+    if (fromPatch === null && !ops.canReadPublishedFiles()) {
+      // Nowhere to read it from -- a hosted project's template files are in
+      // the built site, not the content service -- so nothing to say about
+      // it. Never "gone": that row's fix removes the entry.
+      continue;
+    }
     if (type === "videos") {
       // A video: there or not, and nothing else. See above.
-      const fromPatch = input.fileLastUpdatedByPatchId[entry.localPath] ?? null;
       const reader = await ops.openBinaryFile(entry.localPath, fromPatch);
       if (reader === null) {
         errors[entryPath] = [{
@@ -13998,6 +14030,9 @@ async function uploadRemoteFileCore(ctx, fileRef, metadata, schema) {
       }]
     };
   }
+  if (!ctx.fix) {
+    return localFilesWarning([fileRef]);
+  }
   const opened = await openRemoteUploadSession(ctx);
   if (!opened.success) {
     return opened.result;
@@ -14044,13 +14079,6 @@ async function uploadRemoteFileCore(ctx, fileRef, metadata, schema) {
 }
 async function handleRemoteFileUpload(ctx) {
   var _resolvedRemoteFileAt;
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Remote file needs to be uploaded (use --fix to upload)`
-    };
-  }
   const [, modulePath] = Internal.splitModuleFilePathAndModulePath(ctx.sourcePath);
   if (!ctx.valModule.source || !ctx.valModule.schema) {
     return {
@@ -14068,7 +14096,11 @@ async function handleRemoteFileUpload(ctx) {
       errorMessage: `Expected file to be defined at: ${ctx.sourcePath} but no file was found`
     };
   }
-  const resolveRemoteFileSchema = resolvedRemoteFileAtSourcePath.schema;
+
+  // A rich text image's `src` resolves to the RICH TEXT schema when the schema
+  // is serialized, as it is here: the image schema is its `img` option.
+  const resolvedSchema = resolvedRemoteFileAtSourcePath.schema;
+  const resolveRemoteFileSchema = (resolvedSchema === null || resolvedSchema === void 0 ? void 0 : resolvedSchema.type) === "richtext" ? richTextImageSchema(resolvedSchema) : resolvedSchema;
   if (!resolveRemoteFileSchema) {
     return {
       success: false,
@@ -14102,13 +14134,6 @@ async function handleRemoteFileUpload(ctx) {
 // media options.
 async function handleRemoteGalleryFileUpload(ctx) {
   var _ctx$validationError$, _ctx$remoteFiles$ctx$;
-  if (!ctx.fix) {
-    return {
-      success: false,
-      // No sourcePath in the message: the reported location already points at it.
-      errorMessage: `Remote file needs to be uploaded (use --fix to upload)`
-    };
-  }
   const fix = (_ctx$validationError$ = ctx.validationError.fixes) === null || _ctx$validationError$ === void 0 ? void 0 : _ctx$validationError$[0];
   const mediaType = fix === "files:upload-remote" ? "file" : "image";
 
@@ -14150,30 +14175,7 @@ async function handleRemoteGalleryFileUpload(ctx) {
       errorMessage: `Expected a gallery record at the parent of ${ctx.sourcePath}, got ${(recordSchema === null || recordSchema === void 0 ? void 0 : recordSchema.type) ?? "nothing"}`
     };
   }
-  const {
-    accept,
-    dir
-  } = recordSchema;
-  const schema = mediaType === "image" ? {
-    type: "image",
-    opt: false,
-    options: {
-      ...(accept ? {
-        accept
-      } : {}),
-      ...(dir ? {
-        dir
-      } : {})
-    }
-  } : {
-    type: "file",
-    opt: false,
-    options: {
-      ...(accept ? {
-        accept
-      } : {})
-    }
-  };
+  const schema = Internal.galleryEntryMediaSchema(mediaType, recordSchema);
   const uploaded = await uploadRemoteFileCore(ctx, fileRef, metadata, schema);
   const ref = (_ctx$remoteFiles$ctx$ = ctx.remoteFiles[ctx.sourcePath]) === null || _ctx$remoteFiles$ctx$ === void 0 ? void 0 : _ctx$remoteFiles$ctx$.ref;
   if (!uploaded.success || !uploaded.shouldApplyPatch || ref === undefined) {

package/package.json

@@ -27,7 +27,7 @@
     ],
     "exports": true
   },
-  "version": "0.150.0",
+  "version": "0.150.1",
   "devDependencies": {
     "@prettier/sync": "^0.6.1",
     "@types/jest": "^30.0.0",
@@ -41,9 +41,9 @@
     "typescript": "^6.0.3",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.148.7",
-    "@valbuild/shared": "0.149.7",
-    "@valbuild/ui": "0.150.0"
+    "@valbuild/core": "0.150.1",
+    "@valbuild/shared": "0.150.1",
+    "@valbuild/ui": "0.150.1"
   },
   "engines": {
     "node": "^20.19.0 || >=22"