@uniformdev/canvas-next-rsc 19.79.1-alpha.11 → 19.79.1-alpha.7

package/dist/index.d.ts

@@ -1,12 +1,12 @@
-import { CanvasClient, RouteClient, ResolvedRouteGetResponse } from '@uniformdev/canvas';
+import { CanvasClient, RouteClient, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
 import { CacheMode, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
 export { PageParameters, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
 import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient, ProjectMapNode } from '@uniformdev/project-map';
 import { ContextState, ContextOptions } from '@uniformdev/context';
 import React__default, { PropsWithChildren } from 'react';
-import { U as UniformCompositionProps } from './UniformComposition-d178d865.js';
-export { a as UniformComposition, r as resolveComposition } from './UniformComposition-d178d865.js';
+import { U as UniformCompositionProps } from './UniformComposition-0pvEHduc.js';
+export { a as UniformComposition, r as resolveComposition } from './UniformComposition-0pvEHduc.js';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {
@@ -176,6 +176,26 @@ declare const getManifest: ({ searchParams }: {
                 wv?: string | undefined;
             };
         } | undefined;
+        goal?: {
+            [key: string]: {
+                type: "sig";
+                id: string;
+                op: "=" | "!=" | "<" | ">";
+                score: number;
+            } | {
+                type: "enr";
+                cat: string;
+                value: string;
+                op: "=" | "!=" | "<" | ">";
+                score: number;
+            } | {
+                type: "qrk";
+                id: string;
+                op: "=" | "~" | "//" | "!=" | "!~" | "!//";
+                cs?: boolean | undefined;
+                value: string;
+            };
+        } | undefined;
     };
 }>;
 
@@ -248,6 +268,7 @@ type RetrieveRouteOptions = PageParameters & {
      */
     skipPrefetch?: boolean;
 };
-declare const retrieveRoute: ({ params, searchParams, skipPrefetch, }: RetrieveRouteOptions) => Promise<ResolvedRouteGetResponse>;
+type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'withContentSourceMap' | 'state'>;
+declare const retrieveRoute: ({ params, searchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
 
-export { ContextUpdateTransfer, ContextUpdateTransferProps, CreateServerUniformContextProps, CreateStaticParamsOptions, GetCanvasClientOptions, GetManifestClientOptions, GetProjectMapClientOptions, GetRouteClientOptions, UniformCompositionProps, UniformContext, UniformContextProps, UniformPlayground, UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveRoute };
+export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveRoute };

package/dist/index.esm.js

@@ -299,7 +299,7 @@ var getRouteClient = (options) => {
       } else {
         requestedUrl = new URL(req.url);
       }
-      const tags = [];
+      const tags = ["route"];
       if (requestedUrl) {
         const pathKey = "path";
         const path = requestedUrl.searchParams.get(pathKey);
@@ -394,6 +394,7 @@ import {
   CANVAS_ENRICHMENT_TAG_PARAM,
   CANVAS_PERSONALIZE_TYPE,
   CANVAS_TEST_TYPE,
+  isComponentPlaceholderId,
   walkNodeTree
 } from "@uniformdev/canvas";
 import { ClientContextualEditingComponentWrapper, TestClient } from "@uniformdev/canvas-next-rsc-client";
@@ -442,11 +443,7 @@ import {
 } from "@uniformdev/canvas";
 import { getBaseUrl, getServerConfig as getServerConfig2, resolvePath } from "@uniformdev/canvas-next-rsc-shared";
 import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
-var retrieveRoute = async ({
-  params,
-  searchParams,
-  skipPrefetch
-}) => {
+var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
   if (!skipPrefetch) {
     void getManifest({
       searchParams
@@ -466,7 +463,8 @@ var retrieveRoute = async ({
         result = await retrieveRouteByPath({
           path: value,
           state,
-          searchParams
+          searchParams,
+          fetchOptions
         });
       } catch (e) {
         console.warn(`Failed to retrieve route by path: ${value} with state ${state}`, e);
@@ -500,30 +498,39 @@ var retrieveRoute = async ({
 var retrieveRouteByPath = async ({
   path,
   state,
-  searchParams
+  searchParams,
+  fetchOptions
 }) => {
   var _a;
   const client = getDefaultRouteClient({
     searchParams
   });
+  let queryPath = path;
+  if (searchParams && Object.keys(searchParams).length > 0) {
+    const helper = new URL(getBaseUrl());
+    helper.pathname = path;
+    Object.entries(searchParams).forEach(([key, value]) => {
+      if (typeof value === "string") {
+        helper.searchParams.set(key, value);
+      }
+    });
+    if (helper.searchParams.size > 0) {
+      queryPath = `${helper.pathname}${helper.search}`;
+    }
+  }
   return await client.getRoute({
-    path,
+    ...fetchOptions,
+    path: queryPath,
     state,
     withComponentIDs: true,
     withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig2().experimental) == null ? void 0 : _a.vercelVisualEditing)
   });
 };
 var resolveRedirectHref = (resolveResult, path) => {
-  let href;
-  if (resolveResult.redirect.targetProjectMapNodeId) {
-    const requestUrl = `${getBaseUrl()}${path}`;
-    const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
-    const url = new URL(expandedUrl);
-    href = url.pathname;
-  } else {
-    href = resolveResult.redirect.targetUrl;
-  }
-  return href;
+  const requestUrl = `${getBaseUrl()}${path}`;
+  const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
+  const url = new URL(expandedUrl);
+  return url.pathname;
 };
 var determineState = ({ searchParams }) => {
   const draftMode2 = isDraftModeEnabled({ searchParams });
@@ -564,38 +571,50 @@ var PersonalizeClientWrapper = (props) => {
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
 import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import { createElement, Fragment } from "react";
+
+// src/components/ContextPersonalizationTransfer.tsx
+import { ClientContextPersonalizationTransfer } from "@uniformdev/canvas-next-rsc-client";
+import React4 from "react";
+var ContextPersonalizationTransfer = ({ event }) => {
+  return /* @__PURE__ */ React4.createElement(ClientContextPersonalizationTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
+};
+
+// src/components/PersonalizeServer.ts
 var PersonalizeServer = (props) => {
   var _a;
-  const { indexes } = runPersonalization2(props);
+  const { indexes, event } = runPersonalization2(props);
   const slot = (_a = props.slots) == null ? void 0 : _a[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
     return component;
   });
-  return createElement(Fragment, void 0, components);
+  const eventElement = createElement(ContextPersonalizationTransfer, {
+    event
+  });
+  return createElement(Fragment, void 0, [...components, eventElement]);
 };
 
 // src/components/TestServer.ts
-import { CANVAS_TEST_SLOT, CANVAS_TEST_VARIANT_PARAM } from "@uniformdev/canvas";
+import { CANVAS_TEST_SLOT } from "@uniformdev/canvas";
+import { runTest } from "@uniformdev/canvas-next-rsc-shared";
 import { createElement as createElement2, Fragment as Fragment2 } from "react";
-var TestServer = ({ test, component, contextInstance, slots }) => {
+
+// src/components/ContextTestTransfer.tsx
+import { ClientContextTestTransfer } from "@uniformdev/canvas-next-rsc-client";
+import React5 from "react";
+var ContextTestTransfer = ({ event }) => {
+  return /* @__PURE__ */ React5.createElement(ClientContextTestTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
+};
+
+// src/components/TestServer.ts
+var TestServer = (props) => {
   var _a, _b, _c;
-  const slot = ((_a = component.slots) == null ? void 0 : _a[CANVAS_TEST_SLOT]) || [];
-  const { result } = contextInstance.test({
-    name: test,
-    variations: slot.map((v, i) => {
-      var _a2, _b2, _c2;
-      const contextTag = (_b2 = (_a2 = v.parameters) == null ? void 0 : _a2[CANVAS_TEST_VARIANT_PARAM]) == null ? void 0 : _b2.value;
-      const id = (_c2 = contextTag == null ? void 0 : contextTag.id) != null ? _c2 : "testId" in v ? v.testId : `ab-${i}-${v.type}`;
-      return {
-        id,
-        testDistribution: contextTag == null ? void 0 : contextTag.testDistribution,
-        index: i
-      };
-    })
+  const { index, event } = runTest(props);
+  const component = typeof index === "number" ? (_c = (_b = (_a = props.slots) == null ? void 0 : _a[CANVAS_TEST_SLOT]) == null ? void 0 : _b.items[index]) != null ? _c : null : null;
+  const eventElement = createElement2(ContextTestTransfer, {
+    event
   });
-  const components = result ? (_c = (_b = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _b.items[result.index]) != null ? _c : null : null;
-  return createElement2(Fragment2, void 0, components);
+  return createElement2(Fragment2, void 0, [component, eventElement]);
 };
 
 // src/components/UniformComposition.ts
@@ -814,7 +833,9 @@ var resolveComponents = ({
       component,
       slots,
       contextInstance: isServer || includeContext ? serverContext : void 0,
-      context: compositionContext
+      context: compositionContext,
+      slotName,
+      slotIndex: isRoot ? void 0 : componentIndex
     };
     const element = createElement3(resolvedComponent, componentProps);
     let tagElement = null;
@@ -833,11 +854,12 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
+      const isPlaceholder = isComponentPlaceholderId(component == null ? void 0 : component._id);
       childNode = createElement3(
         PureContextualEditingComponentWrapper,
         {
           key: `${slotName}-${componentIndex}-wrapper`,
-          isPlaceholder: false,
+          isPlaceholder,
           parentComponent: parent,
           component,
           slotName,
@@ -891,7 +913,7 @@ import {
 } from "@uniformdev/canvas-next-rsc-client";
 import { getServerConfig as getServerConfig4 } from "@uniformdev/canvas-next-rsc-shared";
 import { Suspense } from "react";
-import React4 from "react";
+import React6 from "react";
 var UniformContext = async ({
   clientContextComponent,
   children
@@ -902,16 +924,16 @@ var UniformContext = async ({
   });
   const ContextComponent = clientContextComponent || DefaultUniformClientContext;
   const disableDevTools = ((_a = getServerConfig4().context) == null ? void 0 : _a.disableDevTools) || false;
-  return /* @__PURE__ */ React4.createElement(React4.Fragment, null, children, /* @__PURE__ */ React4.createElement(ContextComponent, { manifest, disableDevTools }), /* @__PURE__ */ React4.createElement(Suspense, { fallback: /* @__PURE__ */ React4.createElement(React4.Fragment, null) }, /* @__PURE__ */ React4.createElement(UniformScript, null)));
+  return /* @__PURE__ */ React6.createElement(React6.Fragment, null, children, /* @__PURE__ */ React6.createElement(ContextComponent, { manifest, disableDevTools }), /* @__PURE__ */ React6.createElement(Suspense, { fallback: /* @__PURE__ */ React6.createElement(React6.Fragment, null) }, /* @__PURE__ */ React6.createElement(UniformScript, null)));
 };
 
 // src/components/UniformPlayground.tsx
 import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, CANVAS_EDITOR_STATE as CANVAS_EDITOR_STATE3 } from "@uniformdev/canvas";
 import { notFound as notFound2 } from "next/navigation";
-import React5 from "react";
+import React7 from "react";
 var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!isDraftModeEnabled({ searchParams })) {
-    return /* @__PURE__ */ React5.createElement("div", null, /* @__PURE__ */ React5.createElement("h1", null, "Playground is only available in draft mode"));
+    return /* @__PURE__ */ React7.createElement("div", null, /* @__PURE__ */ React7.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = searchParams["id"];
   if (!id) {
@@ -942,7 +964,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     notFound2();
   }
-  return /* @__PURE__ */ React5.createElement(
+  return /* @__PURE__ */ React7.createElement(
     UniformComposition,
     {
       mode: "server",

package/dist/index.js

@@ -354,7 +354,7 @@ var getRouteClient = (options) => {
       } else {
         requestedUrl = new URL(req.url);
       }
-      const tags = [];
+      const tags = ["route"];
       if (requestedUrl) {
         const pathKey = "path";
         const path = requestedUrl.searchParams.get(pathKey);
@@ -444,12 +444,12 @@ async function generateStaticParams() {
 
 // src/components/UniformComposition.ts
 var import_canvas7 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_client4 = require("@uniformdev/canvas-next-rsc-client");
-var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_client6 = require("@uniformdev/canvas-next-rsc-client");
+var import_canvas_next_rsc_shared7 = require("@uniformdev/canvas-next-rsc-shared");
 var import_core = require("@uniformdev/canvas-react/core");
 var import_headers3 = require("next/headers");
 var import_navigation = require("next/navigation");
-var import_react6 = require("react");
+var import_react8 = require("react");
 
 // src/context/createServerUniformContext.ts
 var import_canvas_next_rsc_shared2 = require("@uniformdev/canvas-next-rsc-shared");
@@ -481,11 +481,7 @@ var createServerUniformContextFromManifest = async (options) => {
 var import_canvas4 = require("@uniformdev/canvas");
 var import_canvas_next_rsc_shared3 = require("@uniformdev/canvas-next-rsc-shared");
 var import_redirect = require("@uniformdev/redirect");
-var retrieveRoute = async ({
-  params,
-  searchParams,
-  skipPrefetch
-}) => {
+var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
   if (!skipPrefetch) {
     void getManifest({
       searchParams
@@ -505,7 +501,8 @@ var retrieveRoute = async ({
         result = await retrieveRouteByPath({
           path: value,
           state,
-          searchParams
+          searchParams,
+          fetchOptions
         });
       } catch (e) {
         console.warn(`Failed to retrieve route by path: ${value} with state ${state}`, e);
@@ -539,30 +536,39 @@ var retrieveRoute = async ({
 var retrieveRouteByPath = async ({
   path,
   state,
-  searchParams
+  searchParams,
+  fetchOptions
 }) => {
   var _a;
   const client = getDefaultRouteClient({
     searchParams
   });
+  let queryPath = path;
+  if (searchParams && Object.keys(searchParams).length > 0) {
+    const helper = new URL((0, import_canvas_next_rsc_shared3.getBaseUrl)());
+    helper.pathname = path;
+    Object.entries(searchParams).forEach(([key, value]) => {
+      if (typeof value === "string") {
+        helper.searchParams.set(key, value);
+      }
+    });
+    if (helper.searchParams.size > 0) {
+      queryPath = `${helper.pathname}${helper.search}`;
+    }
+  }
   return await client.getRoute({
-    path,
+    ...fetchOptions,
+    path: queryPath,
     state,
     withComponentIDs: true,
     withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = (0, import_canvas_next_rsc_shared3.getServerConfig)().experimental) == null ? void 0 : _a.vercelVisualEditing)
   });
 };
 var resolveRedirectHref = (resolveResult, path) => {
-  let href;
-  if (resolveResult.redirect.targetProjectMapNodeId) {
-    const requestUrl = `${(0, import_canvas_next_rsc_shared3.getBaseUrl)()}${path}`;
-    const expandedUrl = (0, import_redirect.getTargetVariableExpandedUrl)(requestUrl, resolveResult.redirect);
-    const url = new URL(expandedUrl);
-    href = url.pathname;
-  } else {
-    href = resolveResult.redirect.targetUrl;
-  }
-  return href;
+  const requestUrl = `${(0, import_canvas_next_rsc_shared3.getBaseUrl)()}${path}`;
+  const expandedUrl = (0, import_redirect.getTargetVariableExpandedUrl)(requestUrl, resolveResult.redirect);
+  const url = new URL(expandedUrl);
+  return url.pathname;
 };
 var determineState = ({ searchParams }) => {
   const draftMode2 = isDraftModeEnabled({ searchParams });
@@ -602,39 +608,51 @@ var PersonalizeClientWrapper = (props) => {
 // src/components/PersonalizeServer.ts
 var import_canvas5 = require("@uniformdev/canvas");
 var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
-var import_react4 = require("react");
+var import_react5 = require("react");
+
+// src/components/ContextPersonalizationTransfer.tsx
+var import_canvas_next_rsc_client4 = require("@uniformdev/canvas-next-rsc-client");
+var import_react4 = __toESM(require("react"));
+var ContextPersonalizationTransfer = ({ event }) => {
+  return /* @__PURE__ */ import_react4.default.createElement(import_canvas_next_rsc_client4.ClientContextPersonalizationTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
+};
+
+// src/components/PersonalizeServer.ts
 var PersonalizeServer = (props) => {
   var _a;
-  const { indexes } = (0, import_canvas_next_rsc_shared5.runPersonalization)(props);
+  const { indexes, event } = (0, import_canvas_next_rsc_shared5.runPersonalization)(props);
   const slot = (_a = props.slots) == null ? void 0 : _a[import_canvas5.CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
     return component;
   });
-  return (0, import_react4.createElement)(import_react4.Fragment, void 0, components);
+  const eventElement = (0, import_react5.createElement)(ContextPersonalizationTransfer, {
+    event
+  });
+  return (0, import_react5.createElement)(import_react5.Fragment, void 0, [...components, eventElement]);
 };
 
 // src/components/TestServer.ts
 var import_canvas6 = require("@uniformdev/canvas");
-var import_react5 = require("react");
-var TestServer = ({ test, component, contextInstance, slots }) => {
+var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
+var import_react7 = require("react");
+
+// src/components/ContextTestTransfer.tsx
+var import_canvas_next_rsc_client5 = require("@uniformdev/canvas-next-rsc-client");
+var import_react6 = __toESM(require("react"));
+var ContextTestTransfer = ({ event }) => {
+  return /* @__PURE__ */ import_react6.default.createElement(import_canvas_next_rsc_client5.ClientContextTestTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
+};
+
+// src/components/TestServer.ts
+var TestServer = (props) => {
   var _a, _b, _c;
-  const slot = ((_a = component.slots) == null ? void 0 : _a[import_canvas6.CANVAS_TEST_SLOT]) || [];
-  const { result } = contextInstance.test({
-    name: test,
-    variations: slot.map((v, i) => {
-      var _a2, _b2, _c2;
-      const contextTag = (_b2 = (_a2 = v.parameters) == null ? void 0 : _a2[import_canvas6.CANVAS_TEST_VARIANT_PARAM]) == null ? void 0 : _b2.value;
-      const id = (_c2 = contextTag == null ? void 0 : contextTag.id) != null ? _c2 : "testId" in v ? v.testId : `ab-${i}-${v.type}`;
-      return {
-        id,
-        testDistribution: contextTag == null ? void 0 : contextTag.testDistribution,
-        index: i
-      };
-    })
+  const { index, event } = (0, import_canvas_next_rsc_shared6.runTest)(props);
+  const component = typeof index === "number" ? (_c = (_b = (_a = props.slots) == null ? void 0 : _a[import_canvas6.CANVAS_TEST_SLOT]) == null ? void 0 : _b.items[index]) != null ? _c : null : null;
+  const eventElement = (0, import_react7.createElement)(ContextTestTransfer, {
+    event
   });
-  const components = result ? (_c = (_b = slots == null ? void 0 : slots[import_canvas6.CANVAS_TEST_SLOT]) == null ? void 0 : _b.items[result.index]) != null ? _c : null : null;
-  return (0, import_react5.createElement)(import_react5.Fragment, void 0, components);
+  return (0, import_react7.createElement)(import_react7.Fragment, void 0, [component, eventElement]);
 };
 
 // src/components/UniformComposition.ts
@@ -653,7 +671,7 @@ var UniformComposition = async ({
     });
     searchParams = props.searchParams;
   }
-  const { value: path } = (0, import_canvas_next_rsc_shared6.resolvePath)(props);
+  const { value: path } = (0, import_canvas_next_rsc_shared7.resolvePath)(props);
   if (!route || route.type === "notFound") {
     (0, import_navigation.notFound)();
   }
@@ -699,7 +717,7 @@ var UniformComposition = async ({
   if (props.mode === "server") {
     const headersValue = (0, import_headers3.headers)();
     const missingQuirkValue = "unknown";
-    transfer = (0, import_react6.createElement)(ContextUpdateTransfer, {
+    transfer = (0, import_react8.createElement)(ContextUpdateTransfer, {
       serverContext,
       update: {
         params: props.params,
@@ -716,9 +734,9 @@ var UniformComposition = async ({
       }
     });
   } else if (props.mode === "static") {
-    transfer = (0, import_react6.createElement)(ContextUpdateTrigger);
+    transfer = (0, import_react8.createElement)(ContextUpdateTrigger);
   }
-  return (0, import_react6.createElement)(import_react6.Fragment, void 0, transfer, resolved);
+  return (0, import_react8.createElement)(import_react8.Fragment, void 0, transfer, resolved);
 };
 var isServerComponent = ({
   component,
@@ -726,10 +744,10 @@ var isServerComponent = ({
 }) => {
   var _a, _b;
   if (component.type === import_canvas7.CANVAS_PERSONALIZE_TYPE) {
-    return serverContext && ((_a = (0, import_canvas_next_rsc_shared6.getServerConfig)().evaluation) == null ? void 0 : _a.personalization) !== "client";
+    return serverContext && ((_a = (0, import_canvas_next_rsc_shared7.getServerConfig)().evaluation) == null ? void 0 : _a.personalization) !== "client";
   }
   if (component.type === import_canvas7.CANVAS_TEST_TYPE) {
-    return serverContext && ((_b = (0, import_canvas_next_rsc_shared6.getServerConfig)().evaluation) == null ? void 0 : _b.testing) !== "client";
+    return serverContext && ((_b = (0, import_canvas_next_rsc_shared7.getServerConfig)().evaluation) == null ? void 0 : _b.testing) !== "client";
   }
 };
 var resolveSystemComponent = ({
@@ -744,7 +762,7 @@ var resolveSystemComponent = ({
     return server ? PersonalizeServer : PersonalizeClientWrapper;
   }
   if (component.type === import_canvas7.CANVAS_TEST_TYPE) {
-    return server ? TestServer : import_canvas_next_rsc_client4.TestClient;
+    return server ? TestServer : import_canvas_next_rsc_client6.TestClient;
   }
   return null;
 };
@@ -853,12 +871,14 @@ var resolveComponents = ({
       component,
       slots,
       contextInstance: isServer || includeContext ? serverContext : void 0,
-      context: compositionContext
+      context: compositionContext,
+      slotName,
+      slotIndex: isRoot ? void 0 : componentIndex
     };
-    const element = (0, import_react6.createElement)(resolvedComponent, componentProps);
+    const element = (0, import_react8.createElement)(resolvedComponent, componentProps);
     let tagElement = null;
     if (enrichmentTags == null ? void 0 : enrichmentTags.length) {
-      tagElement = (0, import_react6.createElement)(ContextUpdateTransfer, {
+      tagElement = (0, import_react8.createElement)(ContextUpdateTransfer, {
         key: `${slotName}-${componentIndex}-tags`,
         update: {
           enrichments: enrichmentTags
@@ -872,11 +892,12 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
-      childNode = (0, import_react6.createElement)(
+      const isPlaceholder = (0, import_canvas7.isComponentPlaceholderId)(component == null ? void 0 : component._id);
+      childNode = (0, import_react8.createElement)(
         import_core.PureContextualEditingComponentWrapper,
         {
           key: `${slotName}-${componentIndex}-wrapper`,
-          isPlaceholder: false,
+          isPlaceholder,
           parentComponent: parent,
           component,
           slotName,
@@ -891,8 +912,8 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
-      childNode = (0, import_react6.createElement)(
-        import_canvas_next_rsc_client4.ClientContextualEditingComponentWrapper,
+      childNode = (0, import_react8.createElement)(
+        import_canvas_next_rsc_client6.ClientContextualEditingComponentWrapper,
         {
           key: `${slotName}-${componentIndex}-wrapper`,
           isPlaceholder: false,
@@ -912,8 +933,8 @@ var resolveComponents = ({
       }
       childNode = elements;
     }
-    return (0, import_react6.createElement)(
-      import_react6.Fragment,
+    return (0, import_react8.createElement)(
+      import_react8.Fragment,
       {
         key: !isRoot ? `${slotName}-${componentIndex}` : void 0
       },
@@ -924,10 +945,10 @@ var resolveComponents = ({
 };
 
 // src/components/UniformContext.tsx
-var import_canvas_next_rsc_client5 = require("@uniformdev/canvas-next-rsc-client");
-var import_canvas_next_rsc_shared7 = require("@uniformdev/canvas-next-rsc-shared");
-var import_react7 = require("react");
-var import_react8 = __toESM(require("react"));
+var import_canvas_next_rsc_client7 = require("@uniformdev/canvas-next-rsc-client");
+var import_canvas_next_rsc_shared8 = require("@uniformdev/canvas-next-rsc-shared");
+var import_react9 = require("react");
+var import_react10 = __toESM(require("react"));
 var UniformContext = async ({
   clientContextComponent,
   children
@@ -936,18 +957,18 @@ var UniformContext = async ({
   const manifest = await getManifest({
     searchParams: {}
   });
-  const ContextComponent = clientContextComponent || import_canvas_next_rsc_client5.DefaultUniformClientContext;
-  const disableDevTools = ((_a = (0, import_canvas_next_rsc_shared7.getServerConfig)().context) == null ? void 0 : _a.disableDevTools) || false;
-  return /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null, children, /* @__PURE__ */ import_react8.default.createElement(ContextComponent, { manifest, disableDevTools }), /* @__PURE__ */ import_react8.default.createElement(import_react7.Suspense, { fallback: /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null) }, /* @__PURE__ */ import_react8.default.createElement(import_canvas_next_rsc_client5.UniformScript, null)));
+  const ContextComponent = clientContextComponent || import_canvas_next_rsc_client7.DefaultUniformClientContext;
+  const disableDevTools = ((_a = (0, import_canvas_next_rsc_shared8.getServerConfig)().context) == null ? void 0 : _a.disableDevTools) || false;
+  return /* @__PURE__ */ import_react10.default.createElement(import_react10.default.Fragment, null, children, /* @__PURE__ */ import_react10.default.createElement(ContextComponent, { manifest, disableDevTools }), /* @__PURE__ */ import_react10.default.createElement(import_react9.Suspense, { fallback: /* @__PURE__ */ import_react10.default.createElement(import_react10.default.Fragment, null) }, /* @__PURE__ */ import_react10.default.createElement(import_canvas_next_rsc_client7.UniformScript, null)));
 };
 
 // src/components/UniformPlayground.tsx
 var import_canvas8 = require("@uniformdev/canvas");
 var import_navigation2 = require("next/navigation");
-var import_react9 = __toESM(require("react"));
+var import_react11 = __toESM(require("react"));
 var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!isDraftModeEnabled({ searchParams })) {
-    return /* @__PURE__ */ import_react9.default.createElement("div", null, /* @__PURE__ */ import_react9.default.createElement("h1", null, "Playground is only available in draft mode"));
+    return /* @__PURE__ */ import_react11.default.createElement("div", null, /* @__PURE__ */ import_react11.default.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = searchParams["id"];
   if (!id) {
@@ -978,7 +999,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     (0, import_navigation2.notFound)();
   }
-  return /* @__PURE__ */ import_react9.default.createElement(
+  return /* @__PURE__ */ import_react11.default.createElement(
     UniformComposition,
     {
       mode: "server",