@uniformdev/next-app-router 20.7.1-alpha.123 → 20.7.1-alpha.136

package/dist/index.js

@@ -1431,6 +1431,9 @@ var CANVAS_EDITOR_STATE = 63;
 var CANVAS_PERSONALIZATION_PARAM = "$pzCrit";
 var CANVAS_TEST_VARIANT_PARAM = "$tstVrnt";
 var CANVAS_ENRICHMENT_TAG_PARAM = "$enr";
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var CANVAS_CONTEXTUAL_EDITING_PARAM = "$contextualEditing";
 var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
 var PLACEHOLDER_ID = "placeholder";
@@ -1978,19 +1981,19 @@ var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
 };
 
-// src/config/helpers.ts
-var import_uniform_server = __toESM(require("uniform.server.config"));
-var getServerConfig = () => {
-  return import_uniform_server.default;
-};
-
 // src/utils/draft.ts
 var isDraftModeEnabled = ({
   draftModeEnabled
 }) => {
   return draftModeEnabled;
 };
-var isIncontextEditingEnabled = ({ searchParams }) => {
+var isIncontextEditingEnabled = ({
+  isDraftModeEnabled: isDraftModeEnabled2,
+  searchParams
+}) => {
+  if (!isDraftModeEnabled2) {
+    return false;
+  }
   const containsKey = searchParams.has(IN_CONTEXT_EDITOR_QUERY_STRING_PARAM);
   return containsKey;
 };
@@ -1999,9 +2002,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2010,31 +2010,25 @@ var isDetectCacheMode = (options) => {
 };
 var resolveManifestCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().manifestCache
+    options
   });
 };
 var resolveCanvasCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().canvasCache
+    options
   });
 };
 var resolveProjectMapCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().projectMapCache
+    options
   });
 };
 var resolveCache = ({
-  options,
-  defaultCache
+  options
 }) => {
-  let cache2 = defaultCache;
+  let cache2 = void 0;
   if (options) {
-    if (isSpecificCacheMode(options)) {
-      cache2 = options.cache;
-    } else if (isStateCacheMode(options)) {
+    if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache2 = {
           type: "no-cache",
@@ -2059,7 +2053,10 @@ var shouldCacheBeDisabled = (options) => {
   if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled({
+    isDraftModeEnabled: options.draftModeEnabled,
+    searchParams: options.searchParams
+  })) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -2822,7 +2819,6 @@ var Test = ({ index, slots, test, component, context: compositionContext }) => {
   const indexToShow = typeof index === "number" ? (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null : null;
   const event = {
     name: test.name,
-    // todo: add Control Group support
     control: (_d = (_c = test.variations[index]) == null ? void 0 : _c.control) != null ? _d : false,
     variantAssigned: true,
     variantId: (_f = (_e = test.variations[index]) == null ? void 0 : _e.id) != null ? _f : "NO_VARIANTS",
@@ -2854,8 +2850,45 @@ var UniformCompositionWrapper = ({
 // src/components/UniformContext.tsx
 var import_next_app_router_client2 = require("@uniformdev/next-app-router-client");
 var import_react4 = __toESM(require("react"));
+
+// src/config/helpers.ts
+var import_resolved = __toESM(require("@uniformdev/next-app-router/config/resolved"));
+var getDisabledDevTools = () => {
+  var _a;
+  if (typeof ((_a = import_resolved.default.context) == null ? void 0 : _a.disableDevTools) === "boolean") {
+    return import_resolved.default.context.disableDevTools;
+  }
+  return false;
+};
+var getDefaultConsent = () => {
+  if (typeof import_resolved.default.defaultConsent === "boolean") {
+    return import_resolved.default.defaultConsent;
+  }
+  return false;
+};
+var getQuirkSerialization = () => {
+  if (typeof import_resolved.default.quirkSerialization === "boolean") {
+    return import_resolved.default.quirkSerialization;
+  }
+  return true;
+};
+var getMiddlewareRuntimeCache = () => {
+  if (typeof import_resolved.default.middlewareRuntimeCache === "boolean") {
+    return import_resolved.default.middlewareRuntimeCache;
+  }
+  return true;
+};
+var getDisableSwrMiddlewareCache = () => {
+  var _a;
+  if (typeof ((_a = import_resolved.default.experimental) == null ? void 0 : _a.disableSwrMiddlewareCache) === "boolean") {
+    return import_resolved.default.experimental.disableSwrMiddlewareCache;
+  }
+  return false;
+};
+
+// src/components/UniformContext.tsx
 var UniformContext = async ({ clientContextComponent, result }) => {
-  var _a, _b, _c, _d;
+  var _a;
   const manifest = await getManifest({
     state: CANVAS_PUBLISHED_STATE
   });
@@ -2866,10 +2899,9 @@ var UniformContext = async ({ clientContextComponent, result }) => {
     matchedRoute: route.matchedRoute
   } : void 0;
   const ContextComponent = clientContextComponent || import_next_app_router_client2.DefaultUniformClientContext;
-  const serverConfig2 = getServerConfig();
-  const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
-  const defaultConsent = (_c = (_b = result == null ? void 0 : result.pageState.defaultConsent) != null ? _b : serverConfig2.defaultConsent) != null ? _c : false;
-  const experimentalQuirkSerialization = ((_d = serverConfig2.experimental) == null ? void 0 : _d.quirkSerialization) || false;
+  const disableDevTools = getDisabledDevTools();
+  const defaultConsent = (_a = result == null ? void 0 : result.pageState.defaultConsent) != null ? _a : getDefaultConsent();
+  const experimentalQuirkSerialization = getQuirkSerialization();
   return /* @__PURE__ */ import_react4.default.createElement(import_react4.default.Fragment, null, /* @__PURE__ */ import_react4.default.createElement(
     ContextComponent,
     {
@@ -2903,11 +2935,13 @@ async function UniformCompositionInner({
   resolveComponent,
   resolveEmptyPlaceholder,
   compositionCache,
-  clientContextComponent
+  clientContextComponent,
+  dataClient
 }) {
   var _a, _b;
   const result = await resolveRoute({
-    code
+    code,
+    dataClient
   });
   if (!(result == null ? void 0 : result.route) || ((_a = result == null ? void 0 : result.route) == null ? void 0 : _a.type) !== "composition") {
     (0, import_navigation.notFound)();
@@ -3588,7 +3622,7 @@ function permutationsWithoutRepetition(options, k) {
 }
 function combineAcrossGroups(perGroupSelections) {
   return perGroupSelections.reduce(
-    (acc, group) => acc.flatMap((config) => group.map((selection) => [...config, selection])),
+    (acc, group) => acc.flatMap((config2) => group.map((selection) => [...config2, selection])),
     [[]]
   );
 }
@@ -3602,8 +3636,7 @@ var import_functions = require("@vercel/functions");
 var MANIFEST_CACHE_KEY = "uniform-manifest";
 var DefaultDataClient = class {
   async getManifest(options) {
-    var _a, _b;
-    const cache2 = options.source === "middleware" && ((_b = (_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false) ? (0, import_functions.getCache)() : null;
+    const cache2 = options.source === "middleware" && getMiddlewareRuntimeCache() ? (0, import_functions.getCache)() : null;
     if (cache2) {
       const cachedManifest = await cache2.get(MANIFEST_CACHE_KEY);
       if (cachedManifest) {
@@ -3689,18 +3722,16 @@ var DefaultDataClient = class {
   async enhanceRoute(_options) {
   }
   async getRouteMiddleware(options) {
-    var _a, _b, _c, _d;
     const routeClient = getRouteClient({
       searchParams: options.searchParams,
       draftModeEnabled: options.draftModeEnabled
     });
-    const config = getServerConfig();
     const resolvedRoute = await this.getRouteFromApi({
       source: "middleware",
       route: options.route,
       routeClient,
-      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && ((_b = (_a = config.experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false),
-      disableSwrCache: (_d = (_c = config.experimental) == null ? void 0 : _c.disableSwrMiddlewareCache) != null ? _d : false
+      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && getMiddlewareRuntimeCache(),
+      disableSwrCache: getDisableSwrMiddlewareCache()
     });
     if (resolvedRoute.type === "composition") {
       await this.enhanceRoute({
@@ -3716,12 +3747,12 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
-    var _a;
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? (_a = getServerConfig().canvasCache) != null ? _a : {
+      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
         type: "force-cache"
       } : {
-        type: "no-cache"
+        type: "no-cache",
+        bypassCache: true
       }
     });
     const originalRoute = {
@@ -3753,8 +3784,7 @@ var DefaultDataClient = class {
   }
 };
 var expireMiddlewareCacheTag = async (tag) => {
-  var _a;
-  const cache2 = ((_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) ? (0, import_functions.getCache)() : null;
+  const cache2 = getMiddlewareRuntimeCache() ? (0, import_functions.getCache)() : null;
   if (cache2) {
     await cache2.expireTag(tag);
   } else {

package/dist/index.mjs

@@ -1404,6 +1404,9 @@ var CANVAS_EDITOR_STATE = 63;
 var CANVAS_PERSONALIZATION_PARAM = "$pzCrit";
 var CANVAS_TEST_VARIANT_PARAM = "$tstVrnt";
 var CANVAS_ENRICHMENT_TAG_PARAM = "$enr";
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
 var CANVAS_CONTEXTUAL_EDITING_PARAM = "$contextualEditing";
 var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
 var PLACEHOLDER_ID = "placeholder";
@@ -1951,19 +1954,19 @@ var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
 };
 
-// src/config/helpers.ts
-import serverConfig from "uniform.server.config";
-var getServerConfig = () => {
-  return serverConfig;
-};
-
 // src/utils/draft.ts
 var isDraftModeEnabled = ({
   draftModeEnabled
 }) => {
   return draftModeEnabled;
 };
-var isIncontextEditingEnabled = ({ searchParams }) => {
+var isIncontextEditingEnabled = ({
+  isDraftModeEnabled: isDraftModeEnabled2,
+  searchParams
+}) => {
+  if (!isDraftModeEnabled2) {
+    return false;
+  }
   const containsKey = searchParams.has(IN_CONTEXT_EDITOR_QUERY_STRING_PARAM);
   return containsKey;
 };
@@ -1972,9 +1975,6 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
-var isSpecificCacheMode = (options) => {
-  return "cache" in options;
-};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1983,31 +1983,25 @@ var isDetectCacheMode = (options) => {
 };
 var resolveManifestCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().manifestCache
+    options
   });
 };
 var resolveCanvasCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().canvasCache
+    options
   });
 };
 var resolveProjectMapCache = (options) => {
   return resolveCache({
-    options,
-    defaultCache: getServerConfig().projectMapCache
+    options
   });
 };
 var resolveCache = ({
-  options,
-  defaultCache
+  options
 }) => {
-  let cache2 = defaultCache;
+  let cache2 = void 0;
   if (options) {
-    if (isSpecificCacheMode(options)) {
-      cache2 = options.cache;
-    } else if (isStateCacheMode(options)) {
+    if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache2 = {
           type: "no-cache",
@@ -2032,7 +2026,10 @@ var shouldCacheBeDisabled = (options) => {
   if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled({
+    isDraftModeEnabled: options.draftModeEnabled,
+    searchParams: options.searchParams
+  })) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -2799,7 +2796,6 @@ var Test = ({ index, slots, test, component, context: compositionContext }) => {
   const indexToShow = typeof index === "number" ? (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null : null;
   const event = {
     name: test.name,
-    // todo: add Control Group support
     control: (_d = (_c = test.variations[index]) == null ? void 0 : _c.control) != null ? _d : false,
     variantAssigned: true,
     variantId: (_f = (_e = test.variations[index]) == null ? void 0 : _e.id) != null ? _f : "NO_VARIANTS",
@@ -2831,8 +2827,45 @@ var UniformCompositionWrapper = ({
 // src/components/UniformContext.tsx
 import { DefaultUniformClientContext } from "@uniformdev/next-app-router-client";
 import React3 from "react";
+
+// src/config/helpers.ts
+import config from "@uniformdev/next-app-router/config/resolved";
+var getDisabledDevTools = () => {
+  var _a;
+  if (typeof ((_a = config.context) == null ? void 0 : _a.disableDevTools) === "boolean") {
+    return config.context.disableDevTools;
+  }
+  return false;
+};
+var getDefaultConsent = () => {
+  if (typeof config.defaultConsent === "boolean") {
+    return config.defaultConsent;
+  }
+  return false;
+};
+var getQuirkSerialization = () => {
+  if (typeof config.quirkSerialization === "boolean") {
+    return config.quirkSerialization;
+  }
+  return true;
+};
+var getMiddlewareRuntimeCache = () => {
+  if (typeof config.middlewareRuntimeCache === "boolean") {
+    return config.middlewareRuntimeCache;
+  }
+  return true;
+};
+var getDisableSwrMiddlewareCache = () => {
+  var _a;
+  if (typeof ((_a = config.experimental) == null ? void 0 : _a.disableSwrMiddlewareCache) === "boolean") {
+    return config.experimental.disableSwrMiddlewareCache;
+  }
+  return false;
+};
+
+// src/components/UniformContext.tsx
 var UniformContext = async ({ clientContextComponent, result }) => {
-  var _a, _b, _c, _d;
+  var _a;
   const manifest = await getManifest({
     state: CANVAS_PUBLISHED_STATE
   });
@@ -2843,10 +2876,9 @@ var UniformContext = async ({ clientContextComponent, result }) => {
     matchedRoute: route.matchedRoute
   } : void 0;
   const ContextComponent = clientContextComponent || DefaultUniformClientContext;
-  const serverConfig2 = getServerConfig();
-  const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
-  const defaultConsent = (_c = (_b = result == null ? void 0 : result.pageState.defaultConsent) != null ? _b : serverConfig2.defaultConsent) != null ? _c : false;
-  const experimentalQuirkSerialization = ((_d = serverConfig2.experimental) == null ? void 0 : _d.quirkSerialization) || false;
+  const disableDevTools = getDisabledDevTools();
+  const defaultConsent = (_a = result == null ? void 0 : result.pageState.defaultConsent) != null ? _a : getDefaultConsent();
+  const experimentalQuirkSerialization = getQuirkSerialization();
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(
     ContextComponent,
     {
@@ -2880,11 +2912,13 @@ async function UniformCompositionInner({
   resolveComponent,
   resolveEmptyPlaceholder,
   compositionCache,
-  clientContextComponent
+  clientContextComponent,
+  dataClient
 }) {
   var _a, _b;
   const result = await resolveRoute({
-    code
+    code,
+    dataClient
   });
   if (!(result == null ? void 0 : result.route) || ((_a = result == null ? void 0 : result.route) == null ? void 0 : _a.type) !== "composition") {
     notFound();
@@ -3567,7 +3601,7 @@ function permutationsWithoutRepetition(options, k) {
 }
 function combineAcrossGroups(perGroupSelections) {
   return perGroupSelections.reduce(
-    (acc, group) => acc.flatMap((config) => group.map((selection) => [...config, selection])),
+    (acc, group) => acc.flatMap((config2) => group.map((selection) => [...config2, selection])),
     [[]]
   );
 }
@@ -3581,8 +3615,7 @@ import { getCache, waitUntil } from "@vercel/functions";
 var MANIFEST_CACHE_KEY = "uniform-manifest";
 var DefaultDataClient = class {
   async getManifest(options) {
-    var _a, _b;
-    const cache2 = options.source === "middleware" && ((_b = (_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false) ? getCache() : null;
+    const cache2 = options.source === "middleware" && getMiddlewareRuntimeCache() ? getCache() : null;
     if (cache2) {
       const cachedManifest = await cache2.get(MANIFEST_CACHE_KEY);
       if (cachedManifest) {
@@ -3668,18 +3701,16 @@ var DefaultDataClient = class {
   async enhanceRoute(_options) {
   }
   async getRouteMiddleware(options) {
-    var _a, _b, _c, _d;
     const routeClient = getRouteClient({
       searchParams: options.searchParams,
       draftModeEnabled: options.draftModeEnabled
     });
-    const config = getServerConfig();
     const resolvedRoute = await this.getRouteFromApi({
       source: "middleware",
       route: options.route,
       routeClient,
-      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && ((_b = (_a = config.experimental) == null ? void 0 : _a.middlewareRuntimeCache) != null ? _b : false),
-      disableSwrCache: (_d = (_c = config.experimental) == null ? void 0 : _c.disableSwrMiddlewareCache) != null ? _d : false
+      enableRuntimeCache: options.route.state === CANVAS_PUBLISHED_STATE && getMiddlewareRuntimeCache(),
+      disableSwrCache: getDisableSwrMiddlewareCache()
     });
     if (resolvedRoute.type === "composition") {
       await this.enhanceRoute({
@@ -3695,12 +3726,12 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
-    var _a;
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? (_a = getServerConfig().canvasCache) != null ? _a : {
+      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
         type: "force-cache"
       } : {
-        type: "no-cache"
+        type: "no-cache",
+        bypassCache: true
       }
     });
     const originalRoute = {
@@ -3732,8 +3763,7 @@ var DefaultDataClient = class {
   }
 };
 var expireMiddlewareCacheTag = async (tag) => {
-  var _a;
-  const cache2 = ((_a = getServerConfig().experimental) == null ? void 0 : _a.middlewareRuntimeCache) ? getCache() : null;
+  const cache2 = getMiddlewareRuntimeCache() ? getCache() : null;
   if (cache2) {
     await cache2.expireTag(tag);
   } else {