@remkoj/optimizely-cms-react 1.0.4 → 2.0.0-pre2

package/dist/components/index.d.ts

@@ -0,0 +1 @@
+export * from './rich-text';

package/dist/components/index.js

@@ -0,0 +1,2 @@
+export * from './rich-text';
+//# sourceMappingURL=index.js.map

package/dist/components/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA"}

package/dist/components/rich-text/index.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="react" />
+import { type ComponentFactory } from "../../types";
+export type RichTextProps = {
+    /**
+     * The component factory used for this rich text content
+     */
+    factory: ComponentFactory;
+    /**
+     * The rich text to render, provided as either a HTML string or JSON encoded
+     * structured data.
+     */
+    text: string | null | undefined;
+    /**
+     * The value for the "data-epi-edit" marker on the top level element
+     */
+    editId?: string | null;
+    /**
+     * The CSS Class to apply to the text container
+     */
+    className?: string;
+};
+export type RichTextTextNode = {
+    text: string;
+};
+export type RichTextData = {
+    type: string;
+    children?: Array<RichTextData | RichTextTextNode>;
+};
+export declare function isRichTextData(toTest: any): toTest is RichTextData;
+export declare function isRichTextText(toTest: any): toTest is RichTextTextNode;
+export declare const RichText: (props: RichTextProps) => JSX.Element;
+export default RichText;

package/dist/components/rich-text/index.js

@@ -0,0 +1,43 @@
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+export function isRichTextData(toTest) {
+    if (typeof (toTest) != 'object' || toTest == null)
+        return false;
+    return typeof toTest.type == 'string' && toTest.type.length > 0;
+}
+export function isRichTextText(toTest) {
+    if (typeof (toTest) != 'object' || toTest == null)
+        return false;
+    return typeof toTest.text == 'string' && toTest.text.length > 0;
+}
+export const RichText = ({ factory, text, editId, className }) => {
+    const debug = process.env.NODE_ENV != 'production';
+    let data = undefined;
+    try {
+        data = JSON.parse(text ?? 'undefined');
+    }
+    catch (e) { /* Ignore any error as we'll fall-back to HTML injection */ }
+    if (!data)
+        return _jsx("div", { dangerouslySetInnerHTML: { __html: text ?? '' }, className: className, "data-epi-edit": editId });
+    if (!isRichTextData(data)) {
+        if (debug)
+            console.warn(`[Rich Text] Invalid rich text data received: ${text}`);
+        return _jsx("div", { className: className, "data-epi-edit": editId });
+    }
+    return _jsx("div", { className: className, "data-epi-edit": editId, children: _jsx(RichTextElement, { factory: factory, ...data }) });
+};
+const RichTextElement = ({ type, children, text, factory, ...props }) => {
+    const debug = process.env.NODE_ENV != 'production';
+    if (!type && text)
+        return _jsx(_Fragment, { children: text });
+    if (!type) {
+        if (debug)
+            console.warn(`[Rich Text] Invalid rich text element data received: ${{ type, children, text, ...props }}`);
+        return _jsx(_Fragment, {});
+    }
+    const DivElement = 'div';
+    const Component = factory.resolve(type) ?? DivElement;
+    const uid = Math.round(Math.random() * 10000);
+    return _jsx(Component, { ...props, children: children?.map(child => _jsx(RichTextElement, { factory: factory, ...child }, `${uid}::${child.type ?? 'text'}`)) });
+};
+export default RichText;
+//# sourceMappingURL=index.js.map

package/dist/components/rich-text/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/rich-text/index.tsx"],"names":[],"mappings":";AAiCA,MAAM,UAAU,cAAc,CAAC,MAAW;IAEtC,IAAI,OAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,IAAI,MAAM,IAAI,IAAI;QAC5C,OAAO,KAAK,CAAA;IAChB,OAAO,OAAQ,MAAuB,CAAC,IAAI,IAAI,QAAQ,IAAK,MAAuB,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;AACvG,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAW;IAEtC,IAAI,OAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,IAAI,MAAM,IAAI,IAAI;QAC5C,OAAO,KAAK,CAAA;IAChB,OAAO,OAAQ,MAA2B,CAAC,IAAI,IAAI,QAAQ,IAAK,MAA2B,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;AAC/G,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAA2C,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE;IAErG,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAA;IAClD,IAAI,IAAI,GAA8B,SAAS,CAAA;IAC/C,IAAI,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,WAAW,CAAC,CAAA;IAC1C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAC,2DAA2D,CAAA,CAAC;IAE1E,IAAI,CAAC,IAAI;QACL,OAAO,cAAK,uBAAuB,EAAE,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,SAAS,EAAG,SAAS,mBAAmB,MAAM,GAAS,CAAA;IAExH,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,KAAK;YAAE,OAAO,CAAC,IAAI,CAAC,gDAAiD,IAAK,EAAE,CAAC,CAAA;QACjF,OAAO,cAAK,SAAS,EAAG,SAAS,mBAAmB,MAAM,GAAS,CAAA;IACvE,CAAC;IAED,OAAO,cAAK,SAAS,EAAG,SAAS,mBAAmB,MAAM,YAAG,KAAC,eAAe,IAAC,OAAO,EAAG,OAAO,KAAQ,IAAI,GAAK,GAAM,CAAA;AAC1H,CAAC,CAAA;AAED,MAAM,eAAe,GAA+G,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAEhL,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAA;IAClD,IAAI,CAAC,IAAI,IAAI,IAAI;QACb,OAAO,4BAAI,IAAI,GAAK,CAAA;IAExB,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,IAAI,KAAK;YAAE,OAAO,CAAC,IAAI,CAAC,wDAAyD,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,EAAG,EAAE,CAAC,CAAA;QACnH,OAAO,mBAAK,CAAA;IACpB,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAA;IACxB,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAA;IACrD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAA;IAC7C,OAAO,KAAC,SAAS,OAAM,KAAK,YACtB,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAC,eAAe,IAA8D,OAAO,EAAG,OAAO,KAAO,KAAK,IAApF,GAAG,GAAG,KAAO,KAAsB,CAAC,IAAI,IAAI,MAAO,EAAE,CAAmC,CAAC,GACjI,CAAA;AAChB,CAAC,CAAA;AAED,eAAe,QAAQ,CAAA"}

package/dist/factory.d.ts

@@ -5,6 +5,8 @@ export declare const EmptyComponentHandle = "$$fragment$$";
  */
 export declare class DefaultComponentFactory implements ComponentFactory {
     private registry;
+    private dbg;
+    constructor();
     register(type: ComponentTypeHandle, component: ComponentType): void;
     registerAll(components: ComponentTypeDictionary): void;
     has(type: ComponentTypeHandle): boolean;

package/dist/factory.js

@@ -1,13 +1,18 @@
 const MERGE_SYMBOL = '/';
-const DBG = process.env.DXP_DEBUG == '1';
 export const EmptyComponentHandle = '$$fragment$$';
 /**
  * The default implementation of the ComponentFactory iterface
  */
 export class DefaultComponentFactory {
     registry = {};
+    dbg;
+    constructor() {
+        this.dbg = process.env.OPTIMIZELY_DEBUG == '1';
+    }
     register(type, component) {
         type = processComponentTypeHandle(type);
+        if (this.dbg)
+            console.log(`➕ [DefaultComponentFactory] Adding ${type}`);
         this.registry[type] = component;
     }
     registerAll(components) {
@@ -15,10 +20,14 @@ export class DefaultComponentFactory {
     }
     has(type) {
         type = processComponentTypeHandle(type);
+        if (this.dbg)
+            console.log(`🔎 [DefaultComponentFactory] Checking for ${type}`);
         return Object.getOwnPropertyNames(this.registry).includes(type);
     }
     resolve(type) {
         type = processComponentTypeHandle(type);
+        if (this.dbg)
+            console.log(`⚡ [DefaultComponentFactory] Resolving ${type}`);
         if (Object.getOwnPropertyNames(this.registry).includes(type))
             return this.registry[type];
         return undefined;
@@ -40,6 +49,7 @@ const _static = {};
  * @returns The ComponentFactory
  */
 export const getFactory = () => {
+    const DBG = process.env.OPTIMIZELY_DEBUG == '1';
     if (!_static.factory) {
         if (DBG)
             console.log("⚪ [ComponentFactory] Creating new Component Factory");

package/dist/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AACA,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAA;AAExC,MAAM,CAAC,MAAM,oBAAoB,GAAI,cAAc,CAAA;AAEnD;;GAEG;AACH,MAAM,OAAO,uBAAuB;IACxB,QAAQ,GAA2C,EAAE,CAAA;IAE7D,QAAQ,CAAC,IAAyB,EAAE,SAAwB;QAExD,IAAI,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAA;IACnC,CAAC;IAED,WAAW,CAAC,UAAmC;QAE3C,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,GAAG,CAAC,IAAyB;QAEzB,IAAI,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAA;QACvC,OAAO,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACnE,CAAC;IAED,OAAO,CAAC,IAAyB;QAE7B,IAAI,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YACxD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC9B,OAAO,SAAS,CAAA;IACpB,CAAC;CACJ;AAED,SAAS,0BAA0B,CAAC,MAA2B;IAE3D,IAAI,OAAM,CAAC,MAAM,CAAC,IAAI,QAAQ;QAC1B,OAAO,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAA;IACvD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAM,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;QACjE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAC3H,MAAM,IAAI,KAAK,CAAC,kCAAmC,OAAM,CAAC,MAAM,CAAE,EAAE,CAAC,CAAA;AACzE,CAAC;AAED,MAAM,OAAO,GAAqC,EAAE,CAAA;AAEpD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAA4B,GAAG,EAAE;IACpD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACnB,IAAI,GAAG;YAAE,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAA;QAC3E,OAAO,CAAC,OAAO,GAAG,IAAI,uBAAuB,EAAE,CAAA;IACnD,CAAC;SAAM,CAAC;QACJ,IAAI,GAAG;YAAE,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAA;IACnF,CAAC;IACD,OAAO,OAAO,CAAC,OAAO,CAAA;AAC1B,CAAC,CAAA;AACD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAA4C,CAAC,UAA4B,EAAE,EAAE;IAChG,OAAO,CAAC,OAAO,GAAG,UAAU,CAAA;AAChC,CAAC,CAAA;AACD,eAAe,UAAU,EAAE,CAAA"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"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"}

package/dist/server/components/cms-content-area.js

@@ -4,6 +4,7 @@ import CmsContent from './cms-content';
 import * as Utils from '../../utilities';
 import * as Errors from '../../errors';
 import createClient from '@remkoj/optimizely-graph-client';
+import { normalizeContentLinkWithLocale, contentLinkToString } from '@remkoj/optimizely-graph-client/utils';
 import getServerContext from '../context';
 //#endregion
 /**
@@ -32,23 +33,23 @@ export const CmsContentArea = async ({ items, classMapper, className, fieldName,
     const actualItems = (items || []).filter(forValidContentAreaItems);
     const componentData = await Promise.all(actualItems.map(async (item, idx) => {
         // Prepare data from received content area format
-        const contentLink = Utils.normalizeContentLinkWithLocale({ ...item.item, locale: locale });
+        const contentLink = normalizeContentLinkWithLocale(item._metadata);
         if (!contentLink)
-            throw new Errors.InvalidContentLinkError({ ...item.item, locale: locale });
-        const contentType = Utils.normalizeContentType(item.item?.data?.contentType);
-        const fragmentData = item.item?.data || undefined;
+            throw new Errors.InvalidContentLinkError(item._metadata);
+        const contentType = Utils.normalizeContentType(item._metadata.types);
+        const fragmentData = item;
         // Read element wrapper configuration
         const { as: contentItemElement, className: contentItemBaseClassName, itemsProperty: contentItemTarget, ...contentItemElementProps } = itemWrapper ?? {};
         // Generate element wrapper properties
-        const contentAreaItemContainerKey = `ContentAreaItem-${idx}-${contentLink.guidValue}-${contentLink.id}-${contentLink.workId}`;
+        const contentAreaItemContainerKey = `ContentAreaItem-${idx}-${contentLinkToString(contentLink)}`;
         const contentAreaItemContainerProps = {
             className: `opti-content-area-item opti-content-area-item-${idx}${contentItemBaseClassName ? ' ' + contentItemBaseClassName : ''} ${classMapper ? classMapper(item.displayOption ?? 'default', contentType ?? null, idx) : ""}`,
-            "data-epi-block-id": inEditMode && fieldName ? contentLink?.id || undefined : undefined,
+            "data-epi-block-id": inEditMode && fieldName ? Utils.getContentEditId(contentLink) || undefined : undefined,
             "data-displayoption": item.displayOption || undefined,
             "data-tag": item.tag || undefined,
             ...contentItemElementProps
         };
-        const contentAraeItemContent = await CmsContent({ contentLink, contentType, fragmentData, client: gqlClient, factory, outputEditorWarning: inEditMode, contentTypePrefix: "Block" });
+        const contentAraeItemContent = await CmsContent({ contentLink, contentType, fragmentData, client: gqlClient, factory, outputEditorWarning: inEditMode, contentTypePrefix: "Component" });
         // Inject the element into the wrapper
         const childrenTarget = contentItemTarget || "children";
         let contentAreaItemContainerChildren = undefined;
@@ -75,19 +76,13 @@ export const CmsContentArea = async ({ items, classMapper, className, fieldName,
     return _jsx(ContentAreaContainer, { ...contentAreaContainerProps, children: contentAreaContainerChildren });
 };
 function forValidContentAreaItems(itm) {
-    if (itm == undefined || itm == null)
-        return false;
-    if (itm.item == undefined || itm.item == null)
-        return false;
-    if (itm.item.data == undefined || itm.item.data == null)
-        return typeof (itm.item.guidValue) == 'string' && itm.item.guidValue.length > 0;
-    return itm.item.guidValue == itm.item.data.id?.guidValue;
+    return typeof (itm) == 'object' && itm != null && typeof (itm._metadata) == 'object' && itm._metadata != null;
 }
 export async function processContentAreaItems(items, locale) {
     const actualItems = (items ?? []).filter(Utils.isNotNullOrUndefined);
     return Promise.all(actualItems.map(async (item, idx) => {
         // Prepare data from received content area format
-        const contentLink = Utils.normalizeContentLinkWithLocale({ ...item.item, locale: locale });
+        const contentLink = normalizeContentLinkWithLocale({ ...item.item, locale: locale });
         if (!contentLink)
             throw new Errors.InvalidContentLinkError({ ...item.item, locale: locale });
         const contentType = Utils.normalizeContentType(item.item?.data?.contentType);

package/dist/server/components/cms-content-area.js.map

@@ -1 +1 @@
-{"version":3,"file":"cms-content-area.js","sourceRoot":"","sources":["../../../src/server/components/cms-content-area.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"cms-content-area.js","sourceRoot":"","sources":["../../../src/server/components/cms-content-area.tsx"],"names":[],"mappings":";AAAA,OAAO,aAAa,CAAA;AAEpB,OAAO,UAAU,MAAM,eAAe,CAAA;AAEtC,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,YAAY,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,8BAA8B,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAA;AAC3G,OAAO,gBAAgB,MAAM,YAAY,CAAA;AAKzC,YAAY;AAEZ;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAgE,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAC,WAAW,EAAE,GAAG,eAAe,EAA4B,EAAyB,EAAE;IAE9U,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAA;IAClC,IAAI,OAAO,CAAC,oBAAoB,IAAI,CAAC,OAAO,CAAC,MAAM;QAC/C,OAAO,CAAC,IAAI,CAAC,4DAA6D,SAAS,IAAI,gBAAiB,4CAA4C,CAAC,CAAA;IAEzJ,wBAAwB;IACxB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IAC1D,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,IAAI,YAAY,EAAE,CAAA;IAElD,mBAAmB;IACnB,MAAM,MAAM,GAAG,OAAO,IAAI,SAAS,CAAA;IACnC,IAAI,OAAO,CAAC,OAAO,IAAI,MAAM,IAAI,OAAO,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;QAC9D,OAAO,CAAC,IAAI,CAAC,0DAA2D,SAAS,IAAI,gBAAiB,oCAAqC,SAAU,oBAAqB,MAAO,EAAE,CAAC,CAAA;IACxL,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,oGAAqG,SAAS,CAAC,CAAC,CAAC,GAAG,GAAC,SAAS,CAAA,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAA;QACtK,OAAO,mBAAK,CAAA;IAChB,CAAC;IAED,8FAA8F;IAC9F,MAAM,WAAW,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAA;IAClE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAA+B,EAAE;QACrG,iDAAiD;QACjD,MAAM,WAAW,GAAG,8BAA8B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAClE,IAAI,CAAC,WAAW;YACZ,MAAM,IAAI,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC5D,MAAM,WAAW,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QACpE,MAAM,YAAY,GAAG,IAAI,CAAA;QAEzB,qCAAqC;QACrC,MAAM,EACF,EAAE,EAAE,kBAAkB,EACtB,SAAS,EAAE,wBAAwB,EACnC,aAAa,EAAE,iBAAiB,EAChC,GAAG,uBAAuB,EAC7B,GAAG,WAAW,IAAI,EAAE,CAAA;QAErB,sCAAsC;QACtC,MAAM,2BAA2B,GAAG,mBAAoB,GAAI,IAAK,mBAAmB,CAAC,WAAW,CAAE,EAAE,CAAA;QACpG,MAAM,6BAA6B,GAAS;YACxC,SAAS,EAAE,iDAAiD,GAAG,GAAI,wBAAwB,CAAC,CAAC,CAAC,GAAG,GAAG,wBAAwB,CAAC,CAAC,CAAC,EAAG,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,IAAI,SAAS,EAAE,WAAW,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;YACjO,mBAAmB,EAAE,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS;YAC3G,oBAAoB,EAAE,IAAI,CAAC,aAAa,IAAI,SAAS;YACrD,UAAU,EAAE,IAAI,CAAC,GAAG,IAAI,SAAS;YACjC,GAAG,uBAAuB;SAC7B,CAAA;QACD,MAAM,sBAAsB,GAAG,MAAM,UAAU,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC,CAAA;QAExL,sCAAsC;QACtC,MAAM,cAAc,GAAG,iBAAiB,IAAI,UAAU,CAAA;QACtD,IAAI,gCAAgC,GAAG,SAAS,CAAA;QAChD,IAAI,cAAc,IAAI,UAAU;YAC5B,gCAAgC,GAAG,sBAAsB,CAAA;;YAEzD,6BAA6B,CAAC,cAAc,CAAC,GAAG,sBAAsB,CAAA;QAE1E,MAAM,wBAAwB,GAAG,kBAAkB,IAAI,KAAK,CAAA;QAE5D,OAAO,KAAC,wBAAwB,OAAyC,6BAA6B,YAAI,gCAAgC,IAAnG,2BAA2B,CAAqG,CAAA;IAC3K,CAAC,CAAC,CAAC,CAAA;IAEH,0BAA0B;IAC1B,MAAM,yBAAyB,GAAS;QACpC,SAAS,EAAE,qBAAsB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAE,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE;QAC7G,eAAe,EAAE,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QAChE,GAAG,eAAe;KACrB,CAAA;IACD,MAAM,kCAAkC,GAAG,aAAa,IAAI,UAAU,CAAA;IACtE,IAAI,4BAA4B,GAAG,SAAS,CAAA;IAC5C,IAAI,kCAAkC,IAAI,UAAU;QAChD,4BAA4B,GAAG,aAAa,CAAA;;QAE5C,yBAAyB,CAAC,kCAAkC,CAAC,GAAG,aAAa,CAAA;IACjF,MAAM,oBAAoB,GAAG,WAAW,IAAI,KAAK,CAAA;IACjD,OAAO,KAAC,oBAAoB,OAAM,yBAAyB,YAAK,4BAA4B,GAAyB,CAAA;AACzH,CAAC,CAAA;AAED,SAAS,wBAAwB,CAAC,GAAsC;IAEpE,OAAO,OAAM,CAAC,GAAG,CAAC,IAAI,QAAQ,IAAI,GAAG,IAAI,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,QAAQ,IAAI,GAAG,CAAC,SAAS,IAAI,IAAI,CAAA;AAChH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAE,KAAmD,EAAE,MAAe;IAE/G,MAAM,WAAW,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;IACpE,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAA+B,EAAE;QAChF,iDAAiD;QACjD,MAAM,WAAW,GAAG,8BAA8B,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;QACpF,IAAI,CAAC,WAAW;YACZ,MAAM,IAAI,MAAM,CAAC,uBAAuB,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;QAC9E,MAAM,WAAW,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;QAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,SAAS,CAAA;QACjD,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,IAAI,sCAAsC,CAAC,GAAC,IAAI,GAAC,GAAG,CAAA;QAE3F,eAAe;QACf,OAAO,MAAM,UAAU,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAA;IACvF,CAAC,CAAC,CAAC,CAAA;AACP,CAAC;AAED,eAAe,cAAc,CAAA"}

package/dist/server/components/cms-content.d.ts

@@ -8,5 +8,5 @@ export type { CmsContentProps } from './types';
  * @param     param0
  * @returns
  */
-export declare const CmsContent: ({ contentType, contentTypePrefix, contentLink, children, fragmentData }: CmsContentProps) => Promise<JSX.Element>;
+export declare const CmsContent: <LocalesType = string>({ contentType, contentTypePrefix, contentLink: rawContentLink, children, fragmentData }: CmsContentProps<LocalesType>) => Promise<JSX.Element>;
 export default CmsContent;

package/dist/server/components/cms-content.js

@@ -1,8 +1,8 @@
-import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import 'server-only';
 import getContentType from './get-content-type';
 import getServerContext from '../context';
-import createClient, { AuthMode } from '@remkoj/optimizely-graph-client';
+import createClient, { AuthMode, normalizeContentLink, contentLinkToString, isInlineContentLink } from '@remkoj/optimizely-graph-client';
 import { print } from 'graphql';
 import * as Utils from "../../utilities";
 import * as Queries from './queries';
@@ -12,29 +12,45 @@ import * as Queries from './queries';
  * @param     param0
  * @returns
  */
-export const CmsContent = async ({ contentType, contentTypePrefix, contentLink, children, fragmentData }) => {
+export const CmsContent = async ({ contentType, contentTypePrefix, contentLink: rawContentLink, children, fragmentData }) => {
     const context = getServerContext();
+    const contentLink = normalizeContentLink(rawContentLink);
+    if (!contentLink) {
+        if (context.isDebugOrDevelopment)
+            console.warn(`🟠 [CmsContent] Invalid content link provided, not rendering anything`, rawContentLink);
+        return _jsx(_Fragment, {});
+    }
     if (context.isDebugOrDevelopment && !context.client)
-        console.warn(`🟠 [CmsContent] No Content Graph client provided with ${JSON.stringify(contentLink)}, this will cause problems with edit mode!`);
+        console.warn(`🟠 [CmsContent] No Content Graph client provided with ${contentLinkToString(contentLink)}, this will cause problems with edit mode!`);
     // Parse & prepare props
-    const inEditMode = context.inEditMode && context.isEditableContent(contentLink);
+    const isInline = isInlineContentLink(contentLink);
     const outputEditorWarning = context.forceEditorWarnings;
     const factory = context.factory;
+    if (!factory) {
+        console.error(`🔴 [CmsContent] No content type factory registered in the context`);
+        throw new Error("Empty factory on the context");
+    }
     const client = context.client ?? createClient();
-    const isInlineBlock = Utils.isInlineContentLink(contentLink);
-    if (context.isDebug && inEditMode)
-        console.log(`👔 [CmsContent] Edit mode active for content with id: ${JSON.stringify(contentLink)}`);
-    if (context.isDebug && inEditMode && client.currentAuthMode == AuthMode.Public)
+    if (context.isDebug && context.inEditMode)
+        console.log(`👔 [CmsContent] Edit mode active for content with id: ${contentLinkToString(contentLink)}`);
+    if (context.isDebug && context.inEditMode && client.currentAuthMode == AuthMode.Public)
         console.warn(`🟠 [CmsContent] Edit mode active without an authenticated client, this will cause problems`);
     // DEBUG Tracing
     if (context.isDebug)
-        console.log("⚪ [CmsContent] Rendering CMS Content for:", JSON.stringify(contentType), isInlineBlock ? "Inline content" : JSON.stringify({ id: contentLink.id, workId: contentLink.workId, guidValue: contentLink.guidValue, locale: contentLink.locale }), inEditMode ? "edit-mode" : "published");
+        console.log("⚪ [CmsContent] Rendering CMS Content for:", JSON.stringify(contentType), contentLinkToString(contentLink), context.inEditMode ? "edit-mode" : "published");
     // Ensure we have a content type to work with
-    if (!isInlineBlock && !contentType) {
+    if (!contentType) {
+        if (isInline) {
+            console.error(`🔴 [CmsContent] No content type provided for content ${contentLinkToString(contentLink)}, content types cannot be resolved for inline content`);
+            throw new Error("Unable to render Inline CMS Content without Content Type information");
+        }
         if (context.isDebugOrDevelopment)
-            console.warn(`🟠 [CmsContent] No content type provided for content ${JSON.stringify({ id: contentLink.id, workId: contentLink.workId, guidValue: contentLink.guidValue, locale: contentLink.locale })}, this causes an additional GraphQL query to resolve the ContentType`);
+            console.warn(`🟠 [CmsContent] No content type provided for content ${contentLinkToString(contentLink)}, this causes an additional GraphQL query to resolve the ContentType`);
         contentType = await getContentType(contentLink, client);
     }
+    // Optimizely Graph stores the type in Most Significant first order, we need least significant first, also we're stripping out the common "Content" item from it
+    if (Array.isArray(contentType))
+        contentType = contentType.filter(x => x.toLowerCase() != "content").reverse();
     // Apply the content-type prefix if needed
     if (Array.isArray(contentType) && Utils.isNonEmptyString(contentTypePrefix) && contentType.length > 0 && contentType[0] != contentTypePrefix) {
         if (context.isDebug)
@@ -47,7 +63,7 @@ export const CmsContent = async ({ contentType, contentTypePrefix, contentLink,
         if (context.isDebugOrDevelopment) {
             console.warn(`🟠 [CmsContent] Component of type "${contentType?.join('/') ?? ""}" not resolved by factory`);
         }
-        if (context.isDebug || inEditMode || outputEditorWarning) {
+        if (context.isDebug || context.inEditMode || outputEditorWarning) {
             const errorMsg = _jsxs("div", { className: 'opti-error', children: ["Component of type \"", contentType?.join('/') ?? "", "\" not resolved by factory"] });
             return children ? _jsxs(_Fragment, { children: [errorMsg, children] }) : errorMsg;
         }
@@ -64,11 +80,12 @@ export const CmsContent = async ({ contentType, contentTypePrefix, contentLink,
             console.error("🔴 [CmsContent] Invalid fragment data received for ", Component.displayName ?? contentType?.join("/") ?? "[Undetermined component]");
             return _jsx(_Fragment, {});
         }
-        return _jsx(Component, { inEditMode: inEditMode, contentLink: contentLink, data: fragmentData || {}, client: client });
+        return _jsx(Component, { contentLink: contentLink, data: fragmentData || {}, inEditMode: context.inEditMode });
+    }
+    if (isInline) {
+        console.error(`🔴 [CmsContent] No data for content ${contentLinkToString(contentLink)}, data cannot be resolved for inline content`);
+        throw new Error(`Unable to render Inline CMS Content without data. (Content Type: ${Component?.displayName ?? contentType?.join('/') ?? "Unknown"}; Content Link: ${contentLinkToString(contentLink)}; Data keys: ${Object.getOwnPropertyNames(fragmentData ?? {}).join(", ")})`);
     }
-    // If we don't have previously loaded data we cannot load content for inline blocks
-    if (isInlineBlock)
-        return (context.isDebug || inEditMode || outputEditorWarning) ? _jsx("div", { className: 'opti-error', children: "Inline blocks cannot be loaded individually" }) : _jsx(_Fragment, {});
     // Render using included query 
     if (Utils.isCmsComponentWithDataQuery(Component)) {
         const gqlQuery = Component.getDataQuery();
@@ -78,29 +95,29 @@ export const CmsContent = async ({ contentType, contentTypePrefix, contentLink,
         const gqlResponse = await client.request(gqlQuery, gqlVariables);
         if (context.isDebug)
             console.log("⚪ [CmsContent] Component request the following data:", gqlResponse);
-        return _jsx(Component, { inEditMode: inEditMode, contentLink: contentLink, data: gqlResponse, client: client });
+        return _jsx(Component, { contentLink: contentLink, data: gqlResponse, inEditMode: context.inEditMode });
     }
     // Render using included fragment
     if (Utils.isCmsComponentWithFragment(Component)) {
         const [name, fragment] = Component.getDataFragment();
-        const fragmentQuery = `query getContentFragmentById($id: Int!, $workId: Int, $guidValue: String, $locale: [Locales]!, $isCommonDraft: Boolean ) { contentById: Content( where: { ContentLink: { Id: { eq: $id }, WorkId: { eq: $workId }, GuidValue: { eq: $guidValue } },IsCommonDraft: {eq: $isCommonDraft} }, orderBy: { Status: ASC }, locale: $locale, limit: 1 ) { total items { contentType: ContentType id: ContentLink { id: Id, workId: WorkId, guidValue: GuidValue } locale: Language { name: Name } ...${name} } } } ${print(fragment)}`;
+        if (context.isDebug)
+            console.log(`⚪ [CmsContent] Component data fetching using fragment: ${name}`);
+        const fragmentQuery = `query getContentFragmentById($key: String!, $version: String, $locale: [Locales!]) {contentById: Content(where: {_metadata: {key: { eq: $key }, version: { eq: $version }}} locale: $locale) { total, items { _type: __typename, _metadata { key, version, locale } ...${name} }}} ${print(fragment)}`;
         const fragmentVariables = Utils.contentLinkToRequestVariables(contentLink);
-        if (!fragmentVariables?.workId && inEditMode)
-            fragmentVariables.isCommonDraft = true;
         if (context.isDebug)
-            console.log(`⚪ [CmsContent] Component data fetching using fragment ${name}, with variables: ${JSON.stringify(fragmentVariables)}`);
+            console.log(`⚪ [CmsContent] Component data fetching using variables: ${JSON.stringify(fragmentVariables)}`);
         const fragmentResponse = await client.request(fragmentQuery, fragmentVariables);
         const totalItems = fragmentResponse.contentById.total || 0;
         if (totalItems < 1)
             throw new Error(`CmsContent expected to load exactly one content item of type ${name}, received ${totalItems} from Optimizely Graph. Content Item: ${JSON.stringify(fragmentVariables)}`);
         if (totalItems > 1 && context.isDebug)
             console.warn(`🟠 [CmsContent] Resolved ${totalItems} content items, expected only 1. Picked the first one`);
-        return _jsx(Component, { inEditMode: inEditMode, contentLink: contentLink, data: fragmentResponse.contentById.items[0], client: client });
+        return _jsx(Component, { contentLink: contentLink, data: fragmentResponse.contentById.items[0], inEditMode: context.inEditMode });
     }
     // Assume there's no server side prepared data needed for the component
     if (context.isDebug)
         console.log(`⚪ [CmsContent] Component of type "${contentType?.join('/') ?? Component.displayName ?? '?'}" did not request pre-loading of data`);
-    return _jsx(Component, { inEditMode: inEditMode, contentLink: contentLink, data: fragmentData || {}, client: client });
+    return _jsx(Component, { contentLink: contentLink, data: fragmentData || {}, inEditMode: context.inEditMode });
 };
 export default CmsContent;
 //# sourceMappingURL=cms-content.js.map

package/dist/server/components/cms-content.js.map

@@ -1 +1 @@
-{"version":3,"file":"cms-content.js","sourceRoot":"","sources":["../../../src/server/components/cms-content.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"cms-content.js","sourceRoot":"","sources":["../../../src/server/components/cms-content.tsx"],"names":[],"mappings":"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"}

package/dist/server/components/get-content-type.js

@@ -1,5 +1,6 @@
 import { gql } from 'graphql-request';
 import * as Utils from "../../utilities";
+import { isContentLink } from "@remkoj/optimizely-graph-client/utils";
 const DEBUG = false;
 /**
  * Resolve the ContentType of an Optimizely CMS Component, identified by its content link
@@ -9,7 +10,7 @@ const DEBUG = false;
  * @returns     The ContentType, or undefined if it cannot be resolved
  */
 export async function getContentType(link, gqlClient) {
-    if ((!link.id || link.id < 1) && (!link.guidValue || link.guidValue == ""))
+    if (!isContentLink(link))
         throw new Error("Cannot dynamically determine the content type of an inline block");
     const gqlQueryVars = Utils.contentLinkToRequestVariables(link);
     const gqlResponse = await gqlClient.request(getContentTypeQuery, gqlQueryVars);

package/dist/server/components/get-content-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-content-type.js","sourceRoot":"","sources":["../../../src/server/components/get-content-type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AAExC,MAAM,KAAK,GAAG,KAAK,CAAA;AAEnB;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAA2B,EAAE,SAA2B;IAEzF,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;QACtE,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAA;IACvF,MAAM,YAAY,GAAG,KAAK,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAA;IAC9D,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,OAAO,CAAyB,mBAAmB,EAAE,YAAY,CAAC,CAAA;IACtG,IAAI,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAClC,IAAI,KAAK;YACL,OAAO,CAAC,KAAK,CAAC,uDAAwD,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,CAAE,YAAY,EAAE,YAAY,CAAC,CAAA;QACrI,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,KAAK,CAAA;IACxC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IAE3D,MAAM,WAAW,GAAG,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAA;IACrE,IAAI,CAAC,WAAW;QACZ,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;IAEhE,OAAO,WAAW,CAAA;AACtB,CAAC;AAED,eAAe,cAAc,CAAA;AAW7B,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;EAwBpC,CAAA"}
+{"version":3,"file":"get-content-type.js","sourceRoot":"","sources":["../../../src/server/components/get-content-type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAA;AAErE,MAAM,KAAK,GAAG,KAAK,CAAA;AAEnB;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAA2B,EAAE,SAA2B;IAEzF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAA;IACvF,MAAM,YAAY,GAAG,KAAK,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAA;IAC9D,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,OAAO,CAAyB,mBAAmB,EAAE,YAAY,CAAC,CAAA;IACtG,IAAI,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAClC,IAAI,KAAK;YACL,OAAO,CAAC,KAAK,CAAC,uDAAwD,WAAW,CAAC,OAAO,EAAE,KAAK,IAAI,CAAE,YAAY,EAAE,YAAY,CAAC,CAAA;QACrI,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,KAAK,CAAA;IACxC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IAE3D,MAAM,WAAW,GAAG,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAA;IACrE,IAAI,CAAC,WAAW;QACZ,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;IAEhE,OAAO,WAAW,CAAA;AACtB,CAAC;AAED,eAAe,cAAc,CAAA;AAW7B,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;EAwBpC,CAAA"}

package/dist/server/components/index.d.ts

@@ -1,2 +1,3 @@
 export * from './cms-content';
 export * from './cms-content-area';
+export * from './visual-builder';

package/dist/server/components/index.js

@@ -1,3 +1,4 @@
 export * from './cms-content';
 export * from './cms-content-area';
+export * from './visual-builder';
 //# sourceMappingURL=index.js.map

package/dist/server/components/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA"}

package/dist/server/components/queries.js

@@ -1,6 +1,6 @@
 import { gql } from 'graphql-request';
 export const CmsContentFragments = {
-    IContentDataProps: ["contentType", "id", "locale", "path", "__typename"],
+    IContentDataProps: ["_metadata", "_type", "__typename"],
     ContentLink: gql `fragment ContentLink on ContentModelReference {
       id: Id,
       workId: WorkId,

package/dist/server/components/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/server/components/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAA;AAErC,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,iBAAiB,EAAE,CAAC,aAAa,EAAC,IAAI,EAAC,QAAQ,EAAC,MAAM,EAAC,YAAY,CAAC;IACpE,WAAW,EAAE,GAAG,CAAA;;;;MAId;IACF,iBAAiB,EAAE,GAAG,CAAA;;;;MAIpB;IACF,YAAY,EAAE,GAAG,CAAA;;;;;;;;;MASf;IACF,mBAAmB,EAAE,GAAG,CAAA;;;;;;;;MAQtB;IACF,8BAA8B,EAAE,GAAG,CAAA;;;;;;;;MAQjC;IACF,wBAAwB,EAAE,GAAG,CAAA;;;;;;;;MAQ3B;IACF,YAAY,EAAE,GAAG,CAAA;;;;;;;;;;;MAWf;IACF,SAAS,EAAE,GAAG,CAAA;;;;;;;;;MASZ;IACF,eAAe,EAAE,GAAG,CAAA;;;;;;;;;MASlB;IACF,SAAS,EAAE,GAAG,CAAA;;MAEZ;IACF,QAAQ,EAAE,GAAG,CAAA;;MAEX;CACL,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,mBAAmB,EAAE,GAAG,CAAA;;;;;;;;;;;IAWtB;CACH,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;EAmB/B,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;EAiBjC,CAAA"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/server/components/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAA;AAErC,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,iBAAiB,EAAE,CAAC,WAAW,EAAC,OAAO,EAAC,YAAY,CAAC;IACrD,WAAW,EAAE,GAAG,CAAA;;;;MAId;IACF,iBAAiB,EAAE,GAAG,CAAA;;;;MAIpB;IACF,YAAY,EAAE,GAAG,CAAA;;;;;;;;;MASf;IACF,mBAAmB,EAAE,GAAG,CAAA;;;;;;;;MAQtB;IACF,8BAA8B,EAAE,GAAG,CAAA;;;;;;;;MAQjC;IACF,wBAAwB,EAAE,GAAG,CAAA;;;;;;;;MAQ3B;IACF,YAAY,EAAE,GAAG,CAAA;;;;;;;;;;;MAWf;IACF,SAAS,EAAE,GAAG,CAAA;;;;;;;;;MASZ;IACF,eAAe,EAAE,GAAG,CAAA;;;;;;;;;MASlB;IACF,SAAS,EAAE,GAAG,CAAA;;MAEZ;IACF,QAAQ,EAAE,GAAG,CAAA;;MAEX;CACL,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,mBAAmB,EAAE,GAAG,CAAA;;;;;;;;;;;IAWtB;CACH,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;EAmB/B,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;EAiBjC,CAAA"}

package/dist/server/components/types.d.ts

@@ -1,8 +1,8 @@
 import type { SuspenseProps, PropsWithChildren } from "react";
-import type { ContentLinkWithLocale, ComponentFactory, ContentType } from "../../types";
+import type { ComponentFactory, ContentType } from "../../types";
 import type { ElementChildrenProps, ElementProps, ElementType, PropTypeIfPropExists, MayBeArray, TypeIfPropExists } from '../type-utils';
-import type { IOptiGraphClient } from "@remkoj/optimizely-graph-client";
-export type CmsContentProps = PropsWithChildren<{
+import type { IOptiGraphClient, ContentLinkWithLocale, InlineContentLinkWithLocale } from "@remkoj/optimizely-graph-client";
+export type CmsContentProps<LocalesType = string> = PropsWithChildren<{
     /**
      * The content type to render
      */
@@ -10,7 +10,7 @@ export type CmsContentProps = PropsWithChildren<{
     /**
      * The content link to render
      */
-    contentLink: ContentLinkWithLocale;
+    contentLink: ContentLinkWithLocale<LocalesType> | InlineContentLinkWithLocale<LocalesType>;
     /**
      * The initial, pre-loaded data. If set this will be used instead of having the
      * component fetching its' own data. So be sure that this leverages the fragment
@@ -60,27 +60,38 @@ export type CmsContentProps = PropsWithChildren<{
      */
     contentTypePrefix?: string;
 }>;
-type RawContentLink = {
-    id?: number | null;
-    workId?: number | null;
-    guidValue?: string | null;
-};
-type RawLocale = {
-    name?: string | null;
-};
 export type ContentAreaItemDefinition = {
-    __typename?: "ContentAreaItemModelSearch" | "ContentAreaItemModel";
-    item?: (RawContentLink & {
-        data?: {
-            contentType?: (string | null)[] | null;
-            id?: RawContentLink | null;
-            locale?: RawLocale | null;
-            [property: string]: any;
+    __typename?: string | null;
+    _type?: string | null;
+    _metadata?: {
+        key?: string | null;
+        locale?: string | null;
+        types?: Array<string | null> | null;
+        displayName?: string | null;
+        version?: string | null;
+        url?: {
+            base?: string | null;
+            hierarchical?: string | null;
+            default?: string | null;
         } | null;
-    }) | null;
-    displayOption?: string | null;
-    tag?: string | null;
-};
+    } | null;
+} & Record<string, any>;
+export type ValidContentAreaItemDefinition = {
+    __typename?: string | null;
+    _type?: string | null;
+    _metadata: {
+        key?: string | null;
+        locale?: string | null;
+        types?: Array<string | null> | null;
+        displayName?: string | null;
+        version?: string | null;
+        url?: {
+            base?: string | null;
+            hierarchical?: string | null;
+            default?: string | null;
+        } | null;
+    };
+} & Record<string, any>;
 export type CmsContentAreaProps<T extends ElementType, CT extends ElementType> = {
     /**
      * The content area items to be rendered
@@ -173,4 +184,3 @@ export type CmsContentAreaProps<T extends ElementType, CT extends ElementType> =
     itemsProperty: ElementChildrenProps<T>;
 });
 export type CmsContentAreaClassMapper = (displayOption: string, contentType: ContentType | null, index: number) => string;
-export {};

package/dist/server/components/visual-builder/Composition.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import 'server-only';
+import type { OptimizelyCompositionProps } from './types';
+export declare function OptimizelyComposition({ node, elementFactory, propsFactory }: OptimizelyCompositionProps): Promise<JSX.Element>;
+export default OptimizelyComposition;

package/dist/server/components/visual-builder/Composition.js

@@ -0,0 +1,37 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import 'server-only';
+import { isElementNode } from './functions';
+import { CmsContent } from '../cms-content';
+import { isContentLink, isInlineContentLink } from '@remkoj/optimizely-graph-client';
+function isContentType(toTest) {
+    return Array.isArray(toTest) && toTest.every(x => typeof (x) == 'string' && x.length > 0);
+}
+const defaultPropsFactory = (node) => {
+    const contentType = node.element?._metadata?.types;
+    if (!isContentType(contentType))
+        throw new Error("Invalid content type: " + JSON.stringify(contentType));
+    const contentLink = {
+        key: node.element?._metadata?.key || node.key || undefined,
+        version: node.element?._metadata?.version,
+        locale: node.element?._metadata?.locale
+    };
+    if (!(isContentLink(contentLink) || isInlineContentLink(contentLink)))
+        throw new Error("Invalid content link: " + JSON.stringify(contentLink));
+    return [contentLink, contentType, node.element];
+};
+export async function OptimizelyComposition({ node, elementFactory, propsFactory = defaultPropsFactory }) {
+    if (isElementNode(node)) {
+        const [contentLink, contentType, fragmentData] = propsFactory(node);
+        return CmsContent({ contentLink, contentType, fragmentData });
+    }
+    const children = await Promise.all((node.nodes ?? []).map((child, idx) => OptimizelyComposition({
+        key: `${node.name}::${node.key}::${idx}::${child.name}::${Math.round(Math.random() * 100000)}`,
+        node: child,
+        elementFactory,
+        propsFactory
+    })));
+    const Element = elementFactory(node);
+    return _jsx(Element, { node: { name: node.name, layoutType: node.layoutType, type: node.type, key: node.key }, children: children });
+}
+export default OptimizelyComposition;
+//# sourceMappingURL=Composition.js.map

package/dist/server/components/visual-builder/Composition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Composition.js","sourceRoot":"","sources":["../../../../src/server/components/visual-builder/Composition.tsx"],"names":[],"mappings":";AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,aAAa,EAAyB,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAG3G,SAAS,aAAa,CAAC,MAAW;IAE9B,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAM,CAAC,CAAC,CAAC,IAAI,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAC5F,CAAC;AAED,MAAM,mBAAmB,GAA8B,CAA8C,IAAgC,EAAE,EAAE;IACrI,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAA;IAClD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;IAEzE,MAAM,WAAW,GAAwC;QACrD,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,IAAI,SAAS;QAC1D,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO;QACzC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM;KAC1C,CAAA;IACD,IAAI,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;IACzE,OAAO,CAAE,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAE,CAAA;AACrD,CAAC,CAAA;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,GAAG,mBAAmB,EAA8B;IAEhI,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,MAAM,CAAE,WAAW,EAAE,WAAW,EAAE,YAAY,CAAE,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;QACrE,OAAO,UAAU,CAAC,EAAC,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,qBAAqB,CAAC;QAC5F,GAAG,EAAC,GAAI,IAAI,CAAC,IAAK,KAAM,IAAI,CAAC,GAAI,KAAM,GAAI,KAAM,KAAK,CAAC,IAAK,KAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAC,MAAM,CAAE,EAAE;QACrG,IAAI,EAAE,KAAK;QACX,cAAc;QACd,YAAY;KACf,CAAC,CAAC,CAAC,CAAC;IACL,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,CAAA;IACpC,OAAO,KAAC,OAAO,IAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,YAAI,QAAQ,GAAY,CAAA;AAClI,CAAC;AAED,eAAe,qBAAqB,CAAA"}

package/dist/server/components/visual-builder/functions.d.ts

@@ -0,0 +1,5 @@
+import { CompositionNode, CompositionElementNode, CompositionStructureNode } from './types';
+export declare function isElementNode(node: CompositionNode<Record<string, any>>): node is CompositionElementNode<Record<string, any>>;
+export declare function isElementNodeOfType<ET extends Record<string, any>>(node: CompositionNode<Record<string, any>>, test: (data: Record<string, any>) => data is ET): node is CompositionElementNode<ET>;
+export declare function isStructureNode(node: CompositionNode<Record<string, any>>): node is CompositionStructureNode;
+export declare function isNode(toTest: any): toTest is CompositionNode;

package/dist/server/components/visual-builder/functions.js

@@ -0,0 +1,20 @@
+export function isElementNode(node) {
+    return node.layoutType == "element";
+}
+export function isElementNodeOfType(node, test) {
+    if (!isElementNode(node))
+        return false;
+    return test(node.element);
+}
+export function isStructureNode(node) {
+    return !isElementNode(node);
+}
+export function isNode(toTest) {
+    if (typeof (toTest) != 'object' || toTest == null)
+        return false;
+    const nodeTypes = ["experience", "outline", "grid", "row", "column", "element"];
+    const hasValidName = (typeof toTest.name == 'string' && (toTest.name?.length ?? 0) > 0) || toTest.name == null;
+    const hasValidType = typeof toTest.layoutType == 'string' && nodeTypes.includes(toTest.layoutType);
+    return hasValidName && hasValidType;
+}
+//# sourceMappingURL=functions.js.map

package/dist/server/components/visual-builder/functions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../../src/server/components/visual-builder/functions.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,IAAyC;IAEnE,OAAO,IAAI,CAAC,UAAU,IAAI,SAAS,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAgC,IAAyC,EAAE,IAA8C;IAExJ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;QACpB,OAAO,KAAK,CAAA;IAChB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAyC;IAErE,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,MAAW;IAE9B,IAAI,OAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,IAAI,MAAM,IAAI,IAAI;QAC5C,OAAO,KAAK,CAAA;IAEhB,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC/E,MAAM,YAAY,GAAG,CAAC,OAAQ,MAA0B,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAE,MAA0B,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAK,MAA0B,CAAC,IAAI,IAAI,IAAI,CAAA;IAC7K,MAAM,YAAY,GAAG,OAAQ,MAA0B,CAAC,UAAU,IAAI,QAAQ,IAAI,SAAS,CAAC,QAAQ,CAAE,MAA0B,CAAC,UAAU,CAAC,CAAA;IAE5I,OAAO,YAAY,IAAI,YAAY,CAAA;AACvC,CAAC"}

package/dist/server/components/visual-builder/index.d.ts

@@ -0,0 +1,4 @@
+export type * from './types';
+export * from './functions';
+export { OptimizelyComposition } from './Composition';
+export { OptimizelyComposition as default } from './Composition';

package/dist/server/components/visual-builder/index.js

@@ -0,0 +1,4 @@
+export * from './functions';
+export { OptimizelyComposition } from './Composition';
+export { OptimizelyComposition as default } from './Composition';
+//# sourceMappingURL=index.js.map

package/dist/server/components/visual-builder/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/components/visual-builder/index.ts"],"names":[],"mappings":"AAEA,cAAc,aAAa,CAAA;AAE3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,qBAAqB,IAAI,OAAO,EAAE,MAAM,eAAe,CAAA"}

package/dist/server/components/visual-builder/types.d.ts

@@ -0,0 +1,37 @@
+import { type ComponentType, type PropsWithChildren } from "react";
+import { type ContentType } from "../../../types";
+import { type InlineContentLinkWithLocale, type ContentLinkWithLocale } from "@remkoj/optimizely-graph-client";
+export declare enum StructureNodeTypes {
+    Outline = "outline",
+    Grid = "grid",
+    Row = "row",
+    Column = "column"
+}
+export type CompositionStructureNode = {
+    name: string | null;
+    layoutType: "outline" | "grid" | "row" | "column";
+    nodes?: Array<CompositionNode>;
+    key: string | null;
+    type: string | null;
+};
+export type CompositionElementNode<E extends Record<string, any> = Record<string, any>> = {
+    name: string | null;
+    layoutType: "element";
+    element: E;
+    key: string | null;
+};
+export type CompositionNode<E extends Record<string, any> = Record<string, any>> = CompositionStructureNode | CompositionElementNode<E>;
+export type CompositionComponentType<NT extends CompositionNode> = ComponentType<NT extends CompositionElementNode<infer DT> ? {
+    node: Omit<NT, 'element'>;
+    element: DT;
+} : PropsWithChildren<{
+    node: Omit<NT, 'nodes'>;
+}>>;
+export type CompositionComponentFactory = (node: CompositionStructureNode) => CompositionComponentType<CompositionStructureNode>;
+export type CmsComponentPropsFactory = <ET extends Record<string, any>, LT = string>(node: CompositionElementNode<ET>) => [ContentLinkWithLocale<LT> | InlineContentLinkWithLocale<LT>, ContentType, ET];
+export type OptimizelyCompositionProps = {
+    node: CompositionNode<Record<string, any>>;
+    elementFactory: CompositionComponentFactory;
+    propsFactory?: CmsComponentPropsFactory;
+    key?: string;
+};

package/dist/server/components/visual-builder/types.js

@@ -0,0 +1,8 @@
+export var StructureNodeTypes;
+(function (StructureNodeTypes) {
+    StructureNodeTypes["Outline"] = "outline";
+    StructureNodeTypes["Grid"] = "grid";
+    StructureNodeTypes["Row"] = "row";
+    StructureNodeTypes["Column"] = "column";
+})(StructureNodeTypes || (StructureNodeTypes = {}));
+//# sourceMappingURL=types.js.map

package/dist/server/components/visual-builder/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/server/components/visual-builder/types.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC1B,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,iCAAW,CAAA;IACX,uCAAiB,CAAA;AACrB,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B"}

package/dist/server/context.d.ts

@@ -1,31 +1,18 @@
 import 'server-only';
-import type { ComponentFactory } from '../types';
-import type { IOptiGraphClient } from "@remkoj/optimizely-graph-client";
-export type EditableContentId = {
-    id: number | null;
-    workId?: number | null;
-    guidValue?: string | null;
-} | {
-    id?: number | null;
-    workId?: number | null;
-    guidValue: string | null;
-};
-export interface ServerContext {
-    readonly inEditMode: Readonly<boolean>;
-    readonly isDevelopment: boolean;
-    readonly isDebug: boolean;
-    readonly isDebugOrDevelopment: boolean;
-    readonly client?: IOptiGraphClient;
-    readonly factory: ComponentFactory;
+import type { ComponentFactory, GenericContext } from '../types';
+import { type IOptiGraphClient, type ContentLink } from "@remkoj/optimizely-graph-client";
+export interface ServerContext extends GenericContext {
     readonly forceEditorWarnings: boolean;
-    readonly locale?: string;
     setInEditMode(newValue: boolean): ServerContext;
     setOptimizelyGraphClient(newValue: IOptiGraphClient): ServerContext;
     setComponentFactory(newValue: ComponentFactory): ServerContext;
     setForceEditorWarnings(newValue: boolean): ServerContext;
     setLocale(newValue: string | undefined): ServerContext;
-    setEditableContentId(newId: EditableContentId): ServerContext;
-    isEditableContent(id: EditableContentId): boolean;
+    setEditableContentId(newId: ContentLink): ServerContext;
+    isEditableContent(id: ContentLink): boolean;
+    setLocale(newValue: string | undefined): ServerContext;
+    setOptimizelyGraphClient(newValue: IOptiGraphClient): ServerContext;
+    setComponentFactory(newValue: ComponentFactory): ServerContext;
 }
 /**
  * Retrieve the working instance of the component factory, which is memoized through the React.cache()

package/dist/server/context.js

@@ -2,6 +2,7 @@ import 'server-only';
 import React from 'react';
 import { isDevelopment, isDebug } from "./is-debug";
 import { getFactory } from '../factory';
+import { contentLinkIsEqual } from "@remkoj/optimizely-graph-client";
 class DefaultServerContext {
     _inEditMode = false;
     _forceEditorWarnings = false;
@@ -60,11 +61,7 @@ class DefaultServerContext {
     isEditableContent(id) {
         if (!this.inEditMode || !this._editableContent)
             return false; // We can on be editable in edit mode and with an id set
-        if (id.id != this._editableContent.id && id.guidValue != this._editableContent.guidValue)
-            return false; // Both ID and GUID don't match
-        if (this._editableContent.workId && this._editableContent.workId != id.workId)
-            return false; // We know the work ID and it doesn't match
-        return true;
+        return contentLinkIsEqual(this._editableContent, id);
     }
 }
 /**

package/dist/server/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/server/context.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAgCvC,MAAM,oBAAoB;IACd,WAAW,GAAa,KAAK,CAAA;IAC7B,oBAAoB,GAAa,KAAK,CAAA;IACtC,OAAO,GAAkC,SAAS,CAAA;IAClD,QAAQ,GAAkC,SAAS,CAAA;IACnD,OAAO,GAAwB,SAAS,CAAA;IACxC,gBAAgB,GAAmC,SAAS,CAAA;IACpE,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAA;IAC3B,CAAC;IACD,IAAW,OAAO;QACd,OAAO,OAAO,EAAE,CAAA;IACpB,CAAC;IACD,IAAW,aAAa;QACpB,OAAO,aAAa,EAAE,CAAA;IAC1B,CAAC;IACD,IAAW,oBAAoB;QAC3B,OAAO,aAAa,EAAE,IAAI,OAAO,EAAE,CAAA;IACvC,CAAC;IACD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAA;IACxC,CAAC;IACD,IAAW,mBAAmB;QAC1B,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IACD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IACM,aAAa,CAAC,QAAiB;QAElC,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAA;QAC3B,OAAO,IAAI,CAAA;IACf,CAAC;IACM,wBAAwB,CAAC,QAA0B;QACtD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAA;QACvB,OAAO,IAAI,CAAA;IACf,CAAC;IACM,mBAAmB,CAAC,QAA0B;QACjD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,OAAO,IAAI,CAAA;IACf,CAAC;IACM,sBAAsB,CAAC,QAAiB;QAC3C,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAA;QACpC,OAAO,IAAI,CAAA;IACf,CAAC;IACM,SAAS,CAAC,QAA4B;QACzC,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAA;QACvB,OAAO,IAAI,CAAA;IACf,CAAC;IACM,oBAAoB,CAAC,KAAwB;QAChD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAA;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,iBAAiB,CAAC,EAAqB;QAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAAE,OAAO,KAAK,CAAA,CAAC,wDAAwD;QACrH,IAAI,EAAE,CAAC,EAAE,IAAI,IAAI,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS;YACpF,OAAO,KAAK,CAAA,CAAC,+BAA+B;QAChD,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,IAAI,EAAE,CAAC,MAAM;YACzE,OAAO,KAAK,CAAA,CAAC,2CAA2C;QAC5D,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AAED;;;GAGG;AACH,oGAAoG;AACpG,MAAM,CAAC,MAAM,gBAAgB,GAAyB,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE;IACnE,MAAM,GAAG,GAAG,IAAI,oBAAoB,EAAE,CAAA;IACtC,IAAI,GAAG,CAAC,OAAO;QACX,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;IACzD,OAAO,GAAG,CAAA;AACd,CAAC,CAAC,CAAA;AAEF,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/server/context.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvC,OAAO,EAAE,kBAAkB,EAA2C,MAAM,iCAAiC,CAAA;AAgB7G,MAAM,oBAAoB;IACd,WAAW,GAAa,KAAK,CAAA;IAC7B,oBAAoB,GAAa,KAAK,CAAA;IACtC,OAAO,GAAkC,SAAS,CAAA;IAClD,QAAQ,GAAkC,SAAS,CAAA;IACnD,OAAO,GAAwB,SAAS,CAAA;IACxC,gBAAgB,GAA6B,SAAS,CAAA;IAC9D,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAA;IAC3B,CAAC;IACD,IAAW,OAAO;QACd,OAAO,OAAO,EAAE,CAAA;IACpB,CAAC;IACD,IAAW,aAAa;QACpB,OAAO,aAAa,EAAE,CAAA;IAC1B,CAAC;IACD,IAAW,oBAAoB;QAC3B,OAAO,aAAa,EAAE,IAAI,OAAO,EAAE,CAAA;IACvC,CAAC;IACD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAA;IACxC,CAAC;IACD,IAAW,mBAAmB;QAC1B,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;IACD,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IACM,aAAa,CAAC,QAAiB;QAElC,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAA;QAC3B,OAAO,IAAI,CAAA;IACf,CAAC;IACM,wBAAwB,CAAC,QAA0B;QACtD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAA;QACvB,OAAO,IAAI,CAAA;IACf,CAAC;IACM,mBAAmB,CAAC,QAA0B;QACjD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,OAAO,IAAI,CAAA;IACf,CAAC;IACM,sBAAsB,CAAC,QAAiB;QAC3C,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAA;QACpC,OAAO,IAAI,CAAA;IACf,CAAC;IACM,SAAS,CAAC,QAA4B;QACzC,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAA;QACvB,OAAO,IAAI,CAAA;IACf,CAAC;IACM,oBAAoB,CAAC,KAAkB;QAC1C,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAA;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,iBAAiB,CAAC,EAAe;QACpC,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAAE,OAAO,KAAK,CAAA,CAAC,wDAAwD;QACrH,OAAO,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAA;IACxD,CAAC;CACJ;AAED;;;GAGG;AACH,oGAAoG;AACpG,MAAM,CAAC,MAAM,gBAAgB,GAAyB,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE;IACnE,MAAM,GAAG,GAAG,IAAI,oBAAoB,EAAE,CAAA;IACtC,IAAI,GAAG,CAAC,OAAO;QACX,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;IACzD,OAAO,GAAG,CAAA;AACd,CAAC,CAAC,CAAA;AAEF,eAAe,gBAAgB,CAAA"}

package/dist/types.d.ts

@@ -1,52 +1,29 @@
-import type { PropsWithChildren, ComponentType as ReactComponentType } from "react";
+import type { PropsWithChildren, ComponentType as ReactComponentType, ExoticComponent as ReactExoticComponent } from "react";
 import type { DocumentNode } from "graphql";
 import type { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import type { IOptiGraphClient } from "@remkoj/optimizely-graph-client";
+import type { ContentLink, ContentLinkWithLocale, InlineContentLinkWithLocale } from "@remkoj/optimizely-graph-client";
 export type ContentType = string[];
-export type ContentLink = {
-    id: number;
-    workId?: number | null;
-    guidValue?: string | null;
-} | {
-    id?: number | null;
-    workId?: number | null;
-    guidValue: string;
-};
-export type InlineContentLink = {
-    id: 0;
-    workId?: 0 | null;
-    guidValue?: null | "";
-} | {
-    id?: 0 | null;
-    workId?: 0 | null;
-    guidValue: "";
-};
-export type ContentLinkWithLocale = ContentLink & {
-    locale?: string;
-};
+export type { ContentLink, ContentLinkWithLocale } from "@remkoj/optimizely-graph-client";
 export type CmsComponentProps<T> = PropsWithChildren<{
     /**
      * The identifier of the content item
      */
-    contentLink: ContentLinkWithLocale;
+    contentLink: ContentLinkWithLocale | InlineContentLinkWithLocale;
     /**
      * The data already pre-fetched for the this component
      */
     data: T;
     /**
      * Use the Server/Client context instead if you need this information
-     *
-     * @deprecated
      */
     inEditMode?: boolean;
-    /**
-     * Use the Server/Client context instead if you need this information
-     *
-     * @deprecated
-     */
-    client?: IOptiGraphClient;
 }>;
-export type ContentQueryProps = ContentLinkWithLocale;
+export type ContentQueryProps<LocaleType = string> = ContentLink & {
+    locale?: Array<LocaleType> | LocaleType | null;
+    path?: string | null;
+    domain?: string | null;
+};
 /**
  * Extract the data type from a GraphQL Query
  */
@@ -85,8 +62,7 @@ export type CmsComponentWithOptionalQuery<T = DocumentNode> = BaseCmsComponent<T
 export type CmsComponent<T = DocumentNode> = T extends TypedDocumentNode<infer R, any> ? CmsComponentWithQuery<R> : T extends DocumentNode ? CmsComponentWithQuery<{
     [key: string]: any;
 }> : T extends GraphQLFragmentBase ? CmsComponentWithFragment<T> : T extends GraphQLQueryBase ? CmsComponentWithQuery<T> : CmsComponentWithOptionalQuery<T>;
-import type { createElement } from 'react';
-export type ComponentType = Parameters<typeof createElement>[0];
+export type ComponentType = (ReactComponentType<any>) | (ReactExoticComponent<any>) | (keyof JSX.IntrinsicElements);
 export type ComponentTypeHandle = string | string[];
 export type ComponentTypeDictionary = {
     type: ComponentTypeHandle;
@@ -98,3 +74,12 @@ export interface ComponentFactory {
     registerAll(components: ComponentTypeDictionary): void;
     resolve(type: ComponentTypeHandle): ComponentType | undefined;
 }
+export interface GenericContext {
+    readonly client?: IOptiGraphClient;
+    readonly factory?: ComponentFactory;
+    readonly locale?: string;
+    readonly inEditMode: Readonly<boolean>;
+    readonly isDevelopment: boolean;
+    readonly isDebug: boolean;
+    readonly isDebugOrDevelopment: boolean;
+}

package/dist/utilities.d.ts

@@ -1,29 +1,14 @@
 import type { ComponentType } from 'react';
 import type * as Types from './types';
 import type { DocumentNode } from 'graphql';
-export declare function isContentLink(toTest: any): toTest is Types.ContentLink;
-export declare function isContentLinkWithLocale(toTest: any): toTest is Types.ContentLinkWithLocale;
 export declare function isNonEmptyString(toTest: any): toTest is string;
 export declare function isNotNullOrUndefined<T>(toTest?: T | null): toTest is T;
 export declare function isContentType(toTest: any): toTest is Types.ContentType;
 export declare function normalizeContentType(toNormalize: (string | null)[] | null | undefined): Types.ContentType | undefined;
-export declare function normalizeContentLink(toNormalize?: {
-    id?: null | number;
-    workId?: null | number;
-    guidValue?: null | string;
-} | null): Types.ContentLink | undefined;
-export declare function normalizeContentLinkWithLocale(toNormalize?: {
-    id?: null | number;
-    workId?: null | number;
-    guidValue?: null | string;
-    locale?: string | null;
-} | null): Types.ContentLinkWithLocale | undefined;
 export declare function isCmsComponentWithDataQuery<T = DocumentNode>(toTest?: Types.BaseCmsComponent<T>): toTest is Types.CmsComponentWithQuery<T>;
 export declare function isCmsComponentWithFragment<T = DocumentNode>(toTest?: Types.BaseCmsComponent<T>): toTest is Types.CmsComponentWithFragment<T>;
 export declare function validatesFragment<T extends ComponentType<any>>(toTest?: T): toTest is T & Pick<Required<Types.WithGqlFragment<T, any>>, "validateFragment">;
-export declare function contentLocaleToGraphLocale<T>(contentLocale?: T): T extends string ? string : undefined;
 export declare function contentLinkToRequestVariables(contentLink: Types.ContentLinkWithLocale): Types.ContentQueryProps;
-export declare function isInlineContentLink(contentLink: Types.ContentLink): contentLink is Types.InlineContentLink;
-export declare function contentLinkToString(contentLink: Types.ContentLink): string;
 export declare function toUniqueValues<R extends any>(value: R, index: number, array: Array<R>): value is R;
 export declare function trim<T extends string | null | undefined>(valueToTrim: T): T;
+export declare function getContentEditId(contentLink: Types.ContentLink): string;

package/dist/utilities.js

@@ -1,17 +1,4 @@
-export function isContentLink(toTest) {
-    // It must be an object
-    if (typeof (toTest) != 'object' || toTest == null)
-        return false;
-    // The object must have an Id (numeric, >= 0) or GuidValue (string, minimum 1 character)
-    return (typeof (toTest.id) == 'number' && toTest.id >= 0) ||
-        (typeof (toTest.guidValue) == 'string' && toTest.guidValue.length > 0);
-}
-export function isContentLinkWithLocale(toTest) {
-    if (!isContentLink(toTest))
-        return false;
-    const locale = toTest.locale;
-    return locale == undefined || (typeof (locale) == 'string' && locale.length >= 2 && locale.length <= 5);
-}
+import { localeToGraphLocale } from '@remkoj/optimizely-graph-client/utils';
 export function isNonEmptyString(toTest) {
     return typeof (toTest) == 'string' && toTest.length > 0;
 }
@@ -29,23 +16,6 @@ export function normalizeContentType(toNormalize) {
     const filtered = toNormalize.filter(isNonEmptyString);
     return filtered.length > 0 ? filtered : undefined;
 }
-export function normalizeContentLink(toNormalize) {
-    if (typeof (toNormalize) != 'object' || toNormalize == null)
-        return undefined;
-    if (toNormalize.id == null)
-        toNormalize.id = 0; // Change the 'null' identifier and turn it into a 'zero'
-    if (toNormalize.guidValue == null || toNormalize.guidValue == "")
-        delete toNormalize.guidValue; // Remove an empty or null guid value
-    if ((toNormalize.id ?? -1) >= 0 || (toNormalize.guidValue ?? "").length > 0)
-        return toNormalize;
-    return undefined;
-}
-export function normalizeContentLinkWithLocale(toNormalize) {
-    const normalized = normalizeContentLink(toNormalize);
-    if (normalized.locale != undefined && !(typeof (normalized.locale) == 'string' && normalized.locale.length >= 1 && normalized.locale.length <= 5))
-        delete normalized.locale;
-    return normalized;
-}
 export function isCmsComponentWithDataQuery(toTest) {
     const toTestType = typeof (toTest);
     if ((toTestType == 'function' || toTestType == 'object') && toTest != null) {
@@ -65,28 +35,16 @@ export function validatesFragment(toTest) {
         return toTest.validateFragment && typeof (toTest.validateFragment) == 'function' ? true : false;
     return false;
 }
-export function contentLocaleToGraphLocale(contentLocale) {
-    if (typeof (contentLocale) == 'string' && contentLocale.length >= 2 && contentLocale.length <= 5)
-        return contentLocale?.replaceAll('-', '_');
-    return undefined;
-}
 export function contentLinkToRequestVariables(contentLink) {
     const variables = {
-        id: contentLink.id ?? 0,
-        workId: contentLink.workId,
-        guidValue: contentLink.guidValue ?? null,
-        locale: contentLocaleToGraphLocale(contentLink.locale)
+        key: contentLink.key ?? '-no-content-selected-',
+        locale: contentLink.locale ? localeToGraphLocale(contentLink.locale) : undefined,
+        version: contentLink.version
     };
-    if (variables.workId == undefined || variables.workId <= 0)
-        variables.workId = null;
+    if (variables.version == undefined || variables.version == '')
+        variables.version = null;
     return variables;
 }
-export function isInlineContentLink(contentLink) {
-    return !contentLink.id && !contentLink.guidValue;
-}
-export function contentLinkToString(contentLink) {
-    return `${contentLink.id ?? 0}_${contentLink.workId ?? 0}#${contentLink.guidValue ?? ''}\$${contentLink.locale ?? ''}`;
-}
 export function toUniqueValues(value, index, array) {
     return array.indexOf(value) == index;
 }
@@ -95,4 +53,7 @@ export function trim(valueToTrim) {
         return valueToTrim.trim();
     return valueToTrim;
 }
+export function getContentEditId(contentLink) {
+    return contentLink.key;
+}
 //# sourceMappingURL=utilities.js.map

package/dist/utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@remkoj/optimizely-cms-react",
   "license": "Apache-2.0",
-  "version": "1.0.4",
+  "version": "2.0.0-pre2",
   "packageManager": "yarn@4.1.1",
   "repository": "https://github.com/remkoj/optimizely-dxp-clients.git",
   "author": "Remko Jantzen <693172+remkoj@users.noreply.github.com>",
@@ -14,6 +14,7 @@
   ],
   "exports": {
     ".": "./dist/index.js",
+    "./components": "./dist/components/index.js",
     "./browser": "./dist/browser/index.js",
     "./rsc": "./dist/server/index.js",
     "./rsc/cms-content": "./dist/server/components/cms-content.js",
@@ -24,6 +25,9 @@
       "browser": [
         "dist/browser/index.d.ts"
       ],
+      "components": [
+        "dist/components/index.d.ts"
+      ],
       "rsc": [
         "dist/server/index.d.ts"
       ],
@@ -36,25 +40,25 @@
     }
   },
   "devDependencies": {
-    "@remkoj/optimizely-graph-client": "1.0.4",
+    "@remkoj/optimizely-graph-client": "2.0.0-pre2",
     "@types/crypto-js": "^4.2.2",
-    "@types/node": "^20.12.6",
-    "@types/react": "^18.2.75",
-    "@types/react-dom": "18.2.24",
+    "@types/node": "^20.12.10",
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "18.3.0",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
     "prop-types": "^15.8.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "scheduler": "^0.23.0",
-    "typescript": "^5.4.4"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "scheduler": "^0.23.2",
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "@graphql-typed-document-node/core": "^3.2.0",
     "crypto-js": "^4.2.0"
   },
   "peerDependencies": {
-    "@remkoj/optimizely-graph-client": "1.0.4",
+    "@remkoj/optimizely-graph-client": "2.0.0-pre2",
     "graphql": "*",
     "graphql-request": "*",
     "react": "*",
@@ -62,8 +66,9 @@
   },
   "scripts": {
     "clean": "tsc --build --clean",
-    "prepare": "tsc --build",
+    "prepare": "yarn tsc --build",
     "watch": "tsc --watch",
     "recompile": "tsc --build --clean && tsc --build --force"
-  }
+  },
+  "stableVersion": "1.0.4"
 }