sanity-plugin-media 4.3.1 → 4.3.2

package/src/utils/getTagSelectOptions.test.ts

@@ -1,13 +1,14 @@
 import {describe, expect, it} from 'vitest'
-import getTagSelectOptions from './getTagSelectOptions'
+
 import type {Tag, TagItem} from '../types'
+import getTagSelectOptions from './getTagSelectOptions'
 
 function tagItem(partial: Partial<TagItem> & Pick<TagItem, 'tag'>): TagItem {
   return {
     _type: 'tag',
     picked: false,
     updating: false,
-    ...partial
+    ...partial,
   }
 }
 
@@ -17,7 +18,7 @@ const makeTag = (id: string, name: string): Tag => ({
   _createdAt: '',
   _updatedAt: '',
   _rev: 'r1',
-  name: {_type: 'slug', current: name}
+  name: {_type: 'slug', current: name},
 })
 
 describe('getTagSelectOptions', () => {
@@ -25,7 +26,7 @@ describe('getTagSelectOptions', () => {
     const tags = [tagItem({tag: makeTag('t1', 'alpha')}), tagItem({tag: makeTag('t2', 'beta')})]
     expect(getTagSelectOptions(tags)).toEqual([
       {label: 'alpha', value: 't1'},
-      {label: 'beta', value: 't2'}
+      {label: 'beta', value: 't2'},
     ])
   })
 
@@ -36,7 +37,7 @@ describe('getTagSelectOptions', () => {
   it('skips items without a tag', () => {
     const tags = [
       tagItem({tag: makeTag('t1', 'ok')}),
-      {_type: 'tag', tag: undefined, picked: false, updating: false} as unknown as TagItem
+      {_type: 'tag', tag: undefined, picked: false, updating: false} as unknown as TagItem,
     ]
     expect(getTagSelectOptions(tags)).toEqual([{label: 'ok', value: 't1'}])
   })

package/src/utils/getTagSelectOptions.ts

@@ -6,7 +6,7 @@ const getTagSelectOptions = (tags: TagItem[]): TagSelectOption[] => {
     if (tag) {
       acc.push({
         label: tag?.name?.current,
-        value: tag?._id
+        value: tag?._id,
       })
     }
     return acc

package/src/utils/getUniqueDocuments.test.ts

@@ -1,12 +1,13 @@
-import {describe, expect, it} from 'vitest'
 import type {SanityDocument} from '@sanity/client'
+import {describe, expect, it} from 'vitest'
+
 import {getUniqueDocuments} from './getUniqueDocuments'
 
 describe('getUniqueDocuments', () => {
   it('drops published documents when a drafts.* sibling exists', () => {
     const docs: SanityDocument[] = [
       {_id: 'drafts.post1', _type: 'post'} as SanityDocument,
-      {_id: 'post1', _type: 'post'} as SanityDocument
+      {_id: 'post1', _type: 'post'} as SanityDocument,
     ]
     expect(getUniqueDocuments(docs)).toEqual([{_id: 'drafts.post1', _type: 'post'}])
   })
@@ -14,7 +15,7 @@ describe('getUniqueDocuments', () => {
   it('keeps published-only and draft-only ids', () => {
     const docs: SanityDocument[] = [
       {_id: 'onlyPub', _type: 'x'} as SanityDocument,
-      {_id: 'drafts.onlyDraft', _type: 'x'} as SanityDocument
+      {_id: 'drafts.onlyDraft', _type: 'x'} as SanityDocument,
     ]
     expect(getUniqueDocuments(docs)).toEqual(docs)
   })

package/src/utils/getUniqueDocuments.ts

@@ -4,11 +4,11 @@ export function getUniqueDocuments(documents: SanityDocument[]): SanityDocument[
   const draftIds = documents.reduce(
     (acc: string[], doc: SanityDocument) =>
       doc._id.startsWith('drafts.') ? acc.concat(doc._id.slice(7)) : acc,
-    []
+    [],
   )
 
   const filteredDocuments: SanityDocument[] = documents.filter(
-    (doc: SanityDocument) => !draftIds.includes(doc._id)
+    (doc: SanityDocument) => !draftIds.includes(doc._id),
   )
 
   return filteredDocuments

package/src/utils/imageDprUrl.test.ts

@@ -1,6 +1,7 @@
 import {afterEach, describe, expect, it} from 'vitest'
-import imageDprUrl from './imageDprUrl'
+
 import type {ImageAsset} from '../types'
+import imageDprUrl from './imageDprUrl'
 
 const asset = {
   _id: 'a1',
@@ -12,7 +13,7 @@ const asset = {
   size: 1,
   mimeType: 'image/png',
   url: 'https://cdn.test/image.png',
-  metadata: {dimensions: {width: 100, height: 100}, isOpaque: true}
+  metadata: {dimensions: {width: 100, height: 100}, isOpaque: true},
 } as ImageAsset
 
 describe('imageDprUrl', () => {
@@ -37,7 +38,7 @@ describe('imageDprUrl', () => {
   it('uses multiplier 1 when devicePixelRatio is missing', () => {
     Object.defineProperty(window, 'devicePixelRatio', {
       value: undefined as unknown as number,
-      configurable: true
+      configurable: true,
     })
     const url = imageDprUrl(asset, {width: 100})
     expect(url).toBe('https://cdn.test/image.png?fit=max&w=100')

package/src/utils/imageDprUrl.ts

@@ -5,7 +5,7 @@ const imageDprUrl = (
   options: {
     width: number
     height?: number
-  }
+  },
 ): string => {
   const dpi =
     typeof window === 'undefined' || !window.devicePixelRatio

package/src/utils/isSupportedAssetType.test.ts

@@ -1,4 +1,5 @@
 import {describe, expect, it} from 'vitest'
+
 import {isSupportedAssetType} from './isSupportedAssetType'
 
 describe('isSupportedAssetType', () => {

package/src/utils/mediaField.ts

@@ -3,8 +3,9 @@ import type {
   FileDefinition,
   ImageDefinition,
   WidenInitialValue,
-  WidenValidation
+  WidenValidation,
 } from 'sanity'
+
 import {AutoTagInput} from '../components/AutoTagInputWrapper'
 
 type ImageMediaFieldConfig = Omit<ImageDefinition, 'options'> &
@@ -59,7 +60,7 @@ type FileMediaFieldResult = Omit<FileDefinition, 'options'> &
 export function mediaField(config: ImageMediaFieldConfig): ImageMediaFieldResult
 export function mediaField(config: FileMediaFieldConfig): FileMediaFieldResult
 export function mediaField(
-  config: ImageMediaFieldConfig | FileMediaFieldConfig
+  config: ImageMediaFieldConfig | FileMediaFieldConfig,
 ): ImageMediaFieldResult | FileMediaFieldResult {
   const {mediaTags, options, components, ...rest} = config as ImageMediaFieldConfig & {
     components?: Record<string, unknown>
@@ -67,6 +68,6 @@ export function mediaField(
   return {
     ...rest,
     options: {...options, mediaTags},
-    components: {...components, input: AutoTagInput}
+    components: {...components, input: AutoTagInput},
   } as unknown as ImageMediaFieldResult
 }

package/src/utils/sanitizeFormData.test.ts

@@ -1,6 +1,7 @@
 // @vitest-environment node
 
 import {describe, expect, it} from 'vitest'
+
 import sanitizeFormData from './sanitizeFormData'
 
 describe('sanitizeFormData', () => {
@@ -9,12 +10,12 @@ describe('sanitizeFormData', () => {
       sanitizeFormData({
         a: '',
         b: undefined,
-        c: []
-      })
+        c: [],
+      }),
     ).toEqual({
       a: null,
       b: null,
-      c: null
+      c: null,
     })
   })
 
@@ -27,16 +28,16 @@ describe('sanitizeFormData', () => {
       sanitizeFormData({
         opt: {
           media: {
-            tags: []
-          }
-        }
-      })
+            tags: [],
+          },
+        },
+      }),
     ).toEqual({
       opt: {
         media: {
-          tags: null
-        }
-      }
+          tags: null,
+        },
+      },
     })
   })
 
@@ -44,11 +45,11 @@ describe('sanitizeFormData', () => {
     expect(
       sanitizeFormData({
         kept: null,
-        tags: [{_ref: 't1'}]
-      })
+        tags: [{_ref: 't1'}],
+      }),
     ).toEqual({
       kept: null,
-      tags: [{_ref: 't1'}]
+      tags: [{_ref: 't1'}],
     })
   })
 

package/src/utils/typeGuards.test.ts

@@ -1,6 +1,7 @@
 import {describe, expect, it} from 'vitest'
-import {isFileAsset, isImageAsset} from './typeGuards'
+
 import type {Asset} from '../types'
+import {isFileAsset, isImageAsset} from './typeGuards'
 
 describe('typeGuards', () => {
   it('isFileAsset narrows sanity.fileAsset', () => {

package/src/utils/uploadSanityAsset.test.ts

@@ -1,5 +1,6 @@
-import {afterEach, describe, expect, it} from 'vitest'
 import {firstValueFrom} from 'rxjs'
+import {afterEach, describe, expect, it} from 'vitest'
+
 import {hashFile$} from './uploadSanityAsset'
 
 describe('hashFile$', () => {
@@ -9,7 +10,7 @@ describe('hashFile$', () => {
     Object.defineProperty(globalThis, 'crypto', {
       value: cryptoRef,
       configurable: true,
-      writable: true
+      writable: true,
     })
   })
 
@@ -17,12 +18,12 @@ describe('hashFile$', () => {
     Object.defineProperty(globalThis, 'crypto', {
       value: undefined,
       configurable: true,
-      writable: true
+      writable: true,
     })
 
     await expect(firstValueFrom(hashFile$(new File(['x'], 'blob.bin')))).rejects.toMatchObject({
       message: expect.stringMatching(/secure contexts/i),
-      statusCode: 500
+      statusCode: 500,
     })
   })
 })

package/src/utils/uploadSanityAsset.ts

@@ -2,26 +2,27 @@
 // https://github.com/sanity-io/sanity/blob/ccb777e115a8cdf20d81a9a2bc9d8c228568faff/packages/%40sanity/form-builder/src/sanity/inputs/client-adapters/assets.ts
 
 import type {SanityAssetDocument, SanityClient, SanityImageAssetDocument} from '@sanity/client'
-import type {HttpError} from '../types'
 import {Observable, of, throwError} from 'rxjs'
 import {map, mergeMap} from 'rxjs/operators'
+
+import type {HttpError} from '../types'
 import {withMaxConcurrency} from './withMaxConcurrency'
 
 const fetchExisting$ = (client: SanityClient, type: string, hash: string) => {
   return client.observable.fetch('*[_type == $documentType && sha1hash == $hash][0]', {
     documentType: type,
-    hash
+    hash,
   })
 }
 
 const readFile$ = (file: File): Observable<ArrayBuffer> => {
-  return new Observable(subscriber => {
+  return new Observable((subscriber) => {
     const reader = new FileReader()
     reader.onload = () => {
       subscriber.next(reader.result as ArrayBuffer)
       subscriber.complete()
     }
-    reader.onerror = err => {
+    reader.onerror = (err) => {
       subscriber.error(err)
     }
     reader.readAsArrayBuffer(file)
@@ -33,7 +34,7 @@ const readFile$ = (file: File): Observable<ArrayBuffer> => {
 
 const hexFromBuffer = (buffer: ArrayBuffer): string => {
   return Array.prototype.map
-    .call(new Uint8Array(buffer), x => `00${x.toString(16)}`.slice(-2))
+    .call(new Uint8Array(buffer), (x) => `00${x.toString(16)}`.slice(-2))
     .join('')
 }
 
@@ -41,12 +42,12 @@ export const hashFile$ = (file: File): Observable<string> => {
   if (!window.crypto || !window.crypto.subtle || !window.FileReader) {
     return throwError({
       message: 'Unable to generate hash: uploads are only allowed in secure contexts',
-      statusCode: 500
+      statusCode: 500,
     })
   }
   return readFile$(file).pipe(
-    mergeMap(arrayBuffer => window.crypto.subtle.digest('SHA-1', arrayBuffer)),
-    map(hexFromBuffer)
+    mergeMap((arrayBuffer) => window.crypto.subtle.digest('SHA-1', arrayBuffer)),
+    map(hexFromBuffer),
   )
 }
 
@@ -54,7 +55,7 @@ const uploadSanityAsset$ = (
   client: SanityClient,
   assetType: 'file' | 'image',
   file: File,
-  hash: string
+  hash: string,
 ) => {
   return of(null).pipe(
     // NOTE: the sanity api will still dedupe unique files, but this saves us from uploading the asset file entirely
@@ -64,7 +65,7 @@ const uploadSanityAsset$ = (
       if (existingAsset) {
         return throwError({
           message: 'Asset already exists',
-          statusCode: 409
+          statusCode: 409,
         } as HttpError)
       }
 
@@ -75,21 +76,21 @@ const uploadSanityAsset$ = (
       return client.observable.assets
         .upload(assetType, file, {
           extract: ['blurhash', 'exif', 'location', 'lqip', 'palette'],
-          preserveFilename: true
+          preserveFilename: true,
         })
         .pipe(
-          map(event =>
+          map((event) =>
             event.type === 'response'
               ? {
                   // rewrite to a 'complete' event
                   asset: event.body.document,
                   id: event.body.document._id,
-                  type: 'complete'
+                  type: 'complete',
                 }
-              : event
-          )
+              : event,
+          ),
         )
-    })
+    }),
   )
 }
 

package/src/utils/withMaxConcurrency.test.ts

@@ -1,5 +1,6 @@
-import {describe, expect, it} from 'vitest'
 import {Observable, firstValueFrom} from 'rxjs'
+import {describe, expect, it} from 'vitest'
+
 import {createThrottler, withMaxConcurrency} from './withMaxConcurrency'
 
 describe('createThrottler', () => {
@@ -9,7 +10,7 @@ describe('createThrottler', () => {
     const request = createThrottler(2)
 
     const mk = () =>
-      new Observable<number>(sub => {
+      new Observable<number>((sub) => {
         active++
         maxActive = Math.max(maxActive, active)
         queueMicrotask(() => {
@@ -22,7 +23,7 @@ describe('createThrottler', () => {
     await Promise.all([
       firstValueFrom(request(mk())),
       firstValueFrom(request(mk())),
-      firstValueFrom(request(mk()))
+      firstValueFrom(request(mk())),
     ])
 
     expect(maxActive).toBe(2)
@@ -32,7 +33,7 @@ describe('createThrottler', () => {
 describe('withMaxConcurrency', () => {
   it('wraps a function so each call returns a single-value observable', async () => {
     const fn = (n: number) =>
-      new Observable<number>(sub => {
+      new Observable<number>((sub) => {
         sub.next(n)
         sub.complete()
       })

package/src/utils/withMaxConcurrency.ts

@@ -1,7 +1,7 @@
+import {Subject, Subscription, Observable, from} from 'rxjs'
 // Takes a observable-returning function and returns a new function that limits on the number of
 // concurrent observables.
 import {first, mergeMap} from 'rxjs/operators'
-import {Subject, Subscription, Observable, from} from 'rxjs'
 
 const DEFAULT_CONCURRENCY = 4
 
@@ -19,7 +19,7 @@ export const createThrottler = (concurrency: number = DEFAULT_CONCURRENCY) => {
   const ready$ = new Subject()
 
   function request(observable: Observable<any>): Observable<any> {
-    return new Observable(observer => {
+    return new Observable((observer) => {
       if (currentSubscriptions.length >= concurrency) {
         return scheduleAndWait$(observable)
           .pipe(mergeMap(request)) //
@@ -40,7 +40,7 @@ export const createThrottler = (concurrency: number = DEFAULT_CONCURRENCY) => {
 
   function scheduleAndWait$(observable: Observable<any>): Observable<any> {
     pendingObservables.push(observable)
-    return ready$.asObservable().pipe(first(obs => obs === observable))
+    return ready$.asObservable().pipe(first((obs) => obs === observable))
   }
 
   return request
@@ -48,7 +48,7 @@ export const createThrottler = (concurrency: number = DEFAULT_CONCURRENCY) => {
 
 export const withMaxConcurrency = (
   func: (...args: any[]) => Observable<any>,
-  concurrency: number = DEFAULT_CONCURRENCY
+  concurrency: number = DEFAULT_CONCURRENCY,
 ) => {
   const throttler = createThrottler(concurrency)
   return (...args: Array<any>) => from(throttler(func(...args)))

package/src/utils/zodFormResolver.ts

@@ -0,0 +1,17 @@
+import {zodResolver} from '@hookform/resolvers/zod'
+import type {FieldValues, Resolver} from 'react-hook-form'
+
+/**
+ * `@hookform/resolvers/zod` resolves its own `zod` typings through dependency
+ * hoisting, which in this monorepo lands on zod v4, while this plugin authors its
+ * form schemas with zod v3. The resolver accepts v3 schema instances correctly at
+ * runtime, so this thin wrapper only bridges the type-only v3/v4 mismatch. The
+ * react-hook-form field types stay fully checked at the call sites.
+ */
+export default function zodFormResolver<TFieldValues extends FieldValues>(
+  schema: unknown,
+): Resolver<TFieldValues> {
+  return zodResolver(
+    schema as Parameters<typeof zodResolver>[0],
+  ) as unknown as Resolver<TFieldValues>
+}

package/v2-incompatible.js

@@ -5,7 +5,7 @@ export default showIncompatiblePluginDialog({
   name: name,
   versions: {
     v3: version,
-    v2: '^1.4.13'
+    v2: '^1.4.13',
   },
-  sanityExchangeUrl: 'https://www.sanity.io/plugins/sanity-plugin-media'
+  sanityExchangeUrl: 'https://www.sanity.io/plugins/sanity-plugin-media',
 })