chore: clean up blob variant types & naming

Author: gmaclennan

lib/blob-store/index.js

@@ -9,7 +9,7 @@ import { LiveDownload } from './live-download.js'
 
 // prop = blob type name
 // value = array of blob variants supported for that type
-export const SUPPORTED_BLOB_TYPES = /** @type {const} */ ({
+export const SUPPORTED_BLOB_VARIANTS = /** @type {const} */ ({
   photo: ['original', 'preview', 'thumbnail'],
   audio: ['original'],
   video: ['original']

lib/types.d.ts

@@ -4,17 +4,17 @@ import type {
   ValueOf,
   RequireAtLeastOne,
 } from 'type-fest'
-import { SUPPORTED_BLOB_TYPES } from './blob-store/index.js'
+import { SUPPORTED_BLOB_VARIANTS } from './blob-store/index.js'
 
-type SupportedBlobTypes = typeof SUPPORTED_BLOB_TYPES
-type BlobType = keyof SupportedBlobTypes
-type BlobVariant = TupleToUnion<SupportedBlobTypes[BlobType]>
+type SupportedBlobVariants = typeof SUPPORTED_BLOB_VARIANTS
+type BlobType = keyof SupportedBlobVariants
+type BlobVariant<TBlobType extends BlobType> = TupleToUnion<SupportedBlobVariants[TBlobType]>
 
 type BlobIdBase<T extends BlobType> = {
   /** Type of blob */
   type: T
   /** Blob variant (some blob types have smaller previews and thumbnails available) */
-  variant: TupleToUnion<SupportedBlobTypes[T]>
+  variant: BlobVariant<T>
   /** unique identifier for blob (e.g. hash of content) */
   name: string
   /** public key as hex string of hyperdrive where blob is stored */
@@ -32,6 +32,6 @@ type ArrayAtLeastOne<T> = [T, ...T[]]
 
 export type BlobFilter = RequireAtLeastOne<{
   [KeyType in BlobType]: ArrayAtLeastOne<
-    TupleToUnion<SupportedBlobTypes[KeyType]>
+    BlobVariant<KeyType>
   >
 }>