@websolutespa/bom-core 1.8.18 → 1.8.20

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-core
 
+## 1.8.20
+
+### Patch Changes
+
+- Modified: isMedia, category, route
+
+## 1.8.19
+
+### Patch Changes
+
+- f0d17f3: Modified: page market filtering
+
 ## 1.8.18
 
 ### Patch Changes

package/dist/index.d.ts

@@ -262,6 +262,7 @@ type ICategorized = IEntity & {
     markets?: string[];
     createdAt?: Date;
     updatedAt?: Date;
+    _status?: string;
 };
 
 type IClassNameValue = string | boolean | number | null | undefined;
@@ -1111,6 +1112,7 @@ declare function findRoutesOfCategory(routes: IRoute[], categoryId: IEquatable,
 declare function getRouteHref(segments: {
     slug: ILocalizable;
 }[], market: IMarket, locale: ILocale, markets: IMarket[], locales: ILocale[]): string;
+declare function hasMarket(item: ICategorized, market: IMarket): boolean;
 
 declare function arrayShuffle<T extends IEntity>(items: T[]): T[];
 
@@ -1252,6 +1254,12 @@ declare function isValidString(item: unknown): item is string;
  * @returns True if the item is an array, false otherwise.
  */
 declare function isArray<T = unknown>(item: unknown): item is Array<T>;
+/**
+ * Checks if the given item is an array and is not empty.
+ * @param item The item to check.
+ * @returns True if the item is an array and its length is > 0, false otherwise.
+ */
+declare function isNonEmptyArray<T = unknown>(item: unknown): item is Array<T>;
 /**
  * Checks if the given item is an object.
  * @param item The item to check.
@@ -1344,4 +1352,4 @@ declare function asServerProps(props: any): any;
 declare function awaitAll(array: any, callback: (item: any, index: number) => Promise<any>): Promise<any[]>;
 declare function merge(target: any, source: any): any;
 
-export { DeepPartial, Dynamic, FetchError, FetchRequestOptions, FetchService, FindParams, FindWhereParams, Headings, IAction, IActionEmailData, IAnchor, ICategorized, ICategory, ICategoryItem, IClassName, IClassNameCollection, IClassNameValue, ICollectionDescription, IComponent, IConfig, IConsentPreference, IContextBaseParams, IContextParams, IDecoratedNav, IEmailConfig, IEndUser, IEntity, IEquatable, IFeature, IFeatureType, IImageResize, ILabel, ILayout, ILegalNotice, ILetter, ILocale, ILocaleId, ILocalizable, ILocalized, ILocalizedMenu, ILocalizedString, IMarket, IMedia, IMediaImage, IMediaInfo, IMediaJson, IMediaPdf, IMediaType, IMediaVideo, IMemoryStore, IMenu, IMenuBase, IMenuCategory, IMenuCustom, IMenuGroup, IMenuHref, IMenuItem, IMenuLink, IMenuPage, IMenuRoute, INamedEntity, IOption, IOverride, IOverrideReturnValue, IOverrideValue, IPackages, IPage, IPageItem, IPageRelation, IPageRelationResult, IPageUnresolvedRelation, IPagedResult, IPaginationResult, IPartial, IPreference, IPrettify, IQuerable, IRedirect, IRoute, IRouteCanonical, IRouteLink, IRouteParams, ISchema, ISerializedCollection, ISerializedStore, IServerSideContext, IServerSideSplatContext, IStaticContext, IStore, ITemplate, ITitledEntity, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, IUndecoratedNav, ImageStrategy, Json, JsonService, LiteralUnion, Logger, LoggerLevel, MenuCategoryStrategy, NextApiRequestCookies, Operator, PageProps, Pagination, PreviewData, Primitive, QueryParams, RedirectReason, RequireAtLeastOne, RouteStrategy, SchemaType, ServerSidePropsContext, StaticPropsContext, User, UserRole, UserWithRoles, ValueOf, Where, WhereAndOr, WhereBase, WhereField, arrayShuffle, asCategoryId, asEntityId, asEquatable, asEquatableNumber, asEquatableString, asServerProps, asSortedOptions, awaitAll, base64ToString, camelToSnakeCase, cloneItem, collectFeatureTypes, collectFeatureTypes__, collectOptions, collectRoutes, consoleWarn, decryptImageResize, deepMerge, defaultLocale, defaultMarket, eachCategorized, eachMarketLocale, eachMedia, eachValue, encryptImageToken, enumToList, excludeComponent, findCategoryInCategories, findChildCategories, findRouteOfCategory, findRoutesOfCategory, getCategorySegments, getCategorySegmentsByCategory, getClassNames, getCollectionDescription, getEnv, getHost, getIsDevelopment, getIsProduction, getOrigin, getParentCategoriesById, getParentCategory, getProto, getRootCategory, getRouteHref, groupComponents, hasComponents, httpDelete, httpFetch, httpGet, httpPatch, httpPost, httpPut, isArray, isBrowser, isComponent, isComponentOfType, isDevelopment, isEntity, isEquatable, isHeaders, isIncomingHttpHeaders, isLocalizedString, isMedia, isMediaImage, isMediaJson, isMediaPdf, isMediaVideo, isMenuCategory, isMenuGroup, isMenuHref, isMenuLink, isMenuPage, isMenuRoute, isNotNullString, isNumber, isObject, isProduction, isPromise, isRelation, isReservedCollectionDescription, isStage, isString, isUndecoratedCategory, isUndecoratedMenuCategory, isUndecoratedMenuItem, isUndecoratedMenuPage, isUndecoratedNav, isUnresolvedCategory, isUnresolvedRelation, isValidCollectionDescription, isValidString, localize, localizeItem, localizeValue, localizedToString, merge, pascalCaseToCamelCase, pascalCaseToCharCase, pascalCaseToKebabCase, pascalCaseToSnakeCase, passwordStrategy, pickComponent, pickHero, prependHero, qsDeserialize, qsDeserializeRaw, qsSerialize, qsSerializeRaw, resolveMediaType, stringToBase64, toCamelCase, toCharCase, toDisplayName, toFindParams, toKebabCase, toPascalCase, toPluralName, toSnakeCase, toTitleCase, toValidCollectionName, unknownCaseToPascalCase, uuidv4, withSchema };
+export { DeepPartial, Dynamic, FetchError, FetchRequestOptions, FetchService, FindParams, FindWhereParams, Headings, IAction, IActionEmailData, IAnchor, ICategorized, ICategory, ICategoryItem, IClassName, IClassNameCollection, IClassNameValue, ICollectionDescription, IComponent, IConfig, IConsentPreference, IContextBaseParams, IContextParams, IDecoratedNav, IEmailConfig, IEndUser, IEntity, IEquatable, IFeature, IFeatureType, IImageResize, ILabel, ILayout, ILegalNotice, ILetter, ILocale, ILocaleId, ILocalizable, ILocalized, ILocalizedMenu, ILocalizedString, IMarket, IMedia, IMediaImage, IMediaInfo, IMediaJson, IMediaPdf, IMediaType, IMediaVideo, IMemoryStore, IMenu, IMenuBase, IMenuCategory, IMenuCustom, IMenuGroup, IMenuHref, IMenuItem, IMenuLink, IMenuPage, IMenuRoute, INamedEntity, IOption, IOverride, IOverrideReturnValue, IOverrideValue, IPackages, IPage, IPageItem, IPageRelation, IPageRelationResult, IPageUnresolvedRelation, IPagedResult, IPaginationResult, IPartial, IPreference, IPrettify, IQuerable, IRedirect, IRoute, IRouteCanonical, IRouteLink, IRouteParams, ISchema, ISerializedCollection, ISerializedStore, IServerSideContext, IServerSideSplatContext, IStaticContext, IStore, ITemplate, ITitledEntity, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, IUndecoratedNav, ImageStrategy, Json, JsonService, LiteralUnion, Logger, LoggerLevel, MenuCategoryStrategy, NextApiRequestCookies, Operator, PageProps, Pagination, PreviewData, Primitive, QueryParams, RedirectReason, RequireAtLeastOne, RouteStrategy, SchemaType, ServerSidePropsContext, StaticPropsContext, User, UserRole, UserWithRoles, ValueOf, Where, WhereAndOr, WhereBase, WhereField, arrayShuffle, asCategoryId, asEntityId, asEquatable, asEquatableNumber, asEquatableString, asServerProps, asSortedOptions, awaitAll, base64ToString, camelToSnakeCase, cloneItem, collectFeatureTypes, collectFeatureTypes__, collectOptions, collectRoutes, consoleWarn, decryptImageResize, deepMerge, defaultLocale, defaultMarket, eachCategorized, eachMarketLocale, eachMedia, eachValue, encryptImageToken, enumToList, excludeComponent, findCategoryInCategories, findChildCategories, findRouteOfCategory, findRoutesOfCategory, getCategorySegments, getCategorySegmentsByCategory, getClassNames, getCollectionDescription, getEnv, getHost, getIsDevelopment, getIsProduction, getOrigin, getParentCategoriesById, getParentCategory, getProto, getRootCategory, getRouteHref, groupComponents, hasComponents, hasMarket, httpDelete, httpFetch, httpGet, httpPatch, httpPost, httpPut, isArray, isBrowser, isComponent, isComponentOfType, isDevelopment, isEntity, isEquatable, isHeaders, isIncomingHttpHeaders, isLocalizedString, isMedia, isMediaImage, isMediaJson, isMediaPdf, isMediaVideo, isMenuCategory, isMenuGroup, isMenuHref, isMenuLink, isMenuPage, isMenuRoute, isNonEmptyArray, isNotNullString, isNumber, isObject, isProduction, isPromise, isRelation, isReservedCollectionDescription, isStage, isString, isUndecoratedCategory, isUndecoratedMenuCategory, isUndecoratedMenuItem, isUndecoratedMenuPage, isUndecoratedNav, isUnresolvedCategory, isUnresolvedRelation, isValidCollectionDescription, isValidString, localize, localizeItem, localizeValue, localizedToString, merge, pascalCaseToCamelCase, pascalCaseToCharCase, pascalCaseToKebabCase, pascalCaseToSnakeCase, passwordStrategy, pickComponent, pickHero, prependHero, qsDeserialize, qsDeserializeRaw, qsSerialize, qsSerializeRaw, resolveMediaType, stringToBase64, toCamelCase, toCharCase, toDisplayName, toFindParams, toKebabCase, toPascalCase, toPluralName, toSnakeCase, toTitleCase, toValidCollectionName, unknownCaseToPascalCase, uuidv4, withSchema };

package/dist/index.js

@@ -85,6 +85,7 @@ __export(src_exports, {
   getRouteHref: () => getRouteHref,
   groupComponents: () => groupComponents,
   hasComponents: () => hasComponents,
+  hasMarket: () => hasMarket,
   httpDelete: () => httpDelete,
   httpFetch: () => httpFetch,
   httpGet: () => httpGet,
@@ -112,6 +113,7 @@ __export(src_exports, {
   isMenuLink: () => isMenuLink,
   isMenuPage: () => isMenuPage,
   isMenuRoute: () => isMenuRoute,
+  isNonEmptyArray: () => isNonEmptyArray,
   isNotNullString: () => isNotNullString,
   isNumber: () => isNumber,
   isObject: () => isObject,
@@ -183,6 +185,9 @@ function isValidString(item) {
 function isArray(item) {
   return Array.isArray(item);
 }
+function isNonEmptyArray(item) {
+  return Array.isArray(item) && item.length > 0;
+}
 function isObject(item) {
   return item != null && typeof item === "object" && !isArray(item);
 }
@@ -574,7 +579,7 @@ function isMediaPdf(media) {
   return false;
 }
 function isMedia(item) {
-  return isObject(item) && "type" in item && (isValidString(item.url) || isValidString(item.src));
+  return isObject(item) && ("mimeType" in item || "type" in item) && (isValidString(item.url) || isValidString(item.src));
 }
 
 // src/types/menu.ts
@@ -1681,7 +1686,10 @@ function getPickedProps(item) {
     "order",
     "template",
     "updatedAt",
-    "useSplat"
+    "useSplat",
+    // 'createdAt',
+    "updatedAt",
+    "_status"
   ].includes(k)));
   return pickedProps;
 }
@@ -1703,7 +1711,7 @@ function collectRoutes(store, categories, markets, locales, medias) {
         const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? asEntityId(defaultMarket2.defaultLanguage) : defaultLocale2.id;
         const isRootCategory = rootCategory && item.category === rootCategory.id && item.isDefault;
         eachMarketLocale(markets, locales, (market, locale, markets2, locales2) => {
-          if (!item.markets || item.markets.includes(market.id)) {
+          if (hasMarket(item, market)) {
             const title = localize(item.title, locale.id);
             const id = getRouteHref(slugs, market, locale, markets2, locales2);
             const isDefaultRootCategory = isRootCategory && market.id === defaultMarket2.id && locale.id === defaultMarketLocale;
@@ -1799,6 +1807,9 @@ function getRouteHref(segments, market, locale, markets, locales) {
   const prefix = prefixes.length ? `/${prefixes.join("-")}` : "";
   return `${prefix}${href}`;
 }
+function hasMarket(item, market) {
+  return !item.markets || item.markets.length === 0 || item.markets.includes(market.id);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ImageStrategy,
@@ -1856,6 +1867,7 @@ function getRouteHref(segments, market, locale, markets, locales) {
   getRouteHref,
   groupComponents,
   hasComponents,
+  hasMarket,
   httpDelete,
   httpFetch,
   httpGet,
@@ -1883,6 +1895,7 @@ function getRouteHref(segments, market, locale, markets, locales) {
   isMenuLink,
   isMenuPage,
   isMenuRoute,
+  isNonEmptyArray,
   isNotNullString,
   isNumber,
   isObject,

package/dist/index.mjs

@@ -16,6 +16,9 @@ function isValidString(item) {
 function isArray(item) {
   return Array.isArray(item);
 }
+function isNonEmptyArray(item) {
+  return Array.isArray(item) && item.length > 0;
+}
 function isObject(item) {
   return item != null && typeof item === "object" && !isArray(item);
 }
@@ -407,7 +410,7 @@ function isMediaPdf(media) {
   return false;
 }
 function isMedia(item) {
-  return isObject(item) && "type" in item && (isValidString(item.url) || isValidString(item.src));
+  return isObject(item) && ("mimeType" in item || "type" in item) && (isValidString(item.url) || isValidString(item.src));
 }
 
 // src/types/menu.ts
@@ -1514,7 +1517,10 @@ function getPickedProps(item) {
     "order",
     "template",
     "updatedAt",
-    "useSplat"
+    "useSplat",
+    // 'createdAt',
+    "updatedAt",
+    "_status"
   ].includes(k)));
   return pickedProps;
 }
@@ -1536,7 +1542,7 @@ function collectRoutes(store, categories, markets, locales, medias) {
         const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? asEntityId(defaultMarket2.defaultLanguage) : defaultLocale2.id;
         const isRootCategory = rootCategory && item.category === rootCategory.id && item.isDefault;
         eachMarketLocale(markets, locales, (market, locale, markets2, locales2) => {
-          if (!item.markets || item.markets.includes(market.id)) {
+          if (hasMarket(item, market)) {
             const title = localize(item.title, locale.id);
             const id = getRouteHref(slugs, market, locale, markets2, locales2);
             const isDefaultRootCategory = isRootCategory && market.id === defaultMarket2.id && locale.id === defaultMarketLocale;
@@ -1632,6 +1638,9 @@ function getRouteHref(segments, market, locale, markets, locales) {
   const prefix = prefixes.length ? `/${prefixes.join("-")}` : "";
   return `${prefix}${href}`;
 }
+function hasMarket(item, market) {
+  return !item.markets || item.markets.length === 0 || item.markets.includes(market.id);
+}
 export {
   ImageStrategy,
   JsonService,
@@ -1688,6 +1697,7 @@ export {
   getRouteHref,
   groupComponents,
   hasComponents,
+  hasMarket,
   httpDelete,
   httpFetch,
   httpGet,
@@ -1715,6 +1725,7 @@ export {
   isMenuLink,
   isMenuPage,
   isMenuRoute,
+  isNonEmptyArray,
   isNotNullString,
   isNumber,
   isObject,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-core",
-  "version": "1.8.18",
+  "version": "1.8.20",
   "description": "Core module of the BOM Repository",
   "keywords": [
     "bom",