@valbuild/shared 0.143.0 → 0.144.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @valbuild/shared
 
+## 0.144.0
+
+### Patch Changes
+
+- [#788](https://github.com/valbuild/val/pull/788) [`a84271c`](https://github.com/valbuild/val/commit/a84271c534822071c1e428cf9990602459682d25) Thanks [@freekh](https://github.com/freekh)! - Fixes to `npx val validate` for `s.imagedir()` and `s.filedir()`, and the `s.image(galleryVal)` / `s.file(filesVal)` fields that use them:
+
+  - **`--fix` now updates every field that uses an uploaded image or file.** When `--fix` moves an entry of an `s.imagedir(dir).remote()` or `s.filedir(dir, options).remote()` to Val Remote, the entry's key changes from the local path to the remote URL. Fields that held the old path were left pointing at it, and reported "The gallery does not have an image at …" with nothing to fix it. Now `s.image(galleryVal)` and `s.file(filesVal)` fields, and images in rich text (`s.richtext({ img: s.image(galleryVal) })`), are updated in the same run. The VS Code extension's "upload to Val Remote" updates them in the same edit, including fields inside `.jsonValues()` entries, which live in their own `*.val.json` files.
+  - **A field that uses an image or file from a `.remote()` gallery is no longer reported as "Expected local image, but found remote".** The gallery decides whether its files are on Val Remote; the field only has to name a file the gallery has. Before, `--fix` would download the file and point the field at a path the gallery did not have.
+  - **Images uploaded through a field into a `.remote()` gallery.** When you upload an image through an `s.image(galleryVal)` field in Val Studio, the field stores the remote URL and the gallery stores the image under its local path. Validation now accepts this, and `useVal` / `fetchVal` now fill in the image's `width`, `height` and `mimeType` from the gallery for it, as they do for every other gallery image.
+  - **Errors in a gallery's keys are reported.** A remote URL in a gallery that is not `.remote()`, a remote URL that is not valid, or one outside the gallery's `dir` was silently ignored by `npx val validate`. It is now reported as an error. `--fix` does not change it: you decide whether the key or the gallery's options are wrong.
+  - **A file is no longer reported as valid when it still has an error.** When `--fix` fixed one error in a file and another error was left, the file could be printed as "✔ valid".
+
+- Updated dependencies [[`a84271c`](https://github.com/valbuild/val/commit/a84271c534822071c1e428cf9990602459682d25), [`860ab2b`](https://github.com/valbuild/val/commit/860ab2b87333daf95a48215b0e4a1b44f441c878)]:
+  - @valbuild/core@0.144.0
+
 ## 0.143.0
 
 ### Patch Changes

package/dist/declarations/src/internal/ApiRoutes.d.ts

@@ -881,14 +881,14 @@ export declare const Api: {
                         patch: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                             op: z.ZodLiteral<"add">;
                             path: z.ZodArray<z.ZodString>;
-                            value: z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>;
+                            value: z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>;
                         }, z.core.$strict>, z.ZodObject<{
                             op: z.ZodLiteral<"remove">;
                             path: z.ZodTuple<[z.ZodString], z.ZodString>;
                         }, z.core.$strict>, z.ZodObject<{
                             op: z.ZodLiteral<"replace">;
                             path: z.ZodArray<z.ZodString>;
-                            value: z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>;
+                            value: z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>;
                         }, z.core.$strict>, z.ZodObject<{
                             op: z.ZodLiteral<"move">;
                             from: z.ZodTuple<[z.ZodString], z.ZodString>;
@@ -900,15 +900,15 @@ export declare const Api: {
                         }, z.core.$strict>, z.ZodObject<{
                             op: z.ZodLiteral<"test">;
                             path: z.ZodArray<z.ZodString>;
-                            value: z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>;
+                            value: z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>;
                         }, z.core.$strict>, z.ZodObject<{
                             op: z.ZodLiteral<"file">;
                             path: z.ZodArray<z.ZodString>;
                             filePath: z.ZodString;
-                            value: z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>;
+                            value: z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>;
                             remote: z.ZodBoolean;
                             nestedFilePath: z.ZodOptional<z.ZodArray<z.ZodString>>;
-                            metadata: z.ZodOptional<z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>>;
+                            metadata: z.ZodOptional<z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>>;
                         }, z.core.$strict>], "op">>>;
                         patchId: z.ZodString & z.ZodType<import("@valbuild/core").PatchId, string, z.core.$ZodTypeInternals<import("@valbuild/core").PatchId, string>>;
                         createdAt: z.ZodString;
@@ -1051,7 +1051,7 @@ export declare const Api: {
                 status: z.ZodLiteral<200>;
                 json: z.ZodObject<{
                     schemaSha: z.ZodString;
-                    schemas: z.ZodRecord<z.ZodString & z.ZodType<ModuleFilePath, string, z.core.$ZodTypeInternals<ModuleFilePath, string>>, z.ZodType<SerializedSchemaT, unknown, z.core.$ZodTypeInternals<SerializedSchemaT, unknown>>>;
+                    schemas: z.ZodRecord<z.ZodString & z.ZodType<ModuleFilePath, string, z.core.$ZodTypeInternals<ModuleFilePath, string>>, z.ZodType<import("@valbuild/core").SerializedSchema, unknown, z.core.$ZodTypeInternals<import("@valbuild/core").SerializedSchema, unknown>>>;
                 }, z.core.$strip>;
             }, z.core.$strip>]>;
         };
@@ -1152,7 +1152,7 @@ export declare const Api: {
                             message: z.ZodString;
                             value: z.ZodOptional<z.ZodUnknown>;
                             fatal: z.ZodOptional<z.ZodBoolean>;
-                            fixes: z.ZodOptional<z.ZodArray<z.ZodType<ValidationFix, unknown, z.core.$ZodTypeInternals<ValidationFix, unknown>>>>;
+                            fixes: z.ZodOptional<z.ZodArray<z.ZodType<"image:add-metadata" | "image:check-metadata" | "image:upload-remote" | "image:download-remote" | "image:check-remote" | "images:check-remote" | "images:upload-remote" | "file:add-metadata" | "file:check-metadata" | "file:upload-remote" | "file:download-remote" | "file:check-remote" | "files:check-remote" | "files:upload-remote" | "video:add-metadata" | "video:upload-remote" | "video:download-remote" | "videos:add-metadata" | "videos:check-remote" | "videos:upload-remote" | "keyof:check-keys" | "router:check-route" | "locale:check-locale" | "images:check-unique-folder" | "files:check-unique-folder" | "images:check-all-files" | "files:check-all-files" | "videos:check-unique-folder" | "videos:check-all-files" | "jsonValues:extract-entry" | "record:fill-keys" | "external:upload" | "view:check-module", unknown, z.core.$ZodTypeInternals<"image:add-metadata" | "image:check-metadata" | "image:upload-remote" | "image:download-remote" | "image:check-remote" | "images:check-remote" | "images:upload-remote" | "file:add-metadata" | "file:check-metadata" | "file:upload-remote" | "file:download-remote" | "file:check-remote" | "files:check-remote" | "files:upload-remote" | "video:add-metadata" | "video:upload-remote" | "video:download-remote" | "videos:add-metadata" | "videos:check-remote" | "videos:upload-remote" | "keyof:check-keys" | "router:check-route" | "locale:check-locale" | "images:check-unique-folder" | "files:check-unique-folder" | "images:check-all-files" | "files:check-all-files" | "videos:check-unique-folder" | "videos:check-all-files" | "jsonValues:extract-entry" | "record:fill-keys" | "external:upload" | "view:check-module", unknown>>>>;
                         }, z.core.$strip>>>>;
                     }, z.core.$strip>>;
                 }, z.core.$strip>;
@@ -1482,8 +1482,8 @@ export declare const Api: {
                         hasArchive: z.ZodBoolean;
                     }, z.core.$strip>;
                     modules: z.ZodRecord<z.ZodString, z.ZodObject<{
-                        source: z.ZodNullable<z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>>;
-                        schema: z.ZodNullable<z.ZodType<SerializedSchemaT, unknown, z.core.$ZodTypeInternals<SerializedSchemaT, unknown>>>;
+                        source: z.ZodNullable<z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>>;
+                        schema: z.ZodNullable<z.ZodType<import("@valbuild/core").SerializedSchema, unknown, z.core.$ZodTypeInternals<import("@valbuild/core").SerializedSchema, unknown>>>;
                         patchIds: z.ZodArray<z.ZodString & z.ZodType<import("@valbuild/core").PatchId, string, z.core.$ZodTypeInternals<import("@valbuild/core").PatchId, string>>>;
                         changedPaths: z.ZodArray<z.ZodString>;
                         failures: z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -1602,8 +1602,8 @@ export declare const Api: {
                 json: z.ZodObject<{
                     moduleFilePath: z.ZodString;
                     module: z.ZodNullable<z.ZodObject<{
-                        source: z.ZodNullable<z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>>;
-                        schema: z.ZodNullable<z.ZodType<SerializedSchemaT, unknown, z.core.$ZodTypeInternals<SerializedSchemaT, unknown>>>;
+                        source: z.ZodNullable<z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>>;
+                        schema: z.ZodNullable<z.ZodType<import("@valbuild/core").SerializedSchema, unknown, z.core.$ZodTypeInternals<import("@valbuild/core").SerializedSchema, unknown>>>;
                         patchIds: z.ZodArray<z.ZodString & z.ZodType<import("@valbuild/core").PatchId, string, z.core.$ZodTypeInternals<import("@valbuild/core").PatchId, string>>>;
                         changedPaths: z.ZodArray<z.ZodString>;
                         failures: z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{

package/dist/declarations/src/internal/aiTools/aiImageToolPatches.d.ts

@@ -40,7 +40,7 @@ export type ResolveResult = {
  * Walks `schema` along `path`, returning a structured result:
  * - `leaf`: walked the full path; resolved schema at the end.
  * - `richtext`: hit a richtext mid-walk; richtext is the resolved schema.
- * - `gallery-traversed`: hit an `s.imageset()` record and walked past it (i.e. the
+ * - `gallery-traversed`: hit an `s.imagedir()` record and walked past it (i.e. the
  *   path tries to address an entry inside the gallery — a clue the AI should
  *   have used the gallery tool instead).
  * - `unresolved`: the path could not be walked.

package/dist/declarations/src/internal/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./richtext/conversion/index.js";
+export * from "./richtext/richTextImages.js";
 export * from "./server/types.js";
 export * from "./server/requestScopedMemo.js";
 export * from "./ValClient.js";

package/dist/declarations/src/internal/richtext/richTextImages.d.ts

@@ -0,0 +1,21 @@
+import type { SerializedImageSchema, SerializedRichTextSchema, SourcePath } from "@valbuild/core";
+/**
+ * The image schema a rich text field's inline `img` nodes are validated with,
+ * when it is a real schema rather than `img: true`.
+ *
+ * It is the only way a rich text field can point INTO a gallery
+ * (`s.richtext({ img: s.image(galleryVal) })`), which is why every reference
+ * scan has to ask: the field's own schema is `richtext`, not `image`, so a walk
+ * that only looks for image leaves walks straight past the images in it.
+ */
+export declare function richTextImageSchema(schema: SerializedRichTextSchema): SerializedImageSchema | null;
+/**
+ * Every inline image in a rich text value, at the path of its `src`.
+ *
+ * `src` is a media value (`{ path, … }`), so the path handed out is one a
+ * patch can address — `field.0."children".1."src"` — and a rename rewrites
+ * `[…, "src", "path"]` there with the same op it uses on an image field.
+ * Images nest (a list item holds a paragraph holds the image), so the walk
+ * follows `children` all the way down.
+ */
+export declare function forEachRichTextImage(path: SourcePath, source: unknown, visit: (srcPath: SourcePath, src: Record<string, unknown>) => void): void;

package/dist/declarations/src/internal/zod/History.d.ts

@@ -64,8 +64,8 @@ export declare const BinaryFileRef: z.ZodObject<{
 }, z.core.$strip>;
 export type BinaryFileRef = z.infer<typeof BinaryFileRef>;
 export declare const HistoricalModule: z.ZodObject<{
-    source: z.ZodNullable<z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>>;
-    schema: z.ZodNullable<z.ZodType<SerializedSchemaT, unknown, z.core.$ZodTypeInternals<SerializedSchemaT, unknown>>>;
+    source: z.ZodNullable<z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>>;
+    schema: z.ZodNullable<z.ZodType<import("@valbuild/core").SerializedSchema, unknown, z.core.$ZodTypeInternals<import("@valbuild/core").SerializedSchema, unknown>>>;
     patchIds: z.ZodArray<z.ZodString & z.ZodType<import("@valbuild/core").PatchId, string, z.core.$ZodTypeInternals<import("@valbuild/core").PatchId, string>>>;
     changedPaths: z.ZodArray<z.ZodString>;
     failures: z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -109,8 +109,8 @@ export declare const HistoricalPatchSet: z.ZodObject<{
         hasArchive: z.ZodBoolean;
     }, z.core.$strip>;
     modules: z.ZodRecord<z.ZodString, z.ZodObject<{
-        source: z.ZodNullable<z.ZodType<JSONValueT, unknown, z.core.$ZodTypeInternals<JSONValueT, unknown>>>;
-        schema: z.ZodNullable<z.ZodType<SerializedSchemaT, unknown, z.core.$ZodTypeInternals<SerializedSchemaT, unknown>>>;
+        source: z.ZodNullable<z.ZodType<import("@valbuild/core/patch").JSONValue, unknown, z.core.$ZodTypeInternals<import("@valbuild/core/patch").JSONValue, unknown>>>;
+        schema: z.ZodNullable<z.ZodType<import("@valbuild/core").SerializedSchema, unknown, z.core.$ZodTypeInternals<import("@valbuild/core").SerializedSchema, unknown>>>;
         patchIds: z.ZodArray<z.ZodString & z.ZodType<import("@valbuild/core").PatchId, string, z.core.$ZodTypeInternals<import("@valbuild/core").PatchId, string>>>;
         changedPaths: z.ZodArray<z.ZodString>;
         failures: z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{

package/dist/declarations/src/internal/zod/SerializedSchema.d.ts

@@ -66,7 +66,25 @@ export declare const ColorOptions: z.ZodObject<{
 export declare const SerializedColorSchema: z.ZodType<SerializedColorSchemaT>;
 export declare const CodeOptions: z.ZodObject<{
     language: z.ZodOptional<z.ZodEnum<{
-        [x: string]: any;
+        json: "json";
+        typescript: "typescript";
+        javascript: "javascript";
+        javascriptreact: "javascriptreact";
+        typescriptreact: "typescriptreact";
+        java: "java";
+        html: "html";
+        css: "css";
+        xml: "xml";
+        markdown: "markdown";
+        sql: "sql";
+        python: "python";
+        rust: "rust";
+        php: "php";
+        go: "go";
+        cpp: "cpp";
+        sass: "sass";
+        vue: "vue";
+        angular: "angular";
     }>>;
 }, z.core.$strip>;
 export declare const SerializedCodeSchema: z.ZodType<SerializedCodeSchemaT>;

package/internal/dist/valbuild-shared-internal.cjs.dev.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var core = require('@valbuild/core');
 var getSitemapTree = require('../../dist/getSitemapTree-c732e09a.cjs.dev.js');
+var core = require('@valbuild/core');
 var zod = require('zod');
 var zodValidationError = require('zod-validation-error');
 var FlexSearch = require('flexsearch');
@@ -657,6 +657,105 @@ function convertListItemToRemirrorParagraph(rtChildren) {
   return children;
 }
 
+/**
+ * The one way to build a child's source path.
+ *
+ * There were five hand-rolled versions of this, three of them subtly different
+ * and two of them wrong, and the wrong ones were wrong in a way that hid: a
+ * module path segment has to be JSON-quoted if it is a string and bare if it is
+ * an array index, and both broken copies appended the raw key at the module
+ * root. An unquoted key parses fine as long as it contains no `.` — so every
+ * object field and every ordinary record key still resolved, and only a key with
+ * a dot in it broke. That is exactly what a media gallery is keyed by, so
+ * clicking a file in the Media panel navigated to
+ * `?p=/public/val/red-8x8_bfbd0.png`, which `splitModulePath` reads as the two
+ * segments `/public/val/red-8x8_bfbd0` and `png`, and the studio said the module
+ * was not found.
+ *
+ * So: one function, and never a template string. `Internal.createValPathOfItem`
+ * is the rule itself — `JSON.stringify` quotes a string and leaves a number
+ * bare, which is precisely the module-path grammar — and everything here defers
+ * to it rather than restating it.
+ */
+function sourcePathOfChild(parent, key) {
+  /**
+   * A parent that is already `…?p=` gets the key with no separator.
+   *
+   * The search index walks from `moduleFilePath + "?p="` rather than from the
+   * module file path, so that every path it produces has a module path — and
+   * `createValPathOfItem` would see the separator and join with a `.`, giving
+   * `?p=."title"`.
+   */
+  if (parent.endsWith(core.Internal.ModuleFilePathSep)) {
+    return "".concat(parent).concat(JSON.stringify(key));
+  }
+  var path = core.Internal.createValPathOfItem(parent, key);
+  if (path === undefined) {
+    // Only when the parent is empty, which callers cannot produce: every walk
+    // starts from a module file path. Thrown rather than skipped so a future
+    // change that breaks that assumption is loud.
+    throw new Error("Could not build a source path for '".concat(key, "' under ").concat(parent));
+  }
+  return path;
+}
+
+/**
+ * The same thing, for callers holding the module file path and module path apart.
+ *
+ * `ModulePath` is empty at the module root, which is the case both broken copies
+ * got wrong: there is no separator in the path yet, so the key is the first
+ * segment and still has to be quoted.
+ */
+function concatModulePath(moduleFilePath, modulePath, key) {
+  return sourcePathOfChild(modulePath ? core.Internal.joinModuleFilePathAndModulePath(moduleFilePath, modulePath) : moduleFilePath, key);
+}
+
+/**
+ * The image schema a rich text field's inline `img` nodes are validated with,
+ * when it is a real schema rather than `img: true`.
+ *
+ * It is the only way a rich text field can point INTO a gallery
+ * (`s.richtext({ img: s.image(galleryVal) })`), which is why every reference
+ * scan has to ask: the field's own schema is `richtext`, not `image`, so a walk
+ * that only looks for image leaves walks straight past the images in it.
+ */
+function richTextImageSchema(schema) {
+  var _schema$options;
+  var img = (_schema$options = schema.options) === null || _schema$options === void 0 ? void 0 : _schema$options.img;
+  return getSitemapTree._typeof(img) === "object" && img !== null ? img : null;
+}
+
+/**
+ * Every inline image in a rich text value, at the path of its `src`.
+ *
+ * `src` is a media value (`{ path, … }`), so the path handed out is one a
+ * patch can address — `field.0."children".1."src"` — and a rename rewrites
+ * `[…, "src", "path"]` there with the same op it uses on an image field.
+ * Images nest (a list item holds a paragraph holds the image), so the walk
+ * follows `children` all the way down.
+ */
+function forEachRichTextImage(path, source, visit) {
+  if (!Array.isArray(source)) {
+    return;
+  }
+  for (var index = 0; index < source.length; index++) {
+    var node = source[index];
+    if (getSitemapTree._typeof(node) !== "object" || node === null || Array.isArray(node)) {
+      continue;
+    }
+    var nodePath = sourcePathOfChild(path, index);
+    if ("tag" in node && node.tag === "img" && "src" in node) {
+      var src = node.src;
+      if (getSitemapTree._typeof(src) === "object" && src !== null && !Array.isArray(src)) {
+        visit(sourcePathOfChild(nodePath, "src"), getSitemapTree._objectSpread2({}, src));
+      }
+    }
+    if ("children" in node) {
+      forEachRichTextImage(sourcePathOfChild(nodePath, "children"), node.children, visit);
+    }
+  }
+}
+
 var VAL_SESSION_COOKIE = core.Internal.VAL_SESSION_COOKIE;
 var VAL_STATE_COOKIE = core.Internal.VAL_STATE_COOKIE;
 var VAL_ENABLE_COOKIE_NAME = core.Internal.VAL_ENABLE_COOKIE_NAME;
@@ -1172,7 +1271,7 @@ var SerializedRecordSchema = zod.z.lazy(function () {
     dir: zod.z.string().optional(),
     remote: zod.z["boolean"]().optional(),
     encode: ImageEncodeOption.optional(),
-    // A videoset's: see `VideoStreamOption` below for why it is spelled
+    // A videodir's: see `VideoStreamOption` below for why it is spelled
     // out rather than passed through.
     stream: VideoStreamOption.optional(),
     alt: SerializedSchema.optional(),
@@ -1228,7 +1327,7 @@ var SerializedVideoSchema = zod.z.object(getSitemapTree._objectSpread2(getSitema
   options: VideoOptions.optional(),
   opt: zod.z["boolean"](),
   remote: zod.z["boolean"]().optional(),
-  // The `s.videoset()` a set-backed field picks from.
+  // The `s.videodir()` a set-backed field picks from.
   referencedModule: zod.z.string().optional()
 }));
 var DateOptions = zod.z.object({
@@ -5567,7 +5666,7 @@ function getSourceAt(source, path) {
  * Walks `schema` along `path`, returning a structured result:
  * - `leaf`: walked the full path; resolved schema at the end.
  * - `richtext`: hit a richtext mid-walk; richtext is the resolved schema.
- * - `gallery-traversed`: hit an `s.imageset()` record and walked past it (i.e. the
+ * - `gallery-traversed`: hit an `s.imagedir()` record and walked past it (i.e. the
  *   path tries to address an entry inside the gallery — a clue the AI should
  *   have used the gallery tool instead).
  * - `unresolved`: the path could not be walked.
@@ -5675,7 +5774,7 @@ function checkGallerySchema(moduleSchema) {
     // looks like a gallery from here, and the tool can do nothing with one.
     return {
       kind: "error",
-      message: "Module is a video set (s.videoset()), not an images gallery. Videos cannot be added or removed by this tool: upload them in Val Studio."
+      message: "Module is a video set (s.videodir()), not an images gallery. Videos cannot be added or removed by this tool: upload them in Val Studio."
     };
   }
   if (moduleSchema.type === "image") {
@@ -5706,7 +5805,7 @@ function buildImageGalleryPatch(args, moduleSchema) {
     op: "add",
     path: [args.filePath],
     value: getSitemapTree._objectSpread2(getSitemapTree._objectSpread2({}, args.metadata), {}, {
-      // `alt` is a REQUIRED field of a gallery entry (`s.imageset()` gives it a
+      // `alt` is a REQUIRED field of a gallery entry (`s.imagedir()` gives it a
       // nullable string schema), so an entry written without one is invalid
       // the moment it lands — and the caller that had no alt to give is the
       // common case, not the odd one. Null is what the Studio's own upload
@@ -5769,7 +5868,7 @@ function buildRemoveImageGalleryEntryPatch(args, moduleSchema, moduleSource) {
 var GALLERY_REDIRECT = {
   kind: "wrong-tool",
   suggestedTool: "add_session_image_to_gallery",
-  reason: "Destination is a media gallery (s.imageset() / s.fileset()). Gallery entries are keyed by file path and carry a file on disk, so they cannot be created with a plain patch. Use add_session_image_to_gallery."
+  reason: "Destination is a media gallery (s.imagedir() / s.filedir()). Gallery entries are keyed by file path and carry a file on disk, so they cannot be created with a plain patch. Use add_session_image_to_gallery."
 };
 
 /**
@@ -5779,10 +5878,10 @@ var GALLERY_REDIRECT = {
  */
 var VIDEOSET_REFUSAL = {
   kind: "error",
-  message: "Destination is a video set (s.videoset()). Its entries are keyed by file path and carry video files, so they cannot be created with a plain patch, and no tool here uploads a video: add it in Val Studio."
+  message: "Destination is a video set (s.videodir()). Its entries are keyed by file path and carry video files, so they cannot be created with a plain patch, and no tool here uploads a video: add it in Val Studio."
 };
 
-/** An `s.imageset()` / `s.fileset()` / `s.videoset()` record: a gallery, not an ordinary record. */
+/** An `s.imagedir()` / `s.filedir()` / `s.videodir()` record: a gallery, not an ordinary record. */
 function isGallery(schema) {
   return schema.type === "record" && schema.mediaType !== undefined;
 }
@@ -6374,59 +6473,6 @@ function withExtension(filename, ext) {
   return "".concat(base, ".").concat(ext);
 }
 
-/**
- * The one way to build a child's source path.
- *
- * There were five hand-rolled versions of this, three of them subtly different
- * and two of them wrong, and the wrong ones were wrong in a way that hid: a
- * module path segment has to be JSON-quoted if it is a string and bare if it is
- * an array index, and both broken copies appended the raw key at the module
- * root. An unquoted key parses fine as long as it contains no `.` — so every
- * object field and every ordinary record key still resolved, and only a key with
- * a dot in it broke. That is exactly what a media gallery is keyed by, so
- * clicking a file in the Media panel navigated to
- * `?p=/public/val/red-8x8_bfbd0.png`, which `splitModulePath` reads as the two
- * segments `/public/val/red-8x8_bfbd0` and `png`, and the studio said the module
- * was not found.
- *
- * So: one function, and never a template string. `Internal.createValPathOfItem`
- * is the rule itself — `JSON.stringify` quotes a string and leaves a number
- * bare, which is precisely the module-path grammar — and everything here defers
- * to it rather than restating it.
- */
-function sourcePathOfChild(parent, key) {
-  /**
-   * A parent that is already `…?p=` gets the key with no separator.
-   *
-   * The search index walks from `moduleFilePath + "?p="` rather than from the
-   * module file path, so that every path it produces has a module path — and
-   * `createValPathOfItem` would see the separator and join with a `.`, giving
-   * `?p=."title"`.
-   */
-  if (parent.endsWith(core.Internal.ModuleFilePathSep)) {
-    return "".concat(parent).concat(JSON.stringify(key));
-  }
-  var path = core.Internal.createValPathOfItem(parent, key);
-  if (path === undefined) {
-    // Only when the parent is empty, which callers cannot produce: every walk
-    // starts from a module file path. Thrown rather than skipped so a future
-    // change that breaks that assumption is loud.
-    throw new Error("Could not build a source path for '".concat(key, "' under ").concat(parent));
-  }
-  return path;
-}
-
-/**
- * The same thing, for callers holding the module file path and module path apart.
- *
- * `ModulePath` is empty at the module root, which is the case both broken copies
- * got wrong: there is no separator in the path yet, so the key is the first
- * segment and still has to be quoted.
- */
-function concatModulePath(moduleFilePath, modulePath, key) {
-  return sourcePathOfChild(modulePath ? core.Internal.joinModuleFilePathAndModulePath(moduleFilePath, modulePath) : moduleFilePath, key);
-}
-
 /**
  * Traverses a schema and source pair, calling a callback for each leaf node.
  * Handles all schema types including primitives, objects, arrays, records, unions, richtext, files, images, etc.
@@ -8056,6 +8102,7 @@ exports.filterRoutesByPatterns = filterRoutesByPatterns;
 exports.findSimilar = findSimilar;
 exports.fitWithin = fitWithin;
 exports.flattenRichText = flattenRichText;
+exports.forEachRichTextImage = forEachRichTextImage;
 exports.getErrorMessageFromUnknownJson = getErrorMessageFromUnknownJson;
 exports.getFilenameFromRef = getFilenameFromRef;
 exports.getInlineImgInfo = getInlineImgInfo;
@@ -8101,6 +8148,7 @@ exports.resolvePairGround = resolvePairGround;
 exports.resolveSchemaSourceFixForError = resolveSchemaSourceFixForError;
 exports.resolveSchemaSourceFixes = resolveSchemaSourceFixes;
 exports.resolveSerializedSchemaAtPath = resolveSerializedSchemaAtPath;
+exports.richTextImageSchema = richTextImageSchema;
 exports.richTextToRemirror = richTextToRemirror;
 exports.safeParsePatch = safeParsePatch;
 exports.sourcePathOfChild = sourcePathOfChild;

package/internal/dist/valbuild-shared-internal.cjs.prod.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var core = require('@valbuild/core');
 var getSitemapTree = require('../../dist/getSitemapTree-0ed3deac.cjs.prod.js');
+var core = require('@valbuild/core');
 var zod = require('zod');
 var zodValidationError = require('zod-validation-error');
 var FlexSearch = require('flexsearch');
@@ -657,6 +657,105 @@ function convertListItemToRemirrorParagraph(rtChildren) {
   return children;
 }
 
+/**
+ * The one way to build a child's source path.
+ *
+ * There were five hand-rolled versions of this, three of them subtly different
+ * and two of them wrong, and the wrong ones were wrong in a way that hid: a
+ * module path segment has to be JSON-quoted if it is a string and bare if it is
+ * an array index, and both broken copies appended the raw key at the module
+ * root. An unquoted key parses fine as long as it contains no `.` — so every
+ * object field and every ordinary record key still resolved, and only a key with
+ * a dot in it broke. That is exactly what a media gallery is keyed by, so
+ * clicking a file in the Media panel navigated to
+ * `?p=/public/val/red-8x8_bfbd0.png`, which `splitModulePath` reads as the two
+ * segments `/public/val/red-8x8_bfbd0` and `png`, and the studio said the module
+ * was not found.
+ *
+ * So: one function, and never a template string. `Internal.createValPathOfItem`
+ * is the rule itself — `JSON.stringify` quotes a string and leaves a number
+ * bare, which is precisely the module-path grammar — and everything here defers
+ * to it rather than restating it.
+ */
+function sourcePathOfChild(parent, key) {
+  /**
+   * A parent that is already `…?p=` gets the key with no separator.
+   *
+   * The search index walks from `moduleFilePath + "?p="` rather than from the
+   * module file path, so that every path it produces has a module path — and
+   * `createValPathOfItem` would see the separator and join with a `.`, giving
+   * `?p=."title"`.
+   */
+  if (parent.endsWith(core.Internal.ModuleFilePathSep)) {
+    return "".concat(parent).concat(JSON.stringify(key));
+  }
+  var path = core.Internal.createValPathOfItem(parent, key);
+  if (path === undefined) {
+    // Only when the parent is empty, which callers cannot produce: every walk
+    // starts from a module file path. Thrown rather than skipped so a future
+    // change that breaks that assumption is loud.
+    throw new Error("Could not build a source path for '".concat(key, "' under ").concat(parent));
+  }
+  return path;
+}
+
+/**
+ * The same thing, for callers holding the module file path and module path apart.
+ *
+ * `ModulePath` is empty at the module root, which is the case both broken copies
+ * got wrong: there is no separator in the path yet, so the key is the first
+ * segment and still has to be quoted.
+ */
+function concatModulePath(moduleFilePath, modulePath, key) {
+  return sourcePathOfChild(modulePath ? core.Internal.joinModuleFilePathAndModulePath(moduleFilePath, modulePath) : moduleFilePath, key);
+}
+
+/**
+ * The image schema a rich text field's inline `img` nodes are validated with,
+ * when it is a real schema rather than `img: true`.
+ *
+ * It is the only way a rich text field can point INTO a gallery
+ * (`s.richtext({ img: s.image(galleryVal) })`), which is why every reference
+ * scan has to ask: the field's own schema is `richtext`, not `image`, so a walk
+ * that only looks for image leaves walks straight past the images in it.
+ */
+function richTextImageSchema(schema) {
+  var _schema$options;
+  var img = (_schema$options = schema.options) === null || _schema$options === void 0 ? void 0 : _schema$options.img;
+  return getSitemapTree._typeof(img) === "object" && img !== null ? img : null;
+}
+
+/**
+ * Every inline image in a rich text value, at the path of its `src`.
+ *
+ * `src` is a media value (`{ path, … }`), so the path handed out is one a
+ * patch can address — `field.0."children".1."src"` — and a rename rewrites
+ * `[…, "src", "path"]` there with the same op it uses on an image field.
+ * Images nest (a list item holds a paragraph holds the image), so the walk
+ * follows `children` all the way down.
+ */
+function forEachRichTextImage(path, source, visit) {
+  if (!Array.isArray(source)) {
+    return;
+  }
+  for (var index = 0; index < source.length; index++) {
+    var node = source[index];
+    if (getSitemapTree._typeof(node) !== "object" || node === null || Array.isArray(node)) {
+      continue;
+    }
+    var nodePath = sourcePathOfChild(path, index);
+    if ("tag" in node && node.tag === "img" && "src" in node) {
+      var src = node.src;
+      if (getSitemapTree._typeof(src) === "object" && src !== null && !Array.isArray(src)) {
+        visit(sourcePathOfChild(nodePath, "src"), getSitemapTree._objectSpread2({}, src));
+      }
+    }
+    if ("children" in node) {
+      forEachRichTextImage(sourcePathOfChild(nodePath, "children"), node.children, visit);
+    }
+  }
+}
+
 var VAL_SESSION_COOKIE = core.Internal.VAL_SESSION_COOKIE;
 var VAL_STATE_COOKIE = core.Internal.VAL_STATE_COOKIE;
 var VAL_ENABLE_COOKIE_NAME = core.Internal.VAL_ENABLE_COOKIE_NAME;
@@ -1172,7 +1271,7 @@ var SerializedRecordSchema = zod.z.lazy(function () {
     dir: zod.z.string().optional(),
     remote: zod.z["boolean"]().optional(),
     encode: ImageEncodeOption.optional(),
-    // A videoset's: see `VideoStreamOption` below for why it is spelled
+    // A videodir's: see `VideoStreamOption` below for why it is spelled
     // out rather than passed through.
     stream: VideoStreamOption.optional(),
     alt: SerializedSchema.optional(),
@@ -1228,7 +1327,7 @@ var SerializedVideoSchema = zod.z.object(getSitemapTree._objectSpread2(getSitema
   options: VideoOptions.optional(),
   opt: zod.z["boolean"](),
   remote: zod.z["boolean"]().optional(),
-  // The `s.videoset()` a set-backed field picks from.
+  // The `s.videodir()` a set-backed field picks from.
   referencedModule: zod.z.string().optional()
 }));
 var DateOptions = zod.z.object({
@@ -5567,7 +5666,7 @@ function getSourceAt(source, path) {
  * Walks `schema` along `path`, returning a structured result:
  * - `leaf`: walked the full path; resolved schema at the end.
  * - `richtext`: hit a richtext mid-walk; richtext is the resolved schema.
- * - `gallery-traversed`: hit an `s.imageset()` record and walked past it (i.e. the
+ * - `gallery-traversed`: hit an `s.imagedir()` record and walked past it (i.e. the
  *   path tries to address an entry inside the gallery — a clue the AI should
  *   have used the gallery tool instead).
  * - `unresolved`: the path could not be walked.
@@ -5675,7 +5774,7 @@ function checkGallerySchema(moduleSchema) {
     // looks like a gallery from here, and the tool can do nothing with one.
     return {
       kind: "error",
-      message: "Module is a video set (s.videoset()), not an images gallery. Videos cannot be added or removed by this tool: upload them in Val Studio."
+      message: "Module is a video set (s.videodir()), not an images gallery. Videos cannot be added or removed by this tool: upload them in Val Studio."
     };
   }
   if (moduleSchema.type === "image") {
@@ -5706,7 +5805,7 @@ function buildImageGalleryPatch(args, moduleSchema) {
     op: "add",
     path: [args.filePath],
     value: getSitemapTree._objectSpread2(getSitemapTree._objectSpread2({}, args.metadata), {}, {
-      // `alt` is a REQUIRED field of a gallery entry (`s.imageset()` gives it a
+      // `alt` is a REQUIRED field of a gallery entry (`s.imagedir()` gives it a
       // nullable string schema), so an entry written without one is invalid
       // the moment it lands — and the caller that had no alt to give is the
       // common case, not the odd one. Null is what the Studio's own upload
@@ -5769,7 +5868,7 @@ function buildRemoveImageGalleryEntryPatch(args, moduleSchema, moduleSource) {
 var GALLERY_REDIRECT = {
   kind: "wrong-tool",
   suggestedTool: "add_session_image_to_gallery",
-  reason: "Destination is a media gallery (s.imageset() / s.fileset()). Gallery entries are keyed by file path and carry a file on disk, so they cannot be created with a plain patch. Use add_session_image_to_gallery."
+  reason: "Destination is a media gallery (s.imagedir() / s.filedir()). Gallery entries are keyed by file path and carry a file on disk, so they cannot be created with a plain patch. Use add_session_image_to_gallery."
 };
 
 /**
@@ -5779,10 +5878,10 @@ var GALLERY_REDIRECT = {
  */
 var VIDEOSET_REFUSAL = {
   kind: "error",
-  message: "Destination is a video set (s.videoset()). Its entries are keyed by file path and carry video files, so they cannot be created with a plain patch, and no tool here uploads a video: add it in Val Studio."
+  message: "Destination is a video set (s.videodir()). Its entries are keyed by file path and carry video files, so they cannot be created with a plain patch, and no tool here uploads a video: add it in Val Studio."
 };
 
-/** An `s.imageset()` / `s.fileset()` / `s.videoset()` record: a gallery, not an ordinary record. */
+/** An `s.imagedir()` / `s.filedir()` / `s.videodir()` record: a gallery, not an ordinary record. */
 function isGallery(schema) {
   return schema.type === "record" && schema.mediaType !== undefined;
 }
@@ -6374,59 +6473,6 @@ function withExtension(filename, ext) {
   return "".concat(base, ".").concat(ext);
 }
 
-/**
- * The one way to build a child's source path.
- *
- * There were five hand-rolled versions of this, three of them subtly different
- * and two of them wrong, and the wrong ones were wrong in a way that hid: a
- * module path segment has to be JSON-quoted if it is a string and bare if it is
- * an array index, and both broken copies appended the raw key at the module
- * root. An unquoted key parses fine as long as it contains no `.` — so every
- * object field and every ordinary record key still resolved, and only a key with
- * a dot in it broke. That is exactly what a media gallery is keyed by, so
- * clicking a file in the Media panel navigated to
- * `?p=/public/val/red-8x8_bfbd0.png`, which `splitModulePath` reads as the two
- * segments `/public/val/red-8x8_bfbd0` and `png`, and the studio said the module
- * was not found.
- *
- * So: one function, and never a template string. `Internal.createValPathOfItem`
- * is the rule itself — `JSON.stringify` quotes a string and leaves a number
- * bare, which is precisely the module-path grammar — and everything here defers
- * to it rather than restating it.
- */
-function sourcePathOfChild(parent, key) {
-  /**
-   * A parent that is already `…?p=` gets the key with no separator.
-   *
-   * The search index walks from `moduleFilePath + "?p="` rather than from the
-   * module file path, so that every path it produces has a module path — and
-   * `createValPathOfItem` would see the separator and join with a `.`, giving
-   * `?p=."title"`.
-   */
-  if (parent.endsWith(core.Internal.ModuleFilePathSep)) {
-    return "".concat(parent).concat(JSON.stringify(key));
-  }
-  var path = core.Internal.createValPathOfItem(parent, key);
-  if (path === undefined) {
-    // Only when the parent is empty, which callers cannot produce: every walk
-    // starts from a module file path. Thrown rather than skipped so a future
-    // change that breaks that assumption is loud.
-    throw new Error("Could not build a source path for '".concat(key, "' under ").concat(parent));
-  }
-  return path;
-}
-
-/**
- * The same thing, for callers holding the module file path and module path apart.
- *
- * `ModulePath` is empty at the module root, which is the case both broken copies
- * got wrong: there is no separator in the path yet, so the key is the first
- * segment and still has to be quoted.
- */
-function concatModulePath(moduleFilePath, modulePath, key) {
-  return sourcePathOfChild(modulePath ? core.Internal.joinModuleFilePathAndModulePath(moduleFilePath, modulePath) : moduleFilePath, key);
-}
-
 /**
  * Traverses a schema and source pair, calling a callback for each leaf node.
  * Handles all schema types including primitives, objects, arrays, records, unions, richtext, files, images, etc.
@@ -8056,6 +8102,7 @@ exports.filterRoutesByPatterns = filterRoutesByPatterns;
 exports.findSimilar = findSimilar;
 exports.fitWithin = fitWithin;
 exports.flattenRichText = flattenRichText;
+exports.forEachRichTextImage = forEachRichTextImage;
 exports.getErrorMessageFromUnknownJson = getErrorMessageFromUnknownJson;
 exports.getFilenameFromRef = getFilenameFromRef;
 exports.getInlineImgInfo = getInlineImgInfo;
@@ -8101,6 +8148,7 @@ exports.resolvePairGround = resolvePairGround;
 exports.resolveSchemaSourceFixForError = resolveSchemaSourceFixForError;
 exports.resolveSchemaSourceFixes = resolveSchemaSourceFixes;
 exports.resolveSerializedSchemaAtPath = resolveSerializedSchemaAtPath;
+exports.richTextImageSchema = richTextImageSchema;
 exports.richTextToRemirror = richTextToRemirror;
 exports.safeParsePatch = safeParsePatch;
 exports.sourcePathOfChild = sourcePathOfChild;

package/internal/dist/valbuild-shared-internal.esm.js

@@ -1,6 +1,6 @@
-import { Internal, CODE_LANGUAGES, resolveSettingsModule, missingDeclaredKeys, localeOfValue, discriminatedUnionBranchOf, DEFAULT_COLOR_FORMAT, declaredKeySetOf } from '@valbuild/core';
 import { _ as _createForOfIteratorHelper, o as _objectSpread2, q as _arrayLikeToArray, r as _unsupportedIterableToArray, s as _typeof, t as _defineProperty, u as _toPropertyKey } from '../../dist/getSitemapTree-6fcdf745.esm.js';
 export { D as DEFAULT_CANVAS_SELECTION, e as DEFAULT_CANVAS_SELECTION_SOFT, b as VAL_AI_SESSION_STORAGE_KEY, d as VAL_CANVAS_MESSAGE, c as VAL_CANVAS_PARAM, V as VAL_CONFIG_SESSION_STORAGE_KEY, a as VAL_THEME_SESSION_STORAGE_KEY, h as getNextAppRouterSourceFolder, m as getPageRouterSitemapTree, k as getPageRouterSourceFolder, n as getPatternFromModuleFilePath, j as getTanStackRouterSourceFolder, l as isTanStackRoutesFolder, g as isValCanvasFrame, i as isValCanvasPageMessage, f as isValCanvasStudioMessage, p as parseRoutePattern, w as withValCanvasParam } from '../../dist/getSitemapTree-6fcdf745.esm.js';
+import { Internal, CODE_LANGUAGES, resolveSettingsModule, missingDeclaredKeys, localeOfValue, discriminatedUnionBranchOf, DEFAULT_COLOR_FORMAT, declaredKeySetOf } from '@valbuild/core';
 import { z } from 'zod';
 import { fromError } from 'zod-validation-error';
 import FlexSearch from 'flexsearch';
@@ -650,6 +650,105 @@ function convertListItemToRemirrorParagraph(rtChildren) {
   return children;
 }
 
+/**
+ * The one way to build a child's source path.
+ *
+ * There were five hand-rolled versions of this, three of them subtly different
+ * and two of them wrong, and the wrong ones were wrong in a way that hid: a
+ * module path segment has to be JSON-quoted if it is a string and bare if it is
+ * an array index, and both broken copies appended the raw key at the module
+ * root. An unquoted key parses fine as long as it contains no `.` — so every
+ * object field and every ordinary record key still resolved, and only a key with
+ * a dot in it broke. That is exactly what a media gallery is keyed by, so
+ * clicking a file in the Media panel navigated to
+ * `?p=/public/val/red-8x8_bfbd0.png`, which `splitModulePath` reads as the two
+ * segments `/public/val/red-8x8_bfbd0` and `png`, and the studio said the module
+ * was not found.
+ *
+ * So: one function, and never a template string. `Internal.createValPathOfItem`
+ * is the rule itself — `JSON.stringify` quotes a string and leaves a number
+ * bare, which is precisely the module-path grammar — and everything here defers
+ * to it rather than restating it.
+ */
+function sourcePathOfChild(parent, key) {
+  /**
+   * A parent that is already `…?p=` gets the key with no separator.
+   *
+   * The search index walks from `moduleFilePath + "?p="` rather than from the
+   * module file path, so that every path it produces has a module path — and
+   * `createValPathOfItem` would see the separator and join with a `.`, giving
+   * `?p=."title"`.
+   */
+  if (parent.endsWith(Internal.ModuleFilePathSep)) {
+    return "".concat(parent).concat(JSON.stringify(key));
+  }
+  var path = Internal.createValPathOfItem(parent, key);
+  if (path === undefined) {
+    // Only when the parent is empty, which callers cannot produce: every walk
+    // starts from a module file path. Thrown rather than skipped so a future
+    // change that breaks that assumption is loud.
+    throw new Error("Could not build a source path for '".concat(key, "' under ").concat(parent));
+  }
+  return path;
+}
+
+/**
+ * The same thing, for callers holding the module file path and module path apart.
+ *
+ * `ModulePath` is empty at the module root, which is the case both broken copies
+ * got wrong: there is no separator in the path yet, so the key is the first
+ * segment and still has to be quoted.
+ */
+function concatModulePath(moduleFilePath, modulePath, key) {
+  return sourcePathOfChild(modulePath ? Internal.joinModuleFilePathAndModulePath(moduleFilePath, modulePath) : moduleFilePath, key);
+}
+
+/**
+ * The image schema a rich text field's inline `img` nodes are validated with,
+ * when it is a real schema rather than `img: true`.
+ *
+ * It is the only way a rich text field can point INTO a gallery
+ * (`s.richtext({ img: s.image(galleryVal) })`), which is why every reference
+ * scan has to ask: the field's own schema is `richtext`, not `image`, so a walk
+ * that only looks for image leaves walks straight past the images in it.
+ */
+function richTextImageSchema(schema) {
+  var _schema$options;
+  var img = (_schema$options = schema.options) === null || _schema$options === void 0 ? void 0 : _schema$options.img;
+  return _typeof(img) === "object" && img !== null ? img : null;
+}
+
+/**
+ * Every inline image in a rich text value, at the path of its `src`.
+ *
+ * `src` is a media value (`{ path, … }`), so the path handed out is one a
+ * patch can address — `field.0."children".1."src"` — and a rename rewrites
+ * `[…, "src", "path"]` there with the same op it uses on an image field.
+ * Images nest (a list item holds a paragraph holds the image), so the walk
+ * follows `children` all the way down.
+ */
+function forEachRichTextImage(path, source, visit) {
+  if (!Array.isArray(source)) {
+    return;
+  }
+  for (var index = 0; index < source.length; index++) {
+    var node = source[index];
+    if (_typeof(node) !== "object" || node === null || Array.isArray(node)) {
+      continue;
+    }
+    var nodePath = sourcePathOfChild(path, index);
+    if ("tag" in node && node.tag === "img" && "src" in node) {
+      var src = node.src;
+      if (_typeof(src) === "object" && src !== null && !Array.isArray(src)) {
+        visit(sourcePathOfChild(nodePath, "src"), _objectSpread2({}, src));
+      }
+    }
+    if ("children" in node) {
+      forEachRichTextImage(sourcePathOfChild(nodePath, "children"), node.children, visit);
+    }
+  }
+}
+
 var VAL_SESSION_COOKIE = Internal.VAL_SESSION_COOKIE;
 var VAL_STATE_COOKIE = Internal.VAL_STATE_COOKIE;
 var VAL_ENABLE_COOKIE_NAME = Internal.VAL_ENABLE_COOKIE_NAME;
@@ -1165,7 +1264,7 @@ var SerializedRecordSchema = z.lazy(function () {
     dir: z.string().optional(),
     remote: z["boolean"]().optional(),
     encode: ImageEncodeOption.optional(),
-    // A videoset's: see `VideoStreamOption` below for why it is spelled
+    // A videodir's: see `VideoStreamOption` below for why it is spelled
     // out rather than passed through.
     stream: VideoStreamOption.optional(),
     alt: SerializedSchema.optional(),
@@ -1221,7 +1320,7 @@ var SerializedVideoSchema = z.object(_objectSpread2(_objectSpread2({}, commonSch
   options: VideoOptions.optional(),
   opt: z["boolean"](),
   remote: z["boolean"]().optional(),
-  // The `s.videoset()` a set-backed field picks from.
+  // The `s.videodir()` a set-backed field picks from.
   referencedModule: z.string().optional()
 }));
 var DateOptions = z.object({
@@ -5560,7 +5659,7 @@ function getSourceAt(source, path) {
  * Walks `schema` along `path`, returning a structured result:
  * - `leaf`: walked the full path; resolved schema at the end.
  * - `richtext`: hit a richtext mid-walk; richtext is the resolved schema.
- * - `gallery-traversed`: hit an `s.imageset()` record and walked past it (i.e. the
+ * - `gallery-traversed`: hit an `s.imagedir()` record and walked past it (i.e. the
  *   path tries to address an entry inside the gallery — a clue the AI should
  *   have used the gallery tool instead).
  * - `unresolved`: the path could not be walked.
@@ -5668,7 +5767,7 @@ function checkGallerySchema(moduleSchema) {
     // looks like a gallery from here, and the tool can do nothing with one.
     return {
       kind: "error",
-      message: "Module is a video set (s.videoset()), not an images gallery. Videos cannot be added or removed by this tool: upload them in Val Studio."
+      message: "Module is a video set (s.videodir()), not an images gallery. Videos cannot be added or removed by this tool: upload them in Val Studio."
     };
   }
   if (moduleSchema.type === "image") {
@@ -5699,7 +5798,7 @@ function buildImageGalleryPatch(args, moduleSchema) {
     op: "add",
     path: [args.filePath],
     value: _objectSpread2(_objectSpread2({}, args.metadata), {}, {
-      // `alt` is a REQUIRED field of a gallery entry (`s.imageset()` gives it a
+      // `alt` is a REQUIRED field of a gallery entry (`s.imagedir()` gives it a
       // nullable string schema), so an entry written without one is invalid
       // the moment it lands — and the caller that had no alt to give is the
       // common case, not the odd one. Null is what the Studio's own upload
@@ -5762,7 +5861,7 @@ function buildRemoveImageGalleryEntryPatch(args, moduleSchema, moduleSource) {
 var GALLERY_REDIRECT = {
   kind: "wrong-tool",
   suggestedTool: "add_session_image_to_gallery",
-  reason: "Destination is a media gallery (s.imageset() / s.fileset()). Gallery entries are keyed by file path and carry a file on disk, so they cannot be created with a plain patch. Use add_session_image_to_gallery."
+  reason: "Destination is a media gallery (s.imagedir() / s.filedir()). Gallery entries are keyed by file path and carry a file on disk, so they cannot be created with a plain patch. Use add_session_image_to_gallery."
 };
 
 /**
@@ -5772,10 +5871,10 @@ var GALLERY_REDIRECT = {
  */
 var VIDEOSET_REFUSAL = {
   kind: "error",
-  message: "Destination is a video set (s.videoset()). Its entries are keyed by file path and carry video files, so they cannot be created with a plain patch, and no tool here uploads a video: add it in Val Studio."
+  message: "Destination is a video set (s.videodir()). Its entries are keyed by file path and carry video files, so they cannot be created with a plain patch, and no tool here uploads a video: add it in Val Studio."
 };
 
-/** An `s.imageset()` / `s.fileset()` / `s.videoset()` record: a gallery, not an ordinary record. */
+/** An `s.imagedir()` / `s.filedir()` / `s.videodir()` record: a gallery, not an ordinary record. */
 function isGallery(schema) {
   return schema.type === "record" && schema.mediaType !== undefined;
 }
@@ -6367,59 +6466,6 @@ function withExtension(filename, ext) {
   return "".concat(base, ".").concat(ext);
 }
 
-/**
- * The one way to build a child's source path.
- *
- * There were five hand-rolled versions of this, three of them subtly different
- * and two of them wrong, and the wrong ones were wrong in a way that hid: a
- * module path segment has to be JSON-quoted if it is a string and bare if it is
- * an array index, and both broken copies appended the raw key at the module
- * root. An unquoted key parses fine as long as it contains no `.` — so every
- * object field and every ordinary record key still resolved, and only a key with
- * a dot in it broke. That is exactly what a media gallery is keyed by, so
- * clicking a file in the Media panel navigated to
- * `?p=/public/val/red-8x8_bfbd0.png`, which `splitModulePath` reads as the two
- * segments `/public/val/red-8x8_bfbd0` and `png`, and the studio said the module
- * was not found.
- *
- * So: one function, and never a template string. `Internal.createValPathOfItem`
- * is the rule itself — `JSON.stringify` quotes a string and leaves a number
- * bare, which is precisely the module-path grammar — and everything here defers
- * to it rather than restating it.
- */
-function sourcePathOfChild(parent, key) {
-  /**
-   * A parent that is already `…?p=` gets the key with no separator.
-   *
-   * The search index walks from `moduleFilePath + "?p="` rather than from the
-   * module file path, so that every path it produces has a module path — and
-   * `createValPathOfItem` would see the separator and join with a `.`, giving
-   * `?p=."title"`.
-   */
-  if (parent.endsWith(Internal.ModuleFilePathSep)) {
-    return "".concat(parent).concat(JSON.stringify(key));
-  }
-  var path = Internal.createValPathOfItem(parent, key);
-  if (path === undefined) {
-    // Only when the parent is empty, which callers cannot produce: every walk
-    // starts from a module file path. Thrown rather than skipped so a future
-    // change that breaks that assumption is loud.
-    throw new Error("Could not build a source path for '".concat(key, "' under ").concat(parent));
-  }
-  return path;
-}
-
-/**
- * The same thing, for callers holding the module file path and module path apart.
- *
- * `ModulePath` is empty at the module root, which is the case both broken copies
- * got wrong: there is no separator in the path yet, so the key is the first
- * segment and still has to be quoted.
- */
-function concatModulePath(moduleFilePath, modulePath, key) {
-  return sourcePathOfChild(modulePath ? Internal.joinModuleFilePathAndModulePath(moduleFilePath, modulePath) : moduleFilePath, key);
-}
-
 /**
  * Traverses a schema and source pair, calling a callback for each leaf node.
  * Handles all schema types including primitives, objects, arrays, records, unions, richtext, files, images, etc.
@@ -7930,4 +7976,4 @@ function parse(schema, body, call) {
   return parsed.data;
 }
 
-export { AA_LARGE, AA_TEXT, Api, BRAND_CONTRAST_PAIRS, BinaryFileRef, CodeOptions, ColorOptions, DEFAULT_ERROR_MESSAGE, DateOptions, ENCODE_DEFAULTS, ENCODE_MIME_TYPE_OF, FileOptions, HistoricalCommit, HistoricalModule, HistoricalPatchSet, HistoryError, ImageEncodeOption, ImageOptions, JSONValue, JSON_ENTRIES_BATCH_MAX, ModuleComparison, NEVER_ENCODED, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchGroup, PatchId, PatchJSON, PublishProtocolError, RAMP_STEPS, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, RestoreVerdict, RichTextOptions, SCHEMA_SOURCE_FIXES, SerializedArraySchema, SerializedBooleanSchema, SerializedCodeSchema, SerializedColorSchema, SerializedDateSchema, SerializedDateTimeSchema, SerializedDiscriminatedUnionSchema, SerializedEnumSchema, SerializedFileSchema, SerializedImageSchema, SerializedKeyOfSchema, SerializedLiteralSchema, SerializedLocaleSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedRecordSchema, SerializedRichTextSchema, SerializedRouteSchema, SerializedSchema, SerializedSettingsSchema, SerializedStringSchema, SerializedValViewSchema, SerializedVideoSchema, SharedValConfig, VAL_ENABLE_COOKIE_NAME, VAL_GREEN_RAMP, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, VAL_STUDIO_HEADER, ValCommit, ValDeployment, VideoOptions, VideoStreamOption, accentRamp, buildDuplicatePatch, buildEmptyAtPathPatch, buildFileRefValue, buildImageGalleryPatch, buildRemoveImageGalleryEntryPatch, buildSearchIndex, chainHeadOf, checkCompatibility, chooseEncoded, concatModulePath, contrastRatio, createRegExpFromPattern, createSearchIndex, createValClient, declaredLocales, describeContainerAtPath, emptyOf, explainIncompatible, filterBlockingValidationErrors, filterRoutesByPatterns, findSimilar, fitWithin, flattenRichText, getErrorMessageFromUnknownJson, getFilenameFromRef, getInlineImgInfo, getKeyOfRecordAt, getRefParts, getRoutesOf, getRoutesWithModulePaths, getSourceAt, indexModule, isMimeTypeAccepted, isRemoteSchema, isSchemaSourceFixError, isSkippedSource, keyOfRecordPath, levenshtein, localeAt, memoizePerRequest, newestCommitSha, parseArtifacts, parseBuildTarget, parseCancel, parseDeclare, parseDiscard, parseJob, parseNewestCiRun, parsePress, parseProblems, parseProjectSource, parsePromote, parsePublishToken, parseRenew, parseRequestStatus, parseStatus, parseUpdateTarget, parseVerify, partitionValidationErrors, performSearch, relativeLuminance, remirrorToRichTextSource, removeModule, resolveEncodeSettings, resolvePairGround, resolveSchemaSourceFixForError, resolveSchemaSourceFixes, resolveSerializedSchemaAtPath, richTextToRemirror, safeParsePatch, sourcePathOfChild, themeCustomProperties, toolNames, traverseSchemaSource, urlOf, validateRoutePatterns, withExtension };
+export { AA_LARGE, AA_TEXT, Api, BRAND_CONTRAST_PAIRS, BinaryFileRef, CodeOptions, ColorOptions, DEFAULT_ERROR_MESSAGE, DateOptions, ENCODE_DEFAULTS, ENCODE_MIME_TYPE_OF, FileOptions, HistoricalCommit, HistoricalModule, HistoricalPatchSet, HistoryError, ImageEncodeOption, ImageOptions, JSONValue, JSON_ENTRIES_BATCH_MAX, ModuleComparison, NEVER_ENCODED, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchGroup, PatchId, PatchJSON, PublishProtocolError, RAMP_STEPS, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, RestoreVerdict, RichTextOptions, SCHEMA_SOURCE_FIXES, SerializedArraySchema, SerializedBooleanSchema, SerializedCodeSchema, SerializedColorSchema, SerializedDateSchema, SerializedDateTimeSchema, SerializedDiscriminatedUnionSchema, SerializedEnumSchema, SerializedFileSchema, SerializedImageSchema, SerializedKeyOfSchema, SerializedLiteralSchema, SerializedLocaleSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedRecordSchema, SerializedRichTextSchema, SerializedRouteSchema, SerializedSchema, SerializedSettingsSchema, SerializedStringSchema, SerializedValViewSchema, SerializedVideoSchema, SharedValConfig, VAL_ENABLE_COOKIE_NAME, VAL_GREEN_RAMP, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, VAL_STUDIO_HEADER, ValCommit, ValDeployment, VideoOptions, VideoStreamOption, accentRamp, buildDuplicatePatch, buildEmptyAtPathPatch, buildFileRefValue, buildImageGalleryPatch, buildRemoveImageGalleryEntryPatch, buildSearchIndex, chainHeadOf, checkCompatibility, chooseEncoded, concatModulePath, contrastRatio, createRegExpFromPattern, createSearchIndex, createValClient, declaredLocales, describeContainerAtPath, emptyOf, explainIncompatible, filterBlockingValidationErrors, filterRoutesByPatterns, findSimilar, fitWithin, flattenRichText, forEachRichTextImage, getErrorMessageFromUnknownJson, getFilenameFromRef, getInlineImgInfo, getKeyOfRecordAt, getRefParts, getRoutesOf, getRoutesWithModulePaths, getSourceAt, indexModule, isMimeTypeAccepted, isRemoteSchema, isSchemaSourceFixError, isSkippedSource, keyOfRecordPath, levenshtein, localeAt, memoizePerRequest, newestCommitSha, parseArtifacts, parseBuildTarget, parseCancel, parseDeclare, parseDiscard, parseJob, parseNewestCiRun, parsePress, parseProblems, parseProjectSource, parsePromote, parsePublishToken, parseRenew, parseRequestStatus, parseStatus, parseUpdateTarget, parseVerify, partitionValidationErrors, performSearch, relativeLuminance, remirrorToRichTextSource, removeModule, resolveEncodeSettings, resolvePairGround, resolveSchemaSourceFixForError, resolveSchemaSourceFixes, resolveSerializedSchemaAtPath, richTextImageSchema, richTextToRemirror, safeParsePatch, sourcePathOfChild, themeCustomProperties, toolNames, traverseSchemaSource, urlOf, validateRoutePatterns, withExtension };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.143.0",
+  "version": "0.144.0",
   "private": false,
   "description": "Val shared types and utilities",
   "repository": {
@@ -37,7 +37,7 @@
     "flexsearch": "^0.8.212",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.143.0"
+    "@valbuild/core": "0.144.0"
   },
   "files": [
     "CHANGELOG.md",