@sanity/media-library-types 1.0.0 → 1.0.2

package/lib/index.d.mts

@@ -1,3 +1,5 @@
+import {Asset as Asset_3} from '@sanity/media-library-types'
+import {AssetInstanceDocument as AssetInstanceDocument_2} from '@sanity/media-library-types'
 import {ClientPerspective} from '@sanity/client'
 import {ComponentType} from 'react'
 import {ElementType} from 'react'
@@ -115,6 +117,7 @@ export declare interface Asset<
   _createdAt: string
   _updatedAt: string
   _rev: string
+  url?: string
 }
 
 /** @public */
@@ -142,6 +145,7 @@ export declare interface AssetAspectDocument extends BaseDocument {
    */
   assetType?: Asset['assetType']
   definition: FieldDefinition
+  public?: boolean
 }
 
 /** @public */
@@ -178,14 +182,14 @@ declare interface AssetSource {
   component: ComponentType<AssetSourceComponentProps>
   icon?: ComponentType<EmptyProps>
   /** @beta */
-  uploader?: AssetSourceUploader
+  Uploader?: AssetSourceUploaderClass
 }
 
 /** @public */
 declare interface AssetSourceComponentProps {
   action?: 'select' | 'upload'
   assetSource: AssetSource
-  assetType?: 'file' | 'image'
+  assetType?: 'file' | 'image' | 'sanity.video'
   accept: string
   selectionType: 'single'
   dialogHeaderTitle?: React.ReactNode
@@ -193,6 +197,8 @@ declare interface AssetSourceComponentProps {
   onClose: () => void
   onSelect: (assetFromSource: AssetFromSource[]) => void
   schemaType?: ImageSchemaType | FileSchemaType
+  /** @beta */
+  uploader?: AssetSourceUploader
 }
 
 /** @public */
@@ -248,6 +254,9 @@ declare interface AssetSourceUploader {
   reset(): void
 }
 
+/** @beta */
+declare type AssetSourceUploaderClass = new (...args: any[]) => AssetSourceUploader
+
 /** @beta */
 declare type AssetSourceUploadEvent =
   | AssetSourceUploadEventProgress
@@ -309,7 +318,7 @@ declare interface AssetSourceUploadFile {
   id: string
   file: globalThis.File
   progress: number
-  status: 'pending' | 'uploading' | 'complete' | 'error' | 'aborted'
+  status: 'pending' | 'uploading' | 'complete' | 'error' | 'aborted' | 'alreadyExists'
   error?: Error
   result?: unknown
 }
@@ -368,6 +377,9 @@ declare interface BaseSchemaType extends Partial<DeprecationConfiguration> {
     input?: ComponentType<any>
     item?: ComponentType<any>
     preview?: ComponentType<any>
+    portableText?: {
+      plugins?: ComponentType<any>
+    }
   }
   /**
    * @deprecated This will be removed.
@@ -405,7 +417,7 @@ declare interface BaseSchemaTypeOptions {
  *           {title: 'Strong', value: 'strong'},
  *           {title: 'Emphasis', value: 'em'},
  *           {title: 'Underline', value: 'underline'},
- *           {title: 'Strike', value: 'strike'},
+ *           {title: 'Strike', value: 'strike-through'},
  *           {title: 'Code', value: 'code'},
  *         ]
  *       }
@@ -439,7 +451,7 @@ declare interface BlockDecoratorDefinition {
  *           {title: 'Strong', value: 'strong'},
  *           {title: 'Emphasis', value: 'em'},
  *           {title: 'Underline', value: 'underline'},
- *           {title: 'Strike', value: 'strike'},
+ *           {title: 'Strike', value: 'strike-through'},
  *           {title: 'Code', value: 'code'},
  *         ],
  *         annotations: [
@@ -532,6 +544,16 @@ declare interface BlockOptions extends BaseSchemaTypeOptions {
    */
   spellCheck?: boolean
   unstable_whitespaceOnPasteMode?: 'preserve' | 'normalize' | 'remove'
+  /**
+   * When enabled, the editor will restrict all line breaks and soft breaks,
+   * forcing content to remain on a single line. This will also update
+   * the styling of the editor to reflect the single-line constraint.
+   *
+   * Pasting content that is on multiple lines will be normalized to a single line, if possible.
+   *
+   * @defaultValue false
+   */
+  oneLine?: boolean
 }
 
 /** @public */
@@ -754,6 +776,8 @@ declare interface DatetimeOptions extends BaseSchemaTypeOptions {
   dateFormat?: string
   timeFormat?: string
   timeStep?: number
+  displayTimeZone?: string
+  allowTimeZoneSwitch?: boolean
 }
 
 /** @public */
@@ -935,6 +959,7 @@ declare interface FileOptions extends ObjectOptions {
   storeOriginalFilename?: boolean
   accept?: string
   sources?: AssetSource[]
+  mediaLibrary?: MediaLibraryOptions
 }
 
 /** @public */
@@ -960,7 +985,7 @@ declare interface FileSchemaType extends Omit<ObjectSchemaType, 'options'> {
   options?: FileOptions
 }
 
-export declare type FileStatus = 'pending' | 'uploading' | 'complete' | 'error'
+export declare type FileStatus = 'pending' | 'uploading' | 'complete' | 'error' | 'alreadyExists'
 
 /**
  * Wrapper object for the file upload with progress and status
@@ -1217,24 +1242,28 @@ declare interface InsertMenuOptions {
    * `filter: 'auto'` automatically turns on filtering if there are more than 5
    * schema types added to the menu.
    */
-  filter?: 'auto' | boolean
-  groups?: Array<{
-    name: string
-    title?: string
-    of?: Array<string>
-  }>
+  filter?: 'auto' | boolean | undefined
+  groups?:
+    | Array<{
+        name: string
+        title?: string
+        of?: Array<string>
+      }>
+    | undefined
   /** defaultValue `true` */
-  showIcons?: boolean
+  showIcons?: boolean | undefined
   /** @defaultValue `[{name: 'list'}]` */
-  views?: Array<
-    | {
-        name: 'list'
-      }
-    | {
-        name: 'grid'
-        previewImageUrl?: (schemaTypeName: string) => string | undefined
-      }
-  >
+  views?:
+    | Array<
+        | {
+            name: 'list'
+          }
+        | {
+            name: 'grid'
+            previewImageUrl?: (schemaTypeName: string) => string | undefined
+          }
+      >
+    | undefined
 }
 
 declare const internalGroqTypeReferenceTo: unique symbol
@@ -1317,6 +1346,52 @@ declare interface LocalizedValidationMessages {
   [locale: string]: string
 }
 
+/** @public */
+declare type MediaAssetTypes = AssetInstanceDocument_2['_type']
+
+/** @public */
+declare interface MediaLibraryFilter {
+  name: string
+  query: string
+}
+
+/** @public */
+declare interface MediaLibraryOptions {
+  filters?: MediaLibraryFilter[]
+}
+
+/** @public */
+declare interface MediaValidationValue<T extends MediaAssetTypes = MediaAssetTypes> {
+  /**
+   * Media information
+   */
+  media: {
+    /**
+     * The Media Library Asset.
+     */
+    asset: Asset_3 & {
+      currentVersion: Extract<
+        AssetInstanceDocument_2,
+        {
+          _type: T
+        }
+      >
+    }
+  }
+  /**
+   * The field value which the media is used in.
+   */
+  value: unknown
+}
+
+/** @public */
+declare interface MediaValidator<T extends MediaAssetTypes = MediaAssetTypes> {
+  (
+    value: MediaValidationValue<T>,
+    context: ValidationContext,
+  ): CustomValidatorResult | Promise<CustomValidatorResult>
+}
+
 /** @public */
 declare interface MultiFieldSet {
   name: string
@@ -1741,6 +1816,7 @@ declare interface Rule {
       bypassConcurrencyLimit?: boolean
     },
   ): Rule
+  media<T extends MediaAssetTypes = MediaAssetTypes>(fn: MediaValidator<T>): Rule
   min(len: number | string | FieldReference): Rule
   max(len: number | string | FieldReference): Rule
   length(len: number | FieldReference): Rule
@@ -1844,15 +1920,15 @@ declare type RuleSpec =
     }
   | {
       flag: 'min'
-      constraint: number | string
+      constraint: number | string | FieldReference
     }
   | {
       flag: 'max'
-      constraint: number | string
+      constraint: number | string | FieldReference
     }
   | {
       flag: 'length'
-      constraint: number
+      constraint: number | FieldReference
     }
   | {
       flag: 'valid'
@@ -1860,15 +1936,15 @@ declare type RuleSpec =
     }
   | {
       flag: 'precision'
-      constraint: number
+      constraint: number | FieldReference
     }
   | {
       flag: 'lessThan'
-      constraint: number
+      constraint: number | FieldReference
     }
   | {
       flag: 'greaterThan'
-      constraint: number
+      constraint: number | FieldReference
     }
   | {
       flag: 'stringCasing'
@@ -1880,6 +1956,10 @@ declare type RuleSpec =
         assetType: 'asset' | 'image' | 'file'
       }
     }
+  | {
+      flag: 'media'
+      constraint: MediaValidator<any>
+    }
   | {
       flag: 'regex'
       constraint: {
@@ -1924,6 +2004,7 @@ declare type SanityAsset = {
   >
   assetType: 'sanity.imageAsset' | 'sanity.videoAsset' | 'sanity.fileAsset'
   cdnAccessPolicy: 'public' | 'private'
+  url?: string
 }
 
 declare type SanityAssetCollection = {
@@ -1943,6 +2024,8 @@ declare type SanityAssetCollection = {
   }>
 }
 
+declare type SanityAssetInstanceState = string
+
 declare type SanityAssetVersion = {
   _type: 'sanity.asset.version'
   title?: string
@@ -2017,7 +2100,7 @@ declare type SanityFileAsset = {
     _type: 'block'
     _key: string
   }>
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string
@@ -2035,7 +2118,7 @@ declare type SanityImageAsset = {
   _updatedAt: string
   _rev: string
   altText?: string
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string
@@ -2154,7 +2237,7 @@ export declare type SanityVideoAsset = {
     _type: 'block'
     _key: string
   }>
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string

package/lib/index.d.ts

@@ -1,3 +1,5 @@
+import {Asset as Asset_3} from '@sanity/media-library-types'
+import {AssetInstanceDocument as AssetInstanceDocument_2} from '@sanity/media-library-types'
 import {ClientPerspective} from '@sanity/client'
 import {ComponentType} from 'react'
 import {ElementType} from 'react'
@@ -115,6 +117,7 @@ export declare interface Asset<
   _createdAt: string
   _updatedAt: string
   _rev: string
+  url?: string
 }
 
 /** @public */
@@ -142,6 +145,7 @@ export declare interface AssetAspectDocument extends BaseDocument {
    */
   assetType?: Asset['assetType']
   definition: FieldDefinition
+  public?: boolean
 }
 
 /** @public */
@@ -178,14 +182,14 @@ declare interface AssetSource {
   component: ComponentType<AssetSourceComponentProps>
   icon?: ComponentType<EmptyProps>
   /** @beta */
-  uploader?: AssetSourceUploader
+  Uploader?: AssetSourceUploaderClass
 }
 
 /** @public */
 declare interface AssetSourceComponentProps {
   action?: 'select' | 'upload'
   assetSource: AssetSource
-  assetType?: 'file' | 'image'
+  assetType?: 'file' | 'image' | 'sanity.video'
   accept: string
   selectionType: 'single'
   dialogHeaderTitle?: React.ReactNode
@@ -193,6 +197,8 @@ declare interface AssetSourceComponentProps {
   onClose: () => void
   onSelect: (assetFromSource: AssetFromSource[]) => void
   schemaType?: ImageSchemaType | FileSchemaType
+  /** @beta */
+  uploader?: AssetSourceUploader
 }
 
 /** @public */
@@ -248,6 +254,9 @@ declare interface AssetSourceUploader {
   reset(): void
 }
 
+/** @beta */
+declare type AssetSourceUploaderClass = new (...args: any[]) => AssetSourceUploader
+
 /** @beta */
 declare type AssetSourceUploadEvent =
   | AssetSourceUploadEventProgress
@@ -309,7 +318,7 @@ declare interface AssetSourceUploadFile {
   id: string
   file: globalThis.File
   progress: number
-  status: 'pending' | 'uploading' | 'complete' | 'error' | 'aborted'
+  status: 'pending' | 'uploading' | 'complete' | 'error' | 'aborted' | 'alreadyExists'
   error?: Error
   result?: unknown
 }
@@ -368,6 +377,9 @@ declare interface BaseSchemaType extends Partial<DeprecationConfiguration> {
     input?: ComponentType<any>
     item?: ComponentType<any>
     preview?: ComponentType<any>
+    portableText?: {
+      plugins?: ComponentType<any>
+    }
   }
   /**
    * @deprecated This will be removed.
@@ -405,7 +417,7 @@ declare interface BaseSchemaTypeOptions {
  *           {title: 'Strong', value: 'strong'},
  *           {title: 'Emphasis', value: 'em'},
  *           {title: 'Underline', value: 'underline'},
- *           {title: 'Strike', value: 'strike'},
+ *           {title: 'Strike', value: 'strike-through'},
  *           {title: 'Code', value: 'code'},
  *         ]
  *       }
@@ -439,7 +451,7 @@ declare interface BlockDecoratorDefinition {
  *           {title: 'Strong', value: 'strong'},
  *           {title: 'Emphasis', value: 'em'},
  *           {title: 'Underline', value: 'underline'},
- *           {title: 'Strike', value: 'strike'},
+ *           {title: 'Strike', value: 'strike-through'},
  *           {title: 'Code', value: 'code'},
  *         ],
  *         annotations: [
@@ -532,6 +544,16 @@ declare interface BlockOptions extends BaseSchemaTypeOptions {
    */
   spellCheck?: boolean
   unstable_whitespaceOnPasteMode?: 'preserve' | 'normalize' | 'remove'
+  /**
+   * When enabled, the editor will restrict all line breaks and soft breaks,
+   * forcing content to remain on a single line. This will also update
+   * the styling of the editor to reflect the single-line constraint.
+   *
+   * Pasting content that is on multiple lines will be normalized to a single line, if possible.
+   *
+   * @defaultValue false
+   */
+  oneLine?: boolean
 }
 
 /** @public */
@@ -754,6 +776,8 @@ declare interface DatetimeOptions extends BaseSchemaTypeOptions {
   dateFormat?: string
   timeFormat?: string
   timeStep?: number
+  displayTimeZone?: string
+  allowTimeZoneSwitch?: boolean
 }
 
 /** @public */
@@ -935,6 +959,7 @@ declare interface FileOptions extends ObjectOptions {
   storeOriginalFilename?: boolean
   accept?: string
   sources?: AssetSource[]
+  mediaLibrary?: MediaLibraryOptions
 }
 
 /** @public */
@@ -960,7 +985,7 @@ declare interface FileSchemaType extends Omit<ObjectSchemaType, 'options'> {
   options?: FileOptions
 }
 
-export declare type FileStatus = 'pending' | 'uploading' | 'complete' | 'error'
+export declare type FileStatus = 'pending' | 'uploading' | 'complete' | 'error' | 'alreadyExists'
 
 /**
  * Wrapper object for the file upload with progress and status
@@ -1217,24 +1242,28 @@ declare interface InsertMenuOptions {
    * `filter: 'auto'` automatically turns on filtering if there are more than 5
    * schema types added to the menu.
    */
-  filter?: 'auto' | boolean
-  groups?: Array<{
-    name: string
-    title?: string
-    of?: Array<string>
-  }>
+  filter?: 'auto' | boolean | undefined
+  groups?:
+    | Array<{
+        name: string
+        title?: string
+        of?: Array<string>
+      }>
+    | undefined
   /** defaultValue `true` */
-  showIcons?: boolean
+  showIcons?: boolean | undefined
   /** @defaultValue `[{name: 'list'}]` */
-  views?: Array<
-    | {
-        name: 'list'
-      }
-    | {
-        name: 'grid'
-        previewImageUrl?: (schemaTypeName: string) => string | undefined
-      }
-  >
+  views?:
+    | Array<
+        | {
+            name: 'list'
+          }
+        | {
+            name: 'grid'
+            previewImageUrl?: (schemaTypeName: string) => string | undefined
+          }
+      >
+    | undefined
 }
 
 declare const internalGroqTypeReferenceTo: unique symbol
@@ -1317,6 +1346,52 @@ declare interface LocalizedValidationMessages {
   [locale: string]: string
 }
 
+/** @public */
+declare type MediaAssetTypes = AssetInstanceDocument_2['_type']
+
+/** @public */
+declare interface MediaLibraryFilter {
+  name: string
+  query: string
+}
+
+/** @public */
+declare interface MediaLibraryOptions {
+  filters?: MediaLibraryFilter[]
+}
+
+/** @public */
+declare interface MediaValidationValue<T extends MediaAssetTypes = MediaAssetTypes> {
+  /**
+   * Media information
+   */
+  media: {
+    /**
+     * The Media Library Asset.
+     */
+    asset: Asset_3 & {
+      currentVersion: Extract<
+        AssetInstanceDocument_2,
+        {
+          _type: T
+        }
+      >
+    }
+  }
+  /**
+   * The field value which the media is used in.
+   */
+  value: unknown
+}
+
+/** @public */
+declare interface MediaValidator<T extends MediaAssetTypes = MediaAssetTypes> {
+  (
+    value: MediaValidationValue<T>,
+    context: ValidationContext,
+  ): CustomValidatorResult | Promise<CustomValidatorResult>
+}
+
 /** @public */
 declare interface MultiFieldSet {
   name: string
@@ -1741,6 +1816,7 @@ declare interface Rule {
       bypassConcurrencyLimit?: boolean
     },
   ): Rule
+  media<T extends MediaAssetTypes = MediaAssetTypes>(fn: MediaValidator<T>): Rule
   min(len: number | string | FieldReference): Rule
   max(len: number | string | FieldReference): Rule
   length(len: number | FieldReference): Rule
@@ -1844,15 +1920,15 @@ declare type RuleSpec =
     }
   | {
       flag: 'min'
-      constraint: number | string
+      constraint: number | string | FieldReference
     }
   | {
       flag: 'max'
-      constraint: number | string
+      constraint: number | string | FieldReference
     }
   | {
       flag: 'length'
-      constraint: number
+      constraint: number | FieldReference
     }
   | {
       flag: 'valid'
@@ -1860,15 +1936,15 @@ declare type RuleSpec =
     }
   | {
       flag: 'precision'
-      constraint: number
+      constraint: number | FieldReference
     }
   | {
       flag: 'lessThan'
-      constraint: number
+      constraint: number | FieldReference
     }
   | {
       flag: 'greaterThan'
-      constraint: number
+      constraint: number | FieldReference
     }
   | {
       flag: 'stringCasing'
@@ -1880,6 +1956,10 @@ declare type RuleSpec =
         assetType: 'asset' | 'image' | 'file'
       }
     }
+  | {
+      flag: 'media'
+      constraint: MediaValidator<any>
+    }
   | {
       flag: 'regex'
       constraint: {
@@ -1924,6 +2004,7 @@ declare type SanityAsset = {
   >
   assetType: 'sanity.imageAsset' | 'sanity.videoAsset' | 'sanity.fileAsset'
   cdnAccessPolicy: 'public' | 'private'
+  url?: string
 }
 
 declare type SanityAssetCollection = {
@@ -1943,6 +2024,8 @@ declare type SanityAssetCollection = {
   }>
 }
 
+declare type SanityAssetInstanceState = string
+
 declare type SanityAssetVersion = {
   _type: 'sanity.asset.version'
   title?: string
@@ -2017,7 +2100,7 @@ declare type SanityFileAsset = {
     _type: 'block'
     _key: string
   }>
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string
@@ -2035,7 +2118,7 @@ declare type SanityImageAsset = {
   _updatedAt: string
   _rev: string
   altText?: string
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string
@@ -2154,7 +2237,7 @@ export declare type SanityVideoAsset = {
     _type: 'block'
     _key: string
   }>
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/media-library-types",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Type definitions for common Sanity Media Library data structures",
   "keywords": [
     "sanity",
@@ -36,10 +36,9 @@
     "lib",
     "src"
   ],
-  "dependencies": {},
   "devDependencies": {
-    "@sanity/types": "^3.90.0",
-    "@sanity/pkg-utils": "^7.2.3",
+    "@sanity/pkg-utils": "^8.1.29",
+    "@sanity/types": "^4.15.0",
     "rimraf": "^5.0.10"
   },
   "scripts": {

package/src/assets.ts

@@ -34,6 +34,7 @@ export interface Asset<AssetInstance extends AssetInstanceDocument = AssetInstan
   _createdAt: string
   _updatedAt: string
   _rev: string
+  url?: string
 }
 
 export type BaseDocument = {
@@ -53,4 +54,5 @@ export interface AssetAspectDocument extends BaseDocument {
    */
   assetType?: Asset['assetType']
   definition: FieldDefinition
+  public?: boolean
 }

package/src/files.ts

@@ -1,4 +1,4 @@
-export type FileStatus = 'pending' | 'uploading' | 'complete' | 'error'
+export type FileStatus = 'pending' | 'uploading' | 'complete' | 'error' | 'alreadyExists'
 
 /**
  * Wrapper object for the file upload with progress and status

package/src/schema.types.ts

@@ -1,5 +1,10 @@
 export declare const internalGroqTypeReferenceTo: unique symbol
 
+export type SanitySystem = {
+  _type: 'sanity.system'
+  createdBy?: string
+}
+
 export type SanityAssetUploadSession = {
   _id: string
   _type: 'sanity.asset.upload-session'
@@ -17,11 +22,6 @@ export type SanityAssetUploadSession = {
   _system?: SanitySystem
 }
 
-export type SanitySystem = {
-  _type: 'sanity.system'
-  createdBy?: string
-}
-
 export type SanityAssetCollection = {
   _id: string
   _type: 'sanity.asset.collection'
@@ -46,23 +46,16 @@ export type SanityVideoMetadataPlayback = {
   policy: string
 }
 
-export type SanityImagePaletteSwatch = {
-  _type: 'sanity.imagePaletteSwatch'
-  background?: string
-  foreground?: string
-  population?: number
-  title?: string
-}
-
-export type SanityImagePalette = {
-  _type: 'sanity.imagePalette'
-  darkMuted?: SanityImagePaletteSwatch
-  lightVibrant?: SanityImagePaletteSwatch
-  darkVibrant?: SanityImagePaletteSwatch
-  vibrant?: SanityImagePaletteSwatch
-  dominant?: SanityImagePaletteSwatch
-  lightMuted?: SanityImagePaletteSwatch
-  muted?: SanityImagePaletteSwatch
+export type SanityVideoMetadata = {
+  _type: 'sanity.videoMetadata'
+  aspectRatio?: string
+  duration?: number
+  framerate?: number
+  playbacks?: Array<
+    {
+      _key: string
+    } & SanityVideoMetadataPlayback
+  >
 }
 
 export type SanityImageExifTags = {
@@ -103,6 +96,25 @@ export type SanityImageExifMetadata = {
   Artist?: string
 }
 
+export type SanityImagePaletteSwatch = {
+  _type: 'sanity.imagePaletteSwatch'
+  background?: string
+  foreground?: string
+  population?: number
+  title?: string
+}
+
+export type SanityImagePalette = {
+  _type: 'sanity.imagePalette'
+  darkMuted?: SanityImagePaletteSwatch
+  lightVibrant?: SanityImagePaletteSwatch
+  darkVibrant?: SanityImagePaletteSwatch
+  vibrant?: SanityImagePaletteSwatch
+  dominant?: SanityImagePaletteSwatch
+  lightMuted?: SanityImagePaletteSwatch
+  muted?: SanityImagePaletteSwatch
+}
+
 export type SanityImageDimensions = {
   _type: 'sanity.imageDimensions'
   height: number
@@ -110,6 +122,19 @@ export type SanityImageDimensions = {
   aspectRatio: number
 }
 
+export type SanityImageMetadata = {
+  _type: 'sanity.imageMetadata'
+  location?: Geopoint
+  dimensions: SanityImageDimensions
+  exif?: SanityImageExifMetadata
+  image?: SanityImageExifTags
+  palette: SanityImagePalette
+  lqip: string
+  blurHash: string
+  hasAlpha: boolean
+  isOpaque: boolean
+}
+
 export type SanityAsset = {
   _id: string
   _type: 'sanity.asset'
@@ -131,6 +156,7 @@ export type SanityAsset = {
   >
   assetType: 'sanity.imageAsset' | 'sanity.videoAsset' | 'sanity.fileAsset'
   cdnAccessPolicy: 'public' | 'private'
+  url?: string
 }
 
 export type SanityAssetVersion = {
@@ -182,7 +208,7 @@ export type SanityVideoAsset = {
     _type: 'block'
     _key: string
   }>
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string
@@ -199,17 +225,7 @@ export type SanityVideoAsset = {
   metadata: SanityVideoMetadata
 }
 
-export type SanityVideoMetadata = {
-  _type: 'sanity.videoMetadata'
-  aspectRatio?: string
-  duration?: number
-  framerate?: number
-  playbacks?: Array<
-    {
-      _key: string
-    } & SanityVideoMetadataPlayback
-  >
-}
+export type SanityAssetInstanceState = string
 
 export type SanityFileAsset = {
   _id: string
@@ -236,7 +252,7 @@ export type SanityFileAsset = {
     _type: 'block'
     _key: string
   }>
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string
@@ -254,7 +270,7 @@ export type SanityImageAsset = {
   _updatedAt: string
   _rev: string
   altText?: string
-  state: string
+  state: SanityAssetInstanceState
   sha1hash?: string
   mimeType?: string
   originalFilename?: string
@@ -266,19 +282,6 @@ export type SanityImageAsset = {
   metadata: SanityImageMetadata
 }
 
-export type SanityImageMetadata = {
-  _type: 'sanity.imageMetadata'
-  location?: Geopoint
-  dimensions: SanityImageDimensions
-  exif?: SanityImageExifMetadata
-  image?: SanityImageExifTags
-  palette: SanityImagePalette
-  lqip: string
-  blurHash: string
-  hasAlpha: boolean
-  isOpaque: boolean
-}
-
 export type Geopoint = {
   _type: 'geopoint'
   lat?: number
@@ -286,24 +289,22 @@ export type Geopoint = {
   alt?: number
 }
 
-export type SanityAssetInstanceState = string
-
 export type AllSanitySchemaTypes =
-  | SanityAssetUploadSession
   | SanitySystem
+  | SanityAssetUploadSession
   | SanityAssetCollection
   | SanityVideoMetadataPlayback
-  | SanityImagePaletteSwatch
-  | SanityImagePalette
+  | SanityVideoMetadata
   | SanityImageExifTags
   | SanityImageExifMetadata
+  | SanityImagePaletteSwatch
+  | SanityImagePalette
   | SanityImageDimensions
+  | SanityImageMetadata
   | SanityAsset
   | SanityAssetVersion
   | SanityVideoAsset
-  | SanityVideoMetadata
+  | SanityAssetInstanceState
   | SanityFileAsset
   | SanityImageAsset
-  | SanityImageMetadata
   | Geopoint
-  | SanityAssetInstanceState