@contentful/experiences-core 1.26.1-prerelease-20241211T1921-aab05f6.0 → 1.27.0-prerelease-20241213T0010-0475c78.0

package/dist/entity/EntityStore.d.ts

@@ -12,6 +12,7 @@ type EntityStoreArgs = {
 declare class EntityStore extends EntityStoreBase {
     private _experienceEntry;
     private _unboundValues;
+    private _usedComponentsWithDeepReferences;
     constructor(json: string);
     constructor({ experienceEntry, entities, locale }: EntityStoreArgs);
     getCurrentLocale(): string;
@@ -34,13 +35,7 @@ declare class EntityStore extends EntityStoreBase {
     get unboundValues(): Record<string, {
         value?: string | number | boolean | Record<any, any> | undefined;
     }>;
-    get usedComponents(): {
-        sys: {
-            type: "Link";
-            id: string;
-            linkType: "Entry";
-        };
-    }[] | ExperienceEntry[];
+    get usedComponents(): ExperienceEntry[];
     /**
      * Extend the existing set of unbound values with the ones from the assembly definition.
      * When creating a new assembly out of a container, the unbound value keys are copied and

package/dist/index.js

@@ -1560,7 +1560,7 @@ const detachExperienceStyles = (experience) => {
             if (!currentNode) {
                 break;
             }
-            const usedComponents = experience.entityStore?.experienceEntryFields?.usedComponents ?? [];
+            const usedComponents = experience.entityStore?.usedComponents ?? [];
             const isPatternNode = checkIsAssemblyNode({
                 componentId: currentNode.definitionId,
                 usedComponents,
@@ -1825,7 +1825,8 @@ const resolveBackgroundImageBinding = ({ variableData, getBoundEntityById, dataS
         const defaultValueKey = variableDefinition.defaultValue?.key;
         const defaultValue = unboundValues[defaultValueKey].value;
         const userSetValue = componentVariablesOverwrites?.[variableDefinitionKey];
-        if (!userSetValue) {
+        // userSetValue is a ComponentValue we can safely return the default value
+        if (!userSetValue || userSetValue.type === 'ComponentValue') {
             return defaultValue;
         }
         // at this point userSetValue will either be type of 'DesignValue' or 'BoundValue'
@@ -2023,21 +2024,31 @@ const transformRichText = (entryOrAsset, entityStore, path) => {
         };
     }
     if (typeof value === 'object' && value.nodeType === BLOCKS.DOCUMENT) {
-        //resolve any embedded links - we currently only support resolving embedded in the first entry
+        // resolve any links to assets/entries/hyperlinks
         const richTextDocument = value;
-        richTextDocument.content.forEach((node) => {
-            if ((node.nodeType === BLOCKS.EMBEDDED_ENTRY || node.nodeType === BLOCKS.EMBEDDED_ASSET) &&
-                node.data.target.sys.type === 'Link') {
-                const entity = entityStore.getEntityFromLink(node.data.target);
-                if (entity) {
-                    node.data.target = entity;
-                }
-            }
-        });
-        return value;
+        resolveLinks(richTextDocument, entityStore);
+        return richTextDocument;
     }
     return undefined;
 };
+const isLinkTarget = (node) => {
+    return node?.data?.target?.sys?.type === 'Link';
+};
+const resolveLinks = (node, entityStore) => {
+    if (!node)
+        return;
+    // Resolve link if current node has one
+    if (isLinkTarget(node)) {
+        const entity = entityStore.getEntityFromLink(node.data.target);
+        if (entity) {
+            node.data.target = entity;
+        }
+    }
+    // Process content array if it exists
+    if ('content' in node && Array.isArray(node.content)) {
+        node.content.forEach((childNode) => resolveLinks(childNode, entityStore));
+    }
+};
 
 function getOptimizedImageUrl(url, width, quality, format) {
     if (url.startsWith('//')) {
@@ -3114,6 +3125,21 @@ class EditorModeEntityStore extends EditorEntityStore {
     }
 }
 
+const gatherUsedComponentsWithDeepRefernces = (experienceEntryFields) => {
+    const usedComponentDeepReferences = [];
+    const usedComponents = experienceEntryFields?.usedComponents;
+    if (!usedComponents || usedComponents.length === 0) {
+        return [];
+    }
+    for (const component of usedComponents) {
+        if ('fields' in component) {
+            usedComponentDeepReferences.push(component);
+            usedComponentDeepReferences.push(...gatherUsedComponentsWithDeepRefernces(component.fields));
+        }
+    }
+    return usedComponentDeepReferences;
+};
+
 class EntityStore extends EntityStoreBase {
     constructor(options) {
         if (typeof options === 'string') {
@@ -3128,6 +3154,7 @@ class EntityStore extends EntityStoreBase {
             });
             this._experienceEntry = _experienceEntry;
             this._unboundValues = _unboundValues;
+            this._usedComponentsWithDeepReferences = gatherUsedComponentsWithDeepRefernces(this._experienceEntry);
         }
         else {
             const { experienceEntry, entities, locale } = options;
@@ -3135,6 +3162,7 @@ class EntityStore extends EntityStoreBase {
             if (isExperienceEntry(experienceEntry)) {
                 this._experienceEntry = experienceEntry.fields;
                 this._unboundValues = experienceEntry.fields.unboundValues;
+                this._usedComponentsWithDeepReferences = gatherUsedComponentsWithDeepRefernces(this._experienceEntry);
             }
             else {
                 throw new Error('Provided entry is not experience entry');
@@ -3160,7 +3188,7 @@ class EntityStore extends EntityStoreBase {
         return this._unboundValues ?? {};
     }
     get usedComponents() {
-        return this._experienceEntry?.usedComponents ?? [];
+        return this._usedComponentsWithDeepReferences ?? [];
     }
     /**
      * Extend the existing set of unbound values with the ones from the assembly definition.
@@ -3238,6 +3266,7 @@ const fetchExperienceEntry = async ({ client, experienceTypeId, locale, identifi
     const entries = await client.getEntries({
         content_type: experienceTypeId,
         locale,
+        include: 3, // fetching max 3 level deep references due to nested patterns
         ...filter,
     });
     if (entries.items.length > 1) {