@decocms/blocks 7.20.5 → 7.20.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks",
-  "version": "7.20.5",
+  "version": "7.20.7",
   "type": "module",
   "engines": {
     "node": ">=24"

package/src/cms/schema.test.ts

@@ -237,3 +237,24 @@ describe("composeMeta framework option", () => {
     expect(meta.manifest.blocks.pages).toHaveProperty("website/pages/Page.tsx");
   });
 });
+
+describe("composeMeta idempotency", () => {
+  it("returns an already-composed meta unchanged (no double-compose)", () => {
+    const once = composeMeta(emptySiteMeta());
+    const twice = composeMeta(once);
+    // The sentinel is the top-level `framework` field, which only composeMeta
+    // sets — re-composing must be a no-op, returning the same object.
+    expect(twice).toBe(once);
+  });
+
+  it("does not duplicate framework section refs when re-composed", () => {
+    // Simulate the tanstack runtime path: a self-contained meta.gen.json (baked
+    // at gen time) is loaded from disk and composeMeta runs again on top of it.
+    const composed = composeMeta(emptySiteMeta());
+    const sectionsAnyOf = composed.schema.root.sections.anyOf;
+    const recomposed = composeMeta(composed);
+    // Without the guard, framework section refs (Lazy/Seo/…) would be appended
+    // to root.sections.anyOf a second time.
+    expect(recomposed.schema.root.sections.anyOf).toHaveLength(sectionsAnyOf.length);
+  });
+});

package/src/cms/schema.ts

@@ -1007,6 +1007,20 @@ export function composeMeta(
   siteMeta: MetaResponse,
   options?: ComposeMetaOptions,
 ): MetaResponse {
+  // Idempotency guard. composeMeta is NOT structurally idempotent — it appends
+  // the framework section refs to `root.sections.anyOf` (and `__SECTION_REF__`),
+  // so composing an already-composed meta a second time duplicates those refs.
+  // Since self-contained meta.gen.json is now baked at generation time (via the
+  // CLI's --compose), the tanstack runtime re-runs composeMeta on the file it
+  // loads from disk. A composed meta always carries a top-level `framework`
+  // field, which raw generateMeta() output never sets — use it as the sentinel
+  // and return the already-composed meta unchanged. Raw metas (framework unset,
+  // e.g. sites generated by an older CLI) still compose normally, so this stays
+  // backward compatible.
+  if (siteMeta.framework) {
+    return siteMeta;
+  }
+
   const siteAnyOf = siteMeta.schema?.root?.sections?.anyOf || [];
 
   // Build all framework components