@rubixstudios/payload-media 1.2.4 → 2.0.0

package/dist/endpoints/index.js

@@ -2,6 +2,36 @@ import { getMediaType } from '../utils/getMediaType.js';
 import { getProviders } from '../utils/getProviders.js';
 import { requireAccess } from '../utils/requireAccess.js';
 import { resolveProvider } from '../utils/resolveProvider.js';
+const getProvider = (req)=>{
+    const provider = resolveProvider(req);
+    if (!provider) {
+        return Response.json({
+            data: null,
+            error: 'Provider not supported.'
+        }, {
+            status: 404
+        });
+    }
+    if (!provider.isConfigured) {
+        return Response.json({
+            data: null,
+            error: 'Provider not configured.'
+        }, {
+            status: 500
+        });
+    }
+    return provider;
+};
+const getFilters = (query)=>({
+        category: query.category,
+        color: query.color,
+        colors: query.colors,
+        image_type: query.image_type,
+        order: query.order,
+        orientation: query.orientation,
+        size: query.size,
+        media: getMediaType(query.media)
+    });
 export const providers = [
     {
         path: '/providers',
@@ -10,12 +40,12 @@ export const providers = [
             const denied = await requireAccess(req);
             if (denied) return denied;
             const providerKeys = req.payload?.config?.custom?.providerKeys;
-            const providers = getProviders(providerKeys).map((p)=>({
-                    name: p.name,
-                    key: p.key
+            const data = getProviders(providerKeys).map((provider)=>({
+                    name: provider.name,
+                    key: provider.key
                 }));
             return Response.json({
-                data: providers,
+                data,
                 error: null
             });
         }
@@ -26,33 +56,9 @@ export const providers = [
         handler: async (req)=>{
             const denied = await requireAccess(req);
             if (denied) return denied;
-            const provider = resolveProvider(req);
-            if (!provider) {
-                return Response.json({
-                    data: null,
-                    error: 'Provider not supported.'
-                }, {
-                    status: 404
-                });
-            }
-            if (!provider.isConfigured) {
-                return Response.json({
-                    data: null,
-                    error: 'Provider not configured.'
-                }, {
-                    status: 500
-                });
-            }
-            const data = await provider.getFeatured({
-                category: req.query.category,
-                color: req.query.color,
-                colors: req.query.colors,
-                image_type: req.query.image_type,
-                order: req.query.order,
-                orientation: req.query.orientation,
-                size: req.query.size,
-                media: getMediaType(req.query.media)
-            });
+            const provider = getProvider(req);
+            if (provider instanceof Response) return provider;
+            const data = await provider.getFeatured(getFilters(req.query));
             return Response.json({
                 data,
                 error: null
@@ -65,33 +71,9 @@ export const providers = [
         handler: async (req)=>{
             const denied = await requireAccess(req);
             if (denied) return denied;
-            const provider = resolveProvider(req);
-            if (!provider) {
-                return Response.json({
-                    data: null,
-                    error: 'Provider not supported.'
-                }, {
-                    status: 404
-                });
-            }
-            if (!provider.isConfigured) {
-                return Response.json({
-                    data: null,
-                    error: 'Provider not configured.'
-                }, {
-                    status: 500
-                });
-            }
-            const data = await provider.getSearch(req.query.query, Number(req.query.page ?? 1), {
-                category: req.query.category,
-                color: req.query.color,
-                colors: req.query.colors,
-                image_type: req.query.image_type,
-                order: req.query.order,
-                orientation: req.query.orientation,
-                size: req.query.size,
-                media: getMediaType(req.query.media)
-            });
+            const provider = getProvider(req);
+            if (provider instanceof Response) return provider;
+            const data = await provider.getSearch(req.query.query, Number(req.query.page ?? 1), getFilters(req.query));
             return Response.json({
                 data,
                 error: null
@@ -104,23 +86,8 @@ export const providers = [
         handler: async (req)=>{
             const denied = await requireAccess(req);
             if (denied) return denied;
-            const provider = resolveProvider(req);
-            if (!provider) {
-                return Response.json({
-                    data: null,
-                    error: 'Provider not supported.'
-                }, {
-                    status: 404
-                });
-            }
-            if (!provider.isConfigured) {
-                return Response.json({
-                    data: null,
-                    error: 'Provider not configured.'
-                }, {
-                    status: 500
-                });
-            }
+            const provider = getProvider(req);
+            if (provider instanceof Response) return provider;
             const data = provider.trackDownload(req.query.url);
             return Response.json({
                 data,

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAIrC,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,eAAO,MAAM,WAAW,kBACP,cAAc,sBACZ,MAAM,KAAG,MAiDzB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAIrC,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,eAAO,MAAM,WAAW,kBACP,cAAc,sBACZ,MAAM,KAAG,MA+CzB,CAAA"}

package/dist/index.js

@@ -2,47 +2,46 @@ import { defaultPluginOptions } from './defaults.js';
 import { providers } from './endpoints/index.js';
 export const mediaPlugin = (pluginConfig = {})=>(incomingConfig)=>{
         if (pluginConfig.disabled) return incomingConfig;
-        const mergedOptions = {
+        const options = {
             ...defaultPluginOptions,
             ...pluginConfig
         };
-        const settings = {
+        const config = {
             ...incomingConfig
         };
-        settings.custom = {
-            ...settings.custom || {},
-            providerAccess: mergedOptions.access,
+        config.custom = {
+            ...config.custom ?? {},
+            providerAccess: options.access,
             providerKeys: {
-                pexels: mergedOptions.pexels,
-                unsplash: mergedOptions.unsplash,
-                pixabay: mergedOptions.pixabay
+                pexels: options.pexels,
+                unsplash: options.unsplash,
+                pixabay: options.pixabay
             }
         };
-        settings.collections = (settings.collections || []).map((collection)=>{
+        config.collections = (config.collections ?? []).map((collection)=>{
             const upload = collection.upload;
             if (!upload) return collection;
-            const uploadObj = upload === true ? {} : typeof upload === 'object' ? upload : undefined;
-            const modifiedCollection = {
+            const uploadConfig = upload === true ? {} : typeof upload === 'object' ? upload : undefined;
+            return {
                 ...collection,
                 upload: {
-                    ...uploadObj || {},
+                    ...uploadConfig ?? {},
                     admin: {
-                        ...uploadObj?.admin || {},
+                        ...uploadConfig?.admin ?? {},
                         components: {
-                            ...uploadObj?.admin?.components || {},
+                            ...uploadConfig?.admin?.components ?? {},
                             controls: [
-                                ...uploadObj?.admin?.components?.controls || [],
+                                ...uploadConfig?.admin?.components?.controls ?? [],
                                 '@rubixstudios/payload-media/client#MediaSearch'
                             ]
                         }
                     }
                 }
             };
-            return modifiedCollection;
         });
-        settings.endpoints = [
-            ...settings.endpoints || [],
+        config.endpoints = [
+            ...config.endpoints ?? [],
             ...providers
         ];
-        return settings;
+        return config;
     };

package/dist/lib/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/lib/cache.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACvB,OAAO,CAAC,eAAe;IAIvB,MAAM,CAAC,KAAK,EAAE,MAAM,WAGnB;IAED,GAAG,CAAC,KAAK,EAAE,MAAM,WAoBhB;IAED,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAUpD;CACF"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/lib/cache.ts"],"names":[],"mappings":"AAOA,qBAAa,YAAY;IACvB,OAAO,CAAC,eAAe;IAIvB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAI7B;IAED,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAwB1B;IAED,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAUpD;CACF"}

package/dist/lib/cache.js

@@ -9,20 +9,23 @@ export class CacheManager {
     }
     get(query) {
         const key = this.getVersionedKey(query);
-        const itemStr = localStorage.getItem(key);
-        if (!itemStr) return null;
-        let item;
+        const stored = localStorage.getItem(key);
+        if (!stored) return null;
         try {
-            item = JSON.parse(itemStr);
+            const item = JSON.parse(stored);
+            if (!item || typeof item !== 'object' || !('value' in item)) {
+                localStorage.removeItem(key);
+                return null;
+            }
+            if (item.expiry && Date.now() > item.expiry) {
+                localStorage.removeItem(key);
+                return null;
+            }
+            return item.value;
         } catch  {
             localStorage.removeItem(key);
             return null;
         }
-        if (item.expiry && Date.now() > item.expiry) {
-            localStorage.removeItem(key);
-            return null;
-        }
-        return item.value;
     }
     set(query, data, ttl) {
         const key = this.getVersionedKey(query);

package/dist/types.d.ts

@@ -1,39 +1,68 @@
 import { type Access } from 'payload';
+export type MediaType = 'image' | 'video';
 export type MediaOption = {
     label: string;
-    value: 'image' | 'video';
+    value: MediaType;
 };
 export declare const MediaOptions: MediaOption[];
-export interface OpenverseResponse {
-    page: number;
-    page_count: number;
-    page_size: number;
-    result_count: number;
-    results: OpenverseResult[];
-}
-export interface OpenverseResult {
-    background_color?: string | null;
-    creator: string | null;
-    creator_url: string | null;
-    foreign_landing_url: string | null;
+export type ProviderConfig = {
+    access?: Access;
+    disabled?: boolean;
+    openverse?: string;
+    pexels?: string;
+    pixabay?: string;
+    unsplash?: string;
+};
+export type ProviderKeys = {
+    unsplash?: string;
+    openverse?: string;
+    pexels?: string;
+    pixabay?: string;
+};
+type ProviderKey = 'unsplash' | 'pexels' | 'pixabay';
+export type ProviderOption = {
+    label: string;
+    value: ProviderKey;
+};
+export type ProviderFilters = {
+    provider: 'unsplash';
+    options: UnsplashFilters;
+} | {
+    provider: 'pexels';
+    options: PexelsFilters;
+} | {
+    provider: 'pixabay';
+    options: PixabayFilters;
+};
+export interface ProviderResult {
+    alt: string;
+    attribution: {
+        name: string;
+        link: string;
+    };
+    avatar?: string;
+    color: string;
     height: number;
     id: string;
-    source: string;
-    thumbnail: string;
-    title: string | null;
-    url: string;
+    likes?: number;
+    urls: {
+        view: string;
+        original: string;
+        download: string;
+        downloadLocation?: string;
+    };
     width: number;
 }
-export declare const PexelsColours: {
-    label: string;
-    value: string;
-}[];
 export type PexelsFilters = {
     orientation?: string;
     size?: string;
-    media?: 'image' | 'video';
+    media?: MediaType;
     color?: string;
 };
+export declare const PexelsColours: {
+    label: string;
+    value: string;
+}[];
 export declare const PexelsOrientation: {
     label: string;
     value: string;
@@ -42,6 +71,24 @@ export declare const PexelsSize: {
     label: string;
     value: string;
 }[];
+export declare const PexelsVideoSize: {
+    label: string;
+    value: string;
+}[];
+export interface PexelsResult {
+    alt: string;
+    avg_color: string;
+    height: number;
+    id: string;
+    photographer: string;
+    photographer_url: string;
+    src: {
+        medium: string;
+        original: string;
+    };
+    url: string;
+    width: number;
+}
 interface PexelsVideoUser {
     id: number;
     name: string;
@@ -79,24 +126,14 @@ export interface PexelsVideoResponse {
     url: string;
     videos: PexelsVideo[];
 }
-export declare const PexelsVideoSize: {
-    label: string;
-    value: string;
-}[];
-export interface PexelsResult {
-    alt: string;
-    avg_color: string;
-    height: number;
-    id: string;
-    photographer: string;
-    photographer_url: string;
-    src: {
-        medium: string;
-        original: string;
-    };
-    url: string;
-    width: number;
-}
+export type PixabayFilters = {
+    image_type?: string;
+    orientation?: string;
+    category?: string;
+    colors?: string;
+    order?: string;
+    media?: MediaType;
+};
 export declare const PixabayCategories: {
     label: string;
     value: string;
@@ -105,14 +142,6 @@ export declare const PixabayColours: {
     label: string;
     value: string;
 }[];
-export type PixabayFilters = {
-    image_type?: string;
-    orientation?: string;
-    category?: string;
-    colors?: string;
-    order?: string;
-    media?: 'image' | 'video';
-};
 export declare const PixabayImageType: {
     label: string;
     value: string;
@@ -170,63 +199,15 @@ export interface PixabayVideoResponse {
     total: number;
     totalHits: number;
 }
-export type ProviderConfig = {
-    access?: Access;
-    disabled?: boolean;
-    openverse?: string;
-    pexels?: string;
-    pixabay?: string;
-    unsplash?: string;
-};
-export type ProviderFilters = {
-    provider: 'unsplash';
-    options: UnsplashFilters;
-} | {
-    provider: 'pexels';
-    options: PexelsFilters;
-} | {
-    provider: 'pixabay';
-    options: PixabayFilters;
-};
-export type ProviderKeys = {
-    unsplash?: string;
-    openverse?: string;
-    pexels?: string;
-    pixabay?: string;
-};
-type ProviderKey = 'unsplash' | 'pexels' | 'pixabay';
-export type ProviderOption = {
-    label: string;
-    value: ProviderKey;
+export type UnsplashFilters = {
+    color?: string;
+    orientation?: string;
+    media?: MediaType;
 };
-export interface ProviderResult {
-    alt: string;
-    attribution: {
-        name: string;
-        link: string;
-    };
-    avatar?: string;
-    color: string;
-    height: number;
-    id: string;
-    likes?: number;
-    urls: {
-        view: string;
-        original: string;
-        download: string;
-        downloadLocation?: string;
-    };
-    width: number;
-}
 export declare const UnsplashColours: {
     label: string;
     value: string;
 }[];
-export type UnsplashFilters = {
-    color?: string;
-    orientation?: string;
-    media?: 'image' | 'video';
-};
 export declare const UnsplashOrientation: {
     label: string;
     value: string;
@@ -258,5 +239,25 @@ export interface UnsplashResult {
     };
     width: number;
 }
+export interface OpenverseResult {
+    background_color?: string | null;
+    creator: string | null;
+    creator_url: string | null;
+    foreign_landing_url: string | null;
+    height: number;
+    id: string;
+    source: string;
+    thumbnail: string;
+    title: string | null;
+    url: string;
+    width: number;
+}
+export interface OpenverseResponse {
+    page: number;
+    page_count: number;
+    page_size: number;
+    result_count: number;
+    results: OpenverseResult[];
+}
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/utils/fetchCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchCache.d.ts","sourceRoot":"","sources":["../../src/utils/fetchCache.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,cAAqB,MAAM,iBAsBjD,CAAA"}
+{"version":3,"file":"fetchCache.d.ts","sourceRoot":"","sources":["../../src/utils/fetchCache.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,cAAqB,MAAM,iBAuBjD,CAAA"}

package/dist/utils/fetchCache.js

@@ -1,6 +1,6 @@
 import { CacheManager } from '../lib/cache.js';
 const cache = new CacheManager();
-const defaultExpiry = 24 * 60 * 60 * 1000;
+const CACHE_TTL = 24 * 60 * 60 * 1000;
 export const fetchCache = async (queryPath)=>{
     if (queryPath.includes('undefined')) {
         throw new Error('Invalid provider');
@@ -14,7 +14,7 @@ export const fetchCache = async (queryPath)=>{
     if (!response.ok) {
         throw await response.json();
     }
-    const json = await response.json();
-    cache.set(key, json, defaultExpiry);
-    return json;
+    const data = await response.json();
+    cache.set(key, data, CACHE_TTL);
+    return data;
 };

package/dist/utils/getProviders.d.ts

@@ -2,5 +2,5 @@ import { Pexels } from '../endpoints/handler/Pexels.js';
 import { Pixabay } from '../endpoints/handler/Pixabay.js';
 import { Unsplash } from '../endpoints/handler/Unsplash.js';
 import { type ProviderKeys } from '../types.js';
-export declare function getProviders(providerKey?: ProviderKeys): Array<Pexels | Unsplash | Pixabay>;
+export declare const getProviders: (providerKeys?: ProviderKeys) => (Pexels | Pixabay | Unsplash)[];
 //# sourceMappingURL=getProviders.d.ts.map

package/dist/utils/getProviders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getProviders.d.ts","sourceRoot":"","sources":["../../src/utils/getProviders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAC3D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,wBAAgB,YAAY,CAAC,WAAW,CAAC,EAAE,YAAY,GAAG,KAAK,CAAC,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,CAM3F"}
+{"version":3,"file":"getProviders.d.ts","sourceRoot":"","sources":["../../src/utils/getProviders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAC3D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,eAAO,MAAM,YAAY,kBAAmB,YAAY,oCAMvD,CAAA"}

package/dist/utils/getProviders.js

@@ -1,10 +1,10 @@
 import { Pexels } from '../endpoints/handler/Pexels.js';
 import { Pixabay } from '../endpoints/handler/Pixabay.js';
 import { Unsplash } from '../endpoints/handler/Unsplash.js';
-export function getProviders(providerKey) {
+export const getProviders = (providerKeys)=>{
     return [
-        new Unsplash(()=>providerKey?.unsplash),
-        new Pexels(()=>providerKey?.pexels),
-        new Pixabay(()=>providerKey?.pixabay)
-    ].filter((p)=>p.isConfigured);
-}
+        new Unsplash(()=>providerKeys?.unsplash),
+        new Pexels(()=>providerKeys?.pexels),
+        new Pixabay(()=>providerKeys?.pixabay)
+    ].filter((provider)=>provider.isConfigured);
+};

package/dist/utils/resolveProvider.d.ts

@@ -1,6 +1,3 @@
 import { type PayloadRequest } from 'payload';
-import { type Pexels } from '../endpoints/handler/Pexels.js';
-import { type Pixabay } from '../endpoints/handler/Pixabay.js';
-import { type Unsplash } from '../endpoints/handler/Unsplash.js';
-export declare const resolveProvider: (req: PayloadRequest) => Unsplash | Pexels | Pixabay | null;
+export declare const resolveProvider: (req: PayloadRequest) => import("../endpoints/handler/Pexels.js").Pexels | import("../endpoints/handler/Pixabay.js").Pixabay | import("../endpoints/handler/Unsplash.js").Unsplash | null;
 //# sourceMappingURL=resolveProvider.d.ts.map

package/dist/utils/resolveProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveProvider.d.ts","sourceRoot":"","sources":["../../src/utils/resolveProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,gCAAgC,CAAA;AAC5D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAGhE,eAAO,MAAM,eAAe,QAAS,cAAc,KAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,IAGnF,CAAA"}
+{"version":3,"file":"resolveProvider.d.ts","sourceRoot":"","sources":["../../src/utils/resolveProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,eAAO,MAAM,eAAe,QAAS,cAAc,qKAIlD,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubixstudios/payload-media",
-  "version": "1.2.4",
+  "version": "2.0.0",
   "description": "A Payload CMS plugin that integrates with stock image and video providers including Unsplash, Pexels and Pixabay.",
   "license": "MIT",
   "author": "Rubix Studios <hello@rubixstudios.com.au> (https://rubixstudios.com.au)",
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.15",
-    "@payloadcms/ui": "^3.90.2",
+    "@payloadcms/ui": "4.0.0-beta.0",
     "@semantic-release/changelog": "^7.0.0",
     "@semantic-release/git": "^11.0.1",
     "@swc/cli": "^0.8.1",
@@ -75,7 +75,7 @@
     "typescript": "7.0.2"
   },
   "peerDependencies": {
-    "payload": "^3.90.2"
+    "payload": "4.0.0-beta.0"
   },
   "engines": {
     "node": ">=24",