@littlebox/strapi-suite 1.0.42 → 1.0.43

package/README.md

@@ -203,6 +203,7 @@ GET /api/littlebox-strapi-suite/modules/pages?slug=<SLUG>
 Using the slug module settings (as shown in the screenshot above), you can choose which content will be set as the homepage. Then, just call the API to get the data:
 ```
 GET /api/littlebox-strapi-suite/modules/pages/home?properties=attributes
+GET /api/littlebox-strapi-suite/modules/pages/home?properties=attributes,content
 ```
 The return will be the content in the default language and the respective localizations:
 ```

package/dist/server/index.js

@@ -1598,6 +1598,7 @@ async function getSlugByDocumentId(params) {
       state: "published"
     }
   });
+  if (!document) return null;
   if (document.parentContentId) {
     const parentSlug = await getSlugByDocumentId({
       contentId: document.parentContentId,
@@ -1731,26 +1732,20 @@ async function buildBreadcrumbs(params) {
   }, []);
   return mappedResult;
 }
-function handleAttributes(attributes2, level) {
+function handleAttributes(attributes2) {
   const query = {};
   Object.keys(attributes2).forEach((key) => {
     switch (attributes2[key]["type"]) {
       case "component":
         const componentData = strapi.components[attributes2[key]["component"]];
-        query[key] = { populate: handleAttributes(componentData.attributes, level) };
+        query[key] = { populate: handleAttributes(componentData.attributes) };
         break;
       case "media":
         query[key] = { populate: "*" };
         break;
       case "relation":
         if (key === "roles" || key === "users" || key === "createdBy" || key === "updatedBy") break;
-        query[key] = key === "localizations" ? { populate: "*" } : level === 3 ? { populate: "*" } : {
-          populate: populateQueryFromContentType(
-            strapi,
-            attributes2[key]["target"],
-            level + 1
-          )
-        };
+        query[key] = { populate: "*" };
         break;
       case "dynamiczone":
         const components = attributes2[key]["components"];
@@ -1758,7 +1753,7 @@ function handleAttributes(attributes2, level) {
         components.forEach((component) => {
           const componentData2 = strapi.components[component];
           query[key]["on"][component] = {
-            populate: handleAttributes(componentData2.attributes, level)
+            populate: handleAttributes(componentData2.attributes)
           };
         });
         break;
@@ -1766,11 +1761,46 @@ function handleAttributes(attributes2, level) {
   });
   return Object.keys(query).length === 0 ? "*" : query;
 }
-function populateQueryFromContentType(strapi2, contentType, level = 1) {
+function populateQueryFromContentType(strapi2, contentType) {
   const attributes2 = strapi2.contentTypes[contentType]["attributes"];
-  const query = handleAttributes(attributes2, level);
+  const query = handleAttributes(attributes2);
   return query;
 }
+async function findDocumentIdsAndFetchSlugs(params) {
+  if (!params.document || typeof params.document !== "object") return;
+  const promises = [];
+  async function traverse(current) {
+    if (!current || typeof current !== "object") return;
+    if (Array.isArray(current)) {
+      for (let i = 0; i < current.length; i++) {
+        await traverse(current[i]);
+      }
+      return;
+    }
+    if ("documentId" in current) {
+      promises.push(
+        (async () => {
+          const slug = await getSlugByDocumentId({
+            contentId: current.documentId,
+            locale: current.locale,
+            defaultLocale: params.defaultLocale,
+            showDefaultLanguage: params.showDefaultLanguage,
+            strapi
+          });
+          current.slug = slug;
+        })()
+      );
+    }
+    for (const key in current) {
+      if (Object.prototype.hasOwnProperty.call(current, key) && current[key] !== null) {
+        await traverse(current[key]);
+      }
+    }
+  }
+  await traverse(params.document);
+  await Promise.all(promises);
+  return params.document;
+}
 const SlugModuleService = ({ strapi: strapi2 }) => ({
   async adminGetAll() {
     const ctx = strapi2.requestContext.get();
@@ -1898,6 +1928,11 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
       status: "published",
       documentId: page.contentId
     });
+    await findDocumentIdsAndFetchSlugs({
+      document,
+      defaultLocale,
+      showDefaultLanguage
+    });
     for (const localization of document.localizations) {
       if (homepageSlugStrategy === SLUG_LANGUAGE_STRATEGY && localization.documentId === homepageContentId) {
         localization.slug = localization.locale === defaultLocale ? "" : localization.locale.toLowerCase();
@@ -2083,13 +2118,18 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
         ...attributes2?.parentContentId ? { parent: { id: attributes2.parentContentId, model: attributes2.parentContentModel } } : {}
       };
     }
-    const query = populateQueryFromContentType(strapi2, page.contentModel);
+    const query = properties && properties.includes("content") ? populateQueryFromContentType(strapi2, page.contentModel) : { localizations: { populate: "*" } };
     const document = await strapi2.documents(page.contentModel).findOne({
       locale: page.locale,
       populate: query,
       status: "published",
       documentId: page.contentId
     });
+    await findDocumentIdsAndFetchSlugs({
+      document,
+      defaultLocale,
+      showDefaultLanguage
+    });
     for (const localization of document.localizations) {
       if (homepageSlugStrategy === SLUG_LANGUAGE_STRATEGY) {
         localization.slug = localization.locale === defaultLocale ? "" : localization.locale.toLowerCase();

package/dist/server/index.mjs

@@ -1597,6 +1597,7 @@ async function getSlugByDocumentId(params) {
       state: "published"
     }
   });
+  if (!document) return null;
   if (document.parentContentId) {
     const parentSlug = await getSlugByDocumentId({
       contentId: document.parentContentId,
@@ -1730,26 +1731,20 @@ async function buildBreadcrumbs(params) {
   }, []);
   return mappedResult;
 }
-function handleAttributes(attributes2, level) {
+function handleAttributes(attributes2) {
   const query = {};
   Object.keys(attributes2).forEach((key) => {
     switch (attributes2[key]["type"]) {
       case "component":
         const componentData = strapi.components[attributes2[key]["component"]];
-        query[key] = { populate: handleAttributes(componentData.attributes, level) };
+        query[key] = { populate: handleAttributes(componentData.attributes) };
         break;
       case "media":
         query[key] = { populate: "*" };
         break;
       case "relation":
         if (key === "roles" || key === "users" || key === "createdBy" || key === "updatedBy") break;
-        query[key] = key === "localizations" ? { populate: "*" } : level === 3 ? { populate: "*" } : {
-          populate: populateQueryFromContentType(
-            strapi,
-            attributes2[key]["target"],
-            level + 1
-          )
-        };
+        query[key] = { populate: "*" };
         break;
       case "dynamiczone":
         const components = attributes2[key]["components"];
@@ -1757,7 +1752,7 @@ function handleAttributes(attributes2, level) {
         components.forEach((component) => {
           const componentData2 = strapi.components[component];
           query[key]["on"][component] = {
-            populate: handleAttributes(componentData2.attributes, level)
+            populate: handleAttributes(componentData2.attributes)
           };
         });
         break;
@@ -1765,11 +1760,46 @@ function handleAttributes(attributes2, level) {
   });
   return Object.keys(query).length === 0 ? "*" : query;
 }
-function populateQueryFromContentType(strapi2, contentType, level = 1) {
+function populateQueryFromContentType(strapi2, contentType) {
   const attributes2 = strapi2.contentTypes[contentType]["attributes"];
-  const query = handleAttributes(attributes2, level);
+  const query = handleAttributes(attributes2);
   return query;
 }
+async function findDocumentIdsAndFetchSlugs(params) {
+  if (!params.document || typeof params.document !== "object") return;
+  const promises = [];
+  async function traverse(current) {
+    if (!current || typeof current !== "object") return;
+    if (Array.isArray(current)) {
+      for (let i = 0; i < current.length; i++) {
+        await traverse(current[i]);
+      }
+      return;
+    }
+    if ("documentId" in current) {
+      promises.push(
+        (async () => {
+          const slug = await getSlugByDocumentId({
+            contentId: current.documentId,
+            locale: current.locale,
+            defaultLocale: params.defaultLocale,
+            showDefaultLanguage: params.showDefaultLanguage,
+            strapi
+          });
+          current.slug = slug;
+        })()
+      );
+    }
+    for (const key in current) {
+      if (Object.prototype.hasOwnProperty.call(current, key) && current[key] !== null) {
+        await traverse(current[key]);
+      }
+    }
+  }
+  await traverse(params.document);
+  await Promise.all(promises);
+  return params.document;
+}
 const SlugModuleService = ({ strapi: strapi2 }) => ({
   async adminGetAll() {
     const ctx = strapi2.requestContext.get();
@@ -1897,6 +1927,11 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
       status: "published",
       documentId: page.contentId
     });
+    await findDocumentIdsAndFetchSlugs({
+      document,
+      defaultLocale,
+      showDefaultLanguage
+    });
     for (const localization of document.localizations) {
       if (homepageSlugStrategy === SLUG_LANGUAGE_STRATEGY && localization.documentId === homepageContentId) {
         localization.slug = localization.locale === defaultLocale ? "" : localization.locale.toLowerCase();
@@ -2082,13 +2117,18 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
         ...attributes2?.parentContentId ? { parent: { id: attributes2.parentContentId, model: attributes2.parentContentModel } } : {}
       };
     }
-    const query = populateQueryFromContentType(strapi2, page.contentModel);
+    const query = properties && properties.includes("content") ? populateQueryFromContentType(strapi2, page.contentModel) : { localizations: { populate: "*" } };
     const document = await strapi2.documents(page.contentModel).findOne({
       locale: page.locale,
       populate: query,
       status: "published",
       documentId: page.contentId
     });
+    await findDocumentIdsAndFetchSlugs({
+      document,
+      defaultLocale,
+      showDefaultLanguage
+    });
     for (const localization of document.localizations) {
       if (homepageSlugStrategy === SLUG_LANGUAGE_STRATEGY) {
         localization.slug = localization.locale === defaultLocale ? "" : localization.locale.toLowerCase();

package/dist/server/src/utils/findDocumentIdsAndFetchSlugs.d.ts

@@ -0,0 +1,7 @@
+import type { Core } from '@strapi/strapi';
+export declare function findDocumentIdsAndFetchSlugs(params: {
+    document: any;
+    defaultLocale: string;
+    showDefaultLanguage: boolean;
+    strapi: Core.Strapi;
+}): Promise<any>;

package/dist/server/src/utils/populateQueryFromContentType.d.ts

@@ -1,2 +1,2 @@
 import type { Core } from '@strapi/strapi';
-export declare function populateQueryFromContentType(strapi: Core.Strapi, contentType: string, level?: number): any;
+export declare function populateQueryFromContentType(strapi: Core.Strapi, contentType: string): any;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.42",
+  "version": "1.0.43",
   "keywords": [
     "strapi",
     "strapi plugin",