@elytracms/next 0.0.83 → 0.0.85

package/dist/index.js

@@ -2,6 +2,7 @@ import { ComponentRegistry } from '@elytracms/core/component-registry';
 export { defineComponent } from '@elytracms/core/component-registry';
 import { basePrimitives, getImplementation, renderDocumentBodyItems, documentBodyItems, ImageManifest, serializeListingQuery, RenderErrorBoundary, documentBodyRichTextValues, documentBodyCompositionNodes, richTextEmbedsInValue, collectReferencedAssetIds, collectRichTextRefsInValue, collectReferencedRelations, collectReferencedListings, collectReferencedRichTextLinks, normalizeImageSource } from '@elytracms/core/runtime-renderer';
 import { isValidElement } from 'react';
+import { isBlockSequenceValueShape } from '@elytracms/core/rich-text';
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { cacheTags, isSectionSourceId, parseCmsSourceQueryConfig, listQueryOfCmsConfig, isDocumentHistory, resolvedAsset, createContentClient, createContentContext } from '@elytracms/core/content';
 import { documentKey, splitLocalePath, hierarchyMount, composePath, localeUrlPath, mergeRouteRecords, fallbackHomeRoutes, presentationBodyFields, splitPath, documentSchema, redirectRecordSchema } from '@elytracms/core/cms-core';
@@ -160,10 +161,11 @@ function bodyItemsOf(document, presentation) {
 }
 function compositionOf(document) {
   const body = document["body"];
-  if (Array.isArray(body) || isComponentNodeValue(body)) return body;
+  if (isCompositionishSequence(body) || Array.isArray(body) || isComponentNodeValue(body)) return body;
   const content = document["content"];
-  if (Array.isArray(content) || isComponentNodeValue(content)) return content;
+  if (isCompositionishSequence(content) || Array.isArray(content) || isComponentNodeValue(content)) return content;
   for (const value of Object.values(document)) {
+    if (isCompositionishSequence(value)) return value;
     if (isComponentNodeValue(value)) return value;
     if (Array.isArray(value) && value.length > 0 && value.every(isComponentNodeValue)) return value;
   }
@@ -172,6 +174,11 @@ function compositionOf(document) {
 function compositionNodesOf(document, presentation) {
   return documentBodyCompositionNodes(bodyItemsOf(document, presentation));
 }
+function isCompositionishSequence(value) {
+  return isBlockSequenceValueShape(value) && value.content.some(
+    (node) => typeof node === "object" && node !== null && node.type === "elytra/component"
+  );
+}
 function isComponentNodeValue(value) {
   return typeof value === "object" && value !== null && typeof value.id === "string" && typeof value.componentId === "string";
 }