@valbuild/core 0.141.0 → 0.143.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @valbuild/core
 
+## 0.143.0
+
+### Minor Changes
+
+- [#813](https://github.com/valbuild/val/pull/813) [`f7c25bd`](https://github.com/valbuild/val/commit/f7c25bd4b44c288db8e5ab914e6d8a72c0216ba5) Thanks [@freekh](https://github.com/freekh)! - New: `s.font(fontsVal)`, a field that picks a font from an `s.fontset()`.
+
+  ```ts
+  s.object({
+    headingFont: s.font(fontsVal),
+    title: s.string(),
+  });
+  ```
+
+  It stores `{ path }` like `s.file(fontsVal)` does, and refuses a module that is not a font set. In the Studio, a font field is shown among its object's other fields as a small row — the letter "A" set in the chosen font, and the font's file name. Click it to open the field, which shows every font in the set to pick from, an upload button, and a full specimen of the chosen font. This applies to `s.file()` fields that point at a font set too.
+
+- [#813](https://github.com/valbuild/val/pull/813) [`729c4ed`](https://github.com/valbuild/val/commit/729c4edfa28f5a2942c435ccf225e65858b080cc) Thanks [@freekh](https://github.com/freekh)! - New: `s.fontset()`, a collection of fonts.
+
+  ```ts
+  const fontsVal = c.define(
+    "/content/fonts.val.ts",
+    s.fontset({ dir: "/public/val/fonts" }),
+    {},
+  );
+  // a field that picks one of them
+  s.object({ headingFont: s.file(fontsVal) });
+  ```
+
+  It is an `s.fileset()` whose `accept` defaults to the web font formats (`font/woff2`, `font/woff`, `font/ttf`, `font/otf`); pass `accept: "font/woff2"` to allow only WOFF2. Fonts are not converted on upload.
+
+  The Studio now previews fonts set in themselves — in the gallery, in the picker of a field that points at a font set, and in the field — wherever a file is a font, including fonts in an ordinary `s.fileset()`.
+
+  Font uploads are typed from their bytes, so a font is stored as `font/woff2`, `font/ttf` and so on even when the browser reports no type for it. Files ending in `.ttf`, `.otf` and `.woff` now map to the `font/` types rather than the older `application/x-font-*` names, which are still accepted where they are already stored.
+
 ## 0.141.0
 
 ### Minor Changes

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

@@ -35,7 +35,7 @@ import { ModulePath, SourcePath, getValPath, isVal } from "./val/index.js";
 import { createValPathOfItem } from "./selector/SelectorProxy.js";
 import { Operation } from "./patch/index.js";
 import { initSchema } from "./initSchema.js";
-import { getMimeType, mimeTypeToFileExt, filenameToMimeType, mimeTypeMatchesAccept } from "./mimeType/index.js";
+import { getMimeType, mimeTypeToFileExt, filenameToMimeType, mimeTypeMatchesAccept, isFontMimeType, sniffFontMimeType } from "./mimeType/index.js";
 import { type ImageMetadata } from "./schema/image.js";
 import { type FileMetadata } from "./schema/file.js";
 import { isJson, getJsonImport, resolveJsonValues } from "./source/json.js";
@@ -57,6 +57,7 @@ export { type SerializedNumberSchema, NumberSchema } from "./schema/number.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";
+export { DEFAULT_FONT_ACCEPT, FONT_MIME_TYPES } from "./mimeType/font.js";
 export { type SerializedVideoSchema, VideoSchema, DEFAULT_VIDEO_ACCEPT, DEFAULT_VIDEO_RENDITIONS, DEFAULT_VIDEO_SEGMENT_DURATION, } from "./schema/video.js";
 export { type SerializedDateSchema, DateSchema } from "./schema/date.js";
 export { type SerializedSettingsSchema, SettingsSchema, } from "./schema/settings.js";
@@ -208,6 +209,9 @@ declare const Internal: {
     MIME_TYPES_TO_EXT: {
         [k: string]: string;
     };
+    FONT_MIME_TYPE_EXTENSIONS: Record<string, string>;
+    isFontMimeType: typeof isFontMimeType;
+    sniffFontMimeType: typeof sniffFontMimeType;
     ModuleFilePathSep: string;
     notFileOp: (op: Operation) => op is {
         op: "add";

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

@@ -13,8 +13,10 @@ import { keyOf } from "./schema/keyOf.js";
 import { view } from "./schema/view.js";
 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 { date } from "./schema/date.js";
 import { datetime } from "./schema/datetime.js";
 import { code } from "./schema/code.js";
@@ -219,6 +221,19 @@ export type InitSchema = {
      *
      */
     readonly file: typeof file;
+    /**
+     * A font picked from an `s.fontset()`: `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
+     * const schema = s.object({ headingFont: s.font(fontsVal) });
+     * // source: { headingFont: { path: "/public/val/fonts/inter_a1b2c.woff2" } }
+     * ```
+     */
+    readonly font: typeof font;
     /**
      * Define a video.
      *
@@ -399,6 +414,22 @@ export type InitSchema = {
      * ```
      */
     readonly fileset: typeof fileset;
+    /**
+     * Define a collection of fonts: an `s.fileset()` that accepts the web font
+     * formats, and whose files the Studio previews as type. A field picks from
+     * it with `s.file(fontsVal)`.
+     *
+     * @example
+     * ```typescript
+     * const schema = s.fontset({ dir: "/public/val/fonts" });
+     * export default c.define("/content/fonts.val.ts", schema, {
+     *   "/public/val/fonts/inter_a1b2c.woff2": {
+     *     mimeType: "font/woff2",
+     *   },
+     * });
+     * ```
+     */
+    readonly fontset: typeof fontset;
     /**
      * Define a collection of videos. A field picks from it with
      * `s.video(videosVal)`.
@@ -451,8 +482,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()` and
-     * `s.videoset()` come back with `.remote()` already applied, and so does the
+     * `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
      * 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

@@ -81,7 +81,7 @@ export type ValConfig = {
          * of in the repository.
          *
          * `s.image()`, `s.file()`, `s.video()`, `s.imageset()`, `s.fileset()`,
-         * `s.videoset()` and `s.richtext({ img: true })` all behave as though
+         * `s.fontset()`, `s.videoset()` 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

@@ -0,0 +1,36 @@
+/**
+ * Fonts, as far as a mime type can tell.
+ *
+ * The four web formats have IANA types under `font/` (RFC 8081), and those are
+ * what Val stores. Browsers and operating systems disagree about them: a file
+ * picker reports `.woff2` as `font/woff2`, `application/font-woff2` or nothing
+ * at all depending on the platform, and nothing at all reads as
+ * `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. */
+export declare const FONT_MIME_TYPES: readonly ["font/woff2", "font/woff", "font/ttf", "font/otf"];
+/** `s.fontset()`'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
+ * `accept` of mime types through the operating system's own table, and where
+ * that table does not know `font/woff2` the file is greyed out.
+ */
+export declare const FONT_MIME_TYPE_EXTENSIONS: Record<string, string>;
+/** `mimeType`, with a legacy font name read as its `font/` type. */
+export declare function canonicalFontMimeType(mimeType: string): string;
+/**
+ * Whether a file of `mimeType` is a font a browser can draw: the `font/` types,
+ * and the pre-RFC 8081 names still found in older data.
+ */
+export declare function isFontMimeType(mimeType: string | null | undefined): boolean;
+/**
+ * The font type of `bytes`, read from the signature every font format starts
+ * with, or `null` when they are not a font.
+ *
+ * Only the first four bytes are needed: the WOFF signatures (`wOFF`, `wOF2`),
+ * the SFNT versions of TrueType (`0x00010000`, or `true` from old Apple fonts)
+ * and of CFF-flavoured OpenType (`OTTO`), and a collection's tag (`ttcf`).
+ */
+export declare function sniffFontMimeType(bytes: Uint8Array): string | null;

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

@@ -1,2 +1,3 @@
 export * from "./convertMimeType.js";
 export * from "./all.js";
+export * from "./font.js";

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

@@ -0,0 +1,16 @@
+import { ValModule } from "../index.js";
+import { FileSchema } from "./file.js";
+import { FilesetEntryMetadata } from "./fileset.js";
+import { GalleryFileSource } from "../source/media.js";
+/**
+ * A font picked from an `s.fontset()`.
+ *
+ * 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,
+ * at definition, so a field called a font cannot end up offering PDFs. What the
+ * 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>;
+/** `s.font()` with `.remote()` applied: see `files.remote` in `initSchema`. */
+export declare function remoteFont(fontsetModule: ValModule<Record<string, FilesetEntryMetadata>>): FileSchema<GalleryFileSource>;

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

@@ -0,0 +1,40 @@
+import { fileset, FilesetOptions } from "./fileset.js";
+/**
+ * Options for s.fontset()
+ */
+export type FontsetOptions = {
+    /**
+     * The directory where fonts should be stored.
+     * Must start with "/public" (e.g., "/public/val/fonts")
+     */
+    dir: FilesetOptions["dir"];
+    /**
+     * The accepted font types. Defaults to every web font format:
+     * `"font/woff2,font/woff,font/ttf,font/otf"`. Narrow it to `"font/woff2"` to
+     * keep the site's fonts to the one format every current browser reads and
+     * that is smallest on the wire.
+     */
+    accept?: string;
+};
+/**
+ * Define a collection of fonts.
+ *
+ * A fontset IS a fileset — the same source, the same `s.file(fontsVal)` field
+ * to pick from it, the same checks and fixes — with `accept` defaulting to the
+ * web font formats. What a font gets that any other file does not is decided
+ * by its mime type rather than by the set: the Studio previews any file it
+ * knows is a font, wherever it is shown.
+ *
+ * Remote is off by default: call `.remote()` on the result to allow remote files.
+ *
+ * @example
+ * ```typescript
+ * const schema = s.fontset({ dir: "/public/val/fonts" });
+ * export default c.define("/content/fonts.val.ts", schema, {
+ *   "/public/val/fonts/inter_a1b2c.woff2": {
+ *     mimeType: "font/woff2",
+ *   },
+ * });
+ * ```
+ */
+export declare const fontset: (options: FontsetOptions) => ReturnType<typeof fileset>;

package/dist/{index-a6c53286.esm.js → index-02a1ba06.esm.js}

@@ -3602,7 +3602,7 @@ var EXT_TO_MIME_TYPES = {
   sxw: "application/vnd.sun.xml.writer",
   sxg: "application/vnd.sun.xml.writer.global",
   stw: "application/vnd.sun.xml.writer.template",
-  otf: "application/x-font-otf",
+  otf: "font/otf",
   osfpvg: "application/vnd.yamaha.openscoreformat.osfpvg+xml",
   dp: "application/vnd.osgi.dp",
   pdb: "application/vnd.palm",
@@ -3752,7 +3752,8 @@ var EXT_TO_MIME_TYPES = {
   mxs: "application/vnd.triscape.mxs",
   t: "text/troff",
   tra: "application/vnd.trueapp",
-  ttf: "application/x-font-ttf",
+  ttf: "font/ttf",
+  ttc: "font/collection",
   ttl: "text/turtle",
   umj: "application/vnd.umajin",
   uoml: "application/vnd.uoml+xml",
@@ -3779,7 +3780,8 @@ var EXT_TO_MIME_TYPES = {
   wbmp: "image/vnd.wap.wbmp",
   wav: "audio/x-wav",
   davmount: "application/davmount+xml",
-  woff: "application/x-font-woff",
+  woff: "font/woff",
+  woff2: "font/woff2",
   wspolicy: "application/wspolicy+xml",
   webp: "image/webp",
   wtb: "application/vnd.webturbo",
@@ -3881,6 +3883,93 @@ function mimeTypeMatchesAccept(mimeType, accept) {
   });
 }
 
+/**
+ * Fonts, as far as a mime type can tell.
+ *
+ * The four web formats have IANA types under `font/` (RFC 8081), and those are
+ * what Val stores. Browsers and operating systems disagree about them: a file
+ * picker reports `.woff2` as `font/woff2`, `application/font-woff2` or nothing
+ * at all depending on the platform, and nothing at all reads as
+ * `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. */
+var FONT_MIME_TYPES = ["font/woff2", "font/woff", "font/ttf", "font/otf"];
+
+/** `s.fontset()`'s `accept` when none is given. */
+var DEFAULT_FONT_ACCEPT = FONT_MIME_TYPES.join(",");
+
+/**
+ * The extension of each font type, for a file input: a picker matches an
+ * `accept` of mime types through the operating system's own table, and where
+ * that table does not know `font/woff2` the file is greyed out.
+ */
+var FONT_MIME_TYPE_EXTENSIONS = {
+  "font/woff2": ".woff2",
+  "font/woff": ".woff",
+  "font/ttf": ".ttf",
+  "font/otf": ".otf",
+  "font/collection": ".ttc"
+};
+
+/**
+ * The names the extension table used for fonts before it used RFC 8081's.
+ * Content written then still carries them, and it is the same file.
+ */
+var LEGACY_FONT_MIME_TYPES = {
+  "application/x-font-ttf": "font/ttf",
+  "application/x-font-otf": "font/otf",
+  "application/x-font-woff": "font/woff"
+};
+
+/** `mimeType`, with a legacy font name read as its `font/` type. */
+function canonicalFontMimeType(mimeType) {
+  var _LEGACY_FONT_MIME_TYP;
+  return (_LEGACY_FONT_MIME_TYP = LEGACY_FONT_MIME_TYPES[mimeType]) !== null && _LEGACY_FONT_MIME_TYP !== void 0 ? _LEGACY_FONT_MIME_TYP : mimeType;
+}
+
+/**
+ * Whether a file of `mimeType` is a font a browser can draw: the `font/` types,
+ * and the pre-RFC 8081 names still found in older data.
+ */
+function isFontMimeType(mimeType) {
+  if (!mimeType) {
+    return false;
+  }
+  return mimeType.startsWith("font/") || mimeType.startsWith("application/x-font-") || mimeType === "application/font-woff" || mimeType === "application/font-woff2" || mimeType === "application/font-sfnt" || mimeType === "application/vnd.ms-opentype";
+}
+
+/**
+ * The font type of `bytes`, read from the signature every font format starts
+ * with, or `null` when they are not a font.
+ *
+ * Only the first four bytes are needed: the WOFF signatures (`wOFF`, `wOF2`),
+ * the SFNT versions of TrueType (`0x00010000`, or `true` from old Apple fonts)
+ * and of CFF-flavoured OpenType (`OTTO`), and a collection's tag (`ttcf`).
+ */
+function sniffFontMimeType(bytes) {
+  if (bytes.length < 4) {
+    return null;
+  }
+  var tag = String.fromCharCode(bytes[0], bytes[1], bytes[2], bytes[3]);
+  switch (tag) {
+    case "wOF2":
+      return "font/woff2";
+    case "wOFF":
+      return "font/woff";
+    case "OTTO":
+      return "font/otf";
+    case "true":
+    case "\0\x01\0\0":
+      return "font/ttf";
+    case "ttcf":
+      return "font/collection";
+    default:
+      return null;
+  }
+}
+
 /**
  * How an uploaded image is re-encoded in the browser, before it is uploaded.
  *
@@ -10902,7 +10991,9 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
       // fix was offered -- and the `file:add-metadata` branch below could never be
       // reached for any file whose extension is recognized, which is all of them
       // that get this far.
-      if (mimeType && fileMimeType !== mimeType) {
+      // A legacy font name (`application/x-font-ttf`) is what the extension
+      // table itself used to say, so it is not a mismatch.
+      if (mimeType && fileMimeType !== canonicalFontMimeType(mimeType)) {
         return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Mime type and file extension not matching. Mime type is '".concat(mimeType, "' but file extension is '").concat(fileMimeType, "'"),
           value: src
@@ -11096,6 +11187,38 @@ function fileOf(remote, options) {
   return new FileSchema(options, false, remote);
 }
 
+/**
+ * A font picked from an `s.fontset()`.
+ *
+ * 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,
+ * at definition, so a field called a font cannot end up offering PDFs. What the
+ * 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.
+ */
+function font(fontsetModule) {
+  assertFontset(fontsetModule);
+  return file(fontsetModule);
+}
+
+/** `s.font()` with `.remote()` applied: see `files.remote` in `initSchema`. */
+function remoteFont(fontsetModule) {
+  assertFontset(fontsetModule);
+  return remoteFile(fontsetModule);
+}
+function assertFontset(fontsetModule) {
+  var _getSchema;
+  var modulePath = getValPath(fontsetModule);
+  var serialized = (_getSchema = getSchema(fontsetModule)) === null || _getSchema === void 0 ? void 0 : _getSchema["executeSerialize"]();
+  var accept = (serialized === null || serialized === void 0 ? void 0 : serialized.type) === "record" && serialized.mediaType === "files" ? serialized.accept : undefined;
+  var isFontset = !!accept && accept.split(",").every(function (type) {
+    return isFontMimeType(type.trim());
+  });
+  if (!isFontset) {
+    throw new Error("s.font(".concat(modulePath !== null && modulePath !== void 0 ? modulePath : "?", "): the module must be an s.fontset(). Use s.file() to pick from a set of other files."));
+  }
+}
+
 /**
  * Turn an upload into an HLS stream, in the browser, before it is uploaded.
  *
@@ -11719,6 +11842,50 @@ var fileset = function fileset(options) {
   });
 };
 
+/**
+ * Options for s.fontset()
+ */
+
+/**
+ * Define a collection of fonts.
+ *
+ * A fontset IS a fileset — the same source, the same `s.file(fontsVal)` field
+ * to pick from it, the same checks and fixes — with `accept` defaulting to the
+ * web font formats. What a font gets that any other file does not is decided
+ * by its mime type rather than by the set: the Studio previews any file it
+ * knows is a font, wherever it is shown.
+ *
+ * Remote is off by default: call `.remote()` on the result to allow remote files.
+ *
+ * @example
+ * ```typescript
+ * const schema = s.fontset({ dir: "/public/val/fonts" });
+ * export default c.define("/content/fonts.val.ts", schema, {
+ *   "/public/val/fonts/inter_a1b2c.woff2": {
+ *     mimeType: "font/woff2",
+ *   },
+ * });
+ * ```
+ */
+var fontset = function fontset(options) {
+  var _options$accept;
+  var accept = (_options$accept = options.accept) !== null && _options$accept !== void 0 ? _options$accept : DEFAULT_FONT_ACCEPT;
+  var notFonts = accept.split(",").map(function (type) {
+    return type.trim();
+  }).filter(function (type) {
+    return !isFontMimeType(type);
+  });
+  if (notFonts.length > 0) {
+    // A fontset that took a PDF would be a fileset under a name that says
+    // otherwise, and the Studio would draw a specimen of nothing.
+    throw new Error("s.fontset(): 'accept' may only name font types (font/woff2, font/woff, font/ttf, font/otf or font/*). Got: ".concat(notFonts.join(", "), ". Use s.fileset() for other files."));
+  }
+  return fileset({
+    dir: options.dir,
+    accept: accept
+  });
+};
+
 var DateSchema = /*#__PURE__*/function (_Schema) {
   function DateSchema(options) {
     var _this;
@@ -12764,6 +12931,7 @@ function initSchema(options) {
   var media = (options === null || options === void 0 ? void 0 : options.remote) === true ? {
     image: remoteImage,
     file: remoteFile,
+    font: remoteFont,
     video: remoteVideo,
     richtext: remoteRichtext,
     imageset: function (options) {
@@ -12772,16 +12940,21 @@ function initSchema(options) {
     fileset: function (options) {
       return fileset(options).remote();
     },
+    fontset: function (options) {
+      return fontset(options).remote();
+    },
     videoset: function (options) {
       return videoset(options).remote();
     }
   } : {
     image: image,
     file: file,
+    font: font,
     video: video,
     richtext: richtext,
     imageset: imageset,
     fileset: fileset,
+    fontset: fontset,
     videoset: videoset
   };
   // locales: F.Narrow<Locales>
@@ -12802,8 +12975,10 @@ function initSchema(options) {
     view: view,
     record: record,
     file: media.file,
+    font: media.font,
     video: media.video,
     fileset: media.fileset,
+    fontset: media.fontset,
     date: date,
     datetime: datetime,
     color: color,
@@ -15482,7 +15657,7 @@ function isPageRouter(routerId) {
 
 var corePackageJson = {
 	name: "@valbuild/core",
-	version: "0.141.0",
+	version: "0.143.0",
 	"private": false,
 	description: "Val - supercharged hard-coded content",
 	repository: {
@@ -15652,6 +15827,9 @@ var Internal = {
   mimeTypeMatchesAccept: mimeTypeMatchesAccept,
   EXT_TO_MIME_TYPES: EXT_TO_MIME_TYPES,
   MIME_TYPES_TO_EXT: MIME_TYPES_TO_EXT,
+  FONT_MIME_TYPE_EXTENSIONS: FONT_MIME_TYPE_EXTENSIONS,
+  isFontMimeType: isFontMimeType,
+  sniffFontMimeType: sniffFontMimeType,
   ModuleFilePathSep: ModuleFilePathSep,
   notFileOp: function notFileOp(op) {
     return op.op !== "file";
@@ -15703,4 +15881,4 @@ function tryJsonParse(str) {
   }
 }
 
-export { discriminatedUnionBranchOf as $, ArraySchema as A, BooleanSchema as B, ASSISTANT_SETTINGS_MAX_LENGTH as C, DEFAULT_CONTENT_HOST as D, THEME_RADIUS_STEPS as E, FATAL_ERROR_TYPES as F, GenericSelector as G, THEME_RADIUS_LENGTHS as H, Internal as I, assistantAvailability as J, SETTINGS_MODULE_CONVENTION as K, isRootModuleFilePath as L, ModuleFilePathSep as M, NumberSchema as N, ObjectSchema as O, PatchError as P, resolveSettingsModule as Q, RecordSchema as R, Schema as S, THEME_LOGO_DIRECTORY as T, localeTagError as U, VAL_EXTENSION as V, localeOfValue as W, LocaleSchema as X, declaredKeySetOf as Y, missingDeclaredKeys as Z, _typeof as _, _slicedToArray as a, ColorSchema as a0, CodeSchema as a1, CODE_LANGUAGES as a2, COLOR_FORMATS as a3, DEFAULT_COLOR_FORMAT as a4, DateTimeSchema as a5, KeyOfSchema as a6, ValViewSchema as a7, isValViewSource as a8, RouteSchema as a9, RichTextSchema as aa, DiscriminatedUnionSchema as ab, EnumSchema as ac, LiteralSchema as ad, deserializeSchema as ae, previewScope as af, isInlineRender as ag, parseNextJsRoutePattern as ah, parseTanStackRoutePattern as ai, tanStackSegmentsOfRoutePath as aj, validateUrlAgainstPattern as ak, getSourcePathFromRoute as al, isPageRouter as am, describeSchemeRejection as an, isCheckableScheme as ao, rejectScheme as ap, schemeOf as aq, UNSAFE_URL_SCHEMES as ar, _createClass as b, _classCallCheck as c, _toConsumableArray as d, DEFAULT_APP_HOST as e, DEFAULT_STATIC_HOST as f, extractValModules as g, computeValModuleShas as h, initVal as i, computeSourcesSha as j, computeSchemaSha as k, hasRemoteFileSchema as l, modules as m, hasMediaSchema as n, DEFAULT_VAL_REMOTE_HOST as o, derefPatch as p, StringSchema as q, ImageSchema as r, splitModuleFilePathAndModulePath as s, FileSchema as t, VideoSchema as u, DEFAULT_VIDEO_ACCEPT as v, DEFAULT_VIDEO_RENDITIONS as w, DEFAULT_VIDEO_SEGMENT_DURATION as x, DateSchema as y, SettingsSchema as z };
+export { declaredKeySetOf as $, ArraySchema as A, BooleanSchema as B, DateSchema as C, DEFAULT_CONTENT_HOST as D, SettingsSchema as E, FATAL_ERROR_TYPES as F, GenericSelector as G, ASSISTANT_SETTINGS_MAX_LENGTH as H, Internal as I, THEME_RADIUS_STEPS as J, THEME_RADIUS_LENGTHS as K, assistantAvailability as L, ModuleFilePathSep as M, NumberSchema as N, ObjectSchema as O, PatchError as P, SETTINGS_MODULE_CONVENTION as Q, RecordSchema as R, Schema as S, THEME_LOGO_DIRECTORY as T, isRootModuleFilePath as U, VAL_EXTENSION as V, resolveSettingsModule as W, localeTagError as X, localeOfValue as Y, LocaleSchema as Z, _typeof as _, _slicedToArray as a, missingDeclaredKeys as a0, discriminatedUnionBranchOf as a1, ColorSchema as a2, CodeSchema as a3, CODE_LANGUAGES as a4, COLOR_FORMATS as a5, DEFAULT_COLOR_FORMAT as a6, DateTimeSchema as a7, KeyOfSchema as a8, ValViewSchema as a9, isValViewSource as aa, RouteSchema as ab, RichTextSchema as ac, DiscriminatedUnionSchema as ad, EnumSchema as ae, LiteralSchema as af, deserializeSchema as ag, previewScope as ah, isInlineRender as ai, parseNextJsRoutePattern as aj, parseTanStackRoutePattern as ak, tanStackSegmentsOfRoutePath as al, validateUrlAgainstPattern as am, getSourcePathFromRoute as an, isPageRouter as ao, describeSchemeRejection as ap, isCheckableScheme as aq, rejectScheme as ar, schemeOf as as, UNSAFE_URL_SCHEMES as at, _createClass as b, _classCallCheck as c, _toConsumableArray as d, DEFAULT_APP_HOST as e, DEFAULT_STATIC_HOST as f, extractValModules as g, computeValModuleShas as h, initVal as i, computeSourcesSha as j, computeSchemaSha as k, hasRemoteFileSchema as l, modules as m, hasMediaSchema as n, DEFAULT_VAL_REMOTE_HOST as o, derefPatch as p, StringSchema as q, ImageSchema as r, splitModuleFilePathAndModulePath as s, FileSchema as t, DEFAULT_FONT_ACCEPT as u, FONT_MIME_TYPES as v, VideoSchema as w, DEFAULT_VIDEO_ACCEPT as x, DEFAULT_VIDEO_RENDITIONS as y, DEFAULT_VIDEO_SEGMENT_DURATION as z };

package/dist/{index-13cf45b1.cjs.prod.js → index-46c72f01.cjs.prod.js}

@@ -3604,7 +3604,7 @@ var EXT_TO_MIME_TYPES = {
   sxw: "application/vnd.sun.xml.writer",
   sxg: "application/vnd.sun.xml.writer.global",
   stw: "application/vnd.sun.xml.writer.template",
-  otf: "application/x-font-otf",
+  otf: "font/otf",
   osfpvg: "application/vnd.yamaha.openscoreformat.osfpvg+xml",
   dp: "application/vnd.osgi.dp",
   pdb: "application/vnd.palm",
@@ -3754,7 +3754,8 @@ var EXT_TO_MIME_TYPES = {
   mxs: "application/vnd.triscape.mxs",
   t: "text/troff",
   tra: "application/vnd.trueapp",
-  ttf: "application/x-font-ttf",
+  ttf: "font/ttf",
+  ttc: "font/collection",
   ttl: "text/turtle",
   umj: "application/vnd.umajin",
   uoml: "application/vnd.uoml+xml",
@@ -3781,7 +3782,8 @@ var EXT_TO_MIME_TYPES = {
   wbmp: "image/vnd.wap.wbmp",
   wav: "audio/x-wav",
   davmount: "application/davmount+xml",
-  woff: "application/x-font-woff",
+  woff: "font/woff",
+  woff2: "font/woff2",
   wspolicy: "application/wspolicy+xml",
   webp: "image/webp",
   wtb: "application/vnd.webturbo",
@@ -3883,6 +3885,93 @@ function mimeTypeMatchesAccept(mimeType, accept) {
   });
 }
 
+/**
+ * Fonts, as far as a mime type can tell.
+ *
+ * The four web formats have IANA types under `font/` (RFC 8081), and those are
+ * what Val stores. Browsers and operating systems disagree about them: a file
+ * picker reports `.woff2` as `font/woff2`, `application/font-woff2` or nothing
+ * at all depending on the platform, and nothing at all reads as
+ * `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. */
+var FONT_MIME_TYPES = ["font/woff2", "font/woff", "font/ttf", "font/otf"];
+
+/** `s.fontset()`'s `accept` when none is given. */
+var DEFAULT_FONT_ACCEPT = FONT_MIME_TYPES.join(",");
+
+/**
+ * The extension of each font type, for a file input: a picker matches an
+ * `accept` of mime types through the operating system's own table, and where
+ * that table does not know `font/woff2` the file is greyed out.
+ */
+var FONT_MIME_TYPE_EXTENSIONS = {
+  "font/woff2": ".woff2",
+  "font/woff": ".woff",
+  "font/ttf": ".ttf",
+  "font/otf": ".otf",
+  "font/collection": ".ttc"
+};
+
+/**
+ * The names the extension table used for fonts before it used RFC 8081's.
+ * Content written then still carries them, and it is the same file.
+ */
+var LEGACY_FONT_MIME_TYPES = {
+  "application/x-font-ttf": "font/ttf",
+  "application/x-font-otf": "font/otf",
+  "application/x-font-woff": "font/woff"
+};
+
+/** `mimeType`, with a legacy font name read as its `font/` type. */
+function canonicalFontMimeType(mimeType) {
+  var _LEGACY_FONT_MIME_TYP;
+  return (_LEGACY_FONT_MIME_TYP = LEGACY_FONT_MIME_TYPES[mimeType]) !== null && _LEGACY_FONT_MIME_TYP !== void 0 ? _LEGACY_FONT_MIME_TYP : mimeType;
+}
+
+/**
+ * Whether a file of `mimeType` is a font a browser can draw: the `font/` types,
+ * and the pre-RFC 8081 names still found in older data.
+ */
+function isFontMimeType(mimeType) {
+  if (!mimeType) {
+    return false;
+  }
+  return mimeType.startsWith("font/") || mimeType.startsWith("application/x-font-") || mimeType === "application/font-woff" || mimeType === "application/font-woff2" || mimeType === "application/font-sfnt" || mimeType === "application/vnd.ms-opentype";
+}
+
+/**
+ * The font type of `bytes`, read from the signature every font format starts
+ * with, or `null` when they are not a font.
+ *
+ * Only the first four bytes are needed: the WOFF signatures (`wOFF`, `wOF2`),
+ * the SFNT versions of TrueType (`0x00010000`, or `true` from old Apple fonts)
+ * and of CFF-flavoured OpenType (`OTTO`), and a collection's tag (`ttcf`).
+ */
+function sniffFontMimeType(bytes) {
+  if (bytes.length < 4) {
+    return null;
+  }
+  var tag = String.fromCharCode(bytes[0], bytes[1], bytes[2], bytes[3]);
+  switch (tag) {
+    case "wOF2":
+      return "font/woff2";
+    case "wOFF":
+      return "font/woff";
+    case "OTTO":
+      return "font/otf";
+    case "true":
+    case "\0\x01\0\0":
+      return "font/ttf";
+    case "ttcf":
+      return "font/collection";
+    default:
+      return null;
+  }
+}
+
 /**
  * How an uploaded image is re-encoded in the browser, before it is uploaded.
  *
@@ -10904,7 +10993,9 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
       // fix was offered -- and the `file:add-metadata` branch below could never be
       // reached for any file whose extension is recognized, which is all of them
       // that get this far.
-      if (mimeType && fileMimeType !== mimeType) {
+      // A legacy font name (`application/x-font-ttf`) is what the extension
+      // table itself used to say, so it is not a mismatch.
+      if (mimeType && fileMimeType !== canonicalFontMimeType(mimeType)) {
         return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Mime type and file extension not matching. Mime type is '".concat(mimeType, "' but file extension is '").concat(fileMimeType, "'"),
           value: src
@@ -11098,6 +11189,38 @@ function fileOf(remote, options) {
   return new FileSchema(options, false, remote);
 }
 
+/**
+ * A font picked from an `s.fontset()`.
+ *
+ * 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,
+ * at definition, so a field called a font cannot end up offering PDFs. What the
+ * 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.
+ */
+function font(fontsetModule) {
+  assertFontset(fontsetModule);
+  return file(fontsetModule);
+}
+
+/** `s.font()` with `.remote()` applied: see `files.remote` in `initSchema`. */
+function remoteFont(fontsetModule) {
+  assertFontset(fontsetModule);
+  return remoteFile(fontsetModule);
+}
+function assertFontset(fontsetModule) {
+  var _getSchema;
+  var modulePath = getValPath(fontsetModule);
+  var serialized = (_getSchema = getSchema(fontsetModule)) === null || _getSchema === void 0 ? void 0 : _getSchema["executeSerialize"]();
+  var accept = (serialized === null || serialized === void 0 ? void 0 : serialized.type) === "record" && serialized.mediaType === "files" ? serialized.accept : undefined;
+  var isFontset = !!accept && accept.split(",").every(function (type) {
+    return isFontMimeType(type.trim());
+  });
+  if (!isFontset) {
+    throw new Error("s.font(".concat(modulePath !== null && modulePath !== void 0 ? modulePath : "?", "): the module must be an s.fontset(). Use s.file() to pick from a set of other files."));
+  }
+}
+
 /**
  * Turn an upload into an HLS stream, in the browser, before it is uploaded.
  *
@@ -11721,6 +11844,50 @@ var fileset = function fileset(options) {
   });
 };
 
+/**
+ * Options for s.fontset()
+ */
+
+/**
+ * Define a collection of fonts.
+ *
+ * A fontset IS a fileset — the same source, the same `s.file(fontsVal)` field
+ * to pick from it, the same checks and fixes — with `accept` defaulting to the
+ * web font formats. What a font gets that any other file does not is decided
+ * by its mime type rather than by the set: the Studio previews any file it
+ * knows is a font, wherever it is shown.
+ *
+ * Remote is off by default: call `.remote()` on the result to allow remote files.
+ *
+ * @example
+ * ```typescript
+ * const schema = s.fontset({ dir: "/public/val/fonts" });
+ * export default c.define("/content/fonts.val.ts", schema, {
+ *   "/public/val/fonts/inter_a1b2c.woff2": {
+ *     mimeType: "font/woff2",
+ *   },
+ * });
+ * ```
+ */
+var fontset = function fontset(options) {
+  var _options$accept;
+  var accept = (_options$accept = options.accept) !== null && _options$accept !== void 0 ? _options$accept : DEFAULT_FONT_ACCEPT;
+  var notFonts = accept.split(",").map(function (type) {
+    return type.trim();
+  }).filter(function (type) {
+    return !isFontMimeType(type);
+  });
+  if (notFonts.length > 0) {
+    // A fontset that took a PDF would be a fileset under a name that says
+    // otherwise, and the Studio would draw a specimen of nothing.
+    throw new Error("s.fontset(): 'accept' may only name font types (font/woff2, font/woff, font/ttf, font/otf or font/*). Got: ".concat(notFonts.join(", "), ". Use s.fileset() for other files."));
+  }
+  return fileset({
+    dir: options.dir,
+    accept: accept
+  });
+};
+
 var DateSchema = /*#__PURE__*/function (_Schema) {
   function DateSchema(options) {
     var _this;
@@ -12766,6 +12933,7 @@ function initSchema(options) {
   var media = (options === null || options === void 0 ? void 0 : options.remote) === true ? {
     image: remoteImage,
     file: remoteFile,
+    font: remoteFont,
     video: remoteVideo,
     richtext: remoteRichtext,
     imageset: function (options) {
@@ -12774,16 +12942,21 @@ function initSchema(options) {
     fileset: function (options) {
       return fileset(options).remote();
     },
+    fontset: function (options) {
+      return fontset(options).remote();
+    },
     videoset: function (options) {
       return videoset(options).remote();
     }
   } : {
     image: image,
     file: file,
+    font: font,
     video: video,
     richtext: richtext,
     imageset: imageset,
     fileset: fileset,
+    fontset: fontset,
     videoset: videoset
   };
   // locales: F.Narrow<Locales>
@@ -12804,8 +12977,10 @@ function initSchema(options) {
     view: view,
     record: record,
     file: media.file,
+    font: media.font,
     video: media.video,
     fileset: media.fileset,
+    fontset: media.fontset,
     date: date,
     datetime: datetime,
     color: color,
@@ -15484,7 +15659,7 @@ function isPageRouter(routerId) {
 
 var corePackageJson = {
 	name: "@valbuild/core",
-	version: "0.141.0",
+	version: "0.143.0",
 	"private": false,
 	description: "Val - supercharged hard-coded content",
 	repository: {
@@ -15654,6 +15829,9 @@ var Internal = {
   mimeTypeMatchesAccept: mimeTypeMatchesAccept,
   EXT_TO_MIME_TYPES: EXT_TO_MIME_TYPES,
   MIME_TYPES_TO_EXT: MIME_TYPES_TO_EXT,
+  FONT_MIME_TYPE_EXTENSIONS: FONT_MIME_TYPE_EXTENSIONS,
+  isFontMimeType: isFontMimeType,
+  sniffFontMimeType: sniffFontMimeType,
   ModuleFilePathSep: ModuleFilePathSep,
   notFileOp: function notFileOp(op) {
     return op.op !== "file";
@@ -15715,6 +15893,7 @@ exports.ColorSchema = ColorSchema;
 exports.DEFAULT_APP_HOST = DEFAULT_APP_HOST;
 exports.DEFAULT_COLOR_FORMAT = DEFAULT_COLOR_FORMAT;
 exports.DEFAULT_CONTENT_HOST = DEFAULT_CONTENT_HOST;
+exports.DEFAULT_FONT_ACCEPT = DEFAULT_FONT_ACCEPT;
 exports.DEFAULT_STATIC_HOST = DEFAULT_STATIC_HOST;
 exports.DEFAULT_VAL_REMOTE_HOST = DEFAULT_VAL_REMOTE_HOST;
 exports.DEFAULT_VIDEO_ACCEPT = DEFAULT_VIDEO_ACCEPT;
@@ -15725,6 +15904,7 @@ exports.DateTimeSchema = DateTimeSchema;
 exports.DiscriminatedUnionSchema = DiscriminatedUnionSchema;
 exports.EnumSchema = EnumSchema;
 exports.FATAL_ERROR_TYPES = FATAL_ERROR_TYPES;
+exports.FONT_MIME_TYPES = FONT_MIME_TYPES;
 exports.FileSchema = FileSchema;
 exports.GenericSelector = GenericSelector;
 exports.ImageSchema = ImageSchema;

package/dist/{index-fae161b5.cjs.dev.js → index-aac8c69c.cjs.dev.js}

@@ -3604,7 +3604,7 @@ var EXT_TO_MIME_TYPES = {
   sxw: "application/vnd.sun.xml.writer",
   sxg: "application/vnd.sun.xml.writer.global",
   stw: "application/vnd.sun.xml.writer.template",
-  otf: "application/x-font-otf",
+  otf: "font/otf",
   osfpvg: "application/vnd.yamaha.openscoreformat.osfpvg+xml",
   dp: "application/vnd.osgi.dp",
   pdb: "application/vnd.palm",
@@ -3754,7 +3754,8 @@ var EXT_TO_MIME_TYPES = {
   mxs: "application/vnd.triscape.mxs",
   t: "text/troff",
   tra: "application/vnd.trueapp",
-  ttf: "application/x-font-ttf",
+  ttf: "font/ttf",
+  ttc: "font/collection",
   ttl: "text/turtle",
   umj: "application/vnd.umajin",
   uoml: "application/vnd.uoml+xml",
@@ -3781,7 +3782,8 @@ var EXT_TO_MIME_TYPES = {
   wbmp: "image/vnd.wap.wbmp",
   wav: "audio/x-wav",
   davmount: "application/davmount+xml",
-  woff: "application/x-font-woff",
+  woff: "font/woff",
+  woff2: "font/woff2",
   wspolicy: "application/wspolicy+xml",
   webp: "image/webp",
   wtb: "application/vnd.webturbo",
@@ -3883,6 +3885,93 @@ function mimeTypeMatchesAccept(mimeType, accept) {
   });
 }
 
+/**
+ * Fonts, as far as a mime type can tell.
+ *
+ * The four web formats have IANA types under `font/` (RFC 8081), and those are
+ * what Val stores. Browsers and operating systems disagree about them: a file
+ * picker reports `.woff2` as `font/woff2`, `application/font-woff2` or nothing
+ * at all depending on the platform, and nothing at all reads as
+ * `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. */
+var FONT_MIME_TYPES = ["font/woff2", "font/woff", "font/ttf", "font/otf"];
+
+/** `s.fontset()`'s `accept` when none is given. */
+var DEFAULT_FONT_ACCEPT = FONT_MIME_TYPES.join(",");
+
+/**
+ * The extension of each font type, for a file input: a picker matches an
+ * `accept` of mime types through the operating system's own table, and where
+ * that table does not know `font/woff2` the file is greyed out.
+ */
+var FONT_MIME_TYPE_EXTENSIONS = {
+  "font/woff2": ".woff2",
+  "font/woff": ".woff",
+  "font/ttf": ".ttf",
+  "font/otf": ".otf",
+  "font/collection": ".ttc"
+};
+
+/**
+ * The names the extension table used for fonts before it used RFC 8081's.
+ * Content written then still carries them, and it is the same file.
+ */
+var LEGACY_FONT_MIME_TYPES = {
+  "application/x-font-ttf": "font/ttf",
+  "application/x-font-otf": "font/otf",
+  "application/x-font-woff": "font/woff"
+};
+
+/** `mimeType`, with a legacy font name read as its `font/` type. */
+function canonicalFontMimeType(mimeType) {
+  var _LEGACY_FONT_MIME_TYP;
+  return (_LEGACY_FONT_MIME_TYP = LEGACY_FONT_MIME_TYPES[mimeType]) !== null && _LEGACY_FONT_MIME_TYP !== void 0 ? _LEGACY_FONT_MIME_TYP : mimeType;
+}
+
+/**
+ * Whether a file of `mimeType` is a font a browser can draw: the `font/` types,
+ * and the pre-RFC 8081 names still found in older data.
+ */
+function isFontMimeType(mimeType) {
+  if (!mimeType) {
+    return false;
+  }
+  return mimeType.startsWith("font/") || mimeType.startsWith("application/x-font-") || mimeType === "application/font-woff" || mimeType === "application/font-woff2" || mimeType === "application/font-sfnt" || mimeType === "application/vnd.ms-opentype";
+}
+
+/**
+ * The font type of `bytes`, read from the signature every font format starts
+ * with, or `null` when they are not a font.
+ *
+ * Only the first four bytes are needed: the WOFF signatures (`wOFF`, `wOF2`),
+ * the SFNT versions of TrueType (`0x00010000`, or `true` from old Apple fonts)
+ * and of CFF-flavoured OpenType (`OTTO`), and a collection's tag (`ttcf`).
+ */
+function sniffFontMimeType(bytes) {
+  if (bytes.length < 4) {
+    return null;
+  }
+  var tag = String.fromCharCode(bytes[0], bytes[1], bytes[2], bytes[3]);
+  switch (tag) {
+    case "wOF2":
+      return "font/woff2";
+    case "wOFF":
+      return "font/woff";
+    case "OTTO":
+      return "font/otf";
+    case "true":
+    case "\0\x01\0\0":
+      return "font/ttf";
+    case "ttcf":
+      return "font/collection";
+    default:
+      return null;
+  }
+}
+
 /**
  * How an uploaded image is re-encoded in the browser, before it is uploaded.
  *
@@ -10904,7 +10993,9 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
       // fix was offered -- and the `file:add-metadata` branch below could never be
       // reached for any file whose extension is recognized, which is all of them
       // that get this far.
-      if (mimeType && fileMimeType !== mimeType) {
+      // A legacy font name (`application/x-font-ttf`) is what the extension
+      // table itself used to say, so it is not a mismatch.
+      if (mimeType && fileMimeType !== canonicalFontMimeType(mimeType)) {
         return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Mime type and file extension not matching. Mime type is '".concat(mimeType, "' but file extension is '").concat(fileMimeType, "'"),
           value: src
@@ -11098,6 +11189,38 @@ function fileOf(remote, options) {
   return new FileSchema(options, false, remote);
 }
 
+/**
+ * A font picked from an `s.fontset()`.
+ *
+ * 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,
+ * at definition, so a field called a font cannot end up offering PDFs. What the
+ * 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.
+ */
+function font(fontsetModule) {
+  assertFontset(fontsetModule);
+  return file(fontsetModule);
+}
+
+/** `s.font()` with `.remote()` applied: see `files.remote` in `initSchema`. */
+function remoteFont(fontsetModule) {
+  assertFontset(fontsetModule);
+  return remoteFile(fontsetModule);
+}
+function assertFontset(fontsetModule) {
+  var _getSchema;
+  var modulePath = getValPath(fontsetModule);
+  var serialized = (_getSchema = getSchema(fontsetModule)) === null || _getSchema === void 0 ? void 0 : _getSchema["executeSerialize"]();
+  var accept = (serialized === null || serialized === void 0 ? void 0 : serialized.type) === "record" && serialized.mediaType === "files" ? serialized.accept : undefined;
+  var isFontset = !!accept && accept.split(",").every(function (type) {
+    return isFontMimeType(type.trim());
+  });
+  if (!isFontset) {
+    throw new Error("s.font(".concat(modulePath !== null && modulePath !== void 0 ? modulePath : "?", "): the module must be an s.fontset(). Use s.file() to pick from a set of other files."));
+  }
+}
+
 /**
  * Turn an upload into an HLS stream, in the browser, before it is uploaded.
  *
@@ -11721,6 +11844,50 @@ var fileset = function fileset(options) {
   });
 };
 
+/**
+ * Options for s.fontset()
+ */
+
+/**
+ * Define a collection of fonts.
+ *
+ * A fontset IS a fileset — the same source, the same `s.file(fontsVal)` field
+ * to pick from it, the same checks and fixes — with `accept` defaulting to the
+ * web font formats. What a font gets that any other file does not is decided
+ * by its mime type rather than by the set: the Studio previews any file it
+ * knows is a font, wherever it is shown.
+ *
+ * Remote is off by default: call `.remote()` on the result to allow remote files.
+ *
+ * @example
+ * ```typescript
+ * const schema = s.fontset({ dir: "/public/val/fonts" });
+ * export default c.define("/content/fonts.val.ts", schema, {
+ *   "/public/val/fonts/inter_a1b2c.woff2": {
+ *     mimeType: "font/woff2",
+ *   },
+ * });
+ * ```
+ */
+var fontset = function fontset(options) {
+  var _options$accept;
+  var accept = (_options$accept = options.accept) !== null && _options$accept !== void 0 ? _options$accept : DEFAULT_FONT_ACCEPT;
+  var notFonts = accept.split(",").map(function (type) {
+    return type.trim();
+  }).filter(function (type) {
+    return !isFontMimeType(type);
+  });
+  if (notFonts.length > 0) {
+    // A fontset that took a PDF would be a fileset under a name that says
+    // otherwise, and the Studio would draw a specimen of nothing.
+    throw new Error("s.fontset(): 'accept' may only name font types (font/woff2, font/woff, font/ttf, font/otf or font/*). Got: ".concat(notFonts.join(", "), ". Use s.fileset() for other files."));
+  }
+  return fileset({
+    dir: options.dir,
+    accept: accept
+  });
+};
+
 var DateSchema = /*#__PURE__*/function (_Schema) {
   function DateSchema(options) {
     var _this;
@@ -12766,6 +12933,7 @@ function initSchema(options) {
   var media = (options === null || options === void 0 ? void 0 : options.remote) === true ? {
     image: remoteImage,
     file: remoteFile,
+    font: remoteFont,
     video: remoteVideo,
     richtext: remoteRichtext,
     imageset: function (options) {
@@ -12774,16 +12942,21 @@ function initSchema(options) {
     fileset: function (options) {
       return fileset(options).remote();
     },
+    fontset: function (options) {
+      return fontset(options).remote();
+    },
     videoset: function (options) {
       return videoset(options).remote();
     }
   } : {
     image: image,
     file: file,
+    font: font,
     video: video,
     richtext: richtext,
     imageset: imageset,
     fileset: fileset,
+    fontset: fontset,
     videoset: videoset
   };
   // locales: F.Narrow<Locales>
@@ -12804,8 +12977,10 @@ function initSchema(options) {
     view: view,
     record: record,
     file: media.file,
+    font: media.font,
     video: media.video,
     fileset: media.fileset,
+    fontset: media.fontset,
     date: date,
     datetime: datetime,
     color: color,
@@ -15484,7 +15659,7 @@ function isPageRouter(routerId) {
 
 var corePackageJson = {
 	name: "@valbuild/core",
-	version: "0.141.0",
+	version: "0.143.0",
 	"private": false,
 	description: "Val - supercharged hard-coded content",
 	repository: {
@@ -15654,6 +15829,9 @@ var Internal = {
   mimeTypeMatchesAccept: mimeTypeMatchesAccept,
   EXT_TO_MIME_TYPES: EXT_TO_MIME_TYPES,
   MIME_TYPES_TO_EXT: MIME_TYPES_TO_EXT,
+  FONT_MIME_TYPE_EXTENSIONS: FONT_MIME_TYPE_EXTENSIONS,
+  isFontMimeType: isFontMimeType,
+  sniffFontMimeType: sniffFontMimeType,
   ModuleFilePathSep: ModuleFilePathSep,
   notFileOp: function notFileOp(op) {
     return op.op !== "file";
@@ -15715,6 +15893,7 @@ exports.ColorSchema = ColorSchema;
 exports.DEFAULT_APP_HOST = DEFAULT_APP_HOST;
 exports.DEFAULT_COLOR_FORMAT = DEFAULT_COLOR_FORMAT;
 exports.DEFAULT_CONTENT_HOST = DEFAULT_CONTENT_HOST;
+exports.DEFAULT_FONT_ACCEPT = DEFAULT_FONT_ACCEPT;
 exports.DEFAULT_STATIC_HOST = DEFAULT_STATIC_HOST;
 exports.DEFAULT_VAL_REMOTE_HOST = DEFAULT_VAL_REMOTE_HOST;
 exports.DEFAULT_VIDEO_ACCEPT = DEFAULT_VIDEO_ACCEPT;
@@ -15725,6 +15904,7 @@ exports.DateTimeSchema = DateTimeSchema;
 exports.DiscriminatedUnionSchema = DiscriminatedUnionSchema;
 exports.EnumSchema = EnumSchema;
 exports.FATAL_ERROR_TYPES = FATAL_ERROR_TYPES;
+exports.FONT_MIME_TYPES = FONT_MIME_TYPES;
 exports.FileSchema = FileSchema;
 exports.GenericSelector = GenericSelector;
 exports.ImageSchema = ImageSchema;

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('./index-fae161b5.cjs.dev.js');
+var dist_valbuildCore = require('./index-aac8c69c.cjs.dev.js');
 require('./result-bb1f436e.cjs.dev.js');
 
 
@@ -17,6 +17,7 @@ exports.ColorSchema = dist_valbuildCore.ColorSchema;
 exports.DEFAULT_APP_HOST = dist_valbuildCore.DEFAULT_APP_HOST;
 exports.DEFAULT_COLOR_FORMAT = dist_valbuildCore.DEFAULT_COLOR_FORMAT;
 exports.DEFAULT_CONTENT_HOST = dist_valbuildCore.DEFAULT_CONTENT_HOST;
+exports.DEFAULT_FONT_ACCEPT = dist_valbuildCore.DEFAULT_FONT_ACCEPT;
 exports.DEFAULT_STATIC_HOST = dist_valbuildCore.DEFAULT_STATIC_HOST;
 exports.DEFAULT_VAL_REMOTE_HOST = dist_valbuildCore.DEFAULT_VAL_REMOTE_HOST;
 exports.DEFAULT_VIDEO_ACCEPT = dist_valbuildCore.DEFAULT_VIDEO_ACCEPT;
@@ -27,6 +28,7 @@ exports.DateTimeSchema = dist_valbuildCore.DateTimeSchema;
 exports.DiscriminatedUnionSchema = dist_valbuildCore.DiscriminatedUnionSchema;
 exports.EnumSchema = dist_valbuildCore.EnumSchema;
 exports.FATAL_ERROR_TYPES = dist_valbuildCore.FATAL_ERROR_TYPES;
+exports.FONT_MIME_TYPES = dist_valbuildCore.FONT_MIME_TYPES;
 exports.FileSchema = dist_valbuildCore.FileSchema;
 exports.GenericSelector = dist_valbuildCore.GenericSelector;
 exports.ImageSchema = dist_valbuildCore.ImageSchema;

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('./index-13cf45b1.cjs.prod.js');
+var dist_valbuildCore = require('./index-46c72f01.cjs.prod.js');
 require('./result-787e35f6.cjs.prod.js');
 
 
@@ -17,6 +17,7 @@ exports.ColorSchema = dist_valbuildCore.ColorSchema;
 exports.DEFAULT_APP_HOST = dist_valbuildCore.DEFAULT_APP_HOST;
 exports.DEFAULT_COLOR_FORMAT = dist_valbuildCore.DEFAULT_COLOR_FORMAT;
 exports.DEFAULT_CONTENT_HOST = dist_valbuildCore.DEFAULT_CONTENT_HOST;
+exports.DEFAULT_FONT_ACCEPT = dist_valbuildCore.DEFAULT_FONT_ACCEPT;
 exports.DEFAULT_STATIC_HOST = dist_valbuildCore.DEFAULT_STATIC_HOST;
 exports.DEFAULT_VAL_REMOTE_HOST = dist_valbuildCore.DEFAULT_VAL_REMOTE_HOST;
 exports.DEFAULT_VIDEO_ACCEPT = dist_valbuildCore.DEFAULT_VIDEO_ACCEPT;
@@ -27,6 +28,7 @@ exports.DateTimeSchema = dist_valbuildCore.DateTimeSchema;
 exports.DiscriminatedUnionSchema = dist_valbuildCore.DiscriminatedUnionSchema;
 exports.EnumSchema = dist_valbuildCore.EnumSchema;
 exports.FATAL_ERROR_TYPES = dist_valbuildCore.FATAL_ERROR_TYPES;
+exports.FONT_MIME_TYPES = dist_valbuildCore.FONT_MIME_TYPES;
 exports.FileSchema = dist_valbuildCore.FileSchema;
 exports.GenericSelector = dist_valbuildCore.GenericSelector;
 exports.ImageSchema = dist_valbuildCore.ImageSchema;

package/dist/valbuild-core.esm.js

@@ -1,2 +1,2 @@
-export { C as ASSISTANT_SETTINGS_MAX_LENGTH, A as ArraySchema, B as BooleanSchema, a2 as CODE_LANGUAGES, a3 as COLOR_FORMATS, a1 as CodeSchema, a0 as ColorSchema, e as DEFAULT_APP_HOST, a4 as DEFAULT_COLOR_FORMAT, D as DEFAULT_CONTENT_HOST, f as DEFAULT_STATIC_HOST, o as DEFAULT_VAL_REMOTE_HOST, v as DEFAULT_VIDEO_ACCEPT, w as DEFAULT_VIDEO_RENDITIONS, x as DEFAULT_VIDEO_SEGMENT_DURATION, y as DateSchema, a5 as DateTimeSchema, ab as DiscriminatedUnionSchema, ac as EnumSchema, F as FATAL_ERROR_TYPES, t as FileSchema, G as GenericSelector, r as ImageSchema, I as Internal, a6 as KeyOfSchema, ad as LiteralSchema, X as LocaleSchema, M as ModuleFilePathSep, N as NumberSchema, O as ObjectSchema, R as RecordSchema, aa as RichTextSchema, a9 as RouteSchema, K as SETTINGS_MODULE_CONVENTION, S as Schema, z as SettingsSchema, q as StringSchema, T as THEME_LOGO_DIRECTORY, H as THEME_RADIUS_LENGTHS, E as THEME_RADIUS_STEPS, ar as UNSAFE_URL_SCHEMES, V as VAL_EXTENSION, a7 as ValViewSchema, u as VideoSchema, J as assistantAvailability, k as computeSchemaSha, j as computeSourcesSha, h as computeValModuleShas, Y as declaredKeySetOf, p as derefPatch, an as describeSchemeRejection, ae as deserializeSchema, $ as discriminatedUnionBranchOf, g as extractValModules, al as getSourcePathFromRoute, n as hasMediaSchema, l as hasRemoteFileSchema, i as initVal, ao as isCheckableScheme, ag as isInlineRender, am as isPageRouter, L as isRootModuleFilePath, a8 as isValViewSource, W as localeOfValue, U as localeTagError, Z as missingDeclaredKeys, m as modules, ah as parseNextJsRoutePattern, ai as parseTanStackRoutePattern, af as previewScope, ap as rejectScheme, Q as resolveSettingsModule, aq as schemeOf, aj as tanStackSegmentsOfRoutePath, ak as validateUrlAgainstPattern } from './index-a6c53286.esm.js';
+export { H as ASSISTANT_SETTINGS_MAX_LENGTH, A as ArraySchema, B as BooleanSchema, a4 as CODE_LANGUAGES, a5 as COLOR_FORMATS, a3 as CodeSchema, a2 as ColorSchema, e as DEFAULT_APP_HOST, a6 as DEFAULT_COLOR_FORMAT, D as DEFAULT_CONTENT_HOST, u as DEFAULT_FONT_ACCEPT, f as DEFAULT_STATIC_HOST, o as DEFAULT_VAL_REMOTE_HOST, x as DEFAULT_VIDEO_ACCEPT, y as DEFAULT_VIDEO_RENDITIONS, z as DEFAULT_VIDEO_SEGMENT_DURATION, C as DateSchema, a7 as DateTimeSchema, ad as DiscriminatedUnionSchema, ae as EnumSchema, F as FATAL_ERROR_TYPES, v as FONT_MIME_TYPES, t as FileSchema, G as GenericSelector, r as ImageSchema, I as Internal, a8 as KeyOfSchema, af as LiteralSchema, Z as LocaleSchema, M as ModuleFilePathSep, N as NumberSchema, O as ObjectSchema, R as RecordSchema, ac as RichTextSchema, ab as RouteSchema, Q as SETTINGS_MODULE_CONVENTION, S as Schema, E as SettingsSchema, q as StringSchema, T as THEME_LOGO_DIRECTORY, K as THEME_RADIUS_LENGTHS, J as THEME_RADIUS_STEPS, at as UNSAFE_URL_SCHEMES, V as VAL_EXTENSION, a9 as ValViewSchema, w as VideoSchema, L as assistantAvailability, k as computeSchemaSha, j as computeSourcesSha, h as computeValModuleShas, $ as declaredKeySetOf, p as derefPatch, ap as describeSchemeRejection, ag as deserializeSchema, a1 as discriminatedUnionBranchOf, g as extractValModules, an as getSourcePathFromRoute, n as hasMediaSchema, l as hasRemoteFileSchema, i as initVal, aq as isCheckableScheme, ai as isInlineRender, ao as isPageRouter, U as isRootModuleFilePath, aa as isValViewSource, Y as localeOfValue, X as localeTagError, a0 as missingDeclaredKeys, m as modules, aj as parseNextJsRoutePattern, ak as parseTanStackRoutePattern, ah as previewScope, ar as rejectScheme, W as resolveSettingsModule, as as schemeOf, al as tanStackSegmentsOfRoutePath, am as validateUrlAgainstPattern } from './index-02a1ba06.esm.js';
 import './result-daff1cae.esm.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.141.0",
+  "version": "0.143.0",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "repository": {

package/patch/dist/valbuild-core-patch.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('../../dist/index-fae161b5.cjs.dev.js');
+var dist_valbuildCore = require('../../dist/index-aac8c69c.cjs.dev.js');
 var result = require('../../dist/result-bb1f436e.cjs.dev.js');
 var util = require('../../dist/util-b213092b.cjs.dev.js');
 

package/patch/dist/valbuild-core-patch.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('../../dist/index-13cf45b1.cjs.prod.js');
+var dist_valbuildCore = require('../../dist/index-46c72f01.cjs.prod.js');
 var result = require('../../dist/result-787e35f6.cjs.prod.js');
 var util = require('../../dist/util-030d8a1f.cjs.prod.js');
 

package/patch/dist/valbuild-core-patch.esm.js

@@ -1,5 +1,5 @@
-import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-a6c53286.esm.js';
-export { P as PatchError } from '../../dist/index-a6c53286.esm.js';
+import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-02a1ba06.esm.js';
+export { P as PatchError } from '../../dist/index-02a1ba06.esm.js';
 import { f as isNonEmpty, e as err, o as ok, m as map, g as flatMap, i as isErr, h as flatMapReduce, j as filterOrElse, k as mapErr, l as map$1, n as all, p as flatten, q as allT } from '../../dist/result-daff1cae.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';