@valbuild/core 0.143.0 → 0.145.0

package/CHANGELOG.md

@@ -1,5 +1,65 @@
 # @valbuild/core
 
+## 0.145.0
+
+### Minor Changes
+
+- [#851](https://github.com/valbuild/val/pull/851) [`b6cb939`](https://github.com/valbuild/val/commit/b6cb9395d8bdcd5182e9c6ba84f5284930de2fa5) Thanks [@freekh](https://github.com/freekh)! - New `s.int()` for whole numbers, `.step()` on `s.int()` and `s.number()`, and a slider for both:
+
+  ```ts
+  s.object({
+    columns: s.int().min(1).max(6),
+    opacity: s
+      .int()
+      .min(0)
+      .max(100)
+      .step(5)
+      .render({ as: "slider", min: 0, max: 100 }),
+    lineHeight: s.number().render({ as: "slider", min: 1, max: 2, step: 0.1 }),
+  });
+  ```
+
+  - `.min()`, `.max()` and `.step()` are rules the validator checks. A step is counted from `min`, or from 0 when there is none.
+  - `.render({ as: "slider", min, max, step? })` is how the field is edited: a slider, with a box beside it for typing an exact value. `min` and `max` are required. The slider's step defaults to the schema's `.step()`, then to 1.
+  - The slider can only produce values the schema accepts. A slider outside `.min()`/`.max()`, with a step that is not a multiple of `.step()`, or with decimals on an `s.int()` throws where the schema is defined.
+  - A value outside the slider's range is still valid content. The field says it is out of the slider's reach and offers "Set to" the nearest stop. A value that breaks a rule offers "Round to" the nearest allowed value.
+  - Fixed: `.min(0)` and `.max(0)` on `s.number()` were ignored.
+  - A new item of a number schema starts at the nearest allowed value instead of `0`, so `s.int().min(1)` starts at 1.
+
+## 0.144.0
+
+### Minor Changes
+
+- [#826](https://github.com/valbuild/val/pull/826) [`860ab2b`](https://github.com/valbuild/val/commit/860ab2b87333daf95a48215b0e4a1b44f441c878) Thanks [@freekh](https://github.com/freekh)! - New names for the media collections: `s.imagedir()`, `s.filedir()`, `s.fontdir()` and `s.videodir()`. The directory the uploads land in is now the first argument instead of the `dir` option:
+
+  ```ts
+  // before
+  s.imageset({ dir: "/public/val/images", accept: "image/webp" });
+  s.fileset({ dir: "/public/val/docs", accept: "application/pdf" });
+  s.fontset({ dir: "/public/val/fonts" });
+  s.videoset({ dir: "/public/val/videos", stream: { type: "hls" } });
+
+  // after
+  s.imagedir("/public/val/images", { accept: "image/webp" });
+  s.filedir("/public/val/docs", { accept: "application/pdf" });
+  s.fontdir("/public/val/fonts");
+  s.videodir("/public/val/videos", { stream: { type: "hls" } });
+  ```
+
+  Every other option is unchanged, and so is the content: a module only needs its schema call changed. The options object can now be left out entirely where nothing else is set, as in `s.fontdir("/public/val/fonts")`.
+
+  `s.imageset()`, `s.fileset()`, `s.fontset()` and `s.videoset()` still work and build exactly the same schema, but are deprecated and will be removed in a later release. The exported `VideosetEntryMetadata`, `VideosetOptions` and `SerializedVideosetSchema` types are deprecated in favour of `VideodirEntryMetadata`, `VideodirOptions` and `SerializedVideodirSchema`, and the image, file and font equivalents (`ImagedirOptions`, `ImagedirEntryMetadata`, `FiledirOptions`, `FiledirEntryMetadata`, `FontdirOptions`, `MediaDir`, …) are now exported too.
+
+### 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".
+
 ## 0.143.0
 
 ### Minor Changes

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

@@ -7,8 +7,12 @@ export { hasRemoteFileSchema, hasMediaSchema, } from "./schema/hasRemoteFileSche
 export type { ImageMetadata, ImageEncodeOption, ImageEncodeOptions, } from "./schema/image.js";
 export type { FileMetadata } from "./schema/file.js";
 export type { GalleryVideoOptions, VideoMetadata, VideoOptions, VideoStreamOption, VideoStreamOptions, } from "./schema/video.js";
-import { videosetEntryVideoSchema } from "./schema/videoset.js";
-export type { VideosetEntryMetadata, VideosetOptions, SerializedVideosetSchema, } from "./schema/videoset.js";
+import { videosetEntryVideoSchema } from "./schema/videodir.js";
+export type { VideodirEntryMetadata, VideodirOptions, SerializedVideodirSchema, VideosetEntryMetadata, VideosetOptions, SerializedVideosetSchema, } from "./schema/videodir.js";
+export type { ImagedirEntryMetadata, ImagedirOptions, SerializedImagedirSchema, } from "./schema/imagedir.js";
+export type { FiledirEntryMetadata, FiledirOptions, SerializedFiledirSchema, } from "./schema/filedir.js";
+export type { FontdirOptions } from "./schema/fontdir.js";
+export type { MediaDir } from "./schema/record.js";
 export type { ValModule, SerializedModule, InferValModuleType } from "./module.js";
 export type { SourceObject, SourcePrimitive, Source } from "./source/index.js";
 export type { FileSource } from "./source/media.js";
@@ -47,13 +51,15 @@ import { getValidationBasis, getValidationHash } from "./remote/validationBasis.
 import { getFileHash, hashToRemoteFileHash } from "./remote/fileHash.js";
 import { splitRemoteRef } from "./remote/splitRemoteRef.js";
 import { galleriesOf } from "./source/galleries.js";
-import { fillFromGallery, galleryEntryOf, isHlsVideo, isRemoteMediaPath, mediaUrl, resolveMedia, resolveVideo } from "./source/media.js";
+import { fillFromGallery, galleryEntryOf, galleryKeyOf, isHlsVideo, isRemoteMediaPath, mediaUrl, resolveMedia, resolveVideo } from "./source/media.js";
 import { colorToHex, convertColor, detectColorFormat, formatColor, parseColor } from "./schema/colorFormat.js";
 export { type SerializedArraySchema, ArraySchema } from "./schema/array.js";
 export { type SerializedObjectSchema, ObjectSchema } from "./schema/object.js";
 export { type SerializedRecordSchema, type MediaCollectionType, RecordSchema, } from "./schema/record.js";
 export { type SerializedStringSchema, StringSchema } from "./schema/string.js";
 export { type SerializedNumberSchema, NumberSchema } from "./schema/number.js";
+import { nearestAllowedNumber, isOnStep, stepOrigin } from "./schema/numberRules.js";
+export type { NumberRules } from "./schema/numberRules.js";
 export { type SerializedBooleanSchema, BooleanSchema } from "./schema/boolean.js";
 export { type SerializedImageSchema, ImageSchema } from "./schema/image.js";
 export { type SerializedFileSchema, FileSchema } from "./schema/file.js";
@@ -85,7 +91,7 @@ export { type SerializedUnionSchema, type UnionSchema, type SerializedStringUnio
 export { type SerializedLiteralSchema, LiteralSchema } from "./schema/literal.js";
 export { deserializeSchema } from "./schema/deserialize.js";
 export { type PreviewItem, type ItemPreviewInput, type RecordPreview, type ArrayPreview, type ReifiedPreview, type PreviewScope, previewScope, } from "./preview.js";
-export { type InlineRender, type FieldRender, isInlineRender } from "./render.js";
+export { type InlineRender, type FieldRender, type SliderRender, type NumberRender, isInlineRender, } from "./render.js";
 export type { ValRouter, ExternalPageRouter, RouteValidationError, } from "./router.js";
 export { parseNextJsRoutePattern, parseTanStackRoutePattern, tanStackSegmentsOfRoutePath, validateUrlAgainstPattern, } from "./router.js";
 export { getSourcePathFromRoute, isPageRouter } from "./getSourcePathFromRoute.js";
@@ -148,6 +154,7 @@ declare const Internal: {
         fillFromGallery: typeof fillFromGallery;
         galleriesOf: typeof galleriesOf;
         galleryEntryOf: typeof galleryEntryOf;
+        galleryKeyOf: typeof galleryKeyOf;
         GALLERY_DEFAULT_GROUPS: readonly (readonly string[])[];
         isHlsVideo: typeof isHlsVideo;
         HLS_MIME_TYPE: string;
@@ -168,6 +175,11 @@ declare const Internal: {
     rejectScheme: typeof rejectScheme;
     schemeOf: typeof schemeOf;
     UNSAFE_URL_SCHEMES: readonly ["javascript", "data", "vbscript", "file", "blob"];
+    number: {
+        nearestAllowedNumber: typeof nearestAllowedNumber;
+        isOnStep: typeof isOnStep;
+        stepOrigin: typeof stepOrigin;
+    };
     color: {
         parseColor: typeof parseColor;
         formatColor: typeof formatColor;

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

@@ -1,5 +1,5 @@
 import { array } from "./schema/array.js";
-import { number } from "./schema/number.js";
+import { int, number } from "./schema/number.js";
 import { object } from "./schema/object.js";
 import { string } from "./schema/string.js";
 import { boolean } from "./schema/boolean.js";
@@ -15,8 +15,8 @@ import { record } from "./schema/record.js";
 import { file } from "./schema/file.js";
 import { font } from "./schema/font.js";
 import { video } from "./schema/video.js";
-import { fileset } from "./schema/fileset.js";
-import { fontset } from "./schema/fontset.js";
+import { filedir, fileset } from "./schema/filedir.js";
+import { fontdir, fontset } from "./schema/fontdir.js";
 import { date } from "./schema/date.js";
 import { datetime } from "./schema/datetime.js";
 import { code } from "./schema/code.js";
@@ -24,8 +24,8 @@ import { color } from "./schema/color.js";
 import { locale } from "./schema/locale.js";
 import { route } from "./schema/route.js";
 import { router } from "./schema/router.js";
-import { imageset } from "./schema/imageset.js";
-import { videoset } from "./schema/videoset.js";
+import { imagedir, imageset } from "./schema/imagedir.js";
+import { videodir, videoset } from "./schema/videodir.js";
 import { settings } from "./schema/settings.js";
 export type InitSchema = {
     /**
@@ -74,6 +74,28 @@ export type InitSchema = {
      *
      */
     readonly number: typeof number;
+    /**
+     * Define a whole number. The source is an ordinary `number`; `s.int()` adds
+     * the rule that it has no decimals.
+     *
+     * Takes `.min()`, `.max()` and `.step()` for what the value may be, and
+     * `.render({ as: "slider", min, max })` to edit it with a slider.
+     *
+     * @example
+     * const schema = s.object({
+     *   columns: s.int().min(1).max(6),
+     *   opacity: s.int().min(0).max(100).step(5).render({
+     *     as: "slider",
+     *     min: 0,
+     *     max: 100,
+     *   }),
+     * });
+     * export default c.define("/example.val.ts", schema, {
+     *   columns: 3,
+     *   opacity: 40,
+     * });
+     */
+    readonly int: typeof int;
     /**
      * Define one of several object shapes, told apart by a tag field.
      *
@@ -153,7 +175,7 @@ export type InitSchema = {
      *
      * @example
      * // Backed by a gallery: width, height and mimeType live there.
-     * import galleryVal from "./gallery.val"; // an s.imageset() module
+     * import galleryVal from "./gallery.val"; // an s.imagedir() module
      * const schema = s.image(galleryVal);
      * export default c.define("/example.val.ts", schema, {
      *   path: "/public/val/example.png",
@@ -222,13 +244,13 @@ export type InitSchema = {
      */
     readonly file: typeof file;
     /**
-     * A font picked from an `s.fontset()`: `s.file(fontsVal)` for fonts, which
+     * A font picked from an `s.fontdir()`: `s.file(fontsVal)` for fonts, which
      * refuses a module that is not a font set. The Studio shows it in its parent
      * as the font's "A" and file name, and opens it on the set to pick from.
      *
      * @example
      * ```typescript
-     * import fontsVal from "./fonts.val"; // an s.fontset() module
+     * import fontsVal from "./fonts.val"; // an s.fontdir() module
      * const schema = s.object({ headingFont: s.font(fontsVal) });
      * // source: { headingFont: { path: "/public/val/fonts/inter_a1b2c.woff2" } }
      * ```
@@ -261,7 +283,7 @@ export type InitSchema = {
      *
      * @example
      * // Picked from a set: mimeType, width, height and duration live there.
-     * import videosVal from "./videos.val"; // an s.videoset() module
+     * import videosVal from "./videos.val"; // an s.videodir() module
      * const schema = s.video(videosVal);
      * export default c.define("/example.val.ts", schema, {
      *   path: "/public/val/videos/intro_51df2.mp4",
@@ -377,13 +399,16 @@ export type InitSchema = {
      */
     readonly router: typeof router;
     /**
-     * Define a collection of images.
+     * Define a directory of images: a whole module of images, keyed by file
+     * path, that fields pick from with `s.image(galleryVal)`.
+     *
+     * The first argument is the directory uploads land in, and must start with
+     * `/public`.
      *
      * @example
      * ```typescript
-     * const schema = s.imageset({
+     * const schema = s.imagedir("/public/val/images", {
      *   accept: "image/webp",
-     *   dir: "/public/val/images",
      *   alt: s.string().minLength(4),
      * });
      * export default c.define("/content/images.val.ts", schema, {
@@ -396,15 +421,18 @@ export type InitSchema = {
      * });
      * ```
      */
-    readonly imageset: typeof imageset;
+    readonly imagedir: typeof imagedir;
     /**
-     * Define a collection of files.
+     * Define a directory of files: a whole module of files, keyed by file path,
+     * that fields pick from with `s.file(filesVal)`.
+     *
+     * The first argument is the directory uploads land in, and must start with
+     * `/public`.
      *
      * @example
      * ```typescript
-     * const schema = s.fileset({
+     * const schema = s.filedir("/public/val/documents", {
      *   accept: "application/pdf",
-     *   dir: "/public/val/documents",
      * });
      * export default c.define("/content/documents.val.ts", schema, {
      *   "/public/val/documents/report.pdf": {
@@ -413,15 +441,15 @@ export type InitSchema = {
      * });
      * ```
      */
-    readonly fileset: typeof fileset;
+    readonly filedir: typeof filedir;
     /**
-     * Define a collection of fonts: an `s.fileset()` that accepts the web font
+     * Define a directory of fonts: an `s.filedir()` that accepts the web font
      * formats, and whose files the Studio previews as type. A field picks from
-     * it with `s.file(fontsVal)`.
+     * it with `s.font(fontsVal)`.
      *
      * @example
      * ```typescript
-     * const schema = s.fontset({ dir: "/public/val/fonts" });
+     * const schema = s.fontdir("/public/val/fonts");
      * export default c.define("/content/fonts.val.ts", schema, {
      *   "/public/val/fonts/inter_a1b2c.woff2": {
      *     mimeType: "font/woff2",
@@ -429,15 +457,14 @@ export type InitSchema = {
      * });
      * ```
      */
-    readonly fontset: typeof fontset;
+    readonly fontdir: typeof fontdir;
     /**
-     * Define a collection of videos. A field picks from it with
+     * Define a directory of videos. A field picks from it with
      * `s.video(videosVal)`.
      *
      * @example
      * ```typescript
-     * const schema = s.videoset({
-     *   dir: "/public/val/videos",
+     * const schema = s.videodir("/public/val/videos", {
      *   stream: { type: "hls" },
      * });
      * export default c.define("/content/videos.val.ts", schema, {
@@ -451,6 +478,60 @@ export type InitSchema = {
      * });
      * ```
      */
+    readonly videodir: typeof videodir;
+    /**
+     * Define a collection of images.
+     *
+     * @deprecated Use `s.imagedir(dir, options)`: the directory moved out of the
+     * options and into the first argument.
+     *
+     * @example
+     * ```typescript
+     * // was: s.imageset({ dir: "/public/val/images", accept: "image/webp" })
+     * const schema = s.imagedir("/public/val/images", { accept: "image/webp" });
+     * ```
+     */
+    readonly imageset: typeof imageset;
+    /**
+     * Define a collection of files.
+     *
+     * @deprecated Use `s.filedir(dir, options)`: the directory moved out of the
+     * options and into the first argument.
+     *
+     * @example
+     * ```typescript
+     * // was: s.fileset({ dir: "/public/val/documents", accept: "application/pdf" })
+     * const schema = s.filedir("/public/val/documents", {
+     *   accept: "application/pdf",
+     * });
+     * ```
+     */
+    readonly fileset: typeof fileset;
+    /**
+     * Define a collection of fonts.
+     *
+     * @deprecated Use `s.fontdir(dir, options)`: the directory moved out of the
+     * options and into the first argument.
+     *
+     * @example
+     * ```typescript
+     * // was: s.fontset({ dir: "/public/val/fonts" })
+     * const schema = s.fontdir("/public/val/fonts");
+     * ```
+     */
+    readonly fontset: typeof fontset;
+    /**
+     * Define a collection of videos.
+     *
+     * @deprecated Use `s.videodir(dir, options)`: the directory moved out of the
+     * options and into the first argument.
+     *
+     * @example
+     * ```typescript
+     * // was: s.videoset({ dir: "/public/val/videos", stream: { type: "hls" } })
+     * const schema = s.videodir("/public/val/videos", { stream: { type: "hls" } });
+     * ```
+     */
     readonly videoset: typeof videoset;
     /**
      * Define the project's settings.
@@ -482,8 +563,8 @@ export type InitSchemaOptions = {
     /**
      * Every media schema is remote: `files.remote` in `val.config.ts`.
      *
-     * `s.image()`, `s.file()`, `s.video()`, `s.imageset()`, `s.fileset()`,
-     * `s.fontset()` and `s.videoset()` come back with `.remote()` already applied, and so does the
+     * `s.image()`, `s.file()`, `s.video()`, `s.imagedir()`, `s.filedir()`,
+     * `s.fontdir()` and `s.videodir()` (and their deprecated `*set` names) come back with `.remote()` already applied, and so does the
      * image `s.richtext({ img: true })` builds for itself. Nothing downstream
      * needs to know: the Studio, the MCP tools, validation and publishing all
      * read `remote` off the schema, exactly as they do for a `.remote()` written

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

@@ -80,8 +80,8 @@ export type ValConfig = {
          * Store every image, file and video on Val's remote content host instead
          * of in the repository.
          *
-         * `s.image()`, `s.file()`, `s.video()`, `s.imageset()`, `s.fileset()`,
-         * `s.fontset()`, `s.videoset()` and `s.richtext({ img: true })` all behave as though
+         * `s.image()`, `s.file()`, `s.video()`, `s.imagedir()`, `s.filedir()`,
+         * `s.fontdir()`, `s.videodir()` and `s.richtext({ img: true })` all behave as though
          * `.remote()` had been written on them. Required for a project in the Val
          * app, which has no repository for the bytes to go into: there the Val
          * server refuses to start without it.

package/dist/declarations/src/mimeType/font.d.ts

@@ -8,9 +8,9 @@
  * `application/octet-stream` once the file is a data URL. That is why an upload
  * asks the BYTES ({@link sniffFontMimeType}) rather than trusting the picker.
  */
-/** The formats `s.fontset()` accepts unless told otherwise, best first. */
+/** The formats `s.fontdir()` accepts unless told otherwise, best first. */
 export declare const FONT_MIME_TYPES: readonly ["font/woff2", "font/woff", "font/ttf", "font/otf"];
-/** `s.fontset()`'s `accept` when none is given. */
+/** `s.fontdir()`'s `accept` when none is given. */
 export declare const DEFAULT_FONT_ACCEPT: string;
 /**
  * The extension of each font type, for a file input: a picker matches an

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

@@ -27,11 +27,12 @@ import type { SerializedSchema } from "./schema/index.js";
  */
 /**
  * A RENDER is how a field is laid out in the editor, and it applies only when
- * you are looking at the field. It is declared by a CONTAINER about its
- * children, never by a child about itself: `s.array(item).render({ as: "inline" })`
- * and `s.record(item).render({ as: "inline" })`. The one other schema that takes
- * a render is `s.keyOf(...)`, where it means something of its own (see
- * `KeyOfSchema.render`).
+ * you are looking at the field. On a list it is declared by the CONTAINER about
+ * its children, never by a child about itself: `s.array(item).render({ as: "inline" })`
+ * and `s.record(item).render({ as: "inline" })`. Two other schemas take a
+ * render, each meaning something of its own: `s.keyOf(...)` (see
+ * `KeyOfSchema.render`) and `s.number()` / `s.int()`, whose `{ as: "slider" }`
+ * is a different input for the same value (see {@link SliderRender}).
  *
  * Why the container: inline is a property of the LIST — "my items are edited in
  * their rows" — and the item schema is the wrong place to say it. An item can be
@@ -75,7 +76,7 @@ import type { SerializedSchema } from "./schema/index.js";
  * `s.array(s.object({ tags: s.array(s.string()) })).render({ as: "inline" })`
  * the objects are inline and `tags` keeps its own default.
  *
- * Not available on `s.router(...)`, `s.imageset(...)` or `s.fileset(...)`:
+ * Not available on `s.router(...)`, `s.imagedir(...)` or `s.filedir(...)`:
  * pages and media have UIs of their own, and `RecordSchema.render` throws there.
  *
  * On `s.keyOf(...)` the same value means something else: the selected entry's
@@ -89,6 +90,38 @@ export type InlineRender = {
  * What `.render(...)` takes, and what the serialized schema carries verbatim.
  */
 export type FieldRender = InlineRender;
+/**
+ * `{ as: "slider", min, max }` on `s.int()` or `s.number()`: the value is
+ * edited with a slider from `min` to `max`, next to a box that takes a typed
+ * value.
+ *
+ * `min` and `max` are REQUIRED, because a slider without ends is not a slider.
+ * They are the slider's own and are not validation: a value outside them is
+ * still valid content (if the schema allows it), and the field says it is out
+ * of the slider's reach and offers to bring it back. What the schema accepts is
+ * `.min()`, `.max()` and `.step()` on the schema itself.
+ *
+ * The one rule tying the two together: **the slider may only produce values
+ * the schema accepts.** So its range has to lie inside the schema's, its step
+ * has to be a multiple of the schema's step and its `min` on the schema's grid,
+ * and on `s.int()` all of them have to be whole numbers. A schema that breaks
+ * that throws where it is defined — see `NumberSchema`.
+ *
+ * `step` defaults to the schema's `.step()`, and to 1 when there is none.
+ *
+ * Unlike `inline` this is about the field itself — no list reads it, and
+ * {@link isInlineRender} answers `false` for it.
+ */
+export type SliderRender = {
+    as: "slider";
+    min: number;
+    max: number;
+    step?: number;
+};
+/**
+ * What `s.number().render(...)` and `s.int().render(...)` take.
+ */
+export type NumberRender = SliderRender;
 /**
  * Does this CONTAINER edit its items inside their list rows, rather than behind
  * clickable preview rows that navigate to them?

package/dist/declarations/src/schema/file.d.ts

@@ -5,7 +5,7 @@ import { ModulePath, SourcePath } from "../val/index.js";
 import { ValidationError, ValidationErrors } from "./validation/ValidationError.js";
 import { ValModule } from "../index.js";
 import { ItemPreviewInput, PreviewItem } from "../preview.js";
-import { FilesetEntryMetadata } from "./fileset.js";
+import { FiledirEntryMetadata } from "./filedir.js";
 export type FileOptions = {
     accept?: string;
 };
@@ -32,7 +32,7 @@ export declare class FileSchema<Src extends FileSource | null> extends Schema<Sr
     private readonly isHidden;
     private readonly description?;
     private readonly previewInput;
-    constructor(options?: FileOptions | undefined, opt?: boolean, isRemote?: boolean, customValidateFunctions?: CustomValidateFunction<Src>[], moduleMetadata?: Record<ModulePath, Record<string, FilesetEntryMetadata>>, isReadonly?: boolean, isHidden?: boolean, description?: string | undefined, previewInput?: ItemPreviewInput<Src> | null);
+    constructor(options?: FileOptions | undefined, opt?: boolean, isRemote?: boolean, customValidateFunctions?: CustomValidateFunction<Src>[], moduleMetadata?: Record<ModulePath, Record<string, FiledirEntryMetadata>>, isReadonly?: boolean, isHidden?: boolean, description?: string | undefined, previewInput?: ItemPreviewInput<Src> | null);
     /**
      * Describe this field.
      *
@@ -135,7 +135,7 @@ export declare class FileSchema<Src extends FileSource | null> extends Schema<Sr
  * A file picked from a gallery. Its mime type lives in the gallery, so the
  * field carries only the path.
  */
-export declare function file(galleryModule: ValModule<Record<string, FilesetEntryMetadata>>): FileSchema<GalleryFileSource>;
+export declare function file(galleryModule: ValModule<Record<string, FiledirEntryMetadata>>): FileSchema<GalleryFileSource>;
 /** A file of its own, carrying its own mime type. */
 export declare function file(options?: FileOptions): FileSchema<FileSource>;
 /**
@@ -143,5 +143,5 @@ export declare function file(options?: FileOptions): FileSchema<FileSource>;
  * `val.config.ts`): the same schema, with `.remote()` already applied. See
  * `initSchema`.
  */
-export declare function remoteFile(galleryModule: ValModule<Record<string, FilesetEntryMetadata>>): FileSchema<GalleryFileSource>;
+export declare function remoteFile(galleryModule: ValModule<Record<string, FiledirEntryMetadata>>): FileSchema<GalleryFileSource>;
 export declare function remoteFile(options?: FileOptions): FileSchema<FileSource>;

package/dist/declarations/src/schema/filedir.d.ts

@@ -0,0 +1,83 @@
+import { Schema } from "./index.js";
+import type { MediaDir, SerializedRecordSchema } from "./record.js";
+import { RecordSchema } from "./record.js";
+import { ObjectSchema } from "./object.js";
+import { StringSchema } from "./string.js";
+/**
+ * Options for `s.filedir(dir, options)`: everything but the directory, which
+ * is the first argument.
+ */
+export type FiledirOptions = {
+    /**
+     * The accepted mime type pattern (e.g., "application/pdf", "text/*", "*\/*")
+     */
+    accept: string;
+};
+/**
+ * Options for the deprecated `s.fileset(options)`, which took the directory
+ * as `dir`.
+ *
+ * @deprecated Use `s.filedir(dir, options)` and `FiledirOptions`.
+ */
+export type FilesetOptions = FiledirOptions & {
+    /**
+     * The directory where files should be stored.
+     * Must start with "/public" (e.g., "/public/val/files")
+     */
+    dir: MediaDir;
+};
+/**
+ * Metadata for a file entry in the files record
+ */
+export type FiledirEntryMetadata = {
+    mimeType: string;
+};
+/** @deprecated Use `FiledirEntryMetadata`. */
+export type FilesetEntryMetadata = FiledirEntryMetadata;
+export type SerializedFiledirSchema = SerializedRecordSchema;
+/** @deprecated Use `SerializedFiledirSchema`. */
+export type SerializedFilesetSchema = SerializedFiledirSchema;
+type FiledirItemProps = {
+    mimeType: StringSchema<string>;
+};
+type FiledirItemSrc = {
+    mimeType: string;
+};
+type FiledirSchema = RecordSchema<ObjectSchema<FiledirItemProps, FiledirItemSrc>, Schema<string>, Record<string, FiledirEntryMetadata>>;
+/**
+ * Define a directory of files: a whole module that holds many files, keyed by
+ * their file path, that fields pick from with `s.file(filesVal)`.
+ *
+ * The directory is the first argument and is required — it decides where
+ * uploads land. Remote is off by default: call `.remote()` on the result to
+ * allow remote files.
+ *
+ * @example
+ * ```typescript
+ * const schema = s.filedir("/public/val/documents", {
+ *   accept: "application/pdf",
+ * });
+ * export default c.define("/content/documents.val.ts", schema, {
+ *   "/public/val/documents/report.pdf": {
+ *     mimeType: "application/pdf",
+ *   },
+ * });
+ * ```
+ */
+export declare const filedir: (dir: MediaDir, options: FiledirOptions) => FiledirSchema;
+/**
+ * Define a collection of files.
+ *
+ * @deprecated Use `s.filedir(dir, options)`: the directory moved out of the
+ * options and into the first argument, and nothing else changed.
+ *
+ * @example
+ * ```typescript
+ * // was: s.fileset({ dir: "/public/val/documents", accept: "application/pdf" })
+ * const schema = s.filedir("/public/val/documents", {
+ *   accept: "application/pdf",
+ * });
+ * ```
+ */
+export declare const fileset: (options: FilesetOptions) => FiledirSchema;
+export {};

package/dist/declarations/src/schema/font.d.ts

@@ -1,9 +1,9 @@
 import { ValModule } from "../index.js";
 import { FileSchema } from "./file.js";
-import { FilesetEntryMetadata } from "./fileset.js";
+import { FiledirEntryMetadata } from "./filedir.js";
 import { GalleryFileSource } from "../source/media.js";
 /**
- * A font picked from an `s.fontset()`.
+ * A font picked from an `s.fontdir()`.
  *
  * The same field `s.file(fontsVal)` is — it stores `{ path }` and serializes
  * identically — with one thing more: it refuses a set that is not a font set,
@@ -11,6 +11,6 @@ import { GalleryFileSource } from "../source/media.js";
  * Studio does with it (a specimen in its parent, the set to pick from when
  * opened) it does for any file field backed by a font set.
  */
-export declare function font(fontsetModule: ValModule<Record<string, FilesetEntryMetadata>>): FileSchema<GalleryFileSource>;
+export declare function font(fontsetModule: ValModule<Record<string, FiledirEntryMetadata>>): FileSchema<GalleryFileSource>;
 /** `s.font()` with `.remote()` applied: see `files.remote` in `initSchema`. */
-export declare function remoteFont(fontsetModule: ValModule<Record<string, FilesetEntryMetadata>>): FileSchema<GalleryFileSource>;
+export declare function remoteFont(fontsetModule: ValModule<Record<string, FiledirEntryMetadata>>): FileSchema<GalleryFileSource>;