@mattisvensson/strapi-plugin-webatlas 0.11.3 → 0.11.5

package/dist/server/index.js

@@ -4664,6 +4664,106 @@ function calculateParentAndOrder({
     calculatedOrder
   };
 }
+async function enrichWebatlasData(data, contentTypeUid) {
+  console.log("Enriching data with webatlas fields...", { contentTypeUid });
+  console.log("Original data:", JSON.stringify(data, null, 2));
+  if (!data || typeof data !== "object") return data;
+  const collectDocumentIds = (obj, uid) => {
+    if (!obj || typeof obj !== "object") return [];
+    const ids = [];
+    if (obj.documentId) ids.push(obj.documentId);
+    if (!uid) return ids;
+    const ct = strapi.contentTypes[uid];
+    if (!ct?.attributes) return ids;
+    for (const [key, attr] of Object.entries(ct.attributes)) {
+      const attribute = attr;
+      if (attribute.type === "relation" && obj[key]) {
+        const targetUid = attribute.target;
+        if (Array.isArray(obj[key])) {
+          ids.push(...obj[key].flatMap((item) => collectDocumentIds(item, targetUid)));
+        } else {
+          ids.push(...collectDocumentIds(obj[key], targetUid));
+        }
+      }
+      if (attribute.type === "component" && obj[key]) {
+        const componentUid = attribute.component;
+        if (Array.isArray(obj[key])) {
+          ids.push(...obj[key].flatMap((item) => collectDocumentIds(item, componentUid)));
+        } else {
+          ids.push(...collectDocumentIds(obj[key], componentUid));
+        }
+      }
+      if (attribute.type === "dynamiczone" && Array.isArray(obj[key])) {
+        ids.push(
+          ...obj[key].flatMap((item) => {
+            if (!item || !item.__component) return [];
+            return collectDocumentIds(item, item.__component);
+          })
+        );
+      }
+    }
+    return ids;
+  };
+  const documentIds = collectDocumentIds(data, contentTypeUid);
+  if (documentIds.length === 0) return data;
+  const uniqueDocumentIds = [...new Set(documentIds)];
+  const routes2 = await strapi.db?.query(waRoute).findMany({
+    where: {
+      relatedDocumentId: { $in: uniqueDocumentIds }
+    },
+    select: ["relatedDocumentId", "relatedContentType", "path", "canonicalPath", "slug", "uidPath"]
+  });
+  const routeMap = new Map(routes2?.map((route2) => [route2.relatedDocumentId, route2]) || []);
+  const enrichEntity = (entity, uid) => {
+    if (!entity || typeof entity !== "object") return entity;
+    const ct = uid ? strapi.contentTypes[uid] : null;
+    const isWebatlasEnabled = ct?.pluginOptions?.webatlas?.enabled === true;
+    if (isWebatlasEnabled && entity.documentId && routeMap.has(entity.documentId)) {
+      const route2 = routeMap.get(entity.documentId);
+      entity.webatlas = {
+        path: route2.path || "",
+        canonicalPath: route2.canonicalPath || "",
+        slug: route2.slug || "",
+        uidPath: route2.uidPath || ""
+      };
+    }
+    if (ct?.attributes) {
+      for (const [key, attr] of Object.entries(ct.attributes)) {
+        const attribute = attr;
+        if (attribute.type === "relation" && entity[key]) {
+          const targetUid = attribute.target;
+          strapi.log.debug("relation found");
+          if (Array.isArray(entity[key])) {
+            entity[key] = entity[key].map(
+              (item) => item ? enrichEntity(item, targetUid) : item
+            );
+          } else {
+            entity[key] = enrichEntity(entity[key], targetUid);
+          }
+        }
+        if (attribute.type === "component" && entity[key]) {
+          const componentUid = attribute.component;
+          if (Array.isArray(entity[key])) {
+            entity[key] = entity[key].map(
+              (item) => item ? enrichEntity(item, componentUid) : item
+            );
+          } else {
+            entity[key] = enrichEntity(entity[key], componentUid);
+          }
+        }
+        if (attribute.type === "dynamiczone" && Array.isArray(entity[key])) {
+          entity[key] = entity[key].map((item) => {
+            if (!item || !item.__component) return item;
+            return enrichEntity(item, item.__component);
+          });
+        }
+      }
+    }
+    strapi.log.debug("finished - returning");
+    return entity;
+  };
+  return enrichEntity(data, contentTypeUid);
+}
 const migration_001_canonical_path = {
   version: "001",
   description: "Migrate title field to canonicalPath using transformToUrl",
@@ -4902,7 +5002,7 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
       const data = context.params.data;
       const { webatlas } = data;
       const { slug, parentDocumentId, isOverride } = webatlas || {};
-      const transformedSlug = slug ? transformToUrl(slug) : null;
+      const transformedSlug = slug ? transformToUrl(slug, !isOverride) : null;
       const result2 = await next();
       if (!transformedSlug) return result2;
       const existing = await strapi2.db?.query(waRoute).findOne({
@@ -4953,7 +5053,10 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
       const { documentId } = context.params;
       const { webatlas } = data;
       const { slug, parentDocumentId, isOverride } = webatlas || {};
-      if (!slug) return;
+      if (!slug) {
+        const result3 = await next();
+        return result3;
+      }
       const relatedRoute = await strapi2.documents(waRoute).findFirst({
         filters: {
           relatedDocumentId: documentId
@@ -4972,7 +5075,7 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
           });
         }
       }
-      const transformedSlug = transformToUrl(slug);
+      const transformedSlug = transformToUrl(slug, !isOverride);
       let rawPath = transformedSlug;
       if (!isOverride) rawPath = parent ? `${parent.path}/${transformedSlug}` : transformedSlug;
       const validatedPath = await duplicateCheck(rawPath, relatedRoute?.documentId ?? null);
@@ -5084,124 +5187,18 @@ const addWebatlasField = ({ strapi: strapi2 }) => {
     );
     if (!contentTypeEntry) return;
     const [contentTypeUid, contentType] = contentTypeEntry;
-    const collectDocumentIds = (data, uid = contentTypeUid) => {
-      if (!data || typeof data !== "object") return [];
-      const ids = [];
-      if (data.documentId) {
-        ids.push(data.documentId);
-      }
-      const ct = strapi2.contentTypes[uid];
-      if (ct?.attributes) {
-        for (const [key, attr] of Object.entries(ct.attributes)) {
-          const attribute = attr;
-          if (attribute.type === "relation" && data[key]) {
-            const targetUid = attribute.target;
-            if (Array.isArray(data[key])) {
-              ids.push(...data[key].flatMap((item) => collectDocumentIds(item, targetUid)));
-            } else {
-              ids.push(...collectDocumentIds(data[key], targetUid));
-            }
-          }
-          if (attribute.type === "component" && data[key]) {
-            const componentUid = attribute.component;
-            if (Array.isArray(data[key])) {
-              ids.push(...data[key].flatMap((item) => collectDocumentIds(item, componentUid)));
-            } else {
-              ids.push(...collectDocumentIds(data[key], componentUid));
-            }
-          }
-          if (attribute.type === "dynamiczone" && Array.isArray(data[key])) {
-            ids.push(
-              ...data[key].flatMap((item) => {
-                const componentUid = item.__component;
-                return collectDocumentIds(item, componentUid);
-              })
-            );
-          }
-        }
-      }
-      return ids;
-    };
-    let documentIds = [];
     if (ctx.body.data) {
       if (Array.isArray(ctx.body.data)) {
-        documentIds = ctx.body.data.flatMap((item) => collectDocumentIds(item, contentTypeUid));
-      } else {
-        documentIds = collectDocumentIds(ctx.body.data, contentTypeUid);
-      }
-    } else if (Array.isArray(ctx.body)) {
-      documentIds = ctx.body.flatMap((item) => collectDocumentIds(item, contentTypeUid));
-    } else if (typeof ctx.body === "object") {
-      documentIds = collectDocumentIds(ctx.body, contentTypeUid);
-    }
-    if (documentIds.length === 0) return;
-    const uniqueDocumentIds = [...new Set(documentIds)];
-    const routes2 = await strapi2.db?.query(waRoute).findMany({
-      where: {
-        relatedDocumentId: { $in: uniqueDocumentIds }
-      },
-      select: [
-        "relatedDocumentId",
-        "relatedContentType",
-        "path",
-        "canonicalPath",
-        "slug",
-        "uidPath"
-      ]
-    });
-    const routeMap = new Map(routes2?.map((route2) => [route2.relatedDocumentId, route2]) || []);
-    const enrichWebatlasField = (data, uid = contentTypeUid) => {
-      if (!data || typeof data !== "object") return data;
-      const ct = strapi2.contentTypes[uid];
-      const isWebatlasEnabled = ct?.pluginOptions?.webatlas?.enabled === true;
-      if (isWebatlasEnabled && data.documentId && routeMap.has(data.documentId)) {
-        const route2 = routeMap.get(data.documentId);
-        data.webatlas = {
-          path: route2.path || "",
-          canonicalPath: route2.canonicalPath || "",
-          slug: route2.slug || "",
-          uidPath: route2.uidPath || ""
-        };
-      }
-      if (ct?.attributes) {
-        for (const [key, attr] of Object.entries(ct.attributes)) {
-          const attribute = attr;
-          if (attribute.type === "relation" && data[key]) {
-            const targetUid = attribute.target;
-            if (Array.isArray(data[key])) {
-              data[key] = data[key].map((item) => enrichWebatlasField(item, targetUid));
-            } else {
-              data[key] = enrichWebatlasField(data[key], targetUid);
-            }
-          }
-          if (attribute.type === "component" && data[key]) {
-            const componentUid = attribute.component;
-            if (Array.isArray(data[key])) {
-              data[key] = data[key].map((item) => enrichWebatlasField(item, componentUid));
-            } else {
-              data[key] = enrichWebatlasField(data[key], componentUid);
-            }
-          }
-          if (attribute.type === "dynamiczone" && Array.isArray(data[key])) {
-            data[key] = data[key].map((item) => {
-              const componentUid = item.__component;
-              return enrichWebatlasField(item, componentUid);
-            });
-          }
-        }
-      }
-      return data;
-    };
-    if (ctx.body.data) {
-      if (Array.isArray(ctx.body.data)) {
-        ctx.body.data = ctx.body.data.map((item) => enrichWebatlasField(item, contentTypeUid));
+        ctx.body.data = await Promise.all(
+          ctx.body.data.map((item) => enrichWebatlasData(item, contentTypeUid))
+        );
       } else {
-        ctx.body.data = enrichWebatlasField(ctx.body.data, contentTypeUid);
+        ctx.body.data = await enrichWebatlasData(ctx.body.data, contentTypeUid);
       }
     } else if (Array.isArray(ctx.body)) {
-      ctx.body = ctx.body.map((item) => enrichWebatlasField(item, contentTypeUid));
+      ctx.body = await Promise.all(ctx.body.map((item) => enrichWebatlasData(item, contentTypeUid)));
     } else if (typeof ctx.body === "object") {
-      ctx.body = enrichWebatlasField(ctx.body, contentTypeUid);
+      ctx.body = await enrichWebatlasData(ctx.body, contentTypeUid);
     }
   };
 };
@@ -6089,17 +6086,9 @@ const client = ({ strapi: strapi2 }) => ({
       if (!entity) return null;
       let cleanEntity = cleanRootKeys(entity);
       cleanEntity = removeWaFields(cleanEntity);
-      const webatlasFields = {
-        path: route2.path,
-        canonicalPath: route2.canonicalPath,
-        slug: route2.slug,
-        uidPath: route2.uidPath
-      };
+      cleanEntity = await enrichWebatlasData(cleanEntity, route2.relatedContentType);
       return {
         contentType: contentType.info.singularName,
-        webatlas: {
-          ...webatlasFields
-        },
         ...cleanEntity
       };
     } catch (e) {
@@ -6182,4 +6171,3 @@ const index = {
   middlewares
 };
 exports.default = index;
-//# sourceMappingURL=index.js.map

package/dist/server/index.mjs

@@ -4662,6 +4662,106 @@ function calculateParentAndOrder({
     calculatedOrder
   };
 }
+async function enrichWebatlasData(data, contentTypeUid) {
+  console.log("Enriching data with webatlas fields...", { contentTypeUid });
+  console.log("Original data:", JSON.stringify(data, null, 2));
+  if (!data || typeof data !== "object") return data;
+  const collectDocumentIds = (obj, uid) => {
+    if (!obj || typeof obj !== "object") return [];
+    const ids = [];
+    if (obj.documentId) ids.push(obj.documentId);
+    if (!uid) return ids;
+    const ct = strapi.contentTypes[uid];
+    if (!ct?.attributes) return ids;
+    for (const [key, attr] of Object.entries(ct.attributes)) {
+      const attribute = attr;
+      if (attribute.type === "relation" && obj[key]) {
+        const targetUid = attribute.target;
+        if (Array.isArray(obj[key])) {
+          ids.push(...obj[key].flatMap((item) => collectDocumentIds(item, targetUid)));
+        } else {
+          ids.push(...collectDocumentIds(obj[key], targetUid));
+        }
+      }
+      if (attribute.type === "component" && obj[key]) {
+        const componentUid = attribute.component;
+        if (Array.isArray(obj[key])) {
+          ids.push(...obj[key].flatMap((item) => collectDocumentIds(item, componentUid)));
+        } else {
+          ids.push(...collectDocumentIds(obj[key], componentUid));
+        }
+      }
+      if (attribute.type === "dynamiczone" && Array.isArray(obj[key])) {
+        ids.push(
+          ...obj[key].flatMap((item) => {
+            if (!item || !item.__component) return [];
+            return collectDocumentIds(item, item.__component);
+          })
+        );
+      }
+    }
+    return ids;
+  };
+  const documentIds = collectDocumentIds(data, contentTypeUid);
+  if (documentIds.length === 0) return data;
+  const uniqueDocumentIds = [...new Set(documentIds)];
+  const routes2 = await strapi.db?.query(waRoute).findMany({
+    where: {
+      relatedDocumentId: { $in: uniqueDocumentIds }
+    },
+    select: ["relatedDocumentId", "relatedContentType", "path", "canonicalPath", "slug", "uidPath"]
+  });
+  const routeMap = new Map(routes2?.map((route2) => [route2.relatedDocumentId, route2]) || []);
+  const enrichEntity = (entity, uid) => {
+    if (!entity || typeof entity !== "object") return entity;
+    const ct = uid ? strapi.contentTypes[uid] : null;
+    const isWebatlasEnabled = ct?.pluginOptions?.webatlas?.enabled === true;
+    if (isWebatlasEnabled && entity.documentId && routeMap.has(entity.documentId)) {
+      const route2 = routeMap.get(entity.documentId);
+      entity.webatlas = {
+        path: route2.path || "",
+        canonicalPath: route2.canonicalPath || "",
+        slug: route2.slug || "",
+        uidPath: route2.uidPath || ""
+      };
+    }
+    if (ct?.attributes) {
+      for (const [key, attr] of Object.entries(ct.attributes)) {
+        const attribute = attr;
+        if (attribute.type === "relation" && entity[key]) {
+          const targetUid = attribute.target;
+          strapi.log.debug("relation found");
+          if (Array.isArray(entity[key])) {
+            entity[key] = entity[key].map(
+              (item) => item ? enrichEntity(item, targetUid) : item
+            );
+          } else {
+            entity[key] = enrichEntity(entity[key], targetUid);
+          }
+        }
+        if (attribute.type === "component" && entity[key]) {
+          const componentUid = attribute.component;
+          if (Array.isArray(entity[key])) {
+            entity[key] = entity[key].map(
+              (item) => item ? enrichEntity(item, componentUid) : item
+            );
+          } else {
+            entity[key] = enrichEntity(entity[key], componentUid);
+          }
+        }
+        if (attribute.type === "dynamiczone" && Array.isArray(entity[key])) {
+          entity[key] = entity[key].map((item) => {
+            if (!item || !item.__component) return item;
+            return enrichEntity(item, item.__component);
+          });
+        }
+      }
+    }
+    strapi.log.debug("finished - returning");
+    return entity;
+  };
+  return enrichEntity(data, contentTypeUid);
+}
 const migration_001_canonical_path = {
   version: "001",
   description: "Migrate title field to canonicalPath using transformToUrl",
@@ -4900,7 +5000,7 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
       const data = context.params.data;
       const { webatlas } = data;
       const { slug, parentDocumentId, isOverride } = webatlas || {};
-      const transformedSlug = slug ? transformToUrl(slug) : null;
+      const transformedSlug = slug ? transformToUrl(slug, !isOverride) : null;
       const result2 = await next();
       if (!transformedSlug) return result2;
       const existing = await strapi2.db?.query(waRoute).findOne({
@@ -4951,7 +5051,10 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
       const { documentId } = context.params;
       const { webatlas } = data;
       const { slug, parentDocumentId, isOverride } = webatlas || {};
-      if (!slug) return;
+      if (!slug) {
+        const result3 = await next();
+        return result3;
+      }
       const relatedRoute = await strapi2.documents(waRoute).findFirst({
         filters: {
           relatedDocumentId: documentId
@@ -4970,7 +5073,7 @@ function documentMiddleware(strapi2, enabledContentTypes, config2) {
           });
         }
       }
-      const transformedSlug = transformToUrl(slug);
+      const transformedSlug = transformToUrl(slug, !isOverride);
       let rawPath = transformedSlug;
       if (!isOverride) rawPath = parent ? `${parent.path}/${transformedSlug}` : transformedSlug;
       const validatedPath = await duplicateCheck(rawPath, relatedRoute?.documentId ?? null);
@@ -5082,124 +5185,18 @@ const addWebatlasField = ({ strapi: strapi2 }) => {
     );
     if (!contentTypeEntry) return;
     const [contentTypeUid, contentType] = contentTypeEntry;
-    const collectDocumentIds = (data, uid = contentTypeUid) => {
-      if (!data || typeof data !== "object") return [];
-      const ids = [];
-      if (data.documentId) {
-        ids.push(data.documentId);
-      }
-      const ct = strapi2.contentTypes[uid];
-      if (ct?.attributes) {
-        for (const [key, attr] of Object.entries(ct.attributes)) {
-          const attribute = attr;
-          if (attribute.type === "relation" && data[key]) {
-            const targetUid = attribute.target;
-            if (Array.isArray(data[key])) {
-              ids.push(...data[key].flatMap((item) => collectDocumentIds(item, targetUid)));
-            } else {
-              ids.push(...collectDocumentIds(data[key], targetUid));
-            }
-          }
-          if (attribute.type === "component" && data[key]) {
-            const componentUid = attribute.component;
-            if (Array.isArray(data[key])) {
-              ids.push(...data[key].flatMap((item) => collectDocumentIds(item, componentUid)));
-            } else {
-              ids.push(...collectDocumentIds(data[key], componentUid));
-            }
-          }
-          if (attribute.type === "dynamiczone" && Array.isArray(data[key])) {
-            ids.push(
-              ...data[key].flatMap((item) => {
-                const componentUid = item.__component;
-                return collectDocumentIds(item, componentUid);
-              })
-            );
-          }
-        }
-      }
-      return ids;
-    };
-    let documentIds = [];
     if (ctx.body.data) {
       if (Array.isArray(ctx.body.data)) {
-        documentIds = ctx.body.data.flatMap((item) => collectDocumentIds(item, contentTypeUid));
-      } else {
-        documentIds = collectDocumentIds(ctx.body.data, contentTypeUid);
-      }
-    } else if (Array.isArray(ctx.body)) {
-      documentIds = ctx.body.flatMap((item) => collectDocumentIds(item, contentTypeUid));
-    } else if (typeof ctx.body === "object") {
-      documentIds = collectDocumentIds(ctx.body, contentTypeUid);
-    }
-    if (documentIds.length === 0) return;
-    const uniqueDocumentIds = [...new Set(documentIds)];
-    const routes2 = await strapi2.db?.query(waRoute).findMany({
-      where: {
-        relatedDocumentId: { $in: uniqueDocumentIds }
-      },
-      select: [
-        "relatedDocumentId",
-        "relatedContentType",
-        "path",
-        "canonicalPath",
-        "slug",
-        "uidPath"
-      ]
-    });
-    const routeMap = new Map(routes2?.map((route2) => [route2.relatedDocumentId, route2]) || []);
-    const enrichWebatlasField = (data, uid = contentTypeUid) => {
-      if (!data || typeof data !== "object") return data;
-      const ct = strapi2.contentTypes[uid];
-      const isWebatlasEnabled = ct?.pluginOptions?.webatlas?.enabled === true;
-      if (isWebatlasEnabled && data.documentId && routeMap.has(data.documentId)) {
-        const route2 = routeMap.get(data.documentId);
-        data.webatlas = {
-          path: route2.path || "",
-          canonicalPath: route2.canonicalPath || "",
-          slug: route2.slug || "",
-          uidPath: route2.uidPath || ""
-        };
-      }
-      if (ct?.attributes) {
-        for (const [key, attr] of Object.entries(ct.attributes)) {
-          const attribute = attr;
-          if (attribute.type === "relation" && data[key]) {
-            const targetUid = attribute.target;
-            if (Array.isArray(data[key])) {
-              data[key] = data[key].map((item) => enrichWebatlasField(item, targetUid));
-            } else {
-              data[key] = enrichWebatlasField(data[key], targetUid);
-            }
-          }
-          if (attribute.type === "component" && data[key]) {
-            const componentUid = attribute.component;
-            if (Array.isArray(data[key])) {
-              data[key] = data[key].map((item) => enrichWebatlasField(item, componentUid));
-            } else {
-              data[key] = enrichWebatlasField(data[key], componentUid);
-            }
-          }
-          if (attribute.type === "dynamiczone" && Array.isArray(data[key])) {
-            data[key] = data[key].map((item) => {
-              const componentUid = item.__component;
-              return enrichWebatlasField(item, componentUid);
-            });
-          }
-        }
-      }
-      return data;
-    };
-    if (ctx.body.data) {
-      if (Array.isArray(ctx.body.data)) {
-        ctx.body.data = ctx.body.data.map((item) => enrichWebatlasField(item, contentTypeUid));
+        ctx.body.data = await Promise.all(
+          ctx.body.data.map((item) => enrichWebatlasData(item, contentTypeUid))
+        );
       } else {
-        ctx.body.data = enrichWebatlasField(ctx.body.data, contentTypeUid);
+        ctx.body.data = await enrichWebatlasData(ctx.body.data, contentTypeUid);
       }
     } else if (Array.isArray(ctx.body)) {
-      ctx.body = ctx.body.map((item) => enrichWebatlasField(item, contentTypeUid));
+      ctx.body = await Promise.all(ctx.body.map((item) => enrichWebatlasData(item, contentTypeUid)));
     } else if (typeof ctx.body === "object") {
-      ctx.body = enrichWebatlasField(ctx.body, contentTypeUid);
+      ctx.body = await enrichWebatlasData(ctx.body, contentTypeUid);
     }
   };
 };
@@ -6087,17 +6084,9 @@ const client = ({ strapi: strapi2 }) => ({
       if (!entity) return null;
       let cleanEntity = cleanRootKeys(entity);
       cleanEntity = removeWaFields(cleanEntity);
-      const webatlasFields = {
-        path: route2.path,
-        canonicalPath: route2.canonicalPath,
-        slug: route2.slug,
-        uidPath: route2.uidPath
-      };
+      cleanEntity = await enrichWebatlasData(cleanEntity, route2.relatedContentType);
       return {
         contentType: contentType.info.singularName,
-        webatlas: {
-          ...webatlasFields
-        },
         ...cleanEntity
       };
     } catch (e) {
@@ -6182,4 +6171,3 @@ const index = {
 export {
   index as default
 };
-//# sourceMappingURL=index.mjs.map