@webiny/website-builder-sdk 0.0.0-unstable.a4f3e4ea8b → 0.0.0-unstable.a85ef555b2

package/contentClientState.test.js

@@ -0,0 +1,384 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createContentClient } from "./createContentClient.js";
+import { ContentSdk, contentSdk } from "./ContentSdk.js";
+import { componentRegistry } from "./ComponentRegistry.js";
+import { contentEntryCache } from "./contentEntry/ContentEntryCache.js";
+import { DEFAULT_MAX_DOCUMENT_STORES, DocumentStoreManager, documentStoreManager } from "./DocumentStoreManager.js";
+import { resolveVisitorContext } from "./experiments/render.js";
+import { setHeadersProvider } from "./headersProvider.js";
+import { setDefaultComponentLoader } from "./componentLoader/defaultComponentLoader.js";
+const componentLabels = {
+    "tenant-a": "Hero from tenant A",
+    "tenant-b": "Hero from tenant B"
+};
+const configFor = (tenant)=>({
+        apiHost: `https://${tenant}.example.com`,
+        apiKey: `key-${tenant}`,
+        apiTenant: tenant
+    });
+const createBlueprint = (name, label)=>({
+        component: ()=>label,
+        manifest: {
+            name,
+            label,
+            inputs: [
+                {
+                    type: "contentEntry",
+                    name: "entry",
+                    renderer: "Webiny/ContentEntry",
+                    models: [
+                        "article"
+                    ]
+                }
+            ],
+            tags: []
+        }
+    });
+const createDocument = (componentName)=>({
+        id: "page-1",
+        version: 1,
+        state: {},
+        properties: {
+            id: "page-1",
+            path: "/"
+        },
+        extensions: {},
+        metadata: {},
+        bindings: {},
+        elements: {
+            root: {
+                type: "Webiny/Element",
+                id: "root",
+                component: {
+                    name: componentName
+                }
+            }
+        }
+    });
+const tenantComponentLoader = ({ apiClient })=>({
+        async loadComponent (ref) {
+            const data = await apiClient.query({
+                query: "query LoadComponent($name: String!) { component(name: $name) { label } }",
+                variables: {
+                    name: ref.name
+                }
+            });
+            return createBlueprint(ref.name, data.component.label);
+        }
+    });
+const resolveLabel = (client, document)=>{
+    const resolved = client.resolveElement({
+        element: document.elements.root,
+        elementBindings: {},
+        state: document.state
+    });
+    if (!resolved) return null;
+    return {
+        label: resolved[0].manifest.label,
+        entry: resolved[0].inputs.entry
+    };
+};
+describe("content client state", ()=>{
+    let requestedTenants;
+    let requestedPageIds;
+    beforeEach(()=>{
+        requestedTenants = [];
+        requestedPageIds = {};
+        const fetchMock = vi.fn(async (_url, init)=>{
+            const headers = init.headers;
+            const tenant = headers["X-Tenant"];
+            const body = JSON.parse(init.body);
+            requestedTenants.push(tenant);
+            const delay = "tenant-a" === tenant ? 20 : 0;
+            await new Promise((resolve)=>setTimeout(resolve, delay));
+            if (body.query.includes("getPageById")) {
+                const id = body.variables.id;
+                requestedPageIds[tenant] = [
+                    ...requestedPageIds[tenant] ?? [],
+                    id
+                ];
+                const page = {
+                    id,
+                    properties: {
+                        id,
+                        path: "/",
+                        title: `Draft of ${tenant}`
+                    }
+                };
+                return {
+                    json: async ()=>({
+                            data: {
+                                websiteBuilder: {
+                                    getPageById: {
+                                        data: page,
+                                        error: null
+                                    }
+                                }
+                            }
+                        })
+                };
+            }
+            return {
+                json: async ()=>({
+                        data: {
+                            component: {
+                                label: componentLabels[tenant]
+                            }
+                        }
+                    })
+            };
+        });
+        vi.stubGlobal("fetch", fetchMock);
+    });
+    afterEach(()=>{
+        vi.unstubAllGlobals();
+    });
+    it("resolves same-name components and entries per client, concurrently", async ()=>{
+        const name = "Acme/Hero";
+        const document = createDocument(name);
+        const clientA = createContentClient({
+            ...configFor("tenant-a"),
+            componentLoader: tenantComponentLoader
+        });
+        const clientB = createContentClient({
+            ...configFor("tenant-b"),
+            componentLoader: tenantComponentLoader
+        });
+        clientA.getContentEntryCache().set("root:entry", {
+            id: "entry-a"
+        });
+        clientB.getContentEntryCache().set("root:entry", {
+            id: "entry-b"
+        });
+        const render = async (client)=>{
+            await client.loadDocumentComponents(document);
+            return resolveLabel(client, document);
+        };
+        const [resultA, resultB] = await Promise.all([
+            render(clientA),
+            render(clientB)
+        ]);
+        expect(requestedTenants.sort()).toEqual([
+            "tenant-a",
+            "tenant-b"
+        ]);
+        expect(resultA).toEqual({
+            label: "Hero from tenant A",
+            entry: {
+                id: "entry-a"
+            }
+        });
+        expect(resultB).toEqual({
+            label: "Hero from tenant B",
+            entry: {
+                id: "entry-b"
+            }
+        });
+        expect(componentRegistry.get(name)).toBeUndefined();
+        expect(contentEntryCache.has("root:entry")).toBe(false);
+    });
+    it("keeps the singleton and clients apart, and init() doesn't touch clients", ()=>{
+        const name = "Acme/SingletonOnly";
+        const client = createContentClient(configFor("tenant-a"));
+        contentSdk.init(configFor("tenant-root"));
+        contentSdk.registerComponent(createBlueprint(name, "Singleton component"));
+        expect(componentRegistry.get(name)).toBeDefined();
+        expect(client.getComponentRegistry().get(name)).toBeUndefined();
+        expect(resolveLabel(client, createDocument(name))).toBeNull();
+        client.registerComponent(createBlueprint("Acme/ClientOnly", "Client component"));
+        expect(componentRegistry.get("Acme/ClientOnly")).toBeUndefined();
+        contentSdk.init(configFor("tenant-other"));
+        expect(client.getComponentRegistry().get("Acme/ClientOnly")).toBeDefined();
+        expect(resolveLabel(contentSdk, createDocument(name))?.label).toBe("Singleton component");
+    });
+    it("uses the module-level state for contentSdk and a plain new ContentSdk(), as before", ()=>{
+        const sdk = new ContentSdk();
+        expect(contentSdk.getComponentRegistry()).toBe(componentRegistry);
+        expect(contentSdk.getContentEntryCache()).toBe(contentEntryCache);
+        expect(contentSdk.getDocumentStoreManager()).toBe(documentStoreManager);
+        expect(sdk.getComponentRegistry()).toBe(componentRegistry);
+        expect(sdk.getContentEntryCache()).toBe(contentEntryCache);
+        expect(sdk.getDocumentStoreManager()).toBe(documentStoreManager);
+        const client = createContentClient(configFor("tenant-a"));
+        expect(client.getComponentRegistry()).not.toBe(componentRegistry);
+        expect(client.getContentEntryCache()).not.toBe(contentEntryCache);
+        expect(client.getDocumentStoreManager()).not.toBe(documentStoreManager);
+    });
+    it("still requires init() on the singleton path", ()=>{
+        const sdk = new ContentSdk();
+        expect(()=>sdk.registerComponent(createBlueprint("Acme/X", "X"))).toThrow("ContentSdk has not been initialized!");
+    });
+    it("calls a custom loader with the refs of unregistered components only", async ()=>{
+        const refs = [];
+        const loader = {
+            async loadComponent (ref) {
+                refs.push(ref);
+                return createBlueprint(ref.name, `Loaded ${ref.name}`);
+            }
+        };
+        const client = createContentClient({
+            ...configFor("tenant-a"),
+            componentLoader: ()=>loader
+        });
+        client.registerComponent(createBlueprint("Acme/Registered", "Registered"));
+        const document = createDocument("Acme/Remote");
+        document.elements.second = {
+            type: "Webiny/Element",
+            id: "second",
+            component: {
+                name: "Acme/Registered"
+            }
+        };
+        document.elements.third = {
+            type: "Webiny/Element",
+            id: "third",
+            component: {
+                name: "Acme/Remote"
+            }
+        };
+        await client.loadDocumentComponents(document);
+        expect(refs).toEqual([
+            {
+                name: "Acme/Remote"
+            }
+        ]);
+        expect(resolveLabel(client, document)?.label).toBe("Loaded Acme/Remote");
+        await client.loadDocumentComponents(document);
+        expect(refs).toHaveLength(1);
+    });
+    it("uses the default loader, created per client with its own config", async ()=>{
+        const tenants = [];
+        setDefaultComponentLoader(({ config })=>{
+            tenants.push(config.apiTenant);
+            return {
+                async loadComponent (ref) {
+                    return createBlueprint(ref.name, `Default for ${config.apiTenant}`);
+                }
+            };
+        });
+        try {
+            const document = createDocument("Acme/FromDefault");
+            const clientA = createContentClient(configFor("tenant-a"));
+            const clientB = createContentClient(configFor("tenant-b"));
+            await Promise.all([
+                clientA.loadDocumentComponents(document),
+                clientB.loadDocumentComponents(document)
+            ]);
+            expect(tenants.sort()).toEqual([
+                "tenant-a",
+                "tenant-b"
+            ]);
+            expect(resolveLabel(clientA, document)?.label).toBe("Default for tenant-a");
+            expect(resolveLabel(clientB, document)?.label).toBe("Default for tenant-b");
+        } finally{
+            setDefaultComponentLoader(void 0);
+        }
+    });
+    it("prefers the client's own loader over the default", async ()=>{
+        const defaultLoad = vi.fn();
+        setDefaultComponentLoader(()=>({
+                loadComponent: defaultLoad
+            }));
+        try {
+            const client = createContentClient({
+                ...configFor("tenant-a"),
+                componentLoader: ()=>({
+                        async loadComponent (ref) {
+                            return createBlueprint(ref.name, "Own loader");
+                        }
+                    })
+            });
+            const document = createDocument("Acme/Own");
+            await client.loadDocumentComponents(document);
+            expect(defaultLoad).not.toHaveBeenCalled();
+            expect(resolveLabel(client, document)?.label).toBe("Own loader");
+        } finally{
+            setDefaultComponentLoader(void 0);
+        }
+    });
+    it("fetches preview pages through each client, with the client's preview headers", async ()=>{
+        const previewClient = (tenant, pageId)=>createContentClient({
+                ...configFor(tenant),
+                preview: true,
+                headersProvider: async ()=>new Headers({
+                        "X-Preview-Params": `wb.type=page&wb.path=/&wb.id=${pageId}`
+                    })
+            });
+        const clientA = previewClient("tenant-a", "draft-a");
+        const clientB = previewClient("tenant-b", "draft-b");
+        const [pageA, pageB] = await Promise.all([
+            clientA.getPage("/"),
+            clientB.getPage("/")
+        ]);
+        expect(clientA.isPreviewing()).toBe(true);
+        expect(requestedPageIds).toEqual({
+            "tenant-a": [
+                "draft-a"
+            ],
+            "tenant-b": [
+                "draft-b"
+            ]
+        });
+        expect(pageA?.properties.title).toBe("Draft of tenant-a");
+        expect(pageB?.properties.title).toBe("Draft of tenant-b");
+    });
+    it("falls back to the global headers provider for preview, as before", async ()=>{
+        setHeadersProvider(async ()=>new Headers({
+                "X-Preview-Params": "wb.type=page&wb.path=/&wb.id=draft-global"
+            }));
+        const client = createContentClient({
+            ...configFor("tenant-b"),
+            preview: true
+        });
+        const page = await client.getPage("/");
+        expect(requestedPageIds).toEqual({
+            "tenant-b": [
+                "draft-global"
+            ]
+        });
+        expect(page?.properties.title).toBe("Draft of tenant-b");
+    });
+    it("loads nothing without a loader or a default", async ()=>{
+        const client = createContentClient(configFor("tenant-a"));
+        const document = createDocument("Acme/Unknown");
+        await client.loadDocumentComponents(document);
+        expect(requestedTenants).toEqual([]);
+        expect(resolveLabel(client, document)).toBeNull();
+    });
+    it("bounds the document stores and evicts the least recently used one", ()=>{
+        const stores = new DocumentStoreManager({
+            maxEntries: 2
+        });
+        const first = stores.getStore("a");
+        stores.getStore("b");
+        expect(stores.getStore("a")).toBe(first);
+        stores.getStore("c");
+        expect(stores.hasStore("a")).toBe(true);
+        expect(stores.hasStore("b")).toBe(false);
+        expect(stores.hasStore("c")).toBe(true);
+        expect(stores.getStores().size).toBe(2);
+        stores.clear();
+        expect(stores.getStores().size).toBe(0);
+    });
+    it("keeps every store below the default bound", ()=>{
+        const stores = new DocumentStoreManager();
+        for(let i = 0; i < 1000; i++)stores.getStore(`page-${i}`);
+        expect(stores.getStores().size).toBe(1000);
+        expect(DEFAULT_MAX_DOCUMENT_STORES).toBe(10000);
+    });
+    it("reads request headers from the client's provider, else the global one", async ()=>{
+        setHeadersProvider(async ()=>new Headers({
+                cookie: "wb_ab_vid=global-visitor"
+            }));
+        const fromGlobal = await resolveVisitorContext();
+        expect(fromGlobal.context.visitorId).toBe("global-visitor");
+        const fromOption = await resolveVisitorContext({
+            headersProvider: async ()=>new Headers({
+                    cookie: "wb_ab_vid=client-visitor"
+                })
+        });
+        expect(fromOption.context.visitorId).toBe("client-visitor");
+    });
+});
+
+//# sourceMappingURL=contentClientState.test.js.map

package/contentClientState.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contentClientState.test.js","sources":["../src/contentClientState.test.ts"],"sourcesContent":["import { describe, it, expect, beforeEach, afterEach, vi } from \"vitest\";\nimport { createContentClient } from \"./createContentClient.js\";\nimport { ContentSdk, contentSdk } from \"./ContentSdk.js\";\nimport type { ContentSDKConfig } from \"./ContentSdk.js\";\nimport { componentRegistry } from \"./ComponentRegistry.js\";\nimport { contentEntryCache } from \"./contentEntry/ContentEntryCache.js\";\nimport { documentStoreManager } from \"./DocumentStoreManager.js\";\nimport { DocumentStoreManager } from \"./DocumentStoreManager.js\";\nimport { DEFAULT_MAX_DOCUMENT_STORES } from \"./DocumentStoreManager.js\";\nimport type { ComponentLoader } from \"./componentLoader/ComponentLoader.js\";\nimport type { Component, Document, ElementComponent } from \"./types.js\";\nimport { resolveVisitorContext } from \"./experiments/render.js\";\nimport { setHeadersProvider } from \"./headersProvider.js\";\nimport { setDefaultComponentLoader } from \"./componentLoader/defaultComponentLoader.js\";\n\n// What the stubbed API returns for a component, per tenant.\nconst componentLabels: Record<string, string> = {\n    \"tenant-a\": \"Hero from tenant A\",\n    \"tenant-b\": \"Hero from tenant B\"\n};\n\nconst configFor = (tenant: string): ContentSDKConfig => {\n    return {\n        apiHost: `https://${tenant}.example.com`,\n        apiKey: `key-${tenant}`,\n        apiTenant: tenant\n    };\n};\n\nconst createBlueprint = (name: string, label: string): Component => {\n    return {\n        component: () => label,\n        manifest: {\n            name,\n            label,\n            inputs: [\n                {\n                    type: \"contentEntry\",\n                    name: \"entry\",\n                    renderer: \"Webiny/ContentEntry\",\n                    models: [\"article\"]\n                }\n            ],\n            tags: []\n        }\n    };\n};\n\nconst createDocument = (componentName: string): Document => {\n    return {\n        id: \"page-1\",\n        version: 1,\n        state: {},\n        properties: { id: \"page-1\", path: \"/\" },\n        extensions: {},\n        metadata: {} as Document[\"metadata\"],\n        bindings: {},\n        elements: {\n            root: {\n                type: \"Webiny/Element\",\n                id: \"root\",\n                component: { name: componentName }\n            }\n        }\n    };\n};\n\n// A loader that fetches the component through the client's own API client.\nconst tenantComponentLoader: NonNullable<ContentSDKConfig[\"componentLoader\"]> = ({ apiClient }) => {\n    return {\n        async loadComponent(ref: ElementComponent) {\n            const data = await apiClient.query({\n                query: \"query LoadComponent($name: String!) { component(name: $name) { label } }\",\n                variables: { name: ref.name }\n            });\n            return createBlueprint(ref.name, data.component.label);\n        }\n    };\n};\n\nconst resolveLabel = (client: Pick<ContentSdk, \"resolveElement\">, document: Document) => {\n    const resolved = client.resolveElement({\n        element: document.elements.root,\n        elementBindings: {},\n        state: document.state\n    });\n    if (!resolved) {\n        return null;\n    }\n    return { label: resolved[0].manifest.label, entry: resolved[0].inputs.entry };\n};\n\ndescribe(\"content client state\", () => {\n    let requestedTenants: string[];\n    let requestedPageIds: Record<string, string[]>;\n\n    beforeEach(() => {\n        requestedTenants = [];\n        requestedPageIds = {};\n\n        const fetchMock = vi.fn(async (_url: string, init: RequestInit) => {\n            const headers = init.headers as Record<string, string>;\n            const tenant = headers[\"X-Tenant\"];\n            const body = JSON.parse(init.body as string);\n            requestedTenants.push(tenant);\n\n            // Tenant A answers last, so the two loads interleave.\n            const delay = tenant === \"tenant-a\" ? 20 : 0;\n            await new Promise(resolve => setTimeout(resolve, delay));\n\n            if (body.query.includes(\"getPageById\")) {\n                const id: string = body.variables.id;\n                requestedPageIds[tenant] = [...(requestedPageIds[tenant] ?? []), id];\n                const page = { id, properties: { id, path: \"/\", title: `Draft of ${tenant}` } };\n                return {\n                    json: async () => ({\n                        data: { websiteBuilder: { getPageById: { data: page, error: null } } }\n                    })\n                };\n            }\n\n            return {\n                json: async () => ({ data: { component: { label: componentLabels[tenant] } } })\n            };\n        });\n\n        vi.stubGlobal(\"fetch\", fetchMock);\n    });\n\n    afterEach(() => {\n        vi.unstubAllGlobals();\n    });\n\n    it(\"resolves same-name components and entries per client, concurrently\", async () => {\n        const name = \"Acme/Hero\";\n        const document = createDocument(name);\n\n        const clientA = createContentClient({\n            ...configFor(\"tenant-a\"),\n            componentLoader: tenantComponentLoader\n        });\n        const clientB = createContentClient({\n            ...configFor(\"tenant-b\"),\n            componentLoader: tenantComponentLoader\n        });\n\n        clientA.getContentEntryCache().set(\"root:entry\", { id: \"entry-a\" });\n        clientB.getContentEntryCache().set(\"root:entry\", { id: \"entry-b\" });\n\n        const render = async (client: typeof clientA) => {\n            await client.loadDocumentComponents(document);\n            return resolveLabel(client, document);\n        };\n\n        const [resultA, resultB] = await Promise.all([render(clientA), render(clientB)]);\n\n        expect(requestedTenants.sort()).toEqual([\"tenant-a\", \"tenant-b\"]);\n        expect(resultA).toEqual({ label: \"Hero from tenant A\", entry: { id: \"entry-a\" } });\n        expect(resultB).toEqual({ label: \"Hero from tenant B\", entry: { id: \"entry-b\" } });\n\n        // Nothing reached the singleton's state.\n        expect(componentRegistry.get(name)).toBeUndefined();\n        expect(contentEntryCache.has(\"root:entry\")).toBe(false);\n    });\n\n    it(\"keeps the singleton and clients apart, and init() doesn't touch clients\", () => {\n        const name = \"Acme/SingletonOnly\";\n        const client = createContentClient(configFor(\"tenant-a\"));\n\n        contentSdk.init(configFor(\"tenant-root\"));\n        contentSdk.registerComponent(createBlueprint(name, \"Singleton component\"));\n\n        expect(componentRegistry.get(name)).toBeDefined();\n        expect(client.getComponentRegistry().get(name)).toBeUndefined();\n        expect(resolveLabel(client, createDocument(name))).toBeNull();\n\n        client.registerComponent(createBlueprint(\"Acme/ClientOnly\", \"Client component\"));\n        expect(componentRegistry.get(\"Acme/ClientOnly\")).toBeUndefined();\n\n        contentSdk.init(configFor(\"tenant-other\"));\n        expect(client.getComponentRegistry().get(\"Acme/ClientOnly\")).toBeDefined();\n        expect(resolveLabel(contentSdk, createDocument(name))?.label).toBe(\"Singleton component\");\n    });\n\n    it(\"uses the module-level state for contentSdk and a plain new ContentSdk(), as before\", () => {\n        const sdk = new ContentSdk();\n\n        expect(contentSdk.getComponentRegistry()).toBe(componentRegistry);\n        expect(contentSdk.getContentEntryCache()).toBe(contentEntryCache);\n        expect(contentSdk.getDocumentStoreManager()).toBe(documentStoreManager);\n        expect(sdk.getComponentRegistry()).toBe(componentRegistry);\n        expect(sdk.getContentEntryCache()).toBe(contentEntryCache);\n        expect(sdk.getDocumentStoreManager()).toBe(documentStoreManager);\n\n        const client = createContentClient(configFor(\"tenant-a\"));\n        expect(client.getComponentRegistry()).not.toBe(componentRegistry);\n        expect(client.getContentEntryCache()).not.toBe(contentEntryCache);\n        expect(client.getDocumentStoreManager()).not.toBe(documentStoreManager);\n    });\n\n    it(\"still requires init() on the singleton path\", () => {\n        const sdk = new ContentSdk();\n        expect(() => sdk.registerComponent(createBlueprint(\"Acme/X\", \"X\"))).toThrow(\n            \"ContentSdk has not been initialized!\"\n        );\n    });\n\n    it(\"calls a custom loader with the refs of unregistered components only\", async () => {\n        const refs: ElementComponent[] = [];\n        const loader: ComponentLoader = {\n            async loadComponent(ref) {\n                refs.push(ref);\n                return createBlueprint(ref.name, `Loaded ${ref.name}`);\n            }\n        };\n\n        const client = createContentClient({\n            ...configFor(\"tenant-a\"),\n            componentLoader: () => loader\n        });\n        client.registerComponent(createBlueprint(\"Acme/Registered\", \"Registered\"));\n\n        const document = createDocument(\"Acme/Remote\");\n        document.elements.second = {\n            type: \"Webiny/Element\",\n            id: \"second\",\n            component: { name: \"Acme/Registered\" }\n        };\n        document.elements.third = {\n            type: \"Webiny/Element\",\n            id: \"third\",\n            component: { name: \"Acme/Remote\" }\n        };\n\n        await client.loadDocumentComponents(document);\n        expect(refs).toEqual([{ name: \"Acme/Remote\" }]);\n        expect(resolveLabel(client, document)?.label).toBe(\"Loaded Acme/Remote\");\n\n        // Registered now, so the loader isn't asked again.\n        await client.loadDocumentComponents(document);\n        expect(refs).toHaveLength(1);\n    });\n\n    it(\"uses the default loader, created per client with its own config\", async () => {\n        const tenants: string[] = [];\n        setDefaultComponentLoader(({ config }) => {\n            tenants.push(config.apiTenant);\n            return {\n                async loadComponent(ref) {\n                    return createBlueprint(ref.name, `Default for ${config.apiTenant}`);\n                }\n            };\n        });\n\n        try {\n            const document = createDocument(\"Acme/FromDefault\");\n            const clientA = createContentClient(configFor(\"tenant-a\"));\n            const clientB = createContentClient(configFor(\"tenant-b\"));\n\n            await Promise.all([\n                clientA.loadDocumentComponents(document),\n                clientB.loadDocumentComponents(document)\n            ]);\n\n            expect(tenants.sort()).toEqual([\"tenant-a\", \"tenant-b\"]);\n            expect(resolveLabel(clientA, document)?.label).toBe(\"Default for tenant-a\");\n            expect(resolveLabel(clientB, document)?.label).toBe(\"Default for tenant-b\");\n        } finally {\n            setDefaultComponentLoader(undefined);\n        }\n    });\n\n    it(\"prefers the client's own loader over the default\", async () => {\n        const defaultLoad = vi.fn();\n        setDefaultComponentLoader(() => ({ loadComponent: defaultLoad }));\n\n        try {\n            const client = createContentClient({\n                ...configFor(\"tenant-a\"),\n                componentLoader: () => ({\n                    async loadComponent(ref) {\n                        return createBlueprint(ref.name, \"Own loader\");\n                    }\n                })\n            });\n            const document = createDocument(\"Acme/Own\");\n\n            await client.loadDocumentComponents(document);\n\n            expect(defaultLoad).not.toHaveBeenCalled();\n            expect(resolveLabel(client, document)?.label).toBe(\"Own loader\");\n        } finally {\n            setDefaultComponentLoader(undefined);\n        }\n    });\n\n    it(\"fetches preview pages through each client, with the client's preview headers\", async () => {\n        const previewClient = (tenant: string, pageId: string) => {\n            return createContentClient({\n                ...configFor(tenant),\n                preview: true,\n                headersProvider: async () =>\n                    new Headers({ \"X-Preview-Params\": `wb.type=page&wb.path=/&wb.id=${pageId}` })\n            });\n        };\n        const clientA = previewClient(\"tenant-a\", \"draft-a\");\n        const clientB = previewClient(\"tenant-b\", \"draft-b\");\n\n        const [pageA, pageB] = await Promise.all([clientA.getPage(\"/\"), clientB.getPage(\"/\")]);\n\n        expect(clientA.isPreviewing()).toBe(true);\n        expect(requestedPageIds).toEqual({ \"tenant-a\": [\"draft-a\"], \"tenant-b\": [\"draft-b\"] });\n        expect(pageA?.properties.title).toBe(\"Draft of tenant-a\");\n        expect(pageB?.properties.title).toBe(\"Draft of tenant-b\");\n    });\n\n    it(\"falls back to the global headers provider for preview, as before\", async () => {\n        setHeadersProvider(\n            async () =>\n                new Headers({ \"X-Preview-Params\": \"wb.type=page&wb.path=/&wb.id=draft-global\" })\n        );\n        const client = createContentClient({ ...configFor(\"tenant-b\"), preview: true });\n\n        const page = await client.getPage(\"/\");\n\n        expect(requestedPageIds).toEqual({ \"tenant-b\": [\"draft-global\"] });\n        expect(page?.properties.title).toBe(\"Draft of tenant-b\");\n    });\n\n    it(\"loads nothing without a loader or a default\", async () => {\n        const client = createContentClient(configFor(\"tenant-a\"));\n        const document = createDocument(\"Acme/Unknown\");\n\n        await client.loadDocumentComponents(document);\n\n        expect(requestedTenants).toEqual([]);\n        expect(resolveLabel(client, document)).toBeNull();\n    });\n\n    it(\"bounds the document stores and evicts the least recently used one\", () => {\n        const stores = new DocumentStoreManager({ maxEntries: 2 });\n        const first = stores.getStore(\"a\");\n        stores.getStore(\"b\");\n\n        // Touch \"a\", so \"b\" is now the least recently used.\n        expect(stores.getStore(\"a\")).toBe(first);\n        stores.getStore(\"c\");\n\n        expect(stores.hasStore(\"a\")).toBe(true);\n        expect(stores.hasStore(\"b\")).toBe(false);\n        expect(stores.hasStore(\"c\")).toBe(true);\n        expect(stores.getStores().size).toBe(2);\n\n        stores.clear();\n        expect(stores.getStores().size).toBe(0);\n    });\n\n    it(\"keeps every store below the default bound\", () => {\n        const stores = new DocumentStoreManager();\n        for (let i = 0; i < 1000; i++) {\n            stores.getStore(`page-${i}`);\n        }\n        expect(stores.getStores().size).toBe(1000);\n        expect(DEFAULT_MAX_DOCUMENT_STORES).toBe(10_000);\n    });\n\n    it(\"reads request headers from the client's provider, else the global one\", async () => {\n        setHeadersProvider(async () => new Headers({ cookie: \"wb_ab_vid=global-visitor\" }));\n\n        const fromGlobal = await resolveVisitorContext();\n        expect(fromGlobal.context.visitorId).toBe(\"global-visitor\");\n\n        const fromOption = await resolveVisitorContext({\n            headersProvider: async () => new Headers({ cookie: \"wb_ab_vid=client-visitor\" })\n        });\n        expect(fromOption.context.visitorId).toBe(\"client-visitor\");\n    });\n});\n"],"names":["componentLabels","configFor","tenant","createBlueprint","name","label","createDocument","componentName","tenantComponentLoader","apiClient","ref","data","resolveLabel","client","document","resolved","describe","requestedTenants","requestedPageIds","beforeEach","fetchMock","vi","_url","init","headers","body","JSON","delay","Promise","resolve","setTimeout","id","page","afterEach","it","clientA","createContentClient","clientB","render","resultA","resultB","expect","componentRegistry","contentEntryCache","contentSdk","sdk","ContentSdk","documentStoreManager","refs","loader","tenants","setDefaultComponentLoader","config","undefined","defaultLoad","previewClient","pageId","Headers","pageA","pageB","setHeadersProvider","stores","DocumentStoreManager","first","i","DEFAULT_MAX_DOCUMENT_STORES","fromGlobal","resolveVisitorContext","fromOption"],"mappings":"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"}

package/contentEntry/ContentEntryBindingsResolver.d.ts

@@ -1,30 +1,33 @@
 import type { ResolvedElement } from "../types.js";
 import type { IBindingsResolver, ResolveElementParams } from "../BindingsResolver.js";
+import type { ContentEntryCache } from "./ContentEntryCache.js";
 /**
  * Decorator for `IBindingsResolver` that resolves `contentEntry` inputs.
  *
  * The inner resolver evaluates binding expressions against the document state,
  * producing raw values (`{ id, modelId }` references or query params). This
  * decorator then replaces those raw values with pre-resolved CMS entries from
- * a supplied map, or (on the client) triggers async resolution via the
- * `contentEntryCache` singleton.
+ * a supplied map, or (on the client) triggers async resolution via a
+ * `ContentEntryCache`. The cache defaults to the `contentEntryCache` singleton.
  *
  * **Server path**: `resolveContentEntries()` pre-fetches all entries, builds
  * the `resolvedEntries` map, and passes it here. The decorator synchronously
  * swaps raw values for resolved entries during render.
  *
  * **Client path (editor preview)**: `resolvedEntries` may be empty. The
- * decorator falls back to `contentEntryCache.resolve()` which kicks off an
+ * decorator falls back to the cache's `resolve()`, which kicks off an
  * async fetch; the mobx-observable cache triggers re-render when it lands.
  */
 export declare class ContentEntryBindingsResolver implements IBindingsResolver {
     private readonly inner;
     private readonly resolvedEntries;
-    constructor(inner: IBindingsResolver, resolvedEntries?: ReadonlyMap<string, unknown>);
+    private readonly cache;
+    constructor(inner: IBindingsResolver, resolvedEntries?: ReadonlyMap<string, unknown>, cache?: ContentEntryCache);
     resolveElement(params: ResolveElementParams): ResolvedElement[];
+    private isUnsafePropertyKey;
     /**
      * Walk the input AST and replace raw content-entry values with resolved
-     * entries from the map or the module-level cache.
+     * entries from the map or the cache.
      */
     private enrichContentEntryInputs;
 }

package/contentEntry/ContentEntryBindingsResolver.js

@@ -1,42 +1,49 @@
 import { contentEntryCache } from "./ContentEntryCache.js";
 import { environment } from "../Environment.js";
 class ContentEntryBindingsResolver {
-    constructor(inner, resolvedEntries = new Map()){
+    constructor(inner, resolvedEntries = new Map(), cache = contentEntryCache){
         this.inner = inner;
         this.resolvedEntries = resolvedEntries;
+        this.cache = cache;
     }
     resolveElement(params) {
         const results = this.inner.resolveElement(params);
         for (const instance of results)this.enrichContentEntryInputs(params.element.id, params.inputAst, instance.inputs);
         return results;
     }
+    isUnsafePropertyKey(key) {
+        return "__proto__" === key || "constructor" === key || "prototype" === key;
+    }
     enrichContentEntryInputs(elementId, ast, inputs) {
         for (const node of ast){
-            if ("contentEntry" === node.input.type) {
-                const key = `${elementId}:${node.name}`;
-                const rawValue = inputs[node.name];
-                const list = node.input.list ?? false;
-                if (this.resolvedEntries.has(key)) {
-                    inputs[node.name] = this.resolvedEntries.get(key);
-                    continue;
-                }
-                if (contentEntryCache.has(key)) {
-                    inputs[node.name] = contentEntryCache.get(key);
-                    continue;
+            const inputName = node.name;
+            if (!this.isUnsafePropertyKey(inputName)) {
+                if ("contentEntry" === node.input.type) {
+                    const key = `${elementId}:${inputName}`;
+                    const rawValue = inputs[inputName];
+                    const list = node.input.list ?? false;
+                    if (this.resolvedEntries.has(key)) {
+                        inputs[inputName] = this.resolvedEntries.get(key);
+                        continue;
+                    }
+                    if (this.cache.has(key)) {
+                        inputs[inputName] = this.cache.get(key);
+                        continue;
+                    }
+                    if (environment.isClient() && this.cache.getLoader()) {
+                        const cacheKey = `${key}:${JSON.stringify(rawValue ?? null)}`;
+                        this.cache.resolve(cacheKey, rawValue, list);
+                        const cached = this.cache.get(cacheKey);
+                        if (void 0 !== cached) inputs[inputName] = cached;
+                    }
                 }
-                if (environment.isClient() && contentEntryCache.getLoader()) {
-                    const cacheKey = `${key}:${JSON.stringify(rawValue ?? null)}`;
-                    contentEntryCache.resolve(cacheKey, rawValue, list);
-                    const cached = contentEntryCache.get(cacheKey);
-                    if (void 0 !== cached) inputs[node.name] = cached;
+                if (node.children.length > 0) {
+                    const value = inputs[inputName];
+                    if (node.list && Array.isArray(value)) {
+                        for (const item of value)if ("object" == typeof item && null !== item) this.enrichContentEntryInputs(elementId, node.children, item);
+                    } else if ("object" == typeof value && null !== value && !Array.isArray(value)) this.enrichContentEntryInputs(elementId, node.children, value);
                 }
             }
-            if (node.children.length > 0) {
-                const value = inputs[node.name];
-                if (node.list && Array.isArray(value)) {
-                    for (const item of value)if ("object" == typeof item && null !== item) this.enrichContentEntryInputs(elementId, node.children, item);
-                } else if ("object" == typeof value && null !== value && !Array.isArray(value)) this.enrichContentEntryInputs(elementId, node.children, value);
-            }
         }
     }
 }

package/contentEntry/ContentEntryBindingsResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"contentEntry/ContentEntryBindingsResolver.js","sources":["../../src/contentEntry/ContentEntryBindingsResolver.ts"],"sourcesContent":["import type { ResolvedElement } from \"~/types.js\";\nimport type { IBindingsResolver, ResolveElementParams } from \"~/BindingsResolver.js\";\nimport type { InputAstNode } from \"~/ComponentManifestToAstConverter.js\";\nimport { contentEntryCache } from \"./ContentEntryCache.js\";\nimport { environment } from \"~/Environment.js\";\n\n/**\n * Decorator for `IBindingsResolver` that resolves `contentEntry` inputs.\n *\n * The inner resolver evaluates binding expressions against the document state,\n * producing raw values (`{ id, modelId }` references or query params). This\n * decorator then replaces those raw values with pre-resolved CMS entries from\n * a supplied map, or (on the client) triggers async resolution via the\n * `contentEntryCache` singleton.\n *\n * **Server path**: `resolveContentEntries()` pre-fetches all entries, builds\n * the `resolvedEntries` map, and passes it here. The decorator synchronously\n * swaps raw values for resolved entries during render.\n *\n * **Client path (editor preview)**: `resolvedEntries` may be empty. The\n * decorator falls back to `contentEntryCache.resolve()` which kicks off an\n * async fetch; the mobx-observable cache triggers re-render when it lands.\n */\nexport class ContentEntryBindingsResolver implements IBindingsResolver {\n    constructor(\n        private readonly inner: IBindingsResolver,\n        private readonly resolvedEntries: ReadonlyMap<string, unknown> = new Map()\n    ) {}\n\n    resolveElement(params: ResolveElementParams): ResolvedElement[] {\n        const results = this.inner.resolveElement(params);\n\n        for (const instance of results) {\n            this.enrichContentEntryInputs(params.element.id, params.inputAst, instance.inputs);\n        }\n\n        return results;\n    }\n\n    /**\n     * Walk the input AST and replace raw content-entry values with resolved\n     * entries from the map or the module-level cache.\n     */\n    private enrichContentEntryInputs(\n        elementId: string,\n        ast: InputAstNode[],\n        inputs: Record<string, any>\n    ): void {\n        for (const node of ast) {\n            if (node.input.type === \"contentEntry\") {\n                const key = `${elementId}:${node.name}`;\n                const rawValue = inputs[node.name];\n                const list = node.input.list ?? false;\n\n                // 1. Pre-resolved entries map (seeded by server pre-pass).\n                if (this.resolvedEntries.has(key)) {\n                    inputs[node.name] = this.resolvedEntries.get(key);\n                    continue;\n                }\n\n                // 2. Module-level cache (populated by previous renders or\n                //    async resolves on the client).\n                if (contentEntryCache.has(key)) {\n                    inputs[node.name] = contentEntryCache.get(key);\n                    continue;\n                }\n\n                // 3. Client-side async resolution: trigger a background fetch.\n                //    The observable cache write will cause a re-render.\n                if (environment.isClient() && contentEntryCache.getLoader()) {\n                    const cacheKey = `${key}:${JSON.stringify(rawValue ?? null)}`;\n                    contentEntryCache.resolve(cacheKey, rawValue, list);\n                    const cached = contentEntryCache.get(cacheKey);\n                    if (cached !== undefined) {\n                        inputs[node.name] = cached;\n                    }\n                }\n            }\n\n            // Recurse into children (object / object-list nodes).\n            if (node.children.length > 0) {\n                const value = inputs[node.name];\n                if (node.list && Array.isArray(value)) {\n                    for (const item of value) {\n                        if (typeof item === \"object\" && item !== null) {\n                            this.enrichContentEntryInputs(elementId, node.children, item);\n                        }\n                    }\n                } else if (typeof value === \"object\" && value !== null && !Array.isArray(value)) {\n                    this.enrichContentEntryInputs(elementId, node.children, value);\n                }\n            }\n        }\n    }\n}\n"],"names":["ContentEntryBindingsResolver","inner","resolvedEntries","Map","params","results","instance","elementId","ast","inputs","node","key","rawValue","list","contentEntryCache","environment","cacheKey","JSON","cached","undefined","value","Array","item"],"mappings":";;AAuBO,MAAMA;IACT,YACqBC,KAAwB,EACxBC,kBAAgD,IAAIC,KAAK,CAC5E;aAFmBF,KAAK,GAALA;aACAC,eAAe,GAAfA;IAClB;IAEH,eAAeE,MAA4B,EAAqB;QAC5D,MAAMC,UAAU,IAAI,CAAC,KAAK,CAAC,cAAc,CAACD;QAE1C,KAAK,MAAME,YAAYD,QACnB,IAAI,CAAC,wBAAwB,CAACD,OAAO,OAAO,CAAC,EAAE,EAAEA,OAAO,QAAQ,EAAEE,SAAS,MAAM;QAGrF,OAAOD;IACX;IAMQ,yBACJE,SAAiB,EACjBC,GAAmB,EACnBC,MAA2B,EACvB;QACJ,KAAK,MAAMC,QAAQF,IAAK;YACpB,IAAIE,AAAoB,mBAApBA,KAAK,KAAK,CAAC,IAAI,EAAqB;gBACpC,MAAMC,MAAM,GAAGJ,UAAU,CAAC,EAAEG,KAAK,IAAI,EAAE;gBACvC,MAAME,WAAWH,MAAM,CAACC,KAAK,IAAI,CAAC;gBAClC,MAAMG,OAAOH,KAAK,KAAK,CAAC,IAAI,IAAI;gBAGhC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAACC,MAAM;oBAC/BF,MAAM,CAACC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAACC;oBAC7C;gBACJ;gBAIA,IAAIG,kBAAkB,GAAG,CAACH,MAAM;oBAC5BF,MAAM,CAACC,KAAK,IAAI,CAAC,GAAGI,kBAAkB,GAAG,CAACH;oBAC1C;gBACJ;gBAIA,IAAII,YAAY,QAAQ,MAAMD,kBAAkB,SAAS,IAAI;oBACzD,MAAME,WAAW,GAAGL,IAAI,CAAC,EAAEM,KAAK,SAAS,CAACL,YAAY,OAAO;oBAC7DE,kBAAkB,OAAO,CAACE,UAAUJ,UAAUC;oBAC9C,MAAMK,SAASJ,kBAAkB,GAAG,CAACE;oBACrC,IAAIE,AAAWC,WAAXD,QACAT,MAAM,CAACC,KAAK,IAAI,CAAC,GAAGQ;gBAE5B;YACJ;YAGA,IAAIR,KAAK,QAAQ,CAAC,MAAM,GAAG,GAAG;gBAC1B,MAAMU,QAAQX,MAAM,CAACC,KAAK,IAAI,CAAC;gBAC/B,IAAIA,KAAK,IAAI,IAAIW,MAAM,OAAO,CAACD,QAC3B;oBAAA,KAAK,MAAME,QAAQF,MACf,IAAI,AAAgB,YAAhB,OAAOE,QAAqBA,AAAS,SAATA,MAC5B,IAAI,CAAC,wBAAwB,CAACf,WAAWG,KAAK,QAAQ,EAAEY;gBAEhE,OACG,IAAI,AAAiB,YAAjB,OAAOF,SAAsBA,AAAU,SAAVA,SAAkB,CAACC,MAAM,OAAO,CAACD,QACrE,IAAI,CAAC,wBAAwB,CAACb,WAAWG,KAAK,QAAQ,EAAEU;YAEhE;QACJ;IACJ;AACJ"}
+{"version":3,"file":"contentEntry/ContentEntryBindingsResolver.js","sources":["../../src/contentEntry/ContentEntryBindingsResolver.ts"],"sourcesContent":["import type { ResolvedElement } from \"~/types.js\";\nimport type { IBindingsResolver, ResolveElementParams } from \"~/BindingsResolver.js\";\nimport type { InputAstNode } from \"~/ComponentManifestToAstConverter.js\";\nimport type { ContentEntryCache } from \"./ContentEntryCache.js\";\nimport { contentEntryCache } from \"./ContentEntryCache.js\";\nimport { environment } from \"~/Environment.js\";\n\n/**\n * Decorator for `IBindingsResolver` that resolves `contentEntry` inputs.\n *\n * The inner resolver evaluates binding expressions against the document state,\n * producing raw values (`{ id, modelId }` references or query params). This\n * decorator then replaces those raw values with pre-resolved CMS entries from\n * a supplied map, or (on the client) triggers async resolution via a\n * `ContentEntryCache`. The cache defaults to the `contentEntryCache` singleton.\n *\n * **Server path**: `resolveContentEntries()` pre-fetches all entries, builds\n * the `resolvedEntries` map, and passes it here. The decorator synchronously\n * swaps raw values for resolved entries during render.\n *\n * **Client path (editor preview)**: `resolvedEntries` may be empty. The\n * decorator falls back to the cache's `resolve()`, which kicks off an\n * async fetch; the mobx-observable cache triggers re-render when it lands.\n */\nexport class ContentEntryBindingsResolver implements IBindingsResolver {\n    constructor(\n        private readonly inner: IBindingsResolver,\n        private readonly resolvedEntries: ReadonlyMap<string, unknown> = new Map(),\n        private readonly cache: ContentEntryCache = contentEntryCache\n    ) {}\n\n    resolveElement(params: ResolveElementParams): ResolvedElement[] {\n        const results = this.inner.resolveElement(params);\n\n        for (const instance of results) {\n            this.enrichContentEntryInputs(params.element.id, params.inputAst, instance.inputs);\n        }\n\n        return results;\n    }\n\n    private isUnsafePropertyKey(key: string): boolean {\n        return key === \"__proto__\" || key === \"constructor\" || key === \"prototype\";\n    }\n\n    /**\n     * Walk the input AST and replace raw content-entry values with resolved\n     * entries from the map or the cache.\n     */\n    private enrichContentEntryInputs(\n        elementId: string,\n        ast: InputAstNode[],\n        inputs: Record<string, any>\n    ): void {\n        for (const node of ast) {\n            const inputName = node.name;\n            if (this.isUnsafePropertyKey(inputName)) {\n                continue;\n            }\n\n            if (node.input.type === \"contentEntry\") {\n                const key = `${elementId}:${inputName}`;\n                const rawValue = inputs[inputName];\n                const list = node.input.list ?? false;\n\n                // 1. Pre-resolved entries map (seeded by server pre-pass).\n                if (this.resolvedEntries.has(key)) {\n                    inputs[inputName] = this.resolvedEntries.get(key);\n                    continue;\n                }\n\n                // 2. Cache (populated by previous renders or async resolves on\n                //    the client).\n                if (this.cache.has(key)) {\n                    inputs[inputName] = this.cache.get(key);\n                    continue;\n                }\n\n                // 3. Client-side async resolution: trigger a background fetch.\n                //    The observable cache write will cause a re-render.\n                if (environment.isClient() && this.cache.getLoader()) {\n                    const cacheKey = `${key}:${JSON.stringify(rawValue ?? null)}`;\n                    this.cache.resolve(cacheKey, rawValue, list);\n                    const cached = this.cache.get(cacheKey);\n                    if (cached !== undefined) {\n                        inputs[inputName] = cached;\n                    }\n                }\n            }\n\n            // Recurse into children (object / object-list nodes).\n            if (node.children.length > 0) {\n                const value = inputs[inputName];\n                if (node.list && Array.isArray(value)) {\n                    for (const item of value) {\n                        if (typeof item === \"object\" && item !== null) {\n                            this.enrichContentEntryInputs(elementId, node.children, item);\n                        }\n                    }\n                } else if (typeof value === \"object\" && value !== null && !Array.isArray(value)) {\n                    this.enrichContentEntryInputs(elementId, node.children, value);\n                }\n            }\n        }\n    }\n}\n"],"names":["ContentEntryBindingsResolver","inner","resolvedEntries","Map","cache","contentEntryCache","params","results","instance","key","elementId","ast","inputs","node","inputName","rawValue","list","environment","cacheKey","JSON","cached","undefined","value","Array","item"],"mappings":";;AAwBO,MAAMA;IACT,YACqBC,KAAwB,EACxBC,kBAAgD,IAAIC,KAAK,EACzDC,QAA2BC,iBAAiB,CAC/D;aAHmBJ,KAAK,GAALA;aACAC,eAAe,GAAfA;aACAE,KAAK,GAALA;IAClB;IAEH,eAAeE,MAA4B,EAAqB;QAC5D,MAAMC,UAAU,IAAI,CAAC,KAAK,CAAC,cAAc,CAACD;QAE1C,KAAK,MAAME,YAAYD,QACnB,IAAI,CAAC,wBAAwB,CAACD,OAAO,OAAO,CAAC,EAAE,EAAEA,OAAO,QAAQ,EAAEE,SAAS,MAAM;QAGrF,OAAOD;IACX;IAEQ,oBAAoBE,GAAW,EAAW;QAC9C,OAAOA,AAAQ,gBAARA,OAAuBA,AAAQ,kBAARA,OAAyBA,AAAQ,gBAARA;IAC3D;IAMQ,yBACJC,SAAiB,EACjBC,GAAmB,EACnBC,MAA2B,EACvB;QACJ,KAAK,MAAMC,QAAQF,IAAK;YACpB,MAAMG,YAAYD,KAAK,IAAI;YAC3B,KAAI,IAAI,CAAC,mBAAmB,CAACC;gBAI7B,IAAID,AAAoB,mBAApBA,KAAK,KAAK,CAAC,IAAI,EAAqB;oBACpC,MAAMJ,MAAM,GAAGC,UAAU,CAAC,EAAEI,WAAW;oBACvC,MAAMC,WAAWH,MAAM,CAACE,UAAU;oBAClC,MAAME,OAAOH,KAAK,KAAK,CAAC,IAAI,IAAI;oBAGhC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAACJ,MAAM;wBAC/BG,MAAM,CAACE,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAACL;wBAC7C;oBACJ;oBAIA,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAACA,MAAM;wBACrBG,MAAM,CAACE,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAACL;wBACnC;oBACJ;oBAIA,IAAIQ,YAAY,QAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI;wBAClD,MAAMC,WAAW,GAAGT,IAAI,CAAC,EAAEU,KAAK,SAAS,CAACJ,YAAY,OAAO;wBAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAACG,UAAUH,UAAUC;wBACvC,MAAMI,SAAS,IAAI,CAAC,KAAK,CAAC,GAAG,CAACF;wBAC9B,IAAIE,AAAWC,WAAXD,QACAR,MAAM,CAACE,UAAU,GAAGM;oBAE5B;gBACJ;gBAGA,IAAIP,KAAK,QAAQ,CAAC,MAAM,GAAG,GAAG;oBAC1B,MAAMS,QAAQV,MAAM,CAACE,UAAU;oBAC/B,IAAID,KAAK,IAAI,IAAIU,MAAM,OAAO,CAACD,QAC3B;wBAAA,KAAK,MAAME,QAAQF,MACf,IAAI,AAAgB,YAAhB,OAAOE,QAAqBA,AAAS,SAATA,MAC5B,IAAI,CAAC,wBAAwB,CAACd,WAAWG,KAAK,QAAQ,EAAEW;oBAEhE,OACG,IAAI,AAAiB,YAAjB,OAAOF,SAAsBA,AAAU,SAAVA,SAAkB,CAACC,MAAM,OAAO,CAACD,QACrE,IAAI,CAAC,wBAAwB,CAACZ,WAAWG,KAAK,QAAQ,EAAES;gBAEhE;;QACJ;IACJ;AACJ"}

package/contentEntry/ContentEntryCache.d.ts

@@ -2,8 +2,10 @@ import { type ContentEntryLoader, type ResolvedContentEntry } from "./resolveCon
 type RawValue = unknown | unknown[] | null | undefined;
 /**
  * SDK-level mobx cache for resolved content-entry inputs. Mirrors the CMS
- * `RefCache` pattern: a singleton observable store that both the server
- * pre-pass (`resolveAutoLoad`) and the editor preview path can seed / read.
+ * `RefCache` pattern: an observable store that both the server pre-pass
+ * (`resolveAutoLoad`) and the editor preview path can seed / read. The
+ * `contentEntryCache` singleton is used by `contentSdk`; each content client
+ * created with `createContentClient` holds its own instance.
  *
  * - **Server / SSR**: `resolveAutoLoad` calls `set(key, resolved)` for every
  *   entry it pre-resolves. `BindingsResolver.resolveSingleInstance` reads via
@@ -15,9 +17,10 @@ type RawValue = unknown | unknown[] | null | undefined;
  *   so when the editor changes the selection/query the key changes and the
  *   entry is re-resolved.
  */
-declare class ContentEntryCacheImpl {
+export declare class ContentEntryCache {
     private cache;
     private loader;
+    private pending;
     constructor();
     get(key: string): ResolvedContentEntry | undefined;
     has(key: string): boolean;
@@ -42,5 +45,5 @@ declare class ContentEntryCacheImpl {
     resolve(key: string, value: RawValue, list: boolean): void;
     clear(): void;
 }
-export declare const contentEntryCache: ContentEntryCacheImpl;
+export declare const contentEntryCache: ContentEntryCache;
 export {};