@websolutespa/payload-plugin-bowl 1.7.13 → 1.7.15

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/payload-plugin-bowl
 
+## 1.7.15
+
+### Patch Changes
+
+- Modified: StoreService, setMixerContext
+
+## 1.7.14
+
+### Patch Changes
+
+- 1b93080: Modified: richTextSerializer
+
 ## 1.7.13
 
 ### Patch Changes

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { Endpoint, AdminView, Locale as Locale$1, Config } from 'payload/config'
 import { Field, FieldBase, Tab, JSONField, Block as Block$1, FieldAffectingData, HookName, FieldHook as FieldHook$1, UIField as UIField$1 } from 'payload/dist/fields/config/types';
 import * as payload_types from 'payload/types';
 import { PayloadRequest, CollectionAfterChangeHook, CollectionAfterDeleteHook, TypeWithID, CollectionConfig, BeforeDuplicate, Where, Block, GlobalConfig, RichTextField, RelationshipField, CheckboxField, BlockField, DateField, TextField, GroupField, Field as Field$1, UploadField, ArrayField, NumberField, FieldHook, SelectField, CollapsibleField, RowField, TabsField, UIField, EmailField, TextareaField, RadioField, CodeField, PointField, SanitizedCollectionConfig } from 'payload/types';
-import { IEntity, ILocale, ICategorized, IRoute, ICategory, IMarket, IMemoryStore, ILocalizable, IEquatable, IMedia, IPageRelation, ISchema, IMenuItem, IMenu } from '@websolutespa/bom-core';
+import { IEntity, ILocale, ICategorized, IRoute, ICategory, IMarket, IMemoryStore, ILocalizable, IEquatable, IMedia, IPageRelation, ISchema, IMenuCategory, IMenuGroup, IMenuLink, IMenuPage, IMenuRoute, IMenuItem, IMenu } from '@websolutespa/bom-core';
 import * as payload_dist_admin_components_forms_FieldDescription_types from 'payload/dist/admin/components/forms/FieldDescription/types';
 import * as React from 'react';
 import React__default, { ReactNode } from 'react';
@@ -208,6 +208,7 @@ declare const staticDetailGet: ((collectionConfig: CollectionConfig) => Endpoint
 declare function populateStaticFields<T = IEntity>(item: T, fields: Field[], locale: string): Promise<T>;
 declare function getStaticLoader(slug: string): () => Promise<Option[]>;
 
+declare function getStoreRequest(req: PayloadRequest, market?: string, locale?: string): PayloadRequest;
 declare function getStore(req: PayloadRequest): Promise<IMemoryStore>;
 type FindOptions = {
     context?: RequestContext;
@@ -227,10 +228,11 @@ type FindOptions = {
     user?: any;
     where?: Where;
 };
-declare function findCollection<T>(req: PayloadRequest, collection: string, options?: Omit<FindOptions, 'req'>): Promise<PaginatedDocs<T>>;
+declare function findCollection<T>(req: PayloadRequest, collection: string, options?: Omit<FindOptions, 'req'>): Promise<T[]>;
 declare function getApiUrl(req: PayloadRequest): string;
 declare function getSearchUrl(req: PayloadRequest, overrideQuery?: {}): string;
 declare function fetchEndpoint<T>(req: PayloadRequest, endpoint: string, query?: {}): Promise<T>;
+declare function fetchStaticCollection<T = any>(req: PayloadRequest, slug: string, query?: {}): Promise<T[]>;
 declare function fetchCollection<T = any>(req: PayloadRequest, slug: string, query?: {}): Promise<{
     docs: T[];
 }>;
@@ -461,11 +463,11 @@ declare function localizeItem<T = IEntity>(item: T, localizedFields: string[], l
 declare function localizeCollection<T = IEntity>(items: T[], localizedFields: string[], locale?: string): Promise<T[]>;
 
 declare const MAX_INT = 1000000000000;
-declare function decorateMenuCategory_(item: IUndecoratedMenuCategory, categories: ICategory[], routes: IRoute[], market: string, depth?: number): IMenuItem;
-declare function decorateMenuGroup_(item: IUndecoratedMenuGroup, categories: ICategory[], routes: IRoute[], market: string): IMenuItem;
-declare function decorateMenuLink_(item: IUndecoratedMenuLink, categories: ICategory[], routes: IRoute[], market: string): IMenuItem;
-declare function decorateMenuPage_(item: IUndecoratedMenuPage, categories: ICategory[], routes: IRoute[], market: string): IMenuItem;
-declare function decorateMenuRoute_(item: IRoute): IMenuItem;
+declare function decorateMenuCategory_(item: IUndecoratedMenuCategory, categories: ICategory[], routes: IRoute[], market: string, depth?: number): IMenuCategory;
+declare function decorateMenuGroup_(item: IUndecoratedMenuGroup, categories: ICategory[], routes: IRoute[], market: string): IMenuGroup;
+declare function decorateMenuLink_(item: IUndecoratedMenuLink, categories: ICategory[], routes: IRoute[], market: string): IMenuLink;
+declare function decorateMenuPage_(item: IUndecoratedMenuPage, categories: ICategory[], routes: IRoute[], market: string): IMenuPage;
+declare function decorateMenuRoute_(item: IRoute): IMenuRoute;
 declare function decorateMenuItem_(item: IUndecoratedMenuItem, categories: ICategory[], routes: IRoute[], market: string, depth?: number): IMenuItem;
 declare function decorateNavItem_(item: IUndecoratedNavItem, categories: ICategory[], routes: IRoute[], market: string, depth?: number): IMenuItem | IMenuItem[];
 declare function hasMarket(item: IUndecoratedMenuItem, market: string): boolean;
@@ -1163,4 +1165,4 @@ declare const Logo: React__default.FC;
 
 declare function webpack(sourceConfig: BowlConfig): (config: any) => any;
 
-export { ActionDefault, BlockDefaults, BowlArrayField, BowlBlock, BowlBlockField, BowlCollapsibleField, BowlCollection, BowlConfig, BowlField, BowlGlobal, BowlGroup, BowlGroupField, BowlInitOptions, BowlOptions, BowlPlugin, BowlRole, BowlRowField, BowlSlug, BowlTab, BowlTabsField, CategoryDefaults, CategoryMenu, CategoryMenuProps, CategoryTree, CategoryTreeProps, CheckboxDefaults, CollectionDefault, CollectionHelper, CollectionHook, CollectionHookName, CollectionHooks, ColorCell, ColorConfig, ColorField, ComponentsDefaults, CustomEditModal, CustomEditModalProps, DataField, DataTree, DataTreeDragItem, DataTreeItem, DataTreeItemLi, DataTreeItemProps, DataTreeProps, DataTreeProvider, DataTreeRenameItem, DateDefaults, DebugField, DecoratedList, DecoratedListProps, FindOptions, GlobalDefault, GlobalHelper, GlobalHook, GlobalHookName, GlobalHooks, GroupKey, IBulkAction, IBulkRecord, ICache, IImportItem, IPage, IPageFull, IPagination, IRelation, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, IUndecoratedNavItem, Icon, ImportExportList, ImportExportListProps, ImportExportRedirectList, ImportLogInvalidTypes, ImportLogType, ImportMode, InMemoryCache, InMemoryCacheOptions, KeyMapper, LeaveModal, LeaveWithoutSavingModal, LeaveWithoutSavingModalProps, LocalizedDescription, LocalizedDescriptionProps, Logo, MAX_INT, MarketDefaults, MediaDefaults, MediasDefaults, MenuItem, MixerContext, Option, OrderDefaults, PRESENTATION_FIELDS, PageDefault, PresentationField, PublicURL, Publish, RelatedDefaults, RichTextDefaults, Save, SaveDraft, SelectDefaults, StaticCollectionConfig, StaticCollectionDefault, TemplateDefaults, TextDefaults, TreeItems, UIStaticCell, UIStaticField, UserRolesDefaults, WithAbstract, WithAbstractProps, WithAction, WithActionProps, WithBlock, WithBlockProps, WithCategory, WithCategoryProps, WithCheckbox, WithCheckboxProps, WithCollection, WithCollectionProps, WithColor, WithColorProps, WithComponents, WithComponentsProps, WithDate, WithDateProps, WithDescription, WithDescriptionProps, WithGlobal, WithGlobalProps, WithId, WithIdProps, WithIsActive, WithIsActiveProps, WithIsDefault, WithIsDefaultProps, WithLink, WithLinkOptions, WithLinkProps, WithMarkets, WithMarketsProps, WithMedia, WithMediaProps, WithMedias, WithMediasProps, WithMenu, WithMenuProps, WithName, WithNameProps, WithOrder, WithOrderProps, WithPage, WithPageProps, WithRelated, WithRelatedProps, WithRichText, WithRichTextProps, WithRoles, WithRolesProps, WithSelect, WithSelectProps, WithSlug, WithSlugProps, WithStatic, WithStaticProps, WithTemplate, WithTemplateProps, WithText, WithTextProps, WithTitle, WithTitleProps, afterCategoryChangeHook, afterCategoryDeleteHook, afterCollectionReadHook, afterMenuReadHook, afterPageChangeHook, afterPageDeleteHook, afterPageReadHook, appearanceOptions, beforeDuplicateCollectionHook, beforeValidate, bowl, collectionBulkPatch, collectionExportGet, collectionImportPost, collectionIndexGet, collectionUpdatePatch, debugField, decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateMenuCategory_, decorateMenuGroup_, decorateMenuItem_, decorateMenuLink_, decorateMenuPage_, decorateMenuRoute_, decorateMenu_, decorateNavItem_, decorateNav_, decorateNavs_, decorateSchema_, decorateSchemas_, deepMerge, bowl as default, defaultGroup, defaultLocale, defaultLocales, defaultMarket, defaultSlug, eachDataField, eachField, encryptData, fetchCollection, fetchCollectionItems, fetchEndpoint, fetchGlobal, fetchGlobalItems, findCollection, formatSlug, getApiUrl, getCollectionItem, getCollectionItems, getEachMarketLocale, getGlobalItems, getLivePreviewURL, getLocale, getNumericParam, getObjectParam, getPages, getPagination, getPreviewURL, getPublicURL, getRoute, getRouteByCategoryAndLocale, getRouteByItemAndLocale, getRoutes, getSearchUrl, getStaticLoader, getStore, getStringParam, getSubRequest, getTranslation, getTranslations, getTreeItemClassName, hasMarket, hasRole, importExportListWithParser, internalSlugs, isAdmin, isAdminOrSelf, isDataField, isObject, isPresentationField, isRelation, isRole, isUndecoratedNavItem, keyWithRequest, localeGet, localizeCollection, localizeItem, log, logMissingTranslations, menuDetailGet, menuIndexGet, modalSlug, optinGet, options, optoutGet, pageDetailGet, pageIndexGet, parseDepth, populateStaticFields, redirectParser, richTextAfterReadHook, richTextSerialize, roles, routeGet, routePost, routePostHandler, setMixerContext, slugToLabel, slugToLabels, sortByGroup, sortCollection, staticCollectionLoaders, staticCollections, staticDetailGet, staticIndexGet, storeGet, textToSlug, toBlock, toCollection, toField, toGlobal, toTab, translateBlock, translateBlocks, translateCollection, translateField, translateFields, translateGlobal, translateTab, translateTabs, webpack, whereCollection, withAbstract, withAbstractRequired, withAction, withBlock, withCategory, withCategoryRequired, withCheckbox, withCheckboxRequired, withCollection, withCollectionHook, withColor, withColorRequired, withComponents, withDate, withDateRequired, withDescription, withDescriptionRequired, withFieldHook, withGlobal, withGlobalHook, withId, withIdRequired, withIsActive, withIsActiveRequired, withIsDefault, withIsDefaultRequired, withLink, withLocalizedDescription, withMarkets, withMarketsRequired, withMedia, withMediaRequired, withMedias, withMediasRequired, withMenu, withName, withNameRequired, withOrder, withOrderRequired, withPage, withRelated, withRichText, withRichTextRequired, withRoles, withSelect, withSelectRequired, withSlug, withSlugRequired, withStaticCollection, withTemplate, withTemplateRequired, withText, withTextRequired, withTitle, withTitleRequired, withUIStatic };
+export { ActionDefault, BlockDefaults, BowlArrayField, BowlBlock, BowlBlockField, BowlCollapsibleField, BowlCollection, BowlConfig, BowlField, BowlGlobal, BowlGroup, BowlGroupField, BowlInitOptions, BowlOptions, BowlPlugin, BowlRole, BowlRowField, BowlSlug, BowlTab, BowlTabsField, CategoryDefaults, CategoryMenu, CategoryMenuProps, CategoryTree, CategoryTreeProps, CheckboxDefaults, CollectionDefault, CollectionHelper, CollectionHook, CollectionHookName, CollectionHooks, ColorCell, ColorConfig, ColorField, ComponentsDefaults, CustomEditModal, CustomEditModalProps, DataField, DataTree, DataTreeDragItem, DataTreeItem, DataTreeItemLi, DataTreeItemProps, DataTreeProps, DataTreeProvider, DataTreeRenameItem, DateDefaults, DebugField, DecoratedList, DecoratedListProps, FindOptions, GlobalDefault, GlobalHelper, GlobalHook, GlobalHookName, GlobalHooks, GroupKey, IBulkAction, IBulkRecord, ICache, IImportItem, IPage, IPageFull, IPagination, IRelation, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, IUndecoratedNavItem, Icon, ImportExportList, ImportExportListProps, ImportExportRedirectList, ImportLogInvalidTypes, ImportLogType, ImportMode, InMemoryCache, InMemoryCacheOptions, KeyMapper, LeaveModal, LeaveWithoutSavingModal, LeaveWithoutSavingModalProps, LocalizedDescription, LocalizedDescriptionProps, Logo, MAX_INT, MarketDefaults, MediaDefaults, MediasDefaults, MenuItem, MixerContext, Option, OrderDefaults, PRESENTATION_FIELDS, PageDefault, PresentationField, PublicURL, Publish, RelatedDefaults, RichTextDefaults, Save, SaveDraft, SelectDefaults, StaticCollectionConfig, StaticCollectionDefault, TemplateDefaults, TextDefaults, TreeItems, UIStaticCell, UIStaticField, UserRolesDefaults, WithAbstract, WithAbstractProps, WithAction, WithActionProps, WithBlock, WithBlockProps, WithCategory, WithCategoryProps, WithCheckbox, WithCheckboxProps, WithCollection, WithCollectionProps, WithColor, WithColorProps, WithComponents, WithComponentsProps, WithDate, WithDateProps, WithDescription, WithDescriptionProps, WithGlobal, WithGlobalProps, WithId, WithIdProps, WithIsActive, WithIsActiveProps, WithIsDefault, WithIsDefaultProps, WithLink, WithLinkOptions, WithLinkProps, WithMarkets, WithMarketsProps, WithMedia, WithMediaProps, WithMedias, WithMediasProps, WithMenu, WithMenuProps, WithName, WithNameProps, WithOrder, WithOrderProps, WithPage, WithPageProps, WithRelated, WithRelatedProps, WithRichText, WithRichTextProps, WithRoles, WithRolesProps, WithSelect, WithSelectProps, WithSlug, WithSlugProps, WithStatic, WithStaticProps, WithTemplate, WithTemplateProps, WithText, WithTextProps, WithTitle, WithTitleProps, afterCategoryChangeHook, afterCategoryDeleteHook, afterCollectionReadHook, afterMenuReadHook, afterPageChangeHook, afterPageDeleteHook, afterPageReadHook, appearanceOptions, beforeDuplicateCollectionHook, beforeValidate, bowl, collectionBulkPatch, collectionExportGet, collectionImportPost, collectionIndexGet, collectionUpdatePatch, debugField, decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateMenuCategory_, decorateMenuGroup_, decorateMenuItem_, decorateMenuLink_, decorateMenuPage_, decorateMenuRoute_, decorateMenu_, decorateNavItem_, decorateNav_, decorateNavs_, decorateSchema_, decorateSchemas_, deepMerge, bowl as default, defaultGroup, defaultLocale, defaultLocales, defaultMarket, defaultSlug, eachDataField, eachField, encryptData, fetchCollection, fetchCollectionItems, fetchEndpoint, fetchGlobal, fetchGlobalItems, fetchStaticCollection, findCollection, formatSlug, getApiUrl, getCollectionItem, getCollectionItems, getEachMarketLocale, getGlobalItems, getLivePreviewURL, getLocale, getNumericParam, getObjectParam, getPages, getPagination, getPreviewURL, getPublicURL, getRoute, getRouteByCategoryAndLocale, getRouteByItemAndLocale, getRoutes, getSearchUrl, getStaticLoader, getStore, getStoreRequest, getStringParam, getSubRequest, getTranslation, getTranslations, getTreeItemClassName, hasMarket, hasRole, importExportListWithParser, internalSlugs, isAdmin, isAdminOrSelf, isDataField, isObject, isPresentationField, isRelation, isRole, isUndecoratedNavItem, keyWithRequest, localeGet, localizeCollection, localizeItem, log, logMissingTranslations, menuDetailGet, menuIndexGet, modalSlug, optinGet, options, optoutGet, pageDetailGet, pageIndexGet, parseDepth, populateStaticFields, redirectParser, richTextAfterReadHook, richTextSerialize, roles, routeGet, routePost, routePostHandler, setMixerContext, slugToLabel, slugToLabels, sortByGroup, sortCollection, staticCollectionLoaders, staticCollections, staticDetailGet, staticIndexGet, storeGet, textToSlug, toBlock, toCollection, toField, toGlobal, toTab, translateBlock, translateBlocks, translateCollection, translateField, translateFields, translateGlobal, translateTab, translateTabs, webpack, whereCollection, withAbstract, withAbstractRequired, withAction, withBlock, withCategory, withCategoryRequired, withCheckbox, withCheckboxRequired, withCollection, withCollectionHook, withColor, withColorRequired, withComponents, withDate, withDateRequired, withDescription, withDescriptionRequired, withFieldHook, withGlobal, withGlobalHook, withId, withIdRequired, withIsActive, withIsActiveRequired, withIsDefault, withIsDefaultRequired, withLink, withLocalizedDescription, withMarkets, withMarketsRequired, withMedia, withMediaRequired, withMedias, withMediasRequired, withMenu, withName, withNameRequired, withOrder, withOrderRequired, withPage, withRelated, withRichText, withRichTextRequired, withRoles, withSelect, withSelectRequired, withSlug, withSlugRequired, withStaticCollection, withTemplate, withTemplateRequired, withText, withTextRequired, withTitle, withTitleRequired, withUIStatic };

package/dist/index.js

@@ -287,6 +287,7 @@ __export(src_exports, {
   fetchEndpoint: () => fetchEndpoint,
   fetchGlobal: () => fetchGlobal,
   fetchGlobalItems: () => fetchGlobalItems,
+  fetchStaticCollection: () => fetchStaticCollection,
   findCollection: () => findCollection,
   formatSlug: () => formatSlug,
   getApiUrl: () => getApiUrl,
@@ -309,6 +310,7 @@ __export(src_exports, {
   getSearchUrl: () => getSearchUrl,
   getStaticLoader: () => getStaticLoader,
   getStore: () => getStore,
+  getStoreRequest: () => getStoreRequest,
   getStringParam: () => getStringParam,
   getSubRequest: () => getSubRequest,
   getTranslation: () => getTranslation4,
@@ -1736,8 +1738,8 @@ async function localizeItem(item, localizedFields, locale) {
   return item;
 }
 __name(localizeItem, "localizeItem");
-async function localizeCollection(items, localizedFields, locale = "*") {
-  if (locale !== "*" && localizedFields.length > 0) {
+async function localizeCollection(items, localizedFields, locale = "all") {
+  if (locale !== "all" && localizedFields.length > 0) {
     const localizedItems = [];
     for (const item of items) {
       const localizedItem = await localizeItem(item, localizedFields, locale);
@@ -3758,6 +3760,7 @@ async function decorateHrefs_(items, slug, context) {
 __name(decorateHrefs_, "decorateHrefs_");
 
 // src/core/decorators/menu.ts
+var import_bom_core6 = require("@websolutespa/bom-core");
 var MAX_INT = 1e12;
 function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
   const decoratedItem = {
@@ -3766,7 +3769,6 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
     title: "",
     href: "",
     category: "",
-    media: item.media,
     abstract: item.abstract,
     customClass: item.customClass,
     extra: item.extra,
@@ -3776,7 +3778,7 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
   if (category) {
     decoratedItem.category = category.id;
     decoratedItem.title = item.customTitle || category.title;
-    decoratedItem.media = decoratedItem.media || category.media;
+    decoratedItem.media = item.media || category.media;
     const route = routes.find((x) => x.isDefault && x.category === category.id);
     if (route) {
       decoratedItem.href = route.id;
@@ -3843,20 +3845,21 @@ function decorateMenuLink_(item, categories, routes, market) {
 }
 __name(decorateMenuLink_, "decorateMenuLink_");
 function decorateMenuPage_(item, categories, routes, market) {
+  const page = (0, import_bom_core6.isObject)(item.page.value) ? item.page.value : {
+    id: item.page.value
+  };
   const route = routes.find(
-    (x) => x.schema === item.page.relationTo && x.page === item.page.value.id
+    (x) => x.schema === item.page.relationTo && x.page === page.id
   );
-  const href = route?.id;
   const schema = item.schema || item.page.relationTo;
-  const page = item.page.value;
   const decoratedItem = {
-    id: item.id,
     type: item.type,
-    title: item.customTitle || page.title,
-    href,
-    page: page.id,
     schema,
-    media: item.media || page.media,
+    id: item.id,
+    href: route?.id,
+    page: route ? route.page : page.id,
+    title: item.customTitle || (route ? route.title : page.title),
+    media: item.media || (route ? route.media : page.media),
     abstract: item.abstract,
     customClass: item.customClass,
     extra: item.extra,
@@ -3870,6 +3873,7 @@ function decorateMenuRoute_(item) {
     id: item.page,
     type: "route",
     title: item.title,
+    media: item.media,
     href: item.id,
     page: item.page,
     schema: item.schema,
@@ -3918,7 +3922,7 @@ function decorateNavItem_(item, categories, routes, market, depth = 0) {
 }
 __name(decorateNavItem_, "decorateNavItem_");
 function hasMarket(item, market) {
-  return Array.isArray(item.markets) ? item.markets.includes(market) : true;
+  return market === "all" ? true : Array.isArray(item.markets) ? item.markets.includes(market) : true;
 }
 __name(hasMarket, "hasMarket");
 async function decorateMenu_(item, context) {
@@ -3927,10 +3931,10 @@ async function decorateMenu_(item, context) {
     items: []
   };
   const { market, locale, markets, locales: locales2, routes, categories } = context;
-  if (!locales2.includes(locale)) {
+  if (!locales2.includes(locale) && locale !== "all") {
     return decoratedItem;
   }
-  if (!markets.includes(market)) {
+  if (!markets.includes(market) && market !== "all") {
     return decoratedItem;
   }
   decoratedItem.items = item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem_(x, categories, routes, market));
@@ -3939,7 +3943,7 @@ async function decorateMenu_(item, context) {
 __name(decorateMenu_, "decorateMenu_");
 
 // src/core/decorators/nav.ts
-var import_bom_core6 = require("@websolutespa/bom-core");
+var import_bom_core7 = require("@websolutespa/bom-core");
 async function decorateNav_(item, slug, context) {
   parseNavs_(item, context);
   return item;
@@ -3954,7 +3958,7 @@ async function decorateNavs_(items, slug, context) {
 __name(decorateNavs_, "decorateNavs_");
 function parseNavs_(item, context) {
   const { market, locale, routes, categories } = context;
-  if ((0, import_bom_core6.isArray)(item)) {
+  if ((0, import_bom_core7.isArray)(item)) {
     item.forEach((v, k) => {
       if (isUndecoratedNavItem(v)) {
         item[k] = decorateNavItem_(v, categories, routes, market);
@@ -3962,7 +3966,7 @@ function parseNavs_(item, context) {
         parseNavs_(v, context);
       }
     });
-  } else if ((0, import_bom_core6.isObject)(item)) {
+  } else if ((0, import_bom_core7.isObject)(item)) {
     Object.entries(item).forEach(([k, v]) => {
       if (isUndecoratedNavItem(v)) {
         item[k] = decorateNavItem_(v, categories, routes, market);
@@ -3974,11 +3978,11 @@ function parseNavs_(item, context) {
 }
 __name(parseNavs_, "parseNavs_");
 function isUndecoratedNavItem(item) {
-  return (0, import_bom_core6.isObject)(item) && (item.type === "category" && ((0, import_bom_core6.isEquatable)(item.category) || (0, import_bom_core6.isObject)(item.category)) || item.type === "page" && isRelation(item.page));
+  return (0, import_bom_core7.isObject)(item) && (item.type === "category" && ((0, import_bom_core7.isEquatable)(item.category) || (0, import_bom_core7.isObject)(item.category)) || item.type === "page" && isRelation(item.page));
 }
 __name(isUndecoratedNavItem, "isUndecoratedNavItem");
 function isRelation(item) {
-  return (0, import_bom_core6.isObject)(item) && (0, import_bom_core6.isNotNullString)(item.relationTo) && ((0, import_bom_core6.isObject)(item.value) || (0, import_bom_core6.isArray)(item.value));
+  return (0, import_bom_core7.isObject)(item) && (0, import_bom_core7.isNotNullString)(item.relationTo) && ((0, import_bom_core7.isObject)(item.value) || (0, import_bom_core7.isArray)(item.value));
 }
 __name(isRelation, "isRelation");
 
@@ -4180,15 +4184,34 @@ var afterPageDeleteHook = /* @__PURE__ */ __name(async ({
 }, "afterPageDeleteHook");
 
 // src/core/api/store.service.ts
-var import_bom_core7 = require("@websolutespa/bom-core");
+var import_bom_core8 = require("@websolutespa/bom-core");
 var import_qs2 = __toESM(require("qs"));
+var USE_CACHE = true;
 var CACHE_2 = new InMemoryCache();
+function getStoreRequest(req, market = "all", locale = "all") {
+  const { where: w, market: m, locale: l, ...rest } = req.query;
+  const subQuery = {
+    market,
+    locale
+  };
+  req.query = {
+    ...rest,
+    ...subQuery
+  };
+  req.locale = locale;
+  return req;
+}
+__name(getStoreRequest, "getStoreRequest");
 async function getStore(req) {
   const key = keyWithRequest("store", req);
-  if (CACHE_2.has(key)) {
+  if (CACHE_2.has(key) && USE_CACHE && req.query.nocache != null) {
     return CACHE_2.get(key);
   }
+  const market = "all";
+  const locale = "all";
   const store = {};
+  const subRequest = getStoreRequest(req, market, locale);
+  const context = await setMixerContext(subRequest, market, locale);
   for (const slug of options.collections) {
     try {
       const collection = req.payload.collections[slug];
@@ -4197,36 +4220,40 @@ async function getStore(req) {
       }
       const bowlCollection = options.bowlCollections.find((x) => x.slug === slug);
       const type = bowlCollection?.type;
-      let items = [];
       switch (type) {
         case "withStatic":
           {
-            const response = await fetchCollection(req, slug, { richText: false });
-            items = response.docs;
+            const items = await fetchStaticCollection(subRequest, slug);
+            store[slug] = items;
           }
           break;
         case "withPage":
           {
-            const response = await findCollection(req, slug, {
+            const options2 = {
               where: {
                 _status: {
                   equals: "published"
                 }
               }
-            });
-            items = response.docs;
+            };
+            const items = await findCollection(subRequest, slug, options2);
+            store[slug] = items;
           }
           break;
         default: {
-          const response = await findCollection(req, slug);
-          items = response.docs;
+          const options2 = slug === "category" ? {
+            sort: "order"
+          } : void 0;
+          const items = await findCollection(subRequest, slug, options2);
+          store[slug] = items;
         }
       }
-      store[slug] = items;
     } catch (error) {
       if (error.status !== 403) {
         throw error;
       }
+      console.log("StoreService", `no access granted for collection '${slug}'`);
+      store[slug] = [];
     }
   }
   const localeCollection = await fetchCollection(req, "locale", { richText: false });
@@ -4238,17 +4265,18 @@ async function getStore(req) {
 }
 __name(getStore, "getStore");
 async function findCollection(req, collection, options2) {
-  const newRequest = { ...req };
-  newRequest.query.richText = "false";
-  const items = await req.payload.find({
+  const response = await req.payload.find({
     collection,
     depth: 1,
     limit: 1e4,
-    locale: "*",
-    req: newRequest,
+    locale: req.locale,
+    pagination: true,
+    // draft: draft === 'true',
+    req,
     user: req.user,
     ...options2
   });
+  const items = (0, import_bom_core8.isArray)(response) ? response : (0, import_bom_core8.isArray)(response.docs) ? response.docs : [];
   return items;
 }
 __name(findCollection, "findCollection");
@@ -4258,14 +4286,14 @@ function getApiUrl(req) {
   const port = process.env.PORT || 4e3;
   const origin = `http://localhost:${port}`;
   let url = `${origin}${config.routes.api}/`;
-  url = import_bom_core7.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
+  url = import_bom_core8.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
   return url;
 }
 __name(getApiUrl, "getApiUrl");
 function getSearchUrl(req, overrideQuery) {
   const { query } = req;
   const params = Object.assign({
-    locale: "*",
+    locale: "all",
     depth: 1,
     limit: 1e4
   }, query, overrideQuery);
@@ -4299,6 +4327,10 @@ async function fetchEndpoint(req, endpoint, query) {
   }
 }
 __name(fetchEndpoint, "fetchEndpoint");
+async function fetchStaticCollection(req, slug, query) {
+  return await fetchEndpoint(req, slug, query);
+}
+__name(fetchStaticCollection, "fetchStaticCollection");
 async function fetchCollection(req, slug, query) {
   return await fetchEndpoint(req, slug, query);
 }
@@ -4897,7 +4929,7 @@ function richTextSerialize(children, includeHtmlTags = true) {
         case "li":
           return `<li>${richTextSerialize(node.children)}</li>`;
         case "link":
-          return `<a href="${(0, import_escape_html.default)(node.url)}">${richTextSerialize(node.children)}</a>`;
+          return `<a href="${(0, import_escape_html.default)(node.url)}"${node.newTab ? ' target="_blank"' : ""}>${richTextSerialize(node.children)}</a>`;
         default:
           return `<p>${richTextSerialize(node.children)}</p>`;
       }
@@ -6354,8 +6386,8 @@ var Province = /* @__PURE__ */ __name((options2) => ({
 }), "Province");
 
 // src/collections/Redirect.ts
-var import_bom_core8 = require("@websolutespa/bom-core");
-var RedirectStatusOptions = Object.entries(import_bom_core8.RedirectReason).map(([k, v]) => ({
+var import_bom_core9 = require("@websolutespa/bom-core");
+var RedirectStatusOptions = Object.entries(import_bom_core9.RedirectReason).map(([k, v]) => ({
   value: v,
   label: `${v} - ${k}`
 }));
@@ -7460,6 +7492,7 @@ var src_default = bowl;
   fetchEndpoint,
   fetchGlobal,
   fetchGlobalItems,
+  fetchStaticCollection,
   findCollection,
   formatSlug,
   getApiUrl,
@@ -7482,6 +7515,7 @@ var src_default = bowl;
   getSearchUrl,
   getStaticLoader,
   getStore,
+  getStoreRequest,
   getStringParam,
   getSubRequest,
   getTranslation,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/payload-plugin-bowl",
-  "version": "1.7.13",
+  "version": "1.7.15",
   "description": "Bowl PayloadCms plugin of the BOM Repository",
   "keywords": [
     "payload",
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "lint": "eslint *.ts*",
-    "test:single": "jest -- \"./src/core/fields/withRoles.test.ts\" --forceExit --runInBand --workerIdleMemoryLimit='1000MB'",
+    "test:single": "jest -- \"./src/core/api/store.service.test.ts\" --forceExit --runInBand --workerIdleMemoryLimit='1000MB'",
     "test": "jest --forceExit --runInBand --workerIdleMemoryLimit='1000MB'",
     "test-watch": "npm test -- --watch",
     "coverage:integration": "npm run test -- --coverage",