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

package/dist/index.d.mts

@@ -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.mjs';
+export { a as UniformComposition, r as resolveComposition } from './UniformComposition-0pvEHduc.mjs';
 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.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,57 @@ 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 }) => {
-  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
-      };
-    })
+
+// 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, _d;
+  const { contextInstance, test } = props;
+  const isTestDefined = Boolean((_a = contextInstance.manifest.data.project.test) == null ? void 0 : _a[test]);
+  if (!isTestDefined && process.env.NODE_ENV !== "production") {
+    console.warn(`Test "${test}" is not defined in Uniform manifest.`);
+  }
+  const { index, event } = runTest(props);
+  const component = typeof index === "number" ? (_d = (_c = (_b = props.slots) == null ? void 0 : _b[CANVAS_TEST_SLOT]) == null ? void 0 : _c.items[index]) != null ? _d : 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 +840,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 +861,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 +920,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 +931,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 +971,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     notFound2();
   }
-  return /* @__PURE__ */ React5.createElement(
+  return /* @__PURE__ */ React7.createElement(
     UniformComposition,
     {
       mode: "server",