@websolutespa/bom-core 1.8.4 → 1.8.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-core
 
+## 1.8.6
+
+### Patch Changes
+
+- Modified: collectRoutes
+
+## 1.8.5
+
+### Patch Changes
+
+- Added: base64 encoder/decoder
+
 ## 1.8.4
 
 ### Patch Changes

package/dist/index.d.ts

@@ -2,6 +2,9 @@ import { IncomingMessage, ServerResponse, IncomingHttpHeaders } from 'http';
 import { ParsedUrlQuery } from 'querystring';
 import React from 'react';
 
+declare function base64ToString(text: string): string;
+declare function stringToBase64(text: string): string;
+
 type Json = string | number | boolean | null | Json[] | {
     [key: string]: Json;
 };
@@ -1038,7 +1041,7 @@ declare enum RouteStrategy {
  * @param locales - The list of locales.
  * @returns An array of collected routes.
  */
-declare function collectRoutes(store: IMemoryStore<ICategorized>, categories: ICategory[], markets: IMarket[], locales: ILocale[]): IRoute[];
+declare function collectRoutes(store: IMemoryStore<ICategorized>, categories: ICategory[], markets: IMarket[], locales: ILocale[], medias?: IMedia[]): IRoute[];
 /**
  * Iterates over each market and locale combination and invokes the callback function.
  *
@@ -1300,4 +1303,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, 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, 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, camelToSnakeCase, cloneItem, collectFeatureTypes, collectFeatureTypes__, collectOptions, collectRoutes, consoleWarn, decryptImageResize, deepMerge, defaultLocale, defaultMarket, eachCategorized, eachMarketLocale, encryptImageToken, enumToList, findCategoryInCategories, findChildCategories, findRouteOfCategory, findRoutesOfCategory, getCategorySegments, getCategorySegmentsByCategory, getClassNames, getCollectionDescription, getEnv, getHost, getIsDevelopment, getIsProduction, getOrigin, getParentCategoriesById, getParentCategory, getProto, getRootCategory, getRouteHref, httpDelete, httpFetch, httpGet, httpPatch, httpPost, httpPut, isArray, isBrowser, isDevelopment, isEntity, isEquatable, isHeaders, isIncomingHttpHeaders, isLocalizedString, isMediaImage, isMediaJson, isMediaPdf, isMediaVideo, isMenuHref, isNotNullString, isNumber, isObject, isProduction, isPromise, isRelation, isReservedCollectionDescription, isStage, isString, isUndecoratedMenuCategory, isUndecoratedMenuItem, isUndecoratedMenuPage, isUndecoratedNav, isUnresolvedRelation, isValidCollectionDescription, isValidString, localize, localizeItem, localizeValue, localizedToString, merge, pascalCaseToCamelCase, pascalCaseToCharCase, pascalCaseToKebabCase, pascalCaseToSnakeCase, qsDeserialize, qsDeserializeRaw, qsSerialize, qsSerializeRaw, resolveMediaType, toCamelCase, toCharCase, toDisplayName, toFindParams, toKebabCase, toPascalCase, toPluralName, toSnakeCase, toTitleCase, toValidCollectionName, unknownCaseToPascalCase, uuidv4, withSchema };
+export { DeepPartial, Dynamic, FetchError, FetchRequestOptions, FetchService, FindParams, FindWhereParams, 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, 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, encryptImageToken, enumToList, findCategoryInCategories, findChildCategories, findRouteOfCategory, findRoutesOfCategory, getCategorySegments, getCategorySegmentsByCategory, getClassNames, getCollectionDescription, getEnv, getHost, getIsDevelopment, getIsProduction, getOrigin, getParentCategoriesById, getParentCategory, getProto, getRootCategory, getRouteHref, httpDelete, httpFetch, httpGet, httpPatch, httpPost, httpPut, isArray, isBrowser, isDevelopment, isEntity, isEquatable, isHeaders, isIncomingHttpHeaders, isLocalizedString, isMediaImage, isMediaJson, isMediaPdf, isMediaVideo, isMenuHref, isNotNullString, isNumber, isObject, isProduction, isPromise, isRelation, isReservedCollectionDescription, isStage, isString, isUndecoratedMenuCategory, isUndecoratedMenuItem, isUndecoratedMenuPage, isUndecoratedNav, isUnresolvedRelation, isValidCollectionDescription, isValidString, localize, localizeItem, localizeValue, localizedToString, merge, pascalCaseToCamelCase, pascalCaseToCharCase, pascalCaseToKebabCase, pascalCaseToSnakeCase, qsDeserialize, qsDeserializeRaw, qsSerialize, qsSerializeRaw, resolveMediaType, stringToBase64, toCamelCase, toCharCase, toDisplayName, toFindParams, toKebabCase, toPascalCase, toPluralName, toSnakeCase, toTitleCase, toValidCollectionName, unknownCaseToPascalCase, uuidv4, withSchema };

package/dist/index.js

@@ -46,6 +46,7 @@ __export(src_exports, {
   asServerProps: () => asServerProps,
   asSortedOptions: () => asSortedOptions,
   awaitAll: () => awaitAll,
+  base64ToString: () => base64ToString,
   camelToSnakeCase: () => camelToSnakeCase,
   cloneItem: () => cloneItem,
   collectFeatureTypes: () => collectFeatureTypes,
@@ -128,6 +129,7 @@ __export(src_exports, {
   qsSerialize: () => qsSerialize,
   qsSerializeRaw: () => qsSerializeRaw,
   resolveMediaType: () => resolveMediaType,
+  stringToBase64: () => stringToBase64,
   toCamelCase: () => toCamelCase,
   toCharCase: () => toCharCase,
   toDisplayName: () => toDisplayName,
@@ -489,6 +491,14 @@ function merge(target, source) {
   return target;
 }
 
+// src/base64/base64.ts
+function base64ToString(text) {
+  return isBrowser ? window.atob(text) : Buffer.from(text, "base64").toString();
+}
+function stringToBase64(text) {
+  return isBrowser ? window.btoa(text) : Buffer.from(text).toString("base64");
+}
+
 // src/category/category.ts
 var ROOT_CATEGORY = process.env.ROOT_CATEGORY || "";
 function getRootCategory(categories) {
@@ -717,12 +727,6 @@ async function httpDelete(url, options = {}) {
 function getSecret() {
   return process.env.IMAGE_SECRET || "The sun sets over the calm ocean";
 }
-function base64ToString_(text) {
-  return isBrowser ? window.atob(text) : Buffer.from(text, "base64").toString();
-}
-function stringToBase64_(text) {
-  return isBrowser ? window.btoa(text) : Buffer.from(text).toString("base64");
-}
 function textToArrayBuffer_(text) {
   const encoder = new TextEncoder();
   const arrayBuffer = encoder.encode(text);
@@ -744,11 +748,11 @@ function xor_(text, secret) {
 }
 function encrypt_(text, secret) {
   const encrypted = xor_(text, secret);
-  const base64 = stringToBase64_(encrypted);
+  const base64 = stringToBase64(encrypted);
   return base64;
 }
 function decrypt_(base64, secret) {
-  const text = base64ToString_(base64);
+  const text = base64ToString(base64);
   const decrypted = xor_(text, secret);
   return decrypted;
 }
@@ -1374,7 +1378,6 @@ function getPickedProps(item) {
   const pickedProps = Object.fromEntries(Object.entries(item).filter(([k, v]) => [
     "category",
     "isDefault",
-    "media",
     "order",
     "template",
     "updatedAt",
@@ -1382,7 +1385,7 @@ function getPickedProps(item) {
   ].includes(k)));
   return pickedProps;
 }
-function collectRoutes(store, categories, markets, locales) {
+function collectRoutes(store, categories, markets, locales, medias) {
   const routes = [];
   if (locales.length > 0 && markets.length > 0) {
     const rootCategory = getRootCategory(categories);
@@ -1411,12 +1414,22 @@ function collectRoutes(store, categories, markets, locales) {
             schema: key,
             title
           };
+          const mediaId = typeof item.media === "string" ? item.media : void 0;
+          if (Array.isArray(medias) && mediaId) {
+            const media = item.media && medias.find((x) => x.id === mediaId);
+            if (media) {
+              route.media = media;
+            }
+          }
           routes.push(route);
         }
         eachMarketLocale(markets, locales, (market, locale, markets2, locales2) => {
           if (!item.markets || item.markets.includes(market.id)) {
             const title = localize(item.title, locale.id);
             const id = getRouteHref(slugs, market, locale, markets2, locales2);
+            if (!id) {
+              return;
+            }
             const pickedProps = getPickedProps(item);
             const route = {
               ...pickedProps,
@@ -1428,6 +1441,13 @@ function collectRoutes(store, categories, markets, locales) {
               schema: key,
               title
             };
+            const mediaId = typeof item.media === "string" ? item.media : void 0;
+            if (Array.isArray(medias) && mediaId) {
+              const media = item.media && medias.find((x) => x.id === mediaId);
+              if (media) {
+                route.media = media;
+              }
+            }
             routes.push(route);
           }
         });
@@ -1604,6 +1624,7 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   asServerProps,
   asSortedOptions,
   awaitAll,
+  base64ToString,
   camelToSnakeCase,
   cloneItem,
   collectFeatureTypes,
@@ -1686,6 +1707,7 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   qsSerialize,
   qsSerializeRaw,
   resolveMediaType,
+  stringToBase64,
   toCamelCase,
   toCharCase,
   toDisplayName,

package/dist/index.mjs

@@ -343,6 +343,14 @@ function merge(target, source) {
   return target;
 }
 
+// src/base64/base64.ts
+function base64ToString(text) {
+  return isBrowser ? window.atob(text) : Buffer.from(text, "base64").toString();
+}
+function stringToBase64(text) {
+  return isBrowser ? window.btoa(text) : Buffer.from(text).toString("base64");
+}
+
 // src/category/category.ts
 var ROOT_CATEGORY = process.env.ROOT_CATEGORY || "";
 function getRootCategory(categories) {
@@ -571,12 +579,6 @@ async function httpDelete(url, options = {}) {
 function getSecret() {
   return process.env.IMAGE_SECRET || "The sun sets over the calm ocean";
 }
-function base64ToString_(text) {
-  return isBrowser ? window.atob(text) : Buffer.from(text, "base64").toString();
-}
-function stringToBase64_(text) {
-  return isBrowser ? window.btoa(text) : Buffer.from(text).toString("base64");
-}
 function textToArrayBuffer_(text) {
   const encoder = new TextEncoder();
   const arrayBuffer = encoder.encode(text);
@@ -598,11 +600,11 @@ function xor_(text, secret) {
 }
 function encrypt_(text, secret) {
   const encrypted = xor_(text, secret);
-  const base64 = stringToBase64_(encrypted);
+  const base64 = stringToBase64(encrypted);
   return base64;
 }
 function decrypt_(base64, secret) {
-  const text = base64ToString_(base64);
+  const text = base64ToString(base64);
   const decrypted = xor_(text, secret);
   return decrypted;
 }
@@ -1228,7 +1230,6 @@ function getPickedProps(item) {
   const pickedProps = Object.fromEntries(Object.entries(item).filter(([k, v]) => [
     "category",
     "isDefault",
-    "media",
     "order",
     "template",
     "updatedAt",
@@ -1236,7 +1237,7 @@ function getPickedProps(item) {
   ].includes(k)));
   return pickedProps;
 }
-function collectRoutes(store, categories, markets, locales) {
+function collectRoutes(store, categories, markets, locales, medias) {
   const routes = [];
   if (locales.length > 0 && markets.length > 0) {
     const rootCategory = getRootCategory(categories);
@@ -1265,12 +1266,22 @@ function collectRoutes(store, categories, markets, locales) {
             schema: key,
             title
           };
+          const mediaId = typeof item.media === "string" ? item.media : void 0;
+          if (Array.isArray(medias) && mediaId) {
+            const media = item.media && medias.find((x) => x.id === mediaId);
+            if (media) {
+              route.media = media;
+            }
+          }
           routes.push(route);
         }
         eachMarketLocale(markets, locales, (market, locale, markets2, locales2) => {
           if (!item.markets || item.markets.includes(market.id)) {
             const title = localize(item.title, locale.id);
             const id = getRouteHref(slugs, market, locale, markets2, locales2);
+            if (!id) {
+              return;
+            }
             const pickedProps = getPickedProps(item);
             const route = {
               ...pickedProps,
@@ -1282,6 +1293,13 @@ function collectRoutes(store, categories, markets, locales) {
               schema: key,
               title
             };
+            const mediaId = typeof item.media === "string" ? item.media : void 0;
+            if (Array.isArray(medias) && mediaId) {
+              const media = item.media && medias.find((x) => x.id === mediaId);
+              if (media) {
+                route.media = media;
+              }
+            }
             routes.push(route);
           }
         });
@@ -1457,6 +1475,7 @@ export {
   asServerProps,
   asSortedOptions,
   awaitAll,
+  base64ToString,
   camelToSnakeCase,
   cloneItem,
   collectFeatureTypes,
@@ -1539,6 +1558,7 @@ export {
   qsSerialize,
   qsSerializeRaw,
   resolveMediaType,
+  stringToBase64,
   toCamelCase,
   toCharCase,
   toDisplayName,

package/package.json

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