@uniformdev/canvas-next-rsc 20.35.0 → 20.35.1-alpha.210

package/dist/{UniformComposition-D_HC6rSo.d.mts → UniformComposition-CfpHU4f0.d.mts}

@@ -1,6 +1,6 @@
 import { ResolvedRouteGetResponse, ComponentInstance } from '@uniformdev/canvas';
 import { PageParameters, ComponentProps, CompositionContext, AppDirectoryServerContext } from '@uniformdev/canvas-next-rsc-shared';
-import React, { ComponentType, ReactNode } from 'react';
+import React, { ComponentType } from 'react';
 
 type UniformStaticCompositionProps = {
     /**
@@ -56,9 +56,7 @@ type ResolveEmptyPlaceholderResult = {
 declare const resolveComposition: (props: Omit<ResolveComponentsOptions, "slotName" | "slotIndex" | "target"> & {
     composition: ComponentInstance;
     compositionContext: CompositionContext;
-}) => React.FunctionComponentElement<{
-    children?: ReactNode | undefined;
-}> | null;
+}) => React.FunctionComponentElement<React.FragmentProps> | null;
 type ResolveComponentsOptions = {
     serverContext?: AppDirectoryServerContext;
     target: {

package/dist/{UniformComposition-D_HC6rSo.d.ts → UniformComposition-CfpHU4f0.d.ts}

@@ -1,6 +1,6 @@
 import { ResolvedRouteGetResponse, ComponentInstance } from '@uniformdev/canvas';
 import { PageParameters, ComponentProps, CompositionContext, AppDirectoryServerContext } from '@uniformdev/canvas-next-rsc-shared';
-import React, { ComponentType, ReactNode } from 'react';
+import React, { ComponentType } from 'react';
 
 type UniformStaticCompositionProps = {
     /**
@@ -56,9 +56,7 @@ type ResolveEmptyPlaceholderResult = {
 declare const resolveComposition: (props: Omit<ResolveComponentsOptions, "slotName" | "slotIndex" | "target"> & {
     composition: ComponentInstance;
     compositionContext: CompositionContext;
-}) => React.FunctionComponentElement<{
-    children?: ReactNode | undefined;
-}> | null;
+}) => React.FunctionComponentElement<React.FragmentProps> | null;
 type ResolveComponentsOptions = {
     serverContext?: AppDirectoryServerContext;
     target: {

package/dist/component.d.mts

@@ -1,7 +1,7 @@
 import { ComponentProps, CompositionContext, SlotDefinition } from '@uniformdev/canvas-next-rsc-shared';
 export { ComponentProps, CompositionContext } from '@uniformdev/canvas-next-rsc-shared';
-import React, { PropsWithChildren, ReactNode, Key, JSX } from 'react';
-export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-D_HC6rSo.mjs';
+import React, { PropsWithChildren, ReactNode, Key } from 'react';
+export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-CfpHU4f0.mjs';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';
@@ -88,7 +88,7 @@ type CustomSlotChildRenderFunc = (options: {
     key: Key;
     slotName: string;
     slotIndex: number;
-}) => JSX.Element;
+}) => ReactNode;
 type UniformSlotProps = {
     data: ComponentInstance;
     context: CompositionContext;

package/dist/component.d.ts

@@ -1,7 +1,7 @@
 import { ComponentProps, CompositionContext, SlotDefinition } from '@uniformdev/canvas-next-rsc-shared';
 export { ComponentProps, CompositionContext } from '@uniformdev/canvas-next-rsc-shared';
-import React, { PropsWithChildren, ReactNode, Key, JSX } from 'react';
-export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-D_HC6rSo.js';
+import React, { PropsWithChildren, ReactNode, Key } from 'react';
+export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-CfpHU4f0.js';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';
@@ -88,7 +88,7 @@ type CustomSlotChildRenderFunc = (options: {
     key: Key;
     slotName: string;
     slotIndex: number;
-}) => JSX.Element;
+}) => ReactNode;
 type UniformSlotProps = {
     data: ComponentInstance;
     context: CompositionContext;

package/dist/handler.js

@@ -204,9 +204,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();

package/dist/handler.mjs

@@ -171,9 +171,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();

package/dist/index.d.mts

@@ -5,8 +5,8 @@ import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient, ProjectMapNode } from '@uniformdev/project-map';
 import { ContextState, ContextOptions } from '@uniformdev/context';
 import React, { PropsWithChildren } from 'react';
-import { U as UniformCompositionProps } from './UniformComposition-D_HC6rSo.mjs';
-export { b as UniformComposition, r as resolveComposition } from './UniformComposition-D_HC6rSo.mjs';
+import { U as UniformCompositionProps } from './UniformComposition-CfpHU4f0.mjs';
+export { b as UniformComposition, r as resolveComposition } from './UniformComposition-CfpHU4f0.mjs';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {

package/dist/index.d.ts

@@ -5,8 +5,8 @@ import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient, ProjectMapNode } from '@uniformdev/project-map';
 import { ContextState, ContextOptions } from '@uniformdev/context';
 import React, { PropsWithChildren } from 'react';
-import { U as UniformCompositionProps } from './UniformComposition-D_HC6rSo.js';
-export { b as UniformComposition, r as resolveComposition } from './UniformComposition-D_HC6rSo.js';
+import { U as UniformCompositionProps } from './UniformComposition-CfpHU4f0.js';
+export { b as UniformComposition, r as resolveComposition } from './UniformComposition-CfpHU4f0.js';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {

package/dist/index.esm.js

@@ -150,9 +150,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
@@ -628,18 +637,11 @@ var ContextUpdateTrigger = ({ path }) => {
 // src/components/PersonalizeClientWrapper.tsx
 import { PersonalizeClient } from "@uniformdev/canvas-next-rsc-client";
 import React3 from "react";
-var PersonalizeClientWrapper = (props) => {
-  return /* @__PURE__ */ React3.createElement(
-    PersonalizeClient,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
-      indexes: []
-    }
-  );
+var PersonalizeClientWrapper = ({
+  contextInstance,
+  ...props
+}) => {
+  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes: [] });
 };
 
 // src/components/PersonalizeServer.ts
@@ -678,19 +680,12 @@ var PersonalizeServer = (props) => {
 import { PersonalizeClient as PersonalizeClient2 } from "@uniformdev/canvas-next-rsc-client";
 import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import React5 from "react";
-var PersonalizeServerHybrid = (props) => {
-  const { indexes } = runPersonalization2(props);
-  return /* @__PURE__ */ React5.createElement(
-    PersonalizeClient2,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
-      indexes
-    }
-  );
+var PersonalizeServerHybrid = ({
+  contextInstance,
+  ...props
+}) => {
+  const { indexes } = runPersonalization2({ ...props, contextInstance });
+  return /* @__PURE__ */ React5.createElement(PersonalizeClient2, { ...props, indexes });
 };
 
 // src/components/TestServer.ts
@@ -753,6 +748,7 @@ var UniformComposition = async ({
   route,
   ...props
 }) => {
+  var _a;
   let searchParams;
   let serverContext = void 0;
   if (props.mode === "static") {
@@ -777,10 +773,10 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === CANVAS_DRAFT_STATE2 || state === CANVAS_EDITOR_STATE2) {
     walkNodeTree(route.compositionApiResponse.composition, (node) => {
-      var _a, _b;
+      var _a2, _b;
       if (node.type === "component" && node.node.parameters) {
         const contextualEditing = node.node.parameters[CANVAS_CONTEXTUAL_EDITING_PARAM];
-        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
+        const editableFields = (_b = (_a2 = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a2.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
@@ -797,7 +793,8 @@ var UniformComposition = async ({
     composition: route.compositionApiResponse.composition,
     matchedRoute: route.matchedRoute,
     searchParams,
-    dynamicInputs: route.dynamicInputs,
+    // provide default non-undefined values to avoid serialization issues
+    dynamicInputs: (_a = route.dynamicInputs) != null ? _a : {},
     type: "composition",
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: await isDraftModeEnabled({ searchParams }),
@@ -829,6 +826,11 @@ var UniformComposition = async ({
           },
           {}
         ),
+        compositionMetadata: {
+          compositionId: route.compositionApiResponse.composition._id,
+          matchedRoute: route.matchedRoute,
+          dynamicInputs: route.dynamicInputs
+        },
         quirks: {
           "vc-country": headersValue.get("x-vercel-ip-country") || missingQuirkValue,
           "vc-region": headersValue.get("x-vercel-ip-country-region") || missingQuirkValue,

package/dist/index.js

@@ -203,9 +203,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
@@ -656,18 +665,11 @@ var ContextUpdateTrigger = ({ path }) => {
 // src/components/PersonalizeClientWrapper.tsx
 var import_canvas_next_rsc_client3 = require("@uniformdev/canvas-next-rsc-client");
 var import_react3 = __toESM(require("react"));
-var PersonalizeClientWrapper = (props) => {
-  return /* @__PURE__ */ import_react3.default.createElement(
-    import_canvas_next_rsc_client3.PersonalizeClient,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
-      indexes: []
-    }
-  );
+var PersonalizeClientWrapper = ({
+  contextInstance,
+  ...props
+}) => {
+  return /* @__PURE__ */ import_react3.default.createElement(import_canvas_next_rsc_client3.PersonalizeClient, { ...props, indexes: [] });
 };
 
 // src/components/PersonalizeServer.ts
@@ -706,19 +708,12 @@ var PersonalizeServer = (props) => {
 var import_canvas_next_rsc_client5 = require("@uniformdev/canvas-next-rsc-client");
 var import_canvas_next_rsc_shared4 = require("@uniformdev/canvas-next-rsc-shared");
 var import_react6 = __toESM(require("react"));
-var PersonalizeServerHybrid = (props) => {
-  const { indexes } = (0, import_canvas_next_rsc_shared4.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,
-      algorithm: props.algorithm,
-      indexes
-    }
-  );
+var PersonalizeServerHybrid = ({
+  contextInstance,
+  ...props
+}) => {
+  const { indexes } = (0, import_canvas_next_rsc_shared4.runPersonalization)({ ...props, contextInstance });
+  return /* @__PURE__ */ import_react6.default.createElement(import_canvas_next_rsc_client5.PersonalizeClient, { ...props, indexes });
 };
 
 // src/components/TestServer.ts
@@ -776,6 +771,7 @@ var UniformComposition = async ({
   route,
   ...props
 }) => {
+  var _a;
   let searchParams;
   let serverContext = void 0;
   if (props.mode === "static") {
@@ -800,10 +796,10 @@ 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;
+      var _a2, _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 : [];
+        const editableFields = (_b = (_a2 = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a2.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
@@ -820,7 +816,8 @@ var UniformComposition = async ({
     composition: route.compositionApiResponse.composition,
     matchedRoute: route.matchedRoute,
     searchParams,
-    dynamicInputs: route.dynamicInputs,
+    // provide default non-undefined values to avoid serialization issues
+    dynamicInputs: (_a = route.dynamicInputs) != null ? _a : {},
     type: "composition",
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: await isDraftModeEnabled({ searchParams }),
@@ -852,6 +849,11 @@ var UniformComposition = async ({
           },
           {}
         ),
+        compositionMetadata: {
+          compositionId: route.compositionApiResponse.composition._id,
+          matchedRoute: route.matchedRoute,
+          dynamicInputs: route.dynamicInputs
+        },
         quirks: {
           "vc-country": headersValue.get("x-vercel-ip-country") || missingQuirkValue,
           "vc-region": headersValue.get("x-vercel-ip-country-region") || missingQuirkValue,

package/dist/index.mjs

@@ -150,9 +150,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
@@ -628,18 +637,11 @@ var ContextUpdateTrigger = ({ path }) => {
 // src/components/PersonalizeClientWrapper.tsx
 import { PersonalizeClient } from "@uniformdev/canvas-next-rsc-client";
 import React3 from "react";
-var PersonalizeClientWrapper = (props) => {
-  return /* @__PURE__ */ React3.createElement(
-    PersonalizeClient,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
-      indexes: []
-    }
-  );
+var PersonalizeClientWrapper = ({
+  contextInstance,
+  ...props
+}) => {
+  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes: [] });
 };
 
 // src/components/PersonalizeServer.ts
@@ -678,19 +680,12 @@ var PersonalizeServer = (props) => {
 import { PersonalizeClient as PersonalizeClient2 } from "@uniformdev/canvas-next-rsc-client";
 import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import React5 from "react";
-var PersonalizeServerHybrid = (props) => {
-  const { indexes } = runPersonalization2(props);
-  return /* @__PURE__ */ React5.createElement(
-    PersonalizeClient2,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      algorithm: props.algorithm,
-      indexes
-    }
-  );
+var PersonalizeServerHybrid = ({
+  contextInstance,
+  ...props
+}) => {
+  const { indexes } = runPersonalization2({ ...props, contextInstance });
+  return /* @__PURE__ */ React5.createElement(PersonalizeClient2, { ...props, indexes });
 };
 
 // src/components/TestServer.ts
@@ -753,6 +748,7 @@ var UniformComposition = async ({
   route,
   ...props
 }) => {
+  var _a;
   let searchParams;
   let serverContext = void 0;
   if (props.mode === "static") {
@@ -777,10 +773,10 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === CANVAS_DRAFT_STATE2 || state === CANVAS_EDITOR_STATE2) {
     walkNodeTree(route.compositionApiResponse.composition, (node) => {
-      var _a, _b;
+      var _a2, _b;
       if (node.type === "component" && node.node.parameters) {
         const contextualEditing = node.node.parameters[CANVAS_CONTEXTUAL_EDITING_PARAM];
-        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
+        const editableFields = (_b = (_a2 = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a2.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
@@ -797,7 +793,8 @@ var UniformComposition = async ({
     composition: route.compositionApiResponse.composition,
     matchedRoute: route.matchedRoute,
     searchParams,
-    dynamicInputs: route.dynamicInputs,
+    // provide default non-undefined values to avoid serialization issues
+    dynamicInputs: (_a = route.dynamicInputs) != null ? _a : {},
     type: "composition",
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: await isDraftModeEnabled({ searchParams }),
@@ -829,6 +826,11 @@ var UniformComposition = async ({
           },
           {}
         ),
+        compositionMetadata: {
+          compositionId: route.compositionApiResponse.composition._id,
+          matchedRoute: route.matchedRoute,
+          dynamicInputs: route.dynamicInputs
+        },
         quirks: {
           "vc-country": headersValue.get("x-vercel-ip-country") || missingQuirkValue,
           "vc-region": headersValue.get("x-vercel-ip-country-region") || missingQuirkValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "20.35.0",
+  "version": "20.35.1-alpha.210+4fa236da76",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -55,21 +55,21 @@
   ],
   "devDependencies": {
     "@types/node": "24.3.1",
-    "@types/react": "18.3.24",
+    "@types/react": "19.2.2",
     "next": "15.2.5",
-    "react": "18.3.1",
-    "react-dom": "18.3.1"
+    "react": "19.2.1",
+    "react-dom": "19.2.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "20.35.0",
-    "@uniformdev/canvas-next-rsc-client": "^20.35.0",
-    "@uniformdev/canvas-next-rsc-shared": "^20.35.0",
-    "@uniformdev/canvas-react": "20.35.0",
-    "@uniformdev/context": "20.35.0",
-    "@uniformdev/project-map": "20.35.0",
-    "@uniformdev/redirect": "20.35.0",
-    "@uniformdev/richtext": "20.35.0",
-    "@uniformdev/webhooks": "20.35.0",
+    "@uniformdev/canvas": "20.35.1-alpha.210+4fa236da76",
+    "@uniformdev/canvas-next-rsc-client": "^20.35.1-alpha.210+4fa236da76",
+    "@uniformdev/canvas-next-rsc-shared": "^20.35.1-alpha.210+4fa236da76",
+    "@uniformdev/canvas-react": "20.35.1-alpha.210+4fa236da76",
+    "@uniformdev/context": "20.35.1-alpha.210+4fa236da76",
+    "@uniformdev/project-map": "20.35.1-alpha.210+4fa236da76",
+    "@uniformdev/redirect": "20.35.1-alpha.210+4fa236da76",
+    "@uniformdev/richtext": "20.35.1-alpha.210+4fa236da76",
+    "@uniformdev/webhooks": "20.35.1-alpha.210+4fa236da76",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f228361828ef49a596ca3841e5b79768c64418cf"
+  "gitHead": "4fa236da76e057582eae6c2595a2fa763fda886a"
 }