@uniformdev/canvas-next-rsc 19.35.2 → 19.36.0

package/dist/client/canvasClient.js

@@ -1,4 +1,5 @@
 import { CanvasClient } from '@uniformdev/canvas';
+import { buildCompositionTag } from '../utils/tag';
 export const getCanvasClient = (options) => {
     return new CanvasClient({
         projectId: process.env.UNIFORM_PROJECT_ID,
@@ -6,6 +7,33 @@ export const getCanvasClient = (options) => {
         apiKey: process.env.UNIFORM_API_KEY,
         edgeApiHost: process.env.UNIFORM_EDGE_API_HOST,
         fetch: (req, init) => {
+            let requestedUrl;
+            if (typeof req === 'string') {
+                requestedUrl = new URL(req);
+            }
+            else if (req instanceof URL) {
+                requestedUrl = req;
+            }
+            else {
+                requestedUrl = new URL(req.url);
+            }
+            const tags = [];
+            if (requestedUrl) {
+                // this is here so this code breaks if parameters change here
+                const compositionIdKey = 'compositionId';
+                const compositionIdsKey = 'compositionIDs';
+                const compositionId = requestedUrl.searchParams.get(compositionIdKey);
+                const compositionIds = requestedUrl.searchParams.get(compositionIdsKey);
+                if (compositionId) {
+                    tags.push(buildCompositionTag(compositionId));
+                }
+                if (compositionIds) {
+                    const ids = compositionIds.split(',');
+                    for (let i = 0; i < ids.length; i++) {
+                        tags.push(buildCompositionTag(ids[i]));
+                    }
+                }
+            }
             let revalidate = options === null || options === void 0 ? void 0 : options.revalidate;
             let noCache = false;
             if (revalidate === -1) {

package/dist/client/routeClient.js

@@ -22,7 +22,15 @@ export const getRouteClient = (options) => {
                 const pathKey = 'path';
                 const path = requestedUrl.searchParams.get(pathKey);
                 if (path) {
-                    tags.push(buildPathTag(path));
+                    // at this point, we do not know if this path is dynamic or not
+                    // so apply each segment as a tag so we can clear any segment, ie:
+                    // /authors/alex would add /authors and /authors/alex as tags
+                    const pieces = path.split('/');
+                    for (let i = 0; i < pieces.length; i++) {
+                        const segmentPieces = pieces.slice(0, i + 1);
+                        const segment = segmentPieces.join('/');
+                        tags.push(buildPathTag(segment));
+                    }
                 }
             }
             let revalidate;

package/dist/components/UniformComponent.d.ts

@@ -1,12 +1,22 @@
-import { type ComponentInstance } from '@uniformdev/canvas';
+import { type ComponentInstance, type RootComponentInstance } from '@uniformdev/canvas';
 import { ReactNode } from 'react';
+export type CompositionContext = {
+    composition: RootComponentInstance;
+    path: string;
+    state?: number;
+    searchParams: {
+        [key: string]: string | undefined;
+    } | undefined;
+};
 export type ComponentProps<TProps = unknown> = TProps & {
     component: ComponentInstance;
+    context: CompositionContext;
 };
 export type UniformComponentProps<TRenderProps = unknown> = {
     data: ComponentInstance;
+    context: CompositionContext;
     children?: ReactNode | ((props: ComponentProps<TRenderProps>) => JSX.Element);
 };
-export declare function UniformComponent({ data, children }: UniformComponentProps): import("react").FunctionComponentElement<{
+export declare function UniformComponent({ data, children, context }: UniformComponentProps): import("react").FunctionComponentElement<{
     children?: ReactNode;
 }>;

package/dist/components/UniformComponent.js

@@ -1,10 +1,11 @@
 import { createElement, Fragment } from 'react';
 import { componentStoreResolver } from '../register/componentStoreResolver';
 import { resolveChildren } from '../resolve/resolveChildren';
-export function UniformComponent({ data, children }) {
+export function UniformComponent({ data, children, context }) {
     const resolvedChildren = resolveChildren({
         children,
         data,
+        context,
         hasParentLayout: false,
         resolveRenderer: componentStoreResolver,
     });

package/dist/components/UniformComposition.js

@@ -51,5 +51,10 @@ const UniformCompositionInner = async ({ params, searchParams, children }) => {
         params,
         searchParams: searchParams !== null && searchParams !== void 0 ? searchParams : {},
     });
-    return (_jsxs(UniformProvider, { cookieValue: cookieValue, seenComponents: seenComponents, children: [_jsx(UniformScript, { enabled: draftMode }), _jsx(UniformComponent, { data: evaluatedComposition }), Boolean(children) && children] }));
+    const context = {
+        composition: evaluatedComposition,
+        path,
+        searchParams,
+    };
+    return (_jsxs(UniformProvider, { cookieValue: cookieValue, seenComponents: seenComponents, children: [_jsx(UniformScript, { enabled: draftMode }), _jsx(UniformComponent, { data: evaluatedComposition, context: context }), Boolean(children) && children] }));
 };

package/dist/components/UniformRichText.d.ts

@@ -0,0 +1,38 @@
+import { ComponentInstance } from '@uniformdev/canvas';
+import React from 'react';
+import { RenderRichTextComponentResolver } from './types';
+export type UniformRichTextProps = {
+    /**
+     * The name of the  HTML tag to render.
+     * @default "div"
+     */
+    as?: React.ElementType;
+    /** The ID of the parameter. */
+    parameterId: string;
+    /**
+     * A function which can provide a custom react component
+     * for rendering a rich text node
+     */
+    resolveRichTextRenderer?: RenderRichTextComponentResolver;
+    /** The component instance. */
+    component: ComponentInstance;
+} & Omit<React.HTMLAttributes<HTMLDivElement>, 'children'>;
+/**
+ * Adds rendering support for Uniform Rich Text parameters
+ */
+export declare const UniformRichText: React.ForwardRefExoticComponent<{
+    /**
+     * The name of the  HTML tag to render.
+     * @default "div"
+     */
+    as?: React.ElementType<any> | undefined;
+    /** The ID of the parameter. */
+    parameterId: string;
+    /**
+     * A function which can provide a custom react component
+     * for rendering a rich text node
+     */
+    resolveRichTextRenderer?: RenderRichTextComponentResolver | undefined;
+    /** The component instance. */
+    component: ComponentInstance;
+} & Omit<React.HTMLAttributes<HTMLDivElement>, "children"> & React.RefAttributes<unknown>>;

package/dist/components/UniformRichText.js

@@ -0,0 +1,15 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { isRichTextValue, isRichTextValueConsideredEmpty, } from '@uniformdev/richtext';
+import React from 'react';
+import { UniformRichTextNode } from './UniformRichTextNode';
+/**
+ * Adds rendering support for Uniform Rich Text parameters
+ */
+export const UniformRichText = React.forwardRef(function UniformRichText({ parameterId, component, resolveRichTextRenderer, as: Tag = 'div', ...props }, ref) {
+    var _a;
+    const parameter = (_a = component === null || component === void 0 ? void 0 : component.parameters) === null || _a === void 0 ? void 0 : _a[parameterId];
+    const value = parameter === null || parameter === void 0 ? void 0 : parameter.value;
+    if (!value || !isRichTextValue(value) || isRichTextValueConsideredEmpty(value))
+        return null;
+    return Tag === null ? (_jsx(UniformRichTextNode, { node: value.root, resolveRichTextRenderer: resolveRichTextRenderer })) : (_jsx(Tag, { ref: ref, ...props, children: _jsx(UniformRichTextNode, { node: value.root, resolveRichTextRenderer: resolveRichTextRenderer }) }));
+});

package/dist/components/UniformRichTextNode.d.ts

@@ -0,0 +1,10 @@
+import { RichTextNode } from '@uniformdev/richtext';
+import { RenderRichTextComponentResolver } from './types';
+export type UniformRichTextNodeProps = {
+    node: RichTextNode;
+    resolveRichTextRenderer?: RenderRichTextComponentResolver;
+};
+/**
+ * Render a single RichText node
+ */
+export declare function UniformRichTextNode({ node, ...props }: UniformRichTextNodeProps): JSX.Element | null;

package/dist/components/UniformRichTextNode.js

@@ -0,0 +1,49 @@
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { createElement as _createElement } from "react";
+import { isRichTextNode } from '@uniformdev/richtext';
+import { HeadingRichTextNode } from './nodes/HeadingRichTextNode';
+import { LinebreakRichTextNode } from './nodes/LinebreakRichTextNode';
+import { LinkRichTextNode } from './nodes/LinkRichTextNode';
+import { ListItemRichTextNode } from './nodes/ListItemRichTextNode';
+import { ListRichTextNode } from './nodes/ListRichTextNode';
+import { ParagraphRichTextNode } from './nodes/ParagraphRichTextNode';
+import { TabRichTextNode } from './nodes/TabRichTextNode';
+import { TextRichTextNode } from './nodes/TextRichTextNode';
+/**
+ * Render a single RichText node
+ */
+export function UniformRichTextNode({ node, ...props }) {
+    var _a;
+    if (!isRichTextNode(node))
+        return null;
+    let NodeRenderer = (_a = props.resolveRichTextRenderer) === null || _a === void 0 ? void 0 : _a.call(props, node);
+    if (typeof NodeRenderer === 'undefined') {
+        NodeRenderer = resolveRichTextDefaultRenderer(node);
+    }
+    if (!NodeRenderer) {
+        return null;
+    }
+    const children = node.children
+        ? node.children.map((childNode, i) => _createElement(UniformRichTextNode, { ...props, key: i, node: childNode }))
+        : null;
+    return _jsx(NodeRenderer, { node: node, children: children });
+}
+const rendererMap = new Map([
+    ['heading', HeadingRichTextNode],
+    ['linebreak', LinebreakRichTextNode],
+    ['link', LinkRichTextNode],
+    ['list', ListRichTextNode],
+    ['listitem', ListItemRichTextNode],
+    ['paragraph', ParagraphRichTextNode],
+    ['quote', ({ children }) => _jsx("blockquote", { children: children })],
+    [
+        'code',
+        ({ children }) => (_jsx("pre", { children: _jsx("code", { children: children }) })),
+    ],
+    ['root', ({ children }) => _jsx(_Fragment, { children: children })],
+    ['text', TextRichTextNode],
+    ['tab', TabRichTextNode],
+]);
+const resolveRichTextDefaultRenderer = (node) => {
+    return rendererMap.get(node.type);
+};

package/dist/components/UniformSlot.d.ts

@@ -1,5 +1,6 @@
 import { ComponentInstance } from '@uniformdev/canvas';
 import { Key, ReactNode } from 'react';
+import { CompositionContext } from './UniformComponent';
 export type CustomSlotChildRenderFunc = (options: {
     child: ReactNode;
     component: ComponentInstance;
@@ -10,6 +11,8 @@ export type UniformSlotProps<TSlotNames extends string> = {
     name: TSlotNames;
     /** The composition that is being rendered */
     data: ComponentInstance;
+    /** The context of the composition that is being rendered */
+    context: CompositionContext;
     /** Optional render props enables wrapping all child components in the slot with some markup */
     children?: CustomSlotChildRenderFunc;
     /**
@@ -19,6 +22,6 @@ export type UniformSlotProps<TSlotNames extends string> = {
      */
     emptyPlaceholder?: ReactNode;
 };
-export declare function UniformSlot<TSlotNames extends string = string>({ name, children, emptyPlaceholder, data: parentData, }: UniformSlotProps<TSlotNames> & {
+export declare function UniformSlot<TSlotNames extends string = string>({ name, children, emptyPlaceholder, data: parentData, context, }: UniformSlotProps<TSlotNames> & {
     data: ComponentInstance;
 }): JSX.Element | null;

package/dist/components/UniformSlot.js

@@ -1,6 +1,6 @@
 import { createElement, Fragment } from 'react';
 import { renderComponent } from './renderComponent';
-export function UniformSlot({ name, children, emptyPlaceholder, data: parentData, }) {
+export function UniformSlot({ name, children, emptyPlaceholder, data: parentData, context, }) {
     var _a;
     const slot = (_a = parentData.slots) === null || _a === void 0 ? void 0 : _a[name];
     if (!slot || !Array.isArray(slot)) {
@@ -9,6 +9,7 @@ export function UniformSlot({ name, children, emptyPlaceholder, data: parentData
     const finalChildren = slot.map((component, index) => {
         const child = renderComponent({
             component,
+            context,
             resolveSystem: {
                 test: () => {
                     // https://www.youtube.com/watch?v=G3AfIvJBcGo

package/dist/components/convertComponentToProps.d.ts

@@ -1,5 +1,5 @@
 import { ComponentInstance } from '@uniformdev/canvas';
-import { ComponentProps } from './UniformComponent';
+import { ComponentProps, CompositionContext } from './UniformComponent';
 /**
  * Extracts parameters from a component instance and returns them as a props object.
  *
@@ -8,4 +8,7 @@ import { ComponentProps } from './UniformComponent';
  * @returns The parameters as a props object.
  *
  */
-export declare function convertComponentToProps<T = unknown>(component: ComponentInstance): ComponentProps<T>;
+export declare function convertComponentToProps<T = unknown>({ component, context, }: {
+    component: ComponentInstance;
+    context: CompositionContext;
+}): ComponentProps<T>;

package/dist/components/convertComponentToProps.js

@@ -6,7 +6,7 @@
  * @returns The parameters as a props object.
  *
  */
-export function convertComponentToProps(component) {
+export function convertComponentToProps({ component, context, }) {
     var _a;
     const parameters = (_a = component.parameters) !== null && _a !== void 0 ? _a : {};
     const renderComponentProps = {
@@ -16,6 +16,7 @@ export function convertComponentToProps(component) {
         }, {}),
         ...component.data,
         component,
+        context,
     };
     return renderComponentProps;
 }

package/dist/components/nodes/HeadingRichTextNode.d.ts

@@ -0,0 +1,2 @@
+import { RichTextRendererComponent } from '../types';
+export declare const HeadingRichTextNode: RichTextRendererComponent;

package/dist/components/nodes/HeadingRichTextNode.js

@@ -0,0 +1,6 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+export const HeadingRichTextNode = ({ children, node }) => {
+    const { tag } = node;
+    const HTag = (tag !== null && tag !== void 0 ? tag : 'h1');
+    return _jsx(HTag, { children: children });
+};

package/dist/components/nodes/LinebreakRichTextNode.d.ts

@@ -0,0 +1,2 @@
+import { RichTextRendererComponent } from '../types';
+export declare const LinebreakRichTextNode: RichTextRendererComponent;

package/dist/components/nodes/LinebreakRichTextNode.js

@@ -0,0 +1,4 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+export const LinebreakRichTextNode = () => {
+    return _jsx("br", {});
+};

package/dist/components/nodes/LinkRichTextNode.d.ts

@@ -0,0 +1,2 @@
+import { RichTextRendererComponent } from '../types';
+export declare const LinkRichTextNode: RichTextRendererComponent;

package/dist/components/nodes/LinkRichTextNode.js

@@ -0,0 +1,6 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { linkParamValueToHref } from '@uniformdev/richtext';
+export const LinkRichTextNode = ({ children, node }) => {
+    const { link } = node;
+    return _jsx("a", { href: linkParamValueToHref(link), children: children });
+};

package/dist/components/nodes/ListItemRichTextNode.d.ts

@@ -0,0 +1,2 @@
+import { RichTextRendererComponent } from '../types';
+export declare const ListItemRichTextNode: RichTextRendererComponent;

package/dist/components/nodes/ListItemRichTextNode.js

@@ -0,0 +1,5 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+export const ListItemRichTextNode = ({ children, node }) => {
+    const { value } = node;
+    return _jsx("li", { value: Number.isFinite(value) && value > 0 ? value : undefined, children: children });
+};

package/dist/components/nodes/ListRichTextNode.d.ts

@@ -0,0 +1,2 @@
+import { RichTextRendererComponent } from '../types';
+export declare const ListRichTextNode: RichTextRendererComponent;

package/dist/components/nodes/ListRichTextNode.js

@@ -0,0 +1,6 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+export const ListRichTextNode = ({ children, node }) => {
+    const { tag, start } = node;
+    const ListTag = (tag !== null && tag !== void 0 ? tag : 'ul');
+    return _jsx(ListTag, { start: Number.isFinite(start) && start > 0 ? start : undefined, children: children });
+};

package/dist/components/nodes/ParagraphRichTextNode.d.ts

@@ -0,0 +1,2 @@
+import { RichTextRendererComponent } from '../types';
+export declare const ParagraphRichTextNode: RichTextRendererComponent;

package/dist/components/nodes/ParagraphRichTextNode.js

@@ -0,0 +1,6 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { isPureDirection, isPureTextAlign } from '@uniformdev/richtext';
+export const ParagraphRichTextNode = ({ children, node }) => {
+    const { format, direction } = node;
+    return (_jsx("p", { dir: isPureDirection(direction) ? direction : undefined, style: isPureTextAlign(format) ? { textAlign: format } : undefined, children: children }));
+};

package/dist/components/nodes/TabRichTextNode.d.ts

@@ -0,0 +1,2 @@
+import { RichTextRendererComponent } from '../types';
+export declare const TabRichTextNode: RichTextRendererComponent;

package/dist/components/nodes/TabRichTextNode.js

@@ -0,0 +1,4 @@
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+export const TabRichTextNode = () => {
+    return _jsx(_Fragment, { children: '\t' });
+};

package/dist/components/nodes/TextRichTextNode.d.ts

@@ -0,0 +1,2 @@
+import { RichTextRendererComponent } from '../types';
+export declare const TextRichTextNode: RichTextRendererComponent;

package/dist/components/nodes/TextRichTextNode.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { getRichTextTagsFromTextFormat } from '@uniformdev/richtext';
+export const TextRichTextNode = ({ node }) => {
+    const { text, format } = node;
+    const tags = getRichTextTagsFromTextFormat(format);
+    return (_jsx(_Fragment, { children: tags.length > 0
+            ? tags.reduceRight((children, Tag) => _jsx(Tag, { children: children }), text)
+            : text }));
+};

package/dist/components/renderComponent.d.ts

@@ -1,8 +1,10 @@
 import { ComponentInstance } from '@uniformdev/canvas';
 import { SystemRenderConfig, UniformSlotProps } from '@uniformdev/canvas-react';
 import { Key } from 'react';
-export declare function renderComponent({ component, resolveSystem, key, indexInSlot, slotName, parentComponent, slotChildrenCount, emptyPlaceholder, }: {
+import { CompositionContext } from './UniformComponent';
+export declare function renderComponent({ component, context, resolveSystem, key, indexInSlot, slotName, parentComponent, slotChildrenCount, emptyPlaceholder, }: {
     component: ComponentInstance;
+    context: CompositionContext;
     resolveSystem: SystemRenderConfig;
     key?: Key;
     indexInSlot?: number;

package/dist/components/renderComponent.js

@@ -3,7 +3,7 @@ import { CANVAS_LOCALE_TAG_PARAM, CANVAS_PERSONALIZE_SLOT, CANVAS_PERSONALIZE_TY
 import { componentStoreResolver } from '../register/componentStoreResolver';
 import { convertComponentToProps } from './convertComponentToProps';
 import { UniformComponent } from './UniformComponent';
-export function renderComponent({ component, resolveSystem, key = 0, indexInSlot, slotName, parentComponent, slotChildrenCount, emptyPlaceholder, }) {
+export function renderComponent({ component, context, resolveSystem, key = 0, indexInSlot, slotName, parentComponent, slotChildrenCount, emptyPlaceholder, }) {
     var _a, _b, _c, _d;
     const RenderComponent = componentStoreResolver(component);
     // custom handling for tests and personalizes
@@ -12,6 +12,7 @@ export function renderComponent({ component, resolveSystem, key = 0, indexInSlot
             var _a, _b;
             return renderComponent({
                 component: variantComponent,
+                context,
                 resolveSystem,
                 key,
                 parentComponent: component,
@@ -26,6 +27,7 @@ export function renderComponent({ component, resolveSystem, key = 0, indexInSlot
             var _a, _b;
             return renderComponent({
                 component: variantComponent,
+                context,
                 resolveSystem,
                 key,
                 parentComponent: component,
@@ -36,10 +38,13 @@ export function renderComponent({ component, resolveSystem, key = 0, indexInSlot
         });
     }
     else if (RenderComponent) {
-        const props = convertComponentToProps(component);
+        const props = convertComponentToProps({
+            component,
+            context,
+        });
         const shouldRenderContextualEditingTags = Boolean(component._id);
         const isPlaceholder = component._id === PLACEHOLDER_ID;
-        return (_jsx(UniformComponent, { data: component, children: _jsxs(_Fragment, { children: [!shouldRenderContextualEditingTags ? null : (_jsx("script", { "data-role": IN_CONTEXT_EDITOR_COMPONENT_START_ROLE, "data-parent-id": parentComponent === null || parentComponent === void 0 ? void 0 : parentComponent._id, "data-parent-type": parentComponent === null || parentComponent === void 0 ? void 0 : parentComponent.type, "data-component-id": component._id, "data-slot-name": slotName !== null && slotName !== void 0 ? slotName : '', "data-component-index": indexInSlot !== null && indexInSlot !== void 0 ? indexInSlot : '', "data-total-components": slotChildrenCount !== null && slotChildrenCount !== void 0 ? slotChildrenCount : '', "data-component-name": component.type, "data-is-placeholder": isPlaceholder ? 'true' : undefined, "data-is-localized": ((_a = component.parameters) === null || _a === void 0 ? void 0 : _a[CANVAS_LOCALE_TAG_PARAM]) ? 'true' : undefined, "data-component-title": (_d = (_c = (_b = component.parameters) === null || _b === void 0 ? void 0 : _b.title) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '' }, key)), isPlaceholder && emptyPlaceholder !== undefined ? (emptyPlaceholder) : (_jsx(RenderComponent, { ...props })), !shouldRenderContextualEditingTags ? null : _jsx("script", { "data-role": "component-end" })] }) }, key));
+        return (_jsx(UniformComponent, { data: component, context: context, children: _jsxs(_Fragment, { children: [!shouldRenderContextualEditingTags ? null : (_jsx("script", { "data-role": IN_CONTEXT_EDITOR_COMPONENT_START_ROLE, "data-parent-id": parentComponent === null || parentComponent === void 0 ? void 0 : parentComponent._id, "data-parent-type": parentComponent === null || parentComponent === void 0 ? void 0 : parentComponent.type, "data-component-id": component._id, "data-slot-name": slotName !== null && slotName !== void 0 ? slotName : '', "data-component-index": indexInSlot !== null && indexInSlot !== void 0 ? indexInSlot : '', "data-total-components": slotChildrenCount !== null && slotChildrenCount !== void 0 ? slotChildrenCount : '', "data-component-name": component.type, "data-is-placeholder": isPlaceholder ? 'true' : undefined, "data-is-localized": ((_a = component.parameters) === null || _a === void 0 ? void 0 : _a[CANVAS_LOCALE_TAG_PARAM]) ? 'true' : undefined, "data-component-title": (_d = (_c = (_b = component.parameters) === null || _b === void 0 ? void 0 : _b.title) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '' }, key)), isPlaceholder && emptyPlaceholder !== undefined ? (emptyPlaceholder) : (_jsx(RenderComponent, { ...props })), !shouldRenderContextualEditingTags ? null : _jsx("script", { "data-role": "component-end" })] }) }, key));
     }
     return null;
 }

package/dist/components/types.d.ts

@@ -0,0 +1,11 @@
+import { RichTextNode } from '@uniformdev/richtext';
+import React, { PropsWithChildren } from 'react';
+export type RichTextComponentProps<TNode extends RichTextNode = RichTextNode> = {
+    node: TNode;
+};
+export type RichTextRendererComponent<TNode extends RichTextNode = RichTextNode> = React.ComponentType<PropsWithChildren<RichTextComponentProps<TNode>>>;
+/**
+ * Function that maps a Rich Text node instance to its React component to render it.
+ * The resolver would commonly inspect the `type` of the component to decide.
+ */
+export type RenderRichTextComponentResolver = (node: RichTextNode) => RichTextRendererComponent | null | undefined;

package/dist/components/types.js

@@ -0,0 +1 @@
+export {};

package/dist/handler/createPreviewPOSTRouteHandler.js

@@ -83,5 +83,6 @@ const handleSvixMessage = async (request) => {
     }
     return new Response(JSON.stringify({
         handled: typeof tags !== 'undefined',
+        tags,
     }));
 };

package/dist/handler/helpers.d.ts

@@ -5,6 +5,7 @@ export declare const isSvixMessage: (request: Request) => Promise<{
 export declare const processCompositionChange: (compositionId: string) => Promise<{
     tags: string[];
 }>;
+export declare const buildProjectMapNodePaths: (path: string) => string[];
 export declare const getPathName: (url: string) => string;
 export declare const processRedirectChange: (sourceUrl: string) => Promise<{
     tags: string[];

package/dist/handler/helpers.js

@@ -3,7 +3,7 @@ import { Webhook } from 'svix';
 import { getProjectMapClient } from '../client/projectMapClient';
 import { getRouteClient } from '../client/routeClient';
 import config from '../config/uniform.server.config';
-import { buildPathTag } from '../utils/tag';
+import { buildCompositionTag, buildPathTag } from '../utils/tag';
 export const isSvixMessage = async (request) => {
     const requiredHeaders = ['svix-id', 'svix-timestamp', 'svix-signature'];
     const hasAllRequiredHeaders = requiredHeaders.every((header) => request.headers.has(header));
@@ -47,13 +47,35 @@ export const processCompositionChange = async (compositionId) => {
             await processEdgeConfigChange({
                 source_url: node.path,
             });
-            tags.push(buildPathTag(node.path));
+            tags.push(...buildProjectMapNodePaths(node.path));
         }
     }
+    tags.push(buildCompositionTag(compositionId));
     return {
         tags,
     };
 };
+export const buildProjectMapNodePaths = (path) => {
+    const tags = [];
+    const isDynamic = path.includes(':');
+    if (!isDynamic) {
+        tags.push(buildPathTag(path));
+    }
+    else {
+        const pieces = path.split('/');
+        const invalidatePieces = [];
+        for (let j = 0; j < pieces.length; j++) {
+            const piece = pieces[j];
+            if (piece.startsWith(':')) {
+                break;
+            }
+            invalidatePieces.push(piece);
+        }
+        const toInvalidate = invalidatePieces.join('/');
+        tags.push(buildPathTag(toInvalidate));
+    }
+    return tags;
+};
 export const getPathName = (url) => {
     try {
         const { pathname } = new URL(url);

package/dist/handler/messages/handleProjectMapNodeDelete.js

@@ -1,7 +1,6 @@
 import { ProjectMapNodeDeleteDefinition } from '@uniformdev/webhooks';
 import config from '../../config/uniform.server.config';
-import { buildPathTag } from '../../utils/tag';
-import { processEdgeConfigChange } from '../helpers';
+import { buildProjectMapNodePaths, processEdgeConfigChange } from '../helpers';
 export const handleProjectMapNodeDelete = async (body) => {
     var _a;
     const parsed = ProjectMapNodeDeleteDefinition.schema.safeParse(body);
@@ -9,7 +8,7 @@ export const handleProjectMapNodeDelete = async (body) => {
         return undefined;
     }
     const tags = [];
-    tags.push(buildPathTag(parsed.data.path));
+    tags.push(...buildProjectMapNodePaths(parsed.data.path));
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeCompositions) {
         await processEdgeConfigChange({
             source_url: parsed.data.path,

package/dist/handler/messages/handleProjectMapNodeInsert.js

@@ -1,7 +1,6 @@
 import { ProjectMapNodeInsertDefinition } from '@uniformdev/webhooks';
 import config from '../../config/uniform.server.config';
-import { buildPathTag } from '../../utils/tag';
-import { processEdgeConfigChange } from '../helpers';
+import { buildProjectMapNodePaths, processEdgeConfigChange } from '../helpers';
 export const handleProjectMapNodeInsert = async (body) => {
     var _a;
     const parsed = ProjectMapNodeInsertDefinition.schema.safeParse(body);
@@ -9,7 +8,7 @@ export const handleProjectMapNodeInsert = async (body) => {
         return undefined;
     }
     const tags = [];
-    tags.push(buildPathTag(parsed.data.path));
+    tags.push(...buildProjectMapNodePaths(parsed.data.path));
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeCompositions) {
         await processEdgeConfigChange({
             source_url: parsed.data.path,

package/dist/handler/messages/handleProjectMapNodeUpdate.js

@@ -1,7 +1,6 @@
 import { ProjectMapNodeUpdateDefinition } from '@uniformdev/webhooks';
 import config from '../../config/uniform.server.config';
-import { buildPathTag } from '../../utils/tag';
-import { processEdgeConfigChange } from '../helpers';
+import { buildProjectMapNodePaths, processEdgeConfigChange } from '../helpers';
 export const handleProjectMapNodeUpdate = async (body) => {
     var _a;
     const parsed = ProjectMapNodeUpdateDefinition.schema.safeParse(body);
@@ -9,8 +8,8 @@ export const handleProjectMapNodeUpdate = async (body) => {
         return undefined;
     }
     const tags = [];
-    tags.push(buildPathTag(parsed.data.path));
-    tags.push(buildPathTag(parsed.data.previous_path));
+    tags.push(...buildProjectMapNodePaths(parsed.data.path));
+    tags.push(...buildProjectMapNodePaths(parsed.data.previous_path));
     if ((_a = config.experimental) === null || _a === void 0 ? void 0 : _a.edgeCompositions) {
         await processEdgeConfigChange({
             source_url: parsed.data.path,

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { UniformCompositionProps as BaseUniformCompositionProps } from './components/UniformComposition';
 export { GoogleTagManagerAnalytics } from './components/GoogleTagManagerAnalytics';
-export { type ComponentProps } from './components/UniformComponent';
+export { type ComponentProps, type CompositionContext } from './components/UniformComponent';
 export { type UniformCompositionProps } from './components/UniformComposition';
 export { UniformSlot, type UniformSlotProps } from './components/UniformSlot';
 export { UniformText, type UniformTextProps } from './components/UniformText';
@@ -11,6 +11,10 @@ export { componentStore } from './register/componentStore';
 export { registerUniformComponent } from './register/registerUniformComponent';
 export { getCanvasClient } from './client/canvasClient';
 export { getManifestClient } from './client/manifestClient';
+export { getProjectMapClient } from './client/projectMapClient';
 export { getRouteClient } from './client/routeClient';
 export declare const UniformComposition: (props: Omit<BaseUniformCompositionProps, 'suspense' | 'children'>) => JSX.Element;
 export declare const UniformCompositionCustom: (props: BaseUniformCompositionProps) => JSX.Element;
+export { UniformRichText } from './components/UniformRichText';
+export { isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment } from './utils/draft';
+export { CANVAS_DRAFT_STATE, CANVAS_PUBLISHED_STATE, IN_CONTEXT_EDITOR_QUERY_STRING_PARAM, } from '@uniformdev/canvas';

package/dist/index.js

@@ -15,6 +15,10 @@ export { registerUniformComponent } from './register/registerUniformComponent';
 // Clients
 export { getCanvasClient } from './client/canvasClient';
 export { getManifestClient } from './client/manifestClient';
+export { getProjectMapClient } from './client/projectMapClient';
 export { getRouteClient } from './client/routeClient';
 export const UniformComposition = (props) => (_jsx(BaseUniformComposition, { ...props }));
 export const UniformCompositionCustom = (props) => (_jsx(BaseUniformComposition, { ...props }));
+export { UniformRichText } from './components/UniformRichText';
+export { isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment } from './utils/draft';
+export { CANVAS_DRAFT_STATE, CANVAS_PUBLISHED_STATE, IN_CONTEXT_EDITOR_QUERY_STRING_PARAM, } from '@uniformdev/canvas';

package/dist/resolve/resolveChildren.d.ts

@@ -1,9 +1,10 @@
 import { RenderComponentResolver } from '@uniformdev/canvas-react';
 import { ReactNode } from 'react';
-import { UniformComponentProps } from '../components/UniformComponent';
-export declare function resolveChildren<TRenderProps = unknown>({ children, data, hasParentLayout, resolveRenderer, }: {
+import { CompositionContext, UniformComponentProps } from '../components/UniformComponent';
+export declare function resolveChildren<TRenderProps = unknown>({ children, data, context, hasParentLayout, resolveRenderer, }: {
     children: UniformComponentProps<TRenderProps>['children'];
     data: Required<UniformComponentProps<TRenderProps>>['data'];
+    context: CompositionContext;
     hasParentLayout: boolean;
     resolveRenderer: RenderComponentResolver;
 }): ReactNode;

package/dist/resolve/resolveChildren.js

@@ -2,17 +2,19 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { createElement } from 'react';
 import { convertComponentToProps } from '../components/convertComponentToProps';
 import { UniformSlot } from '../components/UniformSlot';
-export function resolveChildren({ children, data, hasParentLayout, resolveRenderer, }) {
+export function resolveChildren({ children, data, context, hasParentLayout, resolveRenderer, }) {
     // attempt to resolve the top level component if we're at the root and children were not provided
     if (!children && !hasParentLayout) {
         const topLevelComponent = resolveRenderer({ type: data.type });
         if (topLevelComponent) {
-            children = createElement(topLevelComponent, convertComponentToProps(data));
+            children = createElement(topLevelComponent, convertComponentToProps({ component: data, context }));
         }
         else {
-            children = Object.keys(data.slots || {}).map((slotName) => (_jsx(UniformSlot, { name: slotName, data: data }, slotName)));
+            children = Object.keys(data.slots || {}).map((slotName) => (_jsx(UniformSlot, { name: slotName, data: data, context: context }, slotName)));
         }
     }
-    const renderChildren = typeof children === 'function' ? children(convertComponentToProps(data)) : children;
+    const renderChildren = typeof children === 'function'
+        ? children(convertComponentToProps({ component: data, context }))
+        : children;
     return renderChildren;
 }

package/dist/utils/tag.d.ts

@@ -1 +1,2 @@
 export declare const buildPathTag: (path: string) => string;
+export declare const buildCompositionTag: (compositionId: string) => string;

package/dist/utils/tag.js

@@ -1,4 +1,7 @@
 export const buildPathTag = (path) => {
     const actualPath = path.startsWith('/') ? path : `/${path}`;
-    return `path:${actualPath}`;
+    return `path:${actualPath}`.toLowerCase();
+};
+export const buildCompositionTag = (compositionId) => {
+    return `composition:${compositionId}`.toLowerCase();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.35.2",
+  "version": "19.36.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "dev": "pnpm build --watch",
@@ -56,13 +56,14 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@uniformdev/canvas": "^19.35.2",
-    "@uniformdev/canvas-react": "^19.35.2",
-    "@uniformdev/context": "^19.35.2",
-    "@uniformdev/project-map": "^19.35.2",
-    "@uniformdev/redirect": "^19.35.2",
-    "@uniformdev/webhooks": "^19.35.2",
-    "@vercel/edge-config": "^0.1.5",
+    "@uniformdev/canvas": "19.36.0",
+    "@uniformdev/canvas-react": "19.36.0",
+    "@uniformdev/context": "19.36.0",
+    "@uniformdev/project-map": "19.36.0",
+    "@uniformdev/redirect": "19.36.0",
+    "@uniformdev/richtext": "19.36.0",
+    "@uniformdev/webhooks": "19.36.0",
+    "@vercel/edge-config": "^0.2.0",
     "dequal": "^2.0.3",
     "js-cookie": "^3.0.5",
     "svix": "^1.5.0"
@@ -75,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "64d3270175087c87cfaa29a283aa4a7b0a98fd2c"
+  "gitHead": "3ae246a7f0f39adeaf04ecba4c7e48c478c019ad"
 }