@tinacms/schema-tools 2.9.0 → 2.10.1

package/dist/index.js

@@ -2146,8 +2146,11 @@ const resolveField = (field, schema) => {
       if (field.list) {
         return {
           component: "list",
+          // The list plugin builds each item from `field.field` alone, so
+          // anything the item's input needs has to be carried in here.
           field: {
-            component: "image"
+            component: "image",
+            ...field.accept ? { accept: field.accept } : {}
           },
           ...field,
           ...extraFields
@@ -2313,6 +2316,93 @@ const CONTENT_FORMATS = [
   "yml",
   "toml"
 ];
+const MEDIA_EXTENSIONS = [
+  "jpg",
+  "jpeg",
+  "png",
+  "gif",
+  "webp",
+  "svg",
+  "avif",
+  "ico",
+  "mp4",
+  "webm",
+  "mov",
+  "mp3",
+  "wav",
+  "ogg",
+  "pdf",
+  "json",
+  "csv",
+  "txt"
+];
+const MEDIA_CATEGORIES = {
+  image: ["jpg", "jpeg", "png", "gif", "webp", "svg", "avif", "ico"],
+  video: ["mp4", "webm", "mov"],
+  audio: ["mp3", "wav", "ogg"],
+  document: ["pdf", "json", "csv", "txt"]
+};
+const MEDIA_CATEGORY_NAMES = [
+  "image",
+  "video",
+  "audio",
+  "document"
+];
+const MEDIA_ACCEPT_VALUES = [
+  ...MEDIA_CATEGORY_NAMES,
+  ...MEDIA_EXTENSIONS
+];
+const MEDIA_EXTENSION_ALIASES = {
+  jpg: ["jpeg"],
+  jpeg: ["jpg"]
+};
+const MEDIA_MIME_TYPES = {
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  png: "image/png",
+  gif: "image/gif",
+  webp: "image/webp",
+  svg: "image/svg+xml",
+  avif: "image/avif",
+  ico: "image/x-icon",
+  mp4: "video/mp4",
+  webm: "video/webm",
+  mov: "video/quicktime",
+  mp3: "audio/mpeg",
+  wav: "audio/wav",
+  ogg: "audio/ogg",
+  pdf: "application/pdf",
+  json: "application/json",
+  csv: "text/csv",
+  txt: "text/plain"
+};
+const extensionOf = (value) => {
+  const path = value.split(/[?#]/)[0];
+  const dot = path.lastIndexOf(".");
+  const slash = path.lastIndexOf("/");
+  return dot > slash + 1 ? path.slice(dot + 1).toLowerCase() : "";
+};
+const resolveMediaAccept = (accept) => {
+  if (!accept) return [];
+  const requested = Array.isArray(accept) ? accept : [accept];
+  const resolved = /* @__PURE__ */ new Set();
+  const add = (ext) => {
+    resolved.add(ext);
+    for (const alias of MEDIA_EXTENSION_ALIASES[ext] ?? []) {
+      resolved.add(alias);
+    }
+  };
+  for (const entry of requested) {
+    if (entry in MEDIA_CATEGORIES) {
+      for (const ext of MEDIA_CATEGORIES[entry]) {
+        add(ext);
+      }
+    } else if (MEDIA_EXTENSIONS.includes(entry)) {
+      add(entry);
+    }
+  }
+  return [...resolved];
+};
 const ALL_HEADING_LEVELS = [
   "h1",
   "h2",
@@ -2410,6 +2500,19 @@ const TinaField = z.object({
   required: z.boolean().optional()
 });
 const FieldWithList = TinaField.extend({ list: z.boolean().optional() });
+const validMediaAcceptList = MEDIA_ACCEPT_VALUES.map(
+  (value) => `\`${value}\``
+).join(", ");
+const MediaAcceptValue = z.enum(MEDIA_ACCEPT_VALUES, {
+  errorMap: (issue, ctx) => {
+    if (issue.code === "invalid_enum_value") {
+      return {
+        message: `Invalid \`accept\` value \`${typeof ctx.data === "string" ? ctx.data : JSON.stringify(ctx.data)}\`. Must be one of: ${validMediaAcceptList}.`
+      };
+    }
+    return { message: ctx.defaultError };
+  }
+});
 const TinaScalerBase = FieldWithList.extend({
   options: z.array(Option).optional(),
   uid: z.boolean().optional()
@@ -2444,7 +2547,8 @@ const ImageField = TinaScalerBase.extend({
     invalid_type_error: typeTypeError,
     required_error: typeRequiredError
   }),
-  uploadDir: z.function().args(z.any()).returns(z.string()).optional()
+  uploadDir: z.function().args(z.any()).returns(z.string()).optional(),
+  accept: z.union([MediaAcceptValue, z.array(MediaAcceptValue)]).optional()
 });
 const DateTimeField = TinaScalerBase.extend({
   type: z.literal("datetime", {
@@ -2485,7 +2589,7 @@ const TinaFieldZod = z.lazy(() => {
   const TemplateTemp = z.object({
     label: z.string().optional(),
     name,
-    fields: z.array(TinaFieldZod),
+    fields: z.array(TinaFieldZod).min(1, "Property `fields` cannot be empty."),
     match: z.object({
       start: z.string(),
       end: z.string(),
@@ -2685,7 +2789,7 @@ const Template = z.object({
     required_error: "Missing `label` property. Property `label` is required."
   }),
   name,
-  fields: z.array(TinaFieldZod)
+  fields: z.array(TinaFieldZod).min(1, "Property `fields` cannot be empty.")
 }).superRefine((val, ctx) => {
   var _a;
   const dups = findDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
@@ -2877,6 +2981,11 @@ export {
   ERR_HAS_REFERENCES,
   ERR_NOT_INDEXED,
   ERR_PATH_TRAVERSAL,
+  MEDIA_ACCEPT_VALUES,
+  MEDIA_CATEGORIES,
+  MEDIA_CATEGORY_NAMES,
+  MEDIA_EXTENSIONS,
+  MEDIA_MIME_TYPES,
   NAMER,
   RELATIVE_PATH_ALLOWED_CHARS_MESSAGE,
   RELATIVE_PATH_REGEX,
@@ -2885,6 +2994,7 @@ export {
   TinaSchemaValidationError,
   addNamespaceToSchema,
   canonicalPath,
+  extensionOf,
   isHeadingLevel,
   isValidRelativePath,
   normalizeHeadingLevels,
@@ -2892,6 +3002,7 @@ export {
   parseURL,
   resolveField,
   resolveForm,
+  resolveMediaAccept,
   validateSchema,
   validateTinaCloudSchemaConfig
 };

package/dist/types/index.d.ts

@@ -206,6 +206,62 @@ type DateFormatProps = {
 export type DateTimeField = (FieldGeneric<string, undefined, DateFormatProps> | FieldGeneric<string, true, DateFormatProps> | FieldGeneric<string, false, DateFormatProps>) & BaseField & {
     type: 'datetime';
 };
+/**
+ * File extensions the media manager can filter on. Not a list of what may be
+ * uploaded — that is `media.accept` — but the vocabulary a field or filter
+ * uses to narrow what is shown.
+ */
+export declare const MEDIA_EXTENSIONS: readonly ["jpg", "jpeg", "png", "gif", "webp", "svg", "avif", "ico", "mp4", "webm", "mov", "mp3", "wav", "ogg", "pdf", "json", "csv", "txt"];
+export type MediaExtension = (typeof MEDIA_EXTENSIONS)[number];
+export declare const MEDIA_CATEGORIES: {
+    readonly image: readonly ["jpg", "jpeg", "png", "gif", "webp", "svg", "avif", "ico"];
+    readonly video: readonly ["mp4", "webm", "mov"];
+    readonly audio: readonly ["mp3", "wav", "ogg"];
+    readonly document: readonly ["pdf", "json", "csv", "txt"];
+};
+export type MediaCategory = keyof typeof MEDIA_CATEGORIES;
+export type MediaAccept = MediaExtension | MediaCategory;
+export declare const MEDIA_CATEGORY_NAMES: readonly ["image", "video", "audio", "document"];
+export declare const MEDIA_ACCEPT_VALUES: readonly ["image", "video", "audio", "document", "jpg", "jpeg", "png", "gif", "webp", "svg", "avif", "ico", "mp4", "webm", "mov", "mp3", "wav", "ogg", "pdf", "json", "csv", "txt"];
+/**
+ * The MIME type each extension belongs to. Needed because react-dropzone
+ * keys its `accept` by MIME type and drops bare extensions from the native
+ * file picker.
+ */
+export declare const MEDIA_MIME_TYPES: {
+    readonly jpg: "image/jpeg";
+    readonly jpeg: "image/jpeg";
+    readonly png: "image/png";
+    readonly gif: "image/gif";
+    readonly webp: "image/webp";
+    readonly svg: "image/svg+xml";
+    readonly avif: "image/avif";
+    readonly ico: "image/x-icon";
+    readonly mp4: "video/mp4";
+    readonly webm: "video/webm";
+    readonly mov: "video/quicktime";
+    readonly mp3: "audio/mpeg";
+    readonly wav: "audio/wav";
+    readonly ogg: "audio/ogg";
+    readonly pdf: "application/pdf";
+    readonly json: "application/json";
+    readonly csv: "text/csv";
+    readonly txt: "text/plain";
+};
+/**
+ * Lowercased extension without the dot, from a filename, path or URL.
+ * Query strings and hashes are dropped first, so a transformed asset URL
+ * like `hero.png?fit=crop` still reads as `png`. Dotfiles and extensionless
+ * names return ''.
+ */
+export declare const extensionOf: (value: string) => string;
+/**
+ * Flattens a field's `accept` into concrete extensions, expanding any
+ * category shorthand and pulling in aliases. Unknown values are dropped
+ * rather than passed through, so a typo narrows to nothing visible instead
+ * of silently disabling the filter.
+ */
+export declare const resolveMediaAccept: (accept: MediaAccept | MediaAccept[] | undefined) => MediaExtension[];
 export type ImageField = (FieldGeneric<string, undefined> | FieldGeneric<string, true> | FieldGeneric<string, false>) & BaseField & {
     type: 'image';
     /**
@@ -218,6 +274,19 @@ export type ImageField = (FieldGeneric<string, undefined> | FieldGeneric<string,
      * ```
      */
     uploadDir?: (formValues: Record<string, any>) => string;
+    /**
+     * Restricts this field to specific file types. Narrows what the media
+     * manager offers when browsing and what the field will accept on upload,
+     * overriding the global `media.accept`.
+     *
+     * @example
+     * ```ts
+     * accept: 'pdf'
+     * accept: ['png', 'svg']
+     * accept: 'image'
+     * ```
+     */
+    accept?: MediaAccept | MediaAccept[];
 };
 type ReferenceFieldOptions = {
     optionComponent?: OptionComponent;
@@ -429,7 +498,19 @@ export interface AuthProvider {
      **/
     authenticate: (props?: Record<string, any>) => Promise<any | null>;
     fetchWithToken: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
+    /**
+     * Turns a tokened 401 into the CMS sending the user back to login. The
+     * Tina client assigns this automatically; providers extending
+     * AbstractAuthProvider get the invocation for free, while a provider that
+     * implements its own fetchWithToken must invoke it itself.
+     */
+    sessionExpiredListener?: () => void;
     isAuthorized: (context?: any) => Promise<boolean>;
+    /**
+     * May reject when the identity backend is unreachable (a transport
+     * failure is not an auth answer); callers should catch and treat that as
+     * an error rather than as logged-out.
+     */
     isAuthenticated: () => Promise<boolean>;
     getLoginStrategy: () => LoginStrategy;
     getLoginScreen: () => FC<LoginScreenProps> | null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/schema-tools",
   "type": "module",
-  "version": "2.9.0",
+  "version": "2.10.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -24,7 +24,7 @@
     "ts-jest": "^29.2.5",
     "typescript": "^5.7.3",
     "yup": "^1.6.1",
-    "@tinacms/scripts": "1.6.3"
+    "@tinacms/scripts": "1.6.4"
   },
   "peerDependencies": {
     "react": ">=16.14.0",
@@ -35,7 +35,7 @@
   },
   "repository": {
     "url": "https://github.com/tinacms/tinacms.git",
-    "directory": "packages/@tinacms/cli"
+    "directory": "packages/@tinacms/schema-tools"
   },
   "dependencies": {
     "picomatch-browser": "2.2.6",
@@ -46,7 +46,6 @@
     "build": "tinacms-scripts build",
     "test": "jest --config jest.config.js",
     "types": "pnpm tsc",
-    "test-watch": "jest  --passWithNoTests --watch",
-    "generate:schema": "pnpm node scripts/generateSchema.js"
+    "test-watch": "jest  --passWithNoTests --watch"
   }
 }