@websolutespa/bom-core 3.0.2 → 3.0.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @websolutespa/bom-core
 
+## 3.0.3
+
+### Patch Changes
+
+- Modified: IRoutes schema
+- Fixing: qsDeserialize
+
 ## 3.0.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -383,19 +383,25 @@ type IMarket = IEntity & {
 type IRoute = {
     category: IEquatable;
     id: string;
-    isDefault?: boolean;
-    isRoot?: boolean;
     locale: string;
     market: string;
-    media?: IMedia;
-    noindex?: boolean;
-    order?: number;
     page: IEquatable;
     resolvedCategory: IEquatable;
     schema: string;
-    template?: string;
     title: string;
-    updatedAt?: Date;
+    _status?: 'published' | 'draft';
+    isDefault?: boolean;
+    isRoot?: boolean;
+    media?: {
+        url: string;
+        src?: string;
+        type: string;
+        updatedAt?: Date | string;
+    };
+    noindex?: boolean;
+    order?: number;
+    template?: string;
+    updatedAt?: Date | string;
     useSplat?: boolean;
 };
 type IRouteCanonical = IRoute & {

package/dist/index.js

@@ -1441,7 +1441,7 @@ function qsDeserializeKey(value) {
   return value;
 }
 function qsDeserializeKeys(key) {
-  const keys = key.replace(/[\]]/g, "").split("[").map((x) => qsDeserializeKey(x));
+  const keys = key.replace(/[\]]/g, "").split("[").map((x) => qsDeserializeKey(x)).filter((x) => Boolean(x));
   return keys;
 }
 function getNextKeyItem(key) {
@@ -1540,8 +1540,37 @@ function collectRoutes(store, categories, markets, locales, medias) {
   const routes = [];
   if (locales.length > 0 && markets.length > 0) {
     const rootCategory = getRootCategory(categories);
+    const activeLocales = locales.filter((locale) => locale.isActive !== false);
+    const activeMarkets = markets.filter((market) => market.isActive !== false);
+    const categoryById = new Map(categories.filter((category) => typeof category.id === "string").map((category) => [category.id, category]));
+    const localeById = new Map(activeLocales.filter((locale) => typeof locale.id === "string").map((locale) => [locale.id, locale]));
+    const mediaById = new Map((medias || []).filter((media) => typeof media.id === "string").map((media) => [media.id, media]));
+    const marketLocales = activeMarkets.flatMap((market) => {
+      const localesForMarket = market.languages && market.languages.length > 0 ? market.languages.map((language) => localeById.get(String(asEntityId(language)))).filter((locale) => locale !== void 0) : activeLocales;
+      return localesForMarket.map((locale) => ({ market, locale }));
+    });
+    const getSegments = (item) => {
+      const routeCategories = [];
+      const segments = [];
+      let parentId = asCategoryId(item.category);
+      while (parentId != null) {
+        const parentCategory = categoryById.get(parentId);
+        if (parentCategory) {
+          segments.unshift({ ...parentCategory });
+          routeCategories.push(parentId);
+          parentId = asCategoryId(parentCategory.category);
+          if (parentId && routeCategories.includes(parentId)) {
+            console.log("ICategory.getParentCategoriesById", "circular reference found", parentId);
+            parentId = void 0;
+          }
+        } else {
+          parentId = void 0;
+        }
+      }
+      return segments;
+    };
     eachCategorized(store, (item, key) => {
-      const segments = getCategorySegments(categories, item);
+      const segments = getSegments(item);
       const visibleSegments = segments.filter((x) => x.id !== rootCategory?.id && Boolean(x.isHidden) === false);
       const visibleCategory = visibleSegments.length > 0 ? visibleSegments[visibleSegments.length - 1] : rootCategory;
       if (visibleCategory) {
@@ -1550,10 +1579,10 @@ function collectRoutes(store, categories, markets, locales, medias) {
           slugs.push({ slug: item.slug });
         }
         const isRootCategory = rootCategory && item.category === rootCategory.id && item.isDefault;
-        eachMarketLocale(markets, locales, (market, locale, markets2, locales2) => {
+        marketLocales.forEach(({ market, locale }) => {
           if (hasMarket(item, market)) {
             const title = localize(item.title, locale.id);
-            const id = getRouteHref(slugs, market, locale, markets2, locales2);
+            const id = getRouteHref(slugs, market, locale, activeMarkets, activeLocales);
             const {
               _status,
               category,
@@ -1567,11 +1596,10 @@ function collectRoutes(store, categories, markets, locales, medias) {
             const route = {
               _status,
               category,
-              // id: isDefaultRootCategory ? '/' : id,
               id,
               locale: locale.id,
               market: market.id,
-              media,
+              media: routeMedia(media),
               page: item.id,
               resolvedCategory: visibleCategory.id,
               schema: key,
@@ -1596,10 +1624,10 @@ function collectRoutes(store, categories, markets, locales, medias) {
               route.useSplat = true;
             }
             const mediaId = typeof item.media === "string" ? item.media : void 0;
-            if (Array.isArray(medias) && mediaId) {
-              const media2 = item.media && medias.find((x) => x.id === mediaId);
+            if (mediaId) {
+              const media2 = mediaById.get(mediaId);
               if (media2) {
-                route.media = media2;
+                route.media = routeMedia(media2);
               }
             }
             routes.push(route);
@@ -1610,6 +1638,18 @@ function collectRoutes(store, categories, markets, locales, medias) {
   }
   return routes;
 }
+function routeMedia(media) {
+  const url = media?.url || media?.src;
+  return media && url ? {
+    // createdAt: media.createdAt,
+    updatedAt: media.updatedAt,
+    // filename: media.filename,
+    // mimeType: media.mimeType,
+    // id: media.id,
+    url,
+    type: media.type
+  } : void 0;
+}
 function eachMarketLocale(markets, locales, callback) {
   locales = locales.filter((x) => x.isActive !== false);
   markets = markets.filter((x) => x.isActive !== false);

package/package.json

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