@uniformdev/next-app-router-shared 20.48.0 → 20.48.1-alpha.11

package/dist/index.d.mts

@@ -64,6 +64,11 @@ type PageState = {
      * The locale that was resolved for the current request.
      */
     locale: string | undefined;
+    /**
+     * Whether this page state was generated during a prefetch request.
+     * When true, test evaluations are deferred to the client side.
+     */
+    isPrefetch: true | undefined;
 };
 declare const resolveComponentFromPageState: ({ pageState, componentId: providedComponentId, }: {
     pageState: PageState;
@@ -74,9 +79,8 @@ declare const resolveRuleFromPageState: ({ pageState, rule, }: {
     pageState: PageState;
     rule: VisibilityParameterValue;
 }) => boolean | undefined;
-declare const serializeEvaluationResult: ({ payload, encode, }: {
+declare const serializeEvaluationResult: ({ payload }: {
     payload: PageState;
-    encode?: boolean;
 }) => string;
 declare const deserializeEvaluationResult: ({ input: providedInput, decode, }: {
     input: string;
@@ -156,7 +160,7 @@ type PersonalizeProps = ComponentProps<{
     indexes: number[];
 };
 type TestProps = ComponentProps & {
-    index: number;
+    index: number | undefined;
     test: ExtractTestResult;
 };
 

package/dist/index.d.ts

@@ -64,6 +64,11 @@ type PageState = {
      * The locale that was resolved for the current request.
      */
     locale: string | undefined;
+    /**
+     * Whether this page state was generated during a prefetch request.
+     * When true, test evaluations are deferred to the client side.
+     */
+    isPrefetch: true | undefined;
 };
 declare const resolveComponentFromPageState: ({ pageState, componentId: providedComponentId, }: {
     pageState: PageState;
@@ -74,9 +79,8 @@ declare const resolveRuleFromPageState: ({ pageState, rule, }: {
     pageState: PageState;
     rule: VisibilityParameterValue;
 }) => boolean | undefined;
-declare const serializeEvaluationResult: ({ payload, encode, }: {
+declare const serializeEvaluationResult: ({ payload }: {
     payload: PageState;
-    encode?: boolean;
 }) => string;
 declare const deserializeEvaluationResult: ({ input: providedInput, decode, }: {
     input: string;
@@ -156,7 +160,7 @@ type PersonalizeProps = ComponentProps<{
     indexes: number[];
 };
 type TestProps = ComponentProps & {
-    index: number;
+    index: number | undefined;
     test: ExtractTestResult;
 };
 

package/dist/index.esm.js

@@ -160,23 +160,11 @@ var resolveRuleFromPageState = ({
   }
   return value;
 };
-var replaceReservedCharacters = (value) => {
-  return ENCODED_RESERVED_CHARACTERS.reduce((acc, char) => {
-    return acc.replaceAll(char.character, char.replacement);
-  }, value);
-};
 var unreplaceReservedCharacters = (value) => {
   return ENCODED_RESERVED_CHARACTERS.reduce((acc, char) => {
     return acc.replaceAll(char.replacement, char.character);
   }, value);
 };
-var encodeWithReplacements = (value) => {
-  return replaceReservedCharacters(btoa(value));
-};
-var decodeWithReplacements = (value) => {
-  const urlDecoded = decodeURIComponent(value);
-  return atob(unreplaceReservedCharacters(urlDecoded));
-};
 var compressIds = (ids) => {
   const uuidV4Length = 36;
   let compressedRegistry;
@@ -206,21 +194,58 @@ var compressIds = (ids) => {
   );
 };
 var NAMESPACE_UUID = "00000000-0000-0000-0000-000000000000";
-var serializeEvaluationResult = ({
-  payload,
-  encode = true
-}) => {
-  const compressedPageState = {
-    cs: payload.compositionState,
-    r: payload.routePath,
-    c: {},
-    k: payload.keys,
-    ri: payload.releaseId,
-    dc: typeof payload.defaultConsent !== "undefined" ? payload.defaultConsent ? 1 : 0 : void 0,
-    pm: payload.previewMode === "editor" ? "e" : payload.previewMode === "preview" ? "p" : void 0,
-    rl: void 0,
-    l: payload.locale
+var V2_FIELD_SEP = "~";
+var V2_ENTRY_SEP = ".";
+var V2_KV_SEP = ":";
+var V2_INDEX_SEP = ",";
+var toBase64Url = (value) => {
+  const bytes = new TextEncoder().encode(value);
+  const binary = Array.from(bytes, (b) => String.fromCharCode(b)).join("");
+  return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+};
+var fromBase64Url = (value) => {
+  let base64 = value.replace(/-/g, "+").replace(/_/g, "/");
+  const pad = base64.length % 4;
+  if (pad === 2) {
+    base64 += "==";
+  } else if (pad === 3) {
+    base64 += "=";
+  }
+  const binary = atob(base64);
+  const bytes = Uint8Array.from(binary, (c) => c.charCodeAt(0));
+  return new TextDecoder().decode(bytes);
+};
+var encodeFlags = (payload) => {
+  let flags = 0;
+  if (typeof payload.defaultConsent !== "undefined") {
+    flags |= 1;
+    if (payload.defaultConsent) {
+      flags |= 2;
+    }
+  }
+  if (payload.previewMode === "editor") {
+    flags |= 4;
+  }
+  if (payload.previewMode === "preview") {
+    flags |= 8;
+  }
+  if (payload.isPrefetch) {
+    flags |= 16;
+  }
+  return flags.toString(16);
+};
+var decodeFlags = (hex) => {
+  const flags = parseInt(hex, 16) || 0;
+  return {
+    defaultConsent: flags & 1 ? Boolean(flags & 2) : void 0,
+    previewMode: flags & 4 ? "editor" : flags & 8 ? "preview" : void 0,
+    isPrefetch: flags & 16 ? true : void 0
   };
+};
+var serializeV2 = (payload) => {
+  const parts = ["2"];
+  parts.push(String(payload.compositionState));
+  parts.push(toBase64Url(payload.routePath));
   const componentKeys = Object.keys(payload.components);
   const sortedKeys = componentKeys.sort();
   const sortedComponents = sortedKeys.map((key) => ({
@@ -228,39 +253,146 @@ var serializeEvaluationResult = ({
     ...payload.components[key]
   }));
   const compressedComponentIds = compressIds(sortedComponents.map((c) => c._id));
+  const componentById = new Map(sortedComponents.map((c) => [c._id, c]));
+  const componentEntries = [];
   Object.keys(compressedComponentIds).forEach((compressedId) => {
     var _a;
     const originalId = compressedComponentIds[compressedId];
-    const component = sortedComponents.find((c) => c._id === originalId);
+    const component = componentById.get(originalId);
     if (!component) {
       throw new Error(`Component ${originalId} not found`);
     }
-    compressedPageState.c[compressedId] = {
-      i: ((_a = component.indexes) == null ? void 0 : _a.length) ? component.indexes : void 0
-    };
+    const indexes = ((_a = component.indexes) == null ? void 0 : _a.length) ? component.indexes : void 0;
+    if (indexes) {
+      componentEntries.push(`${compressedId}${V2_KV_SEP}${indexes.join(V2_INDEX_SEP)}`);
+    } else {
+      componentEntries.push(compressedId);
+    }
   });
+  parts.push(componentEntries.join(V2_ENTRY_SEP));
+  let rulesStr = "";
   if (typeof payload.rules !== "undefined") {
     const ruleKeys = Object.keys(payload.rules);
     if (ruleKeys.length !== 0) {
-      compressedPageState.rl = {};
       const sortedRuleKeys = ruleKeys.sort();
       const compressedRuleKeys = compressIds(sortedRuleKeys);
+      const ruleEntries = [];
       Object.keys(compressedRuleKeys).forEach((compressedId) => {
         const originalId = compressedRuleKeys[compressedId];
-        compressedPageState.rl[compressedId] = payload.rules[originalId] ? 1 : 0;
+        ruleEntries.push(`${compressedId}${V2_KV_SEP}${payload.rules[originalId] ? 1 : 0}`);
       });
+      rulesStr = ruleEntries.join(V2_ENTRY_SEP);
     }
   }
-  const result = JSON.stringify(compressedPageState);
-  return encode ? encodeWithReplacements(result) : result;
+  parts.push(rulesStr);
+  let keysStr = "";
+  if (payload.keys) {
+    const keyEntries = Object.entries(payload.keys).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([k, v]) => `${toBase64Url(k)}${V2_KV_SEP}${toBase64Url(v)}`);
+    keysStr = keyEntries.join(V2_ENTRY_SEP);
+  }
+  parts.push(keysStr);
+  parts.push(encodeFlags(payload));
+  parts.push(payload.releaseId ? toBase64Url(payload.releaseId) : "");
+  parts.push(payload.locale ? toBase64Url(payload.locale) : "");
+  return parts.join(V2_FIELD_SEP);
+};
+var UNSAFE_KEYS = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
+var isUnsafeKey = (key) => UNSAFE_KEYS.has(key);
+var deserializeV2 = (input) => {
+  var _a, _b, _c, _d;
+  const fields = input.split(V2_FIELD_SEP);
+  if (fields.length < 3) {
+    throw new Error(`Invalid serialized PageState: expected at least 3 fields but got ${fields.length}`);
+  }
+  const compositionStateRaw = fields[1];
+  const compositionState = Number.parseInt(compositionStateRaw, 10);
+  if (Number.isNaN(compositionState)) {
+    throw new Error(
+      `Invalid serialized PageState: compositionState '${compositionStateRaw}' is not a valid number`
+    );
+  }
+  const routePath = fromBase64Url(fields[2]);
+  const components = {};
+  const componentsStr = (_a = fields[3]) != null ? _a : "";
+  if (componentsStr) {
+    componentsStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx === -1) {
+        const id = entry;
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        components[id] = {};
+      } else {
+        const id = entry.slice(0, sepIdx);
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        const indexes = entry.slice(sepIdx + 1).split(V2_INDEX_SEP).map(Number);
+        components[id] = { indexes };
+      }
+    });
+  }
+  const rulesStr = (_b = fields[4]) != null ? _b : "";
+  let rules;
+  if (rulesStr) {
+    rules = {};
+    rulesStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx !== -1) {
+        const id = entry.slice(0, sepIdx);
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        rules[id] = entry.slice(sepIdx + 1) === "1";
+      }
+    });
+  }
+  const keysStr = (_c = fields[5]) != null ? _c : "";
+  const keys = {};
+  if (keysStr) {
+    keysStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx !== -1) {
+        const k = fromBase64Url(entry.slice(0, sepIdx));
+        if (isUnsafeKey(k)) {
+          return;
+        }
+        const v = fromBase64Url(entry.slice(sepIdx + 1));
+        keys[k] = v;
+      }
+    });
+  }
+  const { defaultConsent, previewMode, isPrefetch } = decodeFlags((_d = fields[6]) != null ? _d : "0");
+  const releaseId = fields[7] ? fromBase64Url(fields[7]) : void 0;
+  const locale = fields[8] ? fromBase64Url(fields[8]) : void 0;
+  return {
+    compositionState,
+    routePath,
+    components,
+    rules,
+    keys,
+    releaseId,
+    defaultConsent,
+    previewMode,
+    locale,
+    isPrefetch
+  };
+};
+var serializeEvaluationResult = ({ payload }) => {
+  return serializeV2(payload);
 };
 var deserializeEvaluationResult = ({
   input: providedInput,
   decode = true
 }) => {
   var _a, _b, _c;
-  const input = decode ? decodeWithReplacements(providedInput) : providedInput;
-  const parsed = JSON.parse(input);
+  const input = decode ? decodeURIComponent(providedInput) : providedInput;
+  if (input.startsWith("2~")) {
+    return deserializeV2(input);
+  }
+  const jsonInput = decode ? atob(unreplaceReservedCharacters(input)) : input;
+  const parsed = JSON.parse(jsonInput);
   const pageState = {
     compositionState: parsed.cs,
     routePath: parsed.r,
@@ -270,7 +402,8 @@ var deserializeEvaluationResult = ({
     defaultConsent: typeof parsed.dc !== "undefined" ? parsed.dc === 1 : void 0,
     previewMode: parsed.pm === "e" ? "editor" : parsed.pm === "p" ? "preview" : void 0,
     rules: parsed.rl ? Object.fromEntries(Object.entries(parsed.rl).map(([key, value]) => [key, value === 1])) : void 0,
-    locale: (_c = parsed.l) != null ? _c : void 0
+    locale: (_c = parsed.l) != null ? _c : void 0,
+    isPrefetch: parsed.pf === 1 ? true : void 0
   };
   Object.keys(parsed.c).forEach((id) => {
     const component = parsed.c[id];

package/dist/index.js

@@ -195,23 +195,11 @@ var resolveRuleFromPageState = ({
   }
   return value;
 };
-var replaceReservedCharacters = (value) => {
-  return ENCODED_RESERVED_CHARACTERS.reduce((acc, char) => {
-    return acc.replaceAll(char.character, char.replacement);
-  }, value);
-};
 var unreplaceReservedCharacters = (value) => {
   return ENCODED_RESERVED_CHARACTERS.reduce((acc, char) => {
     return acc.replaceAll(char.replacement, char.character);
   }, value);
 };
-var encodeWithReplacements = (value) => {
-  return replaceReservedCharacters(btoa(value));
-};
-var decodeWithReplacements = (value) => {
-  const urlDecoded = decodeURIComponent(value);
-  return atob(unreplaceReservedCharacters(urlDecoded));
-};
 var compressIds = (ids) => {
   const uuidV4Length = 36;
   let compressedRegistry;
@@ -241,21 +229,58 @@ var compressIds = (ids) => {
   );
 };
 var NAMESPACE_UUID = "00000000-0000-0000-0000-000000000000";
-var serializeEvaluationResult = ({
-  payload,
-  encode = true
-}) => {
-  const compressedPageState = {
-    cs: payload.compositionState,
-    r: payload.routePath,
-    c: {},
-    k: payload.keys,
-    ri: payload.releaseId,
-    dc: typeof payload.defaultConsent !== "undefined" ? payload.defaultConsent ? 1 : 0 : void 0,
-    pm: payload.previewMode === "editor" ? "e" : payload.previewMode === "preview" ? "p" : void 0,
-    rl: void 0,
-    l: payload.locale
+var V2_FIELD_SEP = "~";
+var V2_ENTRY_SEP = ".";
+var V2_KV_SEP = ":";
+var V2_INDEX_SEP = ",";
+var toBase64Url = (value) => {
+  const bytes = new TextEncoder().encode(value);
+  const binary = Array.from(bytes, (b) => String.fromCharCode(b)).join("");
+  return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+};
+var fromBase64Url = (value) => {
+  let base64 = value.replace(/-/g, "+").replace(/_/g, "/");
+  const pad = base64.length % 4;
+  if (pad === 2) {
+    base64 += "==";
+  } else if (pad === 3) {
+    base64 += "=";
+  }
+  const binary = atob(base64);
+  const bytes = Uint8Array.from(binary, (c) => c.charCodeAt(0));
+  return new TextDecoder().decode(bytes);
+};
+var encodeFlags = (payload) => {
+  let flags = 0;
+  if (typeof payload.defaultConsent !== "undefined") {
+    flags |= 1;
+    if (payload.defaultConsent) {
+      flags |= 2;
+    }
+  }
+  if (payload.previewMode === "editor") {
+    flags |= 4;
+  }
+  if (payload.previewMode === "preview") {
+    flags |= 8;
+  }
+  if (payload.isPrefetch) {
+    flags |= 16;
+  }
+  return flags.toString(16);
+};
+var decodeFlags = (hex) => {
+  const flags = parseInt(hex, 16) || 0;
+  return {
+    defaultConsent: flags & 1 ? Boolean(flags & 2) : void 0,
+    previewMode: flags & 4 ? "editor" : flags & 8 ? "preview" : void 0,
+    isPrefetch: flags & 16 ? true : void 0
   };
+};
+var serializeV2 = (payload) => {
+  const parts = ["2"];
+  parts.push(String(payload.compositionState));
+  parts.push(toBase64Url(payload.routePath));
   const componentKeys = Object.keys(payload.components);
   const sortedKeys = componentKeys.sort();
   const sortedComponents = sortedKeys.map((key) => ({
@@ -263,39 +288,146 @@ var serializeEvaluationResult = ({
     ...payload.components[key]
   }));
   const compressedComponentIds = compressIds(sortedComponents.map((c) => c._id));
+  const componentById = new Map(sortedComponents.map((c) => [c._id, c]));
+  const componentEntries = [];
   Object.keys(compressedComponentIds).forEach((compressedId) => {
     var _a;
     const originalId = compressedComponentIds[compressedId];
-    const component = sortedComponents.find((c) => c._id === originalId);
+    const component = componentById.get(originalId);
     if (!component) {
       throw new Error(`Component ${originalId} not found`);
     }
-    compressedPageState.c[compressedId] = {
-      i: ((_a = component.indexes) == null ? void 0 : _a.length) ? component.indexes : void 0
-    };
+    const indexes = ((_a = component.indexes) == null ? void 0 : _a.length) ? component.indexes : void 0;
+    if (indexes) {
+      componentEntries.push(`${compressedId}${V2_KV_SEP}${indexes.join(V2_INDEX_SEP)}`);
+    } else {
+      componentEntries.push(compressedId);
+    }
   });
+  parts.push(componentEntries.join(V2_ENTRY_SEP));
+  let rulesStr = "";
   if (typeof payload.rules !== "undefined") {
     const ruleKeys = Object.keys(payload.rules);
     if (ruleKeys.length !== 0) {
-      compressedPageState.rl = {};
       const sortedRuleKeys = ruleKeys.sort();
       const compressedRuleKeys = compressIds(sortedRuleKeys);
+      const ruleEntries = [];
       Object.keys(compressedRuleKeys).forEach((compressedId) => {
         const originalId = compressedRuleKeys[compressedId];
-        compressedPageState.rl[compressedId] = payload.rules[originalId] ? 1 : 0;
+        ruleEntries.push(`${compressedId}${V2_KV_SEP}${payload.rules[originalId] ? 1 : 0}`);
       });
+      rulesStr = ruleEntries.join(V2_ENTRY_SEP);
     }
   }
-  const result = JSON.stringify(compressedPageState);
-  return encode ? encodeWithReplacements(result) : result;
+  parts.push(rulesStr);
+  let keysStr = "";
+  if (payload.keys) {
+    const keyEntries = Object.entries(payload.keys).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([k, v]) => `${toBase64Url(k)}${V2_KV_SEP}${toBase64Url(v)}`);
+    keysStr = keyEntries.join(V2_ENTRY_SEP);
+  }
+  parts.push(keysStr);
+  parts.push(encodeFlags(payload));
+  parts.push(payload.releaseId ? toBase64Url(payload.releaseId) : "");
+  parts.push(payload.locale ? toBase64Url(payload.locale) : "");
+  return parts.join(V2_FIELD_SEP);
+};
+var UNSAFE_KEYS = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
+var isUnsafeKey = (key) => UNSAFE_KEYS.has(key);
+var deserializeV2 = (input) => {
+  var _a, _b, _c, _d;
+  const fields = input.split(V2_FIELD_SEP);
+  if (fields.length < 3) {
+    throw new Error(`Invalid serialized PageState: expected at least 3 fields but got ${fields.length}`);
+  }
+  const compositionStateRaw = fields[1];
+  const compositionState = Number.parseInt(compositionStateRaw, 10);
+  if (Number.isNaN(compositionState)) {
+    throw new Error(
+      `Invalid serialized PageState: compositionState '${compositionStateRaw}' is not a valid number`
+    );
+  }
+  const routePath = fromBase64Url(fields[2]);
+  const components = {};
+  const componentsStr = (_a = fields[3]) != null ? _a : "";
+  if (componentsStr) {
+    componentsStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx === -1) {
+        const id = entry;
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        components[id] = {};
+      } else {
+        const id = entry.slice(0, sepIdx);
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        const indexes = entry.slice(sepIdx + 1).split(V2_INDEX_SEP).map(Number);
+        components[id] = { indexes };
+      }
+    });
+  }
+  const rulesStr = (_b = fields[4]) != null ? _b : "";
+  let rules;
+  if (rulesStr) {
+    rules = {};
+    rulesStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx !== -1) {
+        const id = entry.slice(0, sepIdx);
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        rules[id] = entry.slice(sepIdx + 1) === "1";
+      }
+    });
+  }
+  const keysStr = (_c = fields[5]) != null ? _c : "";
+  const keys = {};
+  if (keysStr) {
+    keysStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx !== -1) {
+        const k = fromBase64Url(entry.slice(0, sepIdx));
+        if (isUnsafeKey(k)) {
+          return;
+        }
+        const v = fromBase64Url(entry.slice(sepIdx + 1));
+        keys[k] = v;
+      }
+    });
+  }
+  const { defaultConsent, previewMode, isPrefetch } = decodeFlags((_d = fields[6]) != null ? _d : "0");
+  const releaseId = fields[7] ? fromBase64Url(fields[7]) : void 0;
+  const locale = fields[8] ? fromBase64Url(fields[8]) : void 0;
+  return {
+    compositionState,
+    routePath,
+    components,
+    rules,
+    keys,
+    releaseId,
+    defaultConsent,
+    previewMode,
+    locale,
+    isPrefetch
+  };
+};
+var serializeEvaluationResult = ({ payload }) => {
+  return serializeV2(payload);
 };
 var deserializeEvaluationResult = ({
   input: providedInput,
   decode = true
 }) => {
   var _a, _b, _c;
-  const input = decode ? decodeWithReplacements(providedInput) : providedInput;
-  const parsed = JSON.parse(input);
+  const input = decode ? decodeURIComponent(providedInput) : providedInput;
+  if (input.startsWith("2~")) {
+    return deserializeV2(input);
+  }
+  const jsonInput = decode ? atob(unreplaceReservedCharacters(input)) : input;
+  const parsed = JSON.parse(jsonInput);
   const pageState = {
     compositionState: parsed.cs,
     routePath: parsed.r,
@@ -305,7 +437,8 @@ var deserializeEvaluationResult = ({
     defaultConsent: typeof parsed.dc !== "undefined" ? parsed.dc === 1 : void 0,
     previewMode: parsed.pm === "e" ? "editor" : parsed.pm === "p" ? "preview" : void 0,
     rules: parsed.rl ? Object.fromEntries(Object.entries(parsed.rl).map(([key, value]) => [key, value === 1])) : void 0,
-    locale: (_c = parsed.l) != null ? _c : void 0
+    locale: (_c = parsed.l) != null ? _c : void 0,
+    isPrefetch: parsed.pf === 1 ? true : void 0
   };
   Object.keys(parsed.c).forEach((id) => {
     const component = parsed.c[id];

package/dist/index.mjs

@@ -160,23 +160,11 @@ var resolveRuleFromPageState = ({
   }
   return value;
 };
-var replaceReservedCharacters = (value) => {
-  return ENCODED_RESERVED_CHARACTERS.reduce((acc, char) => {
-    return acc.replaceAll(char.character, char.replacement);
-  }, value);
-};
 var unreplaceReservedCharacters = (value) => {
   return ENCODED_RESERVED_CHARACTERS.reduce((acc, char) => {
     return acc.replaceAll(char.replacement, char.character);
   }, value);
 };
-var encodeWithReplacements = (value) => {
-  return replaceReservedCharacters(btoa(value));
-};
-var decodeWithReplacements = (value) => {
-  const urlDecoded = decodeURIComponent(value);
-  return atob(unreplaceReservedCharacters(urlDecoded));
-};
 var compressIds = (ids) => {
   const uuidV4Length = 36;
   let compressedRegistry;
@@ -206,21 +194,58 @@ var compressIds = (ids) => {
   );
 };
 var NAMESPACE_UUID = "00000000-0000-0000-0000-000000000000";
-var serializeEvaluationResult = ({
-  payload,
-  encode = true
-}) => {
-  const compressedPageState = {
-    cs: payload.compositionState,
-    r: payload.routePath,
-    c: {},
-    k: payload.keys,
-    ri: payload.releaseId,
-    dc: typeof payload.defaultConsent !== "undefined" ? payload.defaultConsent ? 1 : 0 : void 0,
-    pm: payload.previewMode === "editor" ? "e" : payload.previewMode === "preview" ? "p" : void 0,
-    rl: void 0,
-    l: payload.locale
+var V2_FIELD_SEP = "~";
+var V2_ENTRY_SEP = ".";
+var V2_KV_SEP = ":";
+var V2_INDEX_SEP = ",";
+var toBase64Url = (value) => {
+  const bytes = new TextEncoder().encode(value);
+  const binary = Array.from(bytes, (b) => String.fromCharCode(b)).join("");
+  return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+};
+var fromBase64Url = (value) => {
+  let base64 = value.replace(/-/g, "+").replace(/_/g, "/");
+  const pad = base64.length % 4;
+  if (pad === 2) {
+    base64 += "==";
+  } else if (pad === 3) {
+    base64 += "=";
+  }
+  const binary = atob(base64);
+  const bytes = Uint8Array.from(binary, (c) => c.charCodeAt(0));
+  return new TextDecoder().decode(bytes);
+};
+var encodeFlags = (payload) => {
+  let flags = 0;
+  if (typeof payload.defaultConsent !== "undefined") {
+    flags |= 1;
+    if (payload.defaultConsent) {
+      flags |= 2;
+    }
+  }
+  if (payload.previewMode === "editor") {
+    flags |= 4;
+  }
+  if (payload.previewMode === "preview") {
+    flags |= 8;
+  }
+  if (payload.isPrefetch) {
+    flags |= 16;
+  }
+  return flags.toString(16);
+};
+var decodeFlags = (hex) => {
+  const flags = parseInt(hex, 16) || 0;
+  return {
+    defaultConsent: flags & 1 ? Boolean(flags & 2) : void 0,
+    previewMode: flags & 4 ? "editor" : flags & 8 ? "preview" : void 0,
+    isPrefetch: flags & 16 ? true : void 0
   };
+};
+var serializeV2 = (payload) => {
+  const parts = ["2"];
+  parts.push(String(payload.compositionState));
+  parts.push(toBase64Url(payload.routePath));
   const componentKeys = Object.keys(payload.components);
   const sortedKeys = componentKeys.sort();
   const sortedComponents = sortedKeys.map((key) => ({
@@ -228,39 +253,146 @@ var serializeEvaluationResult = ({
     ...payload.components[key]
   }));
   const compressedComponentIds = compressIds(sortedComponents.map((c) => c._id));
+  const componentById = new Map(sortedComponents.map((c) => [c._id, c]));
+  const componentEntries = [];
   Object.keys(compressedComponentIds).forEach((compressedId) => {
     var _a;
     const originalId = compressedComponentIds[compressedId];
-    const component = sortedComponents.find((c) => c._id === originalId);
+    const component = componentById.get(originalId);
     if (!component) {
       throw new Error(`Component ${originalId} not found`);
     }
-    compressedPageState.c[compressedId] = {
-      i: ((_a = component.indexes) == null ? void 0 : _a.length) ? component.indexes : void 0
-    };
+    const indexes = ((_a = component.indexes) == null ? void 0 : _a.length) ? component.indexes : void 0;
+    if (indexes) {
+      componentEntries.push(`${compressedId}${V2_KV_SEP}${indexes.join(V2_INDEX_SEP)}`);
+    } else {
+      componentEntries.push(compressedId);
+    }
   });
+  parts.push(componentEntries.join(V2_ENTRY_SEP));
+  let rulesStr = "";
   if (typeof payload.rules !== "undefined") {
     const ruleKeys = Object.keys(payload.rules);
     if (ruleKeys.length !== 0) {
-      compressedPageState.rl = {};
       const sortedRuleKeys = ruleKeys.sort();
       const compressedRuleKeys = compressIds(sortedRuleKeys);
+      const ruleEntries = [];
       Object.keys(compressedRuleKeys).forEach((compressedId) => {
         const originalId = compressedRuleKeys[compressedId];
-        compressedPageState.rl[compressedId] = payload.rules[originalId] ? 1 : 0;
+        ruleEntries.push(`${compressedId}${V2_KV_SEP}${payload.rules[originalId] ? 1 : 0}`);
       });
+      rulesStr = ruleEntries.join(V2_ENTRY_SEP);
     }
   }
-  const result = JSON.stringify(compressedPageState);
-  return encode ? encodeWithReplacements(result) : result;
+  parts.push(rulesStr);
+  let keysStr = "";
+  if (payload.keys) {
+    const keyEntries = Object.entries(payload.keys).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([k, v]) => `${toBase64Url(k)}${V2_KV_SEP}${toBase64Url(v)}`);
+    keysStr = keyEntries.join(V2_ENTRY_SEP);
+  }
+  parts.push(keysStr);
+  parts.push(encodeFlags(payload));
+  parts.push(payload.releaseId ? toBase64Url(payload.releaseId) : "");
+  parts.push(payload.locale ? toBase64Url(payload.locale) : "");
+  return parts.join(V2_FIELD_SEP);
+};
+var UNSAFE_KEYS = /* @__PURE__ */ new Set(["__proto__", "prototype", "constructor"]);
+var isUnsafeKey = (key) => UNSAFE_KEYS.has(key);
+var deserializeV2 = (input) => {
+  var _a, _b, _c, _d;
+  const fields = input.split(V2_FIELD_SEP);
+  if (fields.length < 3) {
+    throw new Error(`Invalid serialized PageState: expected at least 3 fields but got ${fields.length}`);
+  }
+  const compositionStateRaw = fields[1];
+  const compositionState = Number.parseInt(compositionStateRaw, 10);
+  if (Number.isNaN(compositionState)) {
+    throw new Error(
+      `Invalid serialized PageState: compositionState '${compositionStateRaw}' is not a valid number`
+    );
+  }
+  const routePath = fromBase64Url(fields[2]);
+  const components = {};
+  const componentsStr = (_a = fields[3]) != null ? _a : "";
+  if (componentsStr) {
+    componentsStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx === -1) {
+        const id = entry;
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        components[id] = {};
+      } else {
+        const id = entry.slice(0, sepIdx);
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        const indexes = entry.slice(sepIdx + 1).split(V2_INDEX_SEP).map(Number);
+        components[id] = { indexes };
+      }
+    });
+  }
+  const rulesStr = (_b = fields[4]) != null ? _b : "";
+  let rules;
+  if (rulesStr) {
+    rules = {};
+    rulesStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx !== -1) {
+        const id = entry.slice(0, sepIdx);
+        if (isUnsafeKey(id)) {
+          return;
+        }
+        rules[id] = entry.slice(sepIdx + 1) === "1";
+      }
+    });
+  }
+  const keysStr = (_c = fields[5]) != null ? _c : "";
+  const keys = {};
+  if (keysStr) {
+    keysStr.split(V2_ENTRY_SEP).forEach((entry) => {
+      const sepIdx = entry.indexOf(V2_KV_SEP);
+      if (sepIdx !== -1) {
+        const k = fromBase64Url(entry.slice(0, sepIdx));
+        if (isUnsafeKey(k)) {
+          return;
+        }
+        const v = fromBase64Url(entry.slice(sepIdx + 1));
+        keys[k] = v;
+      }
+    });
+  }
+  const { defaultConsent, previewMode, isPrefetch } = decodeFlags((_d = fields[6]) != null ? _d : "0");
+  const releaseId = fields[7] ? fromBase64Url(fields[7]) : void 0;
+  const locale = fields[8] ? fromBase64Url(fields[8]) : void 0;
+  return {
+    compositionState,
+    routePath,
+    components,
+    rules,
+    keys,
+    releaseId,
+    defaultConsent,
+    previewMode,
+    locale,
+    isPrefetch
+  };
+};
+var serializeEvaluationResult = ({ payload }) => {
+  return serializeV2(payload);
 };
 var deserializeEvaluationResult = ({
   input: providedInput,
   decode = true
 }) => {
   var _a, _b, _c;
-  const input = decode ? decodeWithReplacements(providedInput) : providedInput;
-  const parsed = JSON.parse(input);
+  const input = decode ? decodeURIComponent(providedInput) : providedInput;
+  if (input.startsWith("2~")) {
+    return deserializeV2(input);
+  }
+  const jsonInput = decode ? atob(unreplaceReservedCharacters(input)) : input;
+  const parsed = JSON.parse(jsonInput);
   const pageState = {
     compositionState: parsed.cs,
     routePath: parsed.r,
@@ -270,7 +402,8 @@ var deserializeEvaluationResult = ({
     defaultConsent: typeof parsed.dc !== "undefined" ? parsed.dc === 1 : void 0,
     previewMode: parsed.pm === "e" ? "editor" : parsed.pm === "p" ? "preview" : void 0,
     rules: parsed.rl ? Object.fromEntries(Object.entries(parsed.rl).map(([key, value]) => [key, value === 1])) : void 0,
-    locale: (_c = parsed.l) != null ? _c : void 0
+    locale: (_c = parsed.l) != null ? _c : void 0,
+    isPrefetch: parsed.pf === 1 ? true : void 0
   };
   Object.keys(parsed.c).forEach((id) => {
     const component = parsed.c[id];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router-shared",
-  "version": "20.48.0",
+  "version": "20.48.1-alpha.11+129de094d4",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -36,8 +36,8 @@
     "vitest": "3.2.4"
   },
   "dependencies": {
-    "@uniformdev/canvas": "20.48.0",
-    "@uniformdev/context": "20.48.0",
+    "@uniformdev/canvas": "20.48.1-alpha.11+129de094d4",
+    "@uniformdev/context": "20.48.1-alpha.11+129de094d4",
     "uuid": "9.0.1"
   },
   "engines": {
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "20645902724e610cbd4f75fe062aa5034db0a7db"
+  "gitHead": "129de094d4db58d4adfcae07d6ab0fe506ca739e"
 }