@uniformdev/canvas-next-rsc 19.198.3-alpha.5 → 19.199.1-alpha.10

package/dist/index.js

@@ -472,12 +472,12 @@ async function generateStaticParams() {
 
 // src/components/UniformComposition.ts
 var import_canvas8 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_client7 = require("@uniformdev/canvas-next-rsc-client");
-var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_client8 = 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_react9 = require("react");
+var import_react10 = require("react");
 
 // src/context/createServerUniformContext.ts
 var import_canvas_next_rsc_shared = require("@uniformdev/canvas-next-rsc-shared");
@@ -492,10 +492,13 @@ var createServerUniformContext = async (options) => {
   return context;
 };
 var createServerUniformContextFromManifest = async (options) => {
-  var _a;
+  var _a, _b, _c;
+  const quirksEnabled = (_a = getServerConfig().experimental) == null ? void 0 : _a.quirkSerialization;
   const context = (0, import_canvas_next_rsc_shared.createUniformContext)({
     ...options || {},
-    serverCookieValue: (_a = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
+    serverCookieValue: (_b = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _b.value,
+    experimental_quirksEnabled: quirksEnabled,
+    quirkCookieValue: quirksEnabled ? (_c = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_QUIRK_COOKIE_NAME)) == null ? void 0 : _c.value : void 0
   });
   return context;
 };
@@ -568,12 +571,17 @@ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions)
   let result;
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
+    const releaseId = determineReleaseId({
+      searchParams,
+      state
+    });
     try {
       result = await retrieveRouteByPath({
         path: value,
         state,
         searchParams,
-        fetchOptions
+        fetchOptions,
+        releaseId
       });
     } catch (e) {
       console.warn(`Failed to retrieve route by path: ${value} with state ${state}`, e);
@@ -590,7 +598,8 @@ var retrieveRouteByPath = async ({
   path,
   state,
   searchParams,
-  fetchOptions
+  fetchOptions,
+  releaseId
 }) => {
   var _a;
   const client = getDefaultRouteClient({
@@ -615,7 +624,8 @@ var retrieveRouteByPath = async ({
     state,
     dataSourceVariant: (0, import_canvas4.getDataSourceVariantFromRouteGetParams)(fetchOptions != null ? fetchOptions : {}, state),
     withComponentIDs: true,
-    withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing)
+    withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing),
+    releaseId
   });
 };
 var resolveRedirectHref = (resolveResult, path) => {
@@ -639,6 +649,16 @@ var determineState = ({ searchParams }) => {
   }
   return states;
 };
+var determineReleaseId = ({
+  searchParams,
+  state
+}) => {
+  const draftMode2 = isDraftModeEnabled({ searchParams });
+  if (!draftMode2 || state === import_canvas4.CANVAS_PUBLISHED_STATE) {
+    return void 0;
+  }
+  return searchParams == null ? void 0 : searchParams.releaseId;
+};
 
 // src/components/ContextUpdateTrigger.tsx
 var import_canvas_next_rsc_client2 = require("@uniformdev/canvas-next-rsc-client");
@@ -691,46 +711,59 @@ var PersonalizeServer = (props) => {
   return (0, import_react5.createElement)(import_react5.Fragment, void 0, [...components, eventElement]);
 };
 
+// src/components/PersonalizeServerHybrid.tsx
+var import_canvas_next_rsc_client5 = require("@uniformdev/canvas-next-rsc-client");
+var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
+var import_react6 = __toESM(require("react"));
+var PersonalizeServerHybrid = (props) => {
+  const { indexes } = (0, import_canvas_next_rsc_shared5.runPersonalization)(props);
+  return /* @__PURE__ */ import_react6.default.createElement(
+    import_canvas_next_rsc_client5.PersonalizeClient,
+    {
+      component: props.component,
+      count: props.count,
+      slots: props.slots,
+      trackingEventName: props.trackingEventName,
+      indexes
+    }
+  );
+};
+
 // src/components/TestServer.ts
 var import_canvas6 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
 var import_cache2 = require("next/cache");
-var import_react7 = require("react");
+var import_react8 = 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 import_canvas_next_rsc_client6 = require("@uniformdev/canvas-next-rsc-client");
+var import_react7 = __toESM(require("react"));
 var ContextTestTransfer = ({ event }) => {
-  return /* @__PURE__ */ import_react6.default.createElement(import_canvas_next_rsc_client5.ClientContextTestTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
+  return /* @__PURE__ */ import_react7.default.createElement(import_canvas_next_rsc_client6.ClientContextTestTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
 };
 
 // src/components/TestServer.ts
 var TestServer = async (props) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.testSuspense) {
     (0, import_cache2.unstable_noStore)();
   }
-  const { contextInstance, test } = props;
-  const isTestDefined = Boolean((_b = contextInstance.manifest.data.project.test) == null ? void 0 : _b[test]);
-  if (!isTestDefined && process.env.NODE_ENV !== "production") {
-    console.warn(`Test "${test}" is not defined in Uniform manifest.`);
-  }
-  const { index, event } = (0, import_canvas_next_rsc_shared5.runTest)(props);
+  const { index, event } = (0, import_canvas_next_rsc_shared6.runTest)(props);
   if (index === null || event === null) {
     return null;
   }
-  const component = typeof index === "number" ? (_e = (_d = (_c = props.slots) == null ? void 0 : _c[import_canvas6.CANVAS_TEST_SLOT]) == null ? void 0 : _d.items[index]) != null ? _e : null : null;
-  const eventElement = (0, import_react7.createElement)(ContextTestTransfer, {
+  const component = typeof index === "number" ? (_d = (_c = (_b = props.slots) == null ? void 0 : _b[import_canvas6.CANVAS_TEST_SLOT]) == null ? void 0 : _c.items[index]) != null ? _d : null : null;
+  const eventElement = (0, import_react8.createElement)(ContextTestTransfer, {
     event,
     key: `${props.slotName}-${props.slotIndex}-server-transfer`
   });
-  return (0, import_react7.createElement)(import_react7.Fragment, void 0, [component, eventElement]);
+  return (0, import_react8.createElement)(import_react8.Fragment, void 0, [component, eventElement]);
 };
 
 // src/components/VisibilityRulesWrapper.tsx
 var import_canvas7 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_client6 = require("@uniformdev/canvas-next-rsc-client");
-var import_react8 = __toESM(require("react"));
+var import_canvas_next_rsc_client7 = require("@uniformdev/canvas-next-rsc-client");
+var import_react9 = __toESM(require("react"));
 var VisibilityRulesWrapper = (props) => {
   const { context, ...rest } = props;
   let isVisible = null;
@@ -741,12 +774,13 @@ var VisibilityRulesWrapper = (props) => {
       parameter: props.parameter
     });
   }
-  return /* @__PURE__ */ import_react8.default.createElement(import_canvas_next_rsc_client6.VisibilityRulesWrapperClient, { ...rest, initialIsVisible: isVisible });
+  return /* @__PURE__ */ import_react9.default.createElement(import_canvas_next_rsc_client7.VisibilityRulesWrapperClient, { ...rest, initialIsVisible: isVisible });
 };
 
 // src/components/UniformComposition.ts
 var UniformComposition = async ({
   resolveComponent,
+  resolveEmptyPlaceholder,
   route,
   ...props
 }) => {
@@ -760,7 +794,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)();
   }
@@ -771,13 +805,16 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === import_canvas8.CANVAS_DRAFT_STATE || state === import_canvas8.CANVAS_EDITOR_STATE) {
     (0, import_canvas8.walkNodeTree)(route.compositionApiResponse.composition, (node) => {
+      var _a, _b;
       if (node.type === "component" && node.node.parameters) {
+        const contextualEditing = node.node.parameters[import_canvas8.CANVAS_CONTEXTUAL_EDITING_PARAM];
+        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
             const contextualParameter = parameter;
             contextualParameter._contextualEditing = {
-              isEditable: true
+              isEditable: editableFields.includes(key)
             };
           }
         });
@@ -801,13 +838,14 @@ var UniformComposition = async ({
     resolveComponent,
     serverContext,
     compositionContext,
-    mode: props.mode
+    mode: props.mode,
+    resolveEmptyPlaceholder
   });
   let transfer = null;
   if (props.mode === "server") {
     const headersValue = (0, import_headers3.headers)();
     const missingQuirkValue = "unknown";
-    transfer = (0, import_react9.createElement)(ContextUpdateTransfer, {
+    transfer = (0, import_react10.createElement)(ContextUpdateTransfer, {
       serverContext,
       update: {
         params: props.params,
@@ -827,11 +865,11 @@ var UniformComposition = async ({
       }
     });
   } else if (props.mode === "static") {
-    transfer = (0, import_react9.createElement)(ContextUpdateTrigger, {
+    transfer = (0, import_react10.createElement)(ContextUpdateTrigger, {
       path
     });
   }
-  return (0, import_react9.createElement)(import_react9.Fragment, void 0, transfer, resolved);
+  return (0, import_react10.createElement)(import_react10.Fragment, void 0, transfer, resolved);
 };
 var isServerComponent = ({
   component,
@@ -854,11 +892,11 @@ var resolveSystemComponent = ({
   let resolved = null;
   let suspense = void 0;
   if (component.type === import_canvas8.CANVAS_PERSONALIZE_TYPE) {
-    resolved = server ? PersonalizeServer : PersonalizeClientWrapper;
+    resolved = server ? resolveServerPersonalizeComponent({ config }) : PersonalizeClientWrapper;
     suspense = server && ((_a = config.ppr) == null ? void 0 : _a.personalizationSuspense);
   }
   if (component.type === import_canvas8.CANVAS_TEST_TYPE) {
-    resolved = server ? TestServer : import_canvas_next_rsc_client7.TestClient;
+    resolved = server ? TestServer : import_canvas_next_rsc_client8.TestClient;
     suspense = server && ((_b = config.ppr) == null ? void 0 : _b.testSuspense);
   }
   return {
@@ -866,10 +904,15 @@ var resolveSystemComponent = ({
     suspense
   };
 };
+var resolveServerPersonalizeComponent = ({ config }) => {
+  var _a;
+  return ((_a = config.evaluation) == null ? void 0 : _a.personalization) === "hybrid" ? PersonalizeServerHybrid : PersonalizeServer;
+};
 var resolveSlots = ({
   component,
   root,
   resolveComponent,
+  resolveEmptyPlaceholder,
   serverContext,
   compositionContext,
   mode
@@ -889,7 +932,8 @@ var resolveSlots = ({
         resolveComponent,
         serverContext,
         compositionContext,
-        mode
+        mode,
+        resolveEmptyPlaceholder
       });
       if (resolved) {
         slots[slotName] = {
@@ -920,6 +964,7 @@ var resolveComponents = ({
   slotName,
   slotIndex,
   resolveComponent,
+  resolveEmptyPlaceholder,
   compositionContext,
   mode
 }) => {
@@ -945,11 +990,29 @@ var resolveComponents = ({
       component,
       server: isServer
     });
+    const isPlaceholder = (0, import_canvas8.isComponentPlaceholderId)(component == null ? void 0 : component._id);
+    let resolveResult = null;
+    if (isPlaceholder && resolveEmptyPlaceholder) {
+      const resolvedPlaceholder = resolveEmptyPlaceholder({
+        parentComponent: parent,
+        component,
+        slotName,
+        slotIndex: componentIndex
+      });
+      if (resolvedPlaceholder) {
+        resolveResult = {
+          component: resolvedPlaceholder.component
+        };
+      }
+    }
+    if (!resolveResult) {
+      resolveResult = resolveComponent({ component });
+    }
     const {
       component: regularComponent,
       includeContext,
       suspense: componentSuspense
-    } = resolveComponent({ component }) || {
+    } = resolveResult || {
       component: null
     };
     if (!systemComponent && !regularComponent) {
@@ -961,6 +1024,7 @@ var resolveComponents = ({
       resolveComponent,
       serverContext,
       compositionContext,
+      resolveEmptyPlaceholder,
       mode
     });
     const resolvedComponent = systemComponent || regularComponent;
@@ -983,20 +1047,20 @@ var resolveComponents = ({
     };
     let element = null;
     if (wrapInSuspense) {
-      element = (0, import_react9.createElement)(
-        import_react9.Suspense,
+      element = (0, import_react10.createElement)(
+        import_react10.Suspense,
         {
           key,
-          fallback: typeof wrapInSuspense === "boolean" || typeof (wrapInSuspense == null ? void 0 : wrapInSuspense.fallback) === "undefined" ? void 0 : (0, import_react9.createElement)(wrapInSuspense.fallback)
+          fallback: typeof wrapInSuspense === "boolean" || typeof (wrapInSuspense == null ? void 0 : wrapInSuspense.fallback) === "undefined" ? void 0 : (0, import_react10.createElement)(wrapInSuspense.fallback)
         },
-        (0, import_react9.createElement)(resolvedComponent, componentProps)
+        (0, import_react10.createElement)(resolvedComponent, componentProps)
       );
     } else {
-      element = (0, import_react9.createElement)(resolvedComponent, { ...componentProps, key });
+      element = (0, import_react10.createElement)(resolvedComponent, { ...componentProps, key });
     }
     let tagElement = null;
     if (enrichmentTags == null ? void 0 : enrichmentTags.length) {
-      tagElement = (0, import_react9.createElement)(ContextUpdateTransfer, {
+      tagElement = (0, import_react10.createElement)(ContextUpdateTransfer, {
         key: `${slotName}-${componentIndex}-tags`,
         update: {
           enrichments: enrichmentTags
@@ -1010,13 +1074,13 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
-      const isPlaceholder = (0, import_canvas8.isComponentPlaceholderId)(component == null ? void 0 : component._id);
-      if (!isPlaceholder || compositionContext.previewMode === "editor") {
-        childNode = (0, import_react9.createElement)(
+      const isPlaceholder2 = (0, import_canvas8.isComponentPlaceholderId)(component == null ? void 0 : component._id);
+      if (!isPlaceholder2 || compositionContext.previewMode === "editor") {
+        childNode = (0, import_react10.createElement)(
           import_core.PureContextualEditingComponentWrapper,
           {
             key: `${slotName}-${componentIndex}-wrapper`,
-            isPlaceholder,
+            isPlaceholder: isPlaceholder2,
             parentComponent: parent,
             component,
             slotName,
@@ -1032,8 +1096,8 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
-      childNode = (0, import_react9.createElement)(
-        import_canvas_next_rsc_client7.ClientContextualEditingComponentWrapper,
+      childNode = (0, import_react10.createElement)(
+        import_canvas_next_rsc_client8.ClientContextualEditingComponentWrapper,
         {
           key: `${slotName}-${componentIndex}-wrapper`,
           isPlaceholder: false,
@@ -1054,7 +1118,7 @@ var resolveComponents = ({
       childNode = elements;
     }
     if (visibilityRules) {
-      childNode = (0, import_react9.createElement)(
+      childNode = (0, import_react10.createElement)(
         VisibilityRulesWrapper,
         {
           key: `${slotName}-${componentIndex}-visibility`,
@@ -1064,8 +1128,8 @@ var resolveComponents = ({
         childNode
       );
     }
-    return (0, import_react9.createElement)(
-      import_react9.Fragment,
+    return (0, import_react10.createElement)(
+      import_react10.Fragment,
       {
         key: !isRoot ? `${slotName}-${componentIndex}` : void 0
       },
@@ -1076,38 +1140,40 @@ var resolveComponents = ({
 };
 
 // src/components/UniformContext.tsx
-var import_canvas_next_rsc_client8 = require("@uniformdev/canvas-next-rsc-client");
-var import_react10 = require("react");
-var import_react11 = __toESM(require("react"));
+var import_canvas_next_rsc_client9 = require("@uniformdev/canvas-next-rsc-client");
+var import_react11 = require("react");
+var import_react12 = __toESM(require("react"));
 var UniformContext = async ({
   clientContextComponent,
   children
 }) => {
-  var _a;
+  var _a, _b;
   const manifest = await getManifest({
     searchParams: {}
   });
-  const ContextComponent = clientContextComponent || import_canvas_next_rsc_client8.DefaultUniformClientContext;
+  const ContextComponent = clientContextComponent || import_canvas_next_rsc_client9.DefaultUniformClientContext;
   const serverConfig2 = getServerConfig();
   const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
   const defaultConsent = serverConfig2.defaultConsent || false;
-  return /* @__PURE__ */ import_react11.default.createElement(import_react11.default.Fragment, null, children, /* @__PURE__ */ import_react11.default.createElement(
+  const experimentalQuirkSerialization = ((_b = serverConfig2.experimental) == null ? void 0 : _b.quirkSerialization) || false;
+  return /* @__PURE__ */ import_react12.default.createElement(import_react12.default.Fragment, null, children, /* @__PURE__ */ import_react12.default.createElement(
     ContextComponent,
     {
       manifest,
       disableDevTools,
-      defaultConsent
+      defaultConsent,
+      experimentalQuirkSerialization
     }
-  ), /* @__PURE__ */ import_react11.default.createElement(import_react10.Suspense, { fallback: /* @__PURE__ */ import_react11.default.createElement(import_react11.default.Fragment, null) }, /* @__PURE__ */ import_react11.default.createElement(import_canvas_next_rsc_client8.UniformScript, null)));
+  ), /* @__PURE__ */ import_react12.default.createElement(import_react11.Suspense, { fallback: /* @__PURE__ */ import_react12.default.createElement(import_react12.default.Fragment, null) }, /* @__PURE__ */ import_react12.default.createElement(import_canvas_next_rsc_client9.UniformScript, null)));
 };
 
 // src/components/UniformPlayground.tsx
 var import_canvas9 = require("@uniformdev/canvas");
 var import_navigation2 = require("next/navigation");
-var import_react12 = __toESM(require("react"));
+var import_react13 = __toESM(require("react"));
 var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!isDraftModeEnabled({ searchParams })) {
-    return /* @__PURE__ */ import_react12.default.createElement("div", null, /* @__PURE__ */ import_react12.default.createElement("h1", null, "Playground is only available in draft mode"));
+    return /* @__PURE__ */ import_react13.default.createElement("div", null, /* @__PURE__ */ import_react13.default.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = searchParams["id"];
   if (!id) {
@@ -1138,7 +1204,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     (0, import_navigation2.notFound)();
   }
-  return /* @__PURE__ */ import_react12.default.createElement(
+  return /* @__PURE__ */ import_react13.default.createElement(
     UniformComposition,
     {
       mode: "server",