@matvdt/js-toolkit 0.0.1-canary.21 → 0.0.1-canary.23

package/dist/payload-cms/server/create-global.d.ts

@@ -1,7 +1,7 @@
 import type { GlobalSlug } from 'payload';
-import { payload } from './payload';
+import { payload, FindGlobalOptions } from './payload';
 type BaseGlobalMethods<TSlug extends GlobalSlug> = {
-    get: () => ReturnType<typeof payload.global<TSlug>>;
+    get: (options?: FindGlobalOptions) => ReturnType<typeof payload.global<TSlug>>;
 };
 export declare function createGlobal<TSlug extends GlobalSlug, TExtend extends Record<string, (...args: any[]) => any> = {}>(slug: TSlug, extend?: (base: BaseGlobalMethods<TSlug>) => TExtend): BaseGlobalMethods<TSlug> & TExtend;
 export {};

package/dist/payload-cms/server/index.cjs

@@ -42,13 +42,13 @@ function withCache(collection, method, args, tags, fn) {
   return (0, import_cache.unstable_cache)(fn, cacheKey(collection, method, args), { tags })();
 }
 function revalidateCollection(collection) {
-  (0, import_cache.revalidateTag)(`collection:${collection}`, "max");
+  (0, import_cache.revalidateTag)(`collection:${collection}`, { expire: 0 });
 }
 function revalidateDoc(collection, id) {
-  (0, import_cache.revalidateTag)(`doc:${collection}:${id}`, "max");
+  (0, import_cache.revalidateTag)(`doc:${collection}:${id}`, { expire: 0 });
 }
 function revalidateGlobal(slug) {
-  (0, import_cache.revalidateTag)(`global:${slug}`, "max");
+  (0, import_cache.revalidateTag)(`global:${slug}`, { expire: 0 });
 }
 
 // src/payload-cms/server/payload.ts
@@ -186,10 +186,10 @@ var payload = {
     revalidateCollection(collection);
     return result;
   },
-  global: async (slug) => {
-    return withCache("global", slug, [], [`global:${slug}`], async () => {
+  global: async (slug, options) => {
+    return withCache("global", slug, [options], [`global:${slug}`], async () => {
       const client = await getClient();
-      return client.findGlobal({ slug });
+      return client.findGlobal({ ...options, slug });
     });
   },
   aggregate: async (collection, pipeline, options) => {
@@ -224,7 +224,7 @@ function createCollection(collection, extend) {
 // src/payload-cms/server/create-global.ts
 function createGlobal(slug, extend) {
   const base = {
-    get: () => payload.global(slug)
+    get: (options) => payload.global(slug, options)
   };
   const extended = extend ? extend(base) : void 0;
   return {

package/dist/payload-cms/server/index.js

@@ -7,13 +7,13 @@ function withCache(collection, method, args, tags, fn) {
   return unstable_cache(fn, cacheKey(collection, method, args), { tags })();
 }
 function revalidateCollection(collection) {
-  revalidateTag(`collection:${collection}`, "max");
+  revalidateTag(`collection:${collection}`, { expire: 0 });
 }
 function revalidateDoc(collection, id) {
-  revalidateTag(`doc:${collection}:${id}`, "max");
+  revalidateTag(`doc:${collection}:${id}`, { expire: 0 });
 }
 function revalidateGlobal(slug) {
-  revalidateTag(`global:${slug}`, "max");
+  revalidateTag(`global:${slug}`, { expire: 0 });
 }
 
 // src/payload-cms/server/payload.ts
@@ -151,10 +151,10 @@ var payload = {
     revalidateCollection(collection);
     return result;
   },
-  global: async (slug) => {
-    return withCache("global", slug, [], [`global:${slug}`], async () => {
+  global: async (slug, options) => {
+    return withCache("global", slug, [options], [`global:${slug}`], async () => {
       const client = await getClient();
-      return client.findGlobal({ slug });
+      return client.findGlobal({ ...options, slug });
     });
   },
   aggregate: async (collection, pipeline, options) => {
@@ -189,7 +189,7 @@ function createCollection(collection, extend) {
 // src/payload-cms/server/create-global.ts
 function createGlobal(slug, extend) {
   const base = {
-    get: () => payload.global(slug)
+    get: (options) => payload.global(slug, options)
   };
   const extended = extend ? extend(base) : void 0;
   return {

package/dist/payload-cms/server/payload.d.ts

@@ -6,6 +6,7 @@ export type FindOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>
 export type FindByIDOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['findByID']>[0], 'collection' | 'id'>;
 export type UpdateOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['update']>[0], 'collection' | 'id' | 'data' | 'where'>;
 export type DeleteOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['delete']>[0], 'collection' | 'id' | 'where'>;
+export type FindGlobalOptions = Omit<Parameters<Awaited<ReturnType<typeof getPayload>>['findGlobal']>[0], 'slug'>;
 export type UpdateData = Parameters<Awaited<ReturnType<typeof getPayload>>['update']>[0]['data'];
 export declare const payload: {
     findOne: <TSlug extends CollectionSlug>(collection: TSlug, options?: FindOptions) => Promise<DataFromCollectionSlug<TSlug>>;
@@ -18,7 +19,7 @@ export declare const payload: {
     updateMany: <TSlug extends CollectionSlug>(collection: TSlug, where: Where, data: UpdateData, options?: UpdateOptions) => Promise<import("payload").BulkOperationResult<TSlug, import("payload").SelectExcludeType | import("payload").SelectIncludeType>>;
     delete: <TSlug extends CollectionSlug>(collection: TSlug, id: string | number, options?: DeleteOptions) => Promise<import("payload").JsonObject & import("payload").TypeWithID>;
     deleteMany: <TSlug extends CollectionSlug>(collection: TSlug, where: Where, options?: DeleteOptions) => Promise<import("payload").BulkOperationResult<TSlug, import("payload").SelectExcludeType | import("payload").SelectIncludeType>>;
-    global: <TSlug extends GlobalSlug>(slug: TSlug) => Promise<DataFromGlobalSlug<TSlug>>;
+    global: <TSlug extends GlobalSlug>(slug: TSlug, options?: FindGlobalOptions) => Promise<DataFromGlobalSlug<TSlug>>;
     aggregate: <TSlug extends CollectionSlug, TData = any>(collection: TSlug, pipeline?: PipelineStage[], options?: AggregateOptions) => Promise<Aggregate<TData[]>>;
     raw: () => Promise<import("payload").BasePayload>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matvdt/js-toolkit",
-  "version": "0.0.1-canary.21",
+  "version": "0.0.1-canary.23",
   "description": "JS/TS toolkit",
   "type": "module",
   "main": "./dist/index.js",