@uniformdev/next-app-router 20.50.1 → 20.50.2-alpha.109

package/dist/middleware.js

@@ -530,6 +530,20 @@ async function handleRateLimits(callApi) {
   }
   return response;
 }
+var isPlainObject = (obj) => typeof obj === "object" && obj !== null && !Array.isArray(obj);
+function rewriteFiltersForApi(filters) {
+  return Object.entries(filters != null ? filters : {}).reduce(
+    (acc, [key, value]) => {
+      const lhs = `filters.${key}` + (isPlainObject(value) ? `[${Object.keys(value)[0]}]` : "");
+      const rhs = isPlainObject(value) ? Object.values(value)[0] : value;
+      return {
+        ...acc,
+        [lhs]: Array.isArray(rhs) ? rhs.map((v) => `${v}`.trim()).join(",") : `${rhs}`.trim()
+      };
+    },
+    {}
+  );
+}
 var _url;
 var _AggregateClient = class _AggregateClient2 extends ApiClient {
   constructor(options) {
@@ -1313,20 +1327,6 @@ function createLimitPolicy({
     return currentFunc();
   };
 }
-var isPlainObject = (obj) => typeof obj === "object" && obj !== null && !Array.isArray(obj);
-function rewriteFilters(filters) {
-  return Object.entries(filters != null ? filters : {}).reduce(
-    (acc, [key, value]) => {
-      const lhs = `filters.${key}` + (isPlainObject(value) ? `[${Object.keys(value)[0]}]` : "");
-      const rhs = isPlainObject(value) ? Object.values(value)[0] : value;
-      return {
-        ...acc,
-        [lhs]: Array.isArray(rhs) ? rhs.map((v) => `${v}`.trim()).join(",") : `${rhs}`.trim()
-      };
-    },
-    {}
-  );
-}
 var CANVAS_URL = "/api/v1/canvas";
 var CanvasClient = class extends ApiClient {
   constructor(options) {
@@ -1342,7 +1342,7 @@ var CanvasClient = class extends ApiClient {
   async getCompositionList(params = {}) {
     const { projectId } = this.options;
     const { resolveData, filters, ...originParams } = params;
-    const rewrittenFilters = rewriteFilters(filters);
+    const rewrittenFilters = rewriteFiltersForApi(filters);
     if (!resolveData) {
       const fetchUri = this.createUrl(CANVAS_URL, { ...originParams, projectId, ...rewrittenFilters });
       return this.apiClient(fetchUri);
@@ -1462,7 +1462,7 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
   getEntries(options) {
     const { projectId } = this.options;
     const { skipDataResolution, filters, ...params } = options;
-    const rewrittenFilters = rewriteFilters(filters);
+    const rewrittenFilters = rewriteFiltersForApi(filters);
     if (skipDataResolution) {
       const url = this.createUrl(__privateGet3(_ContentClient2, _entriesUrl), { ...params, ...rewrittenFilters, projectId });
       return this.apiClient(url);
@@ -1709,7 +1709,7 @@ function hasReferencedVariables(value) {
   return variableTokenCount;
 }
 function walkNodeTree(node, visitor, options) {
-  var _a, _b;
+  var _a, _b, _c;
   const componentQueue = [
     {
       ancestorsAndSelf: Array.isArray(node) ? node : [{ node, type: "root" }],
@@ -1717,12 +1717,14 @@ function walkNodeTree(node, visitor, options) {
     }
   ];
   const childContexts = /* @__PURE__ */ new Map();
+  const order = (_a = options == null ? void 0 : options.order) != null ? _a : "dfs";
+  const takeNext = () => order === "bfs" ? componentQueue.shift() : componentQueue.pop();
   do {
-    const currentQueueEntry = componentQueue.pop();
+    const currentQueueEntry = takeNext();
     if (!currentQueueEntry) continue;
     const currentComponent = currentQueueEntry.ancestorsAndSelf[0];
     let visitDescendants = true;
-    let descendantContext = (_a = childContexts.get(currentComponent.node)) != null ? _a : currentQueueEntry.context;
+    let descendantContext = (_b = childContexts.get(currentComponent.node)) != null ? _b : currentQueueEntry.context;
     let visitorInfo;
     if (currentComponent.type === "root" && isRootEntryReference(currentComponent) || currentComponent.type === "block") {
       visitorInfo = {
@@ -1909,39 +1911,11 @@ function walkNodeTree(node, visitor, options) {
       continue;
     }
     const slots = "slots" in currentComponent.node && currentComponent.node.slots;
-    if (slots) {
-      const slotKeys = Object.keys(slots);
-      for (let slotIndex = slotKeys.length - 1; slotIndex >= 0; slotIndex--) {
-        const slotKey = slotKeys[slotIndex];
-        const components = slots[slotKey];
-        for (let componentIndex = components.length - 1; componentIndex >= 0; componentIndex--) {
-          const enqueueingComponent = components[componentIndex];
-          const parentSlotIndexFn = () => {
-            const result = currentComponent.node.slots[slotKey].findIndex(
-              (x) => x === enqueueingComponent
-            );
-            return result;
-          };
-          componentQueue.push({
-            ancestorsAndSelf: [
-              {
-                type: "slot",
-                node: enqueueingComponent,
-                parentSlot: slotKey,
-                parentSlotIndexFn
-              },
-              ...currentQueueEntry.ancestorsAndSelf
-            ],
-            context: descendantContext
-          });
-        }
-      }
-    }
+    const childEntries = [];
     const properties = getPropertiesValue(currentComponent.node);
     if (properties) {
       const propertyEntries = Object.entries(properties);
-      for (let propIndex = propertyEntries.length - 1; propIndex >= 0; propIndex--) {
-        const [propKey, propObject] = propertyEntries[propIndex];
+      for (const [propKey, propObject] of propertyEntries) {
         if (!isNestedNodeType(propObject.type)) {
           continue;
         }
@@ -1961,13 +1935,12 @@ function walkNodeTree(node, visitor, options) {
             continue;
           }
         }
-        const blocks = (_b = propObject.value) != null ? _b : [];
-        for (let blockIndex = blocks.length - 1; blockIndex >= 0; blockIndex--) {
-          const enqueueingBlock = blocks[blockIndex];
+        const blocks = (_c = propObject.value) != null ? _c : [];
+        for (const enqueueingBlock of blocks) {
           const blockIndexFn = () => {
             return getBlockValue(currentComponent.node, propKey).findIndex((x) => x === enqueueingBlock);
           };
-          componentQueue.push({
+          childEntries.push({
             ancestorsAndSelf: [
               {
                 type: "block",
@@ -1982,6 +1955,36 @@ function walkNodeTree(node, visitor, options) {
         }
       }
     }
+    if (slots) {
+      const slotKeys = Object.keys(slots);
+      for (const slotKey of slotKeys) {
+        const components = slots[slotKey];
+        for (const enqueueingComponent of components) {
+          const parentSlotIndexFn = () => {
+            const result = currentComponent.node.slots[slotKey].findIndex(
+              (x) => x === enqueueingComponent
+            );
+            return result;
+          };
+          childEntries.push({
+            ancestorsAndSelf: [
+              {
+                type: "slot",
+                node: enqueueingComponent,
+                parentSlot: slotKey,
+                parentSlotIndexFn
+              },
+              ...currentQueueEntry.ancestorsAndSelf
+            ],
+            context: descendantContext
+          });
+        }
+      }
+    }
+    if (order === "dfs") {
+      childEntries.reverse();
+    }
+    componentQueue.push(...childEntries);
   } while (componentQueue.length > 0);
 }
 function isNestedNodeType(type) {
@@ -2197,6 +2200,7 @@ var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2
 _baseUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd3(_IntegrationPropertyEditorsClient, _baseUrl, "/api/v1/integration-property-editors");
 var _url22;
+var _projectsUrl;
 var _ProjectClient = class _ProjectClient2 extends ApiClient {
   constructor(options) {
     super({ ...options, bypassCache: true });
@@ -2206,6 +2210,15 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
     const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22), { ...options });
     return await this.apiClient(fetchUri);
   }
+  /**
+   * Fetches projects grouped by team.
+   * When teamId is provided, returns a single team with its projects.
+   * When omitted, returns all accessible teams and their projects.
+   */
+  async getProjects(options) {
+    const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _projectsUrl), options ? { ...options } : {});
+    return await this.apiClient(fetchUri);
+  }
   /** Updates or creates (based on id) a Project */
   async upsert(body) {
     const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22));
@@ -2225,7 +2238,9 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
   }
 };
 _url22 = /* @__PURE__ */ new WeakMap();
+_projectsUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd3(_ProjectClient, _url22, "/api/v1/project");
+__privateAdd3(_ProjectClient, _projectsUrl, "/api/v1/projects");
 var ROUTE_URL = "/api/v1/route";
 var RouteClient = class extends ApiClient {
   constructor(options) {
@@ -2339,8 +2354,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2362,7 +2384,9 @@ var resolveCache = ({
 }) => {
   let cache = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -2757,7 +2781,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -2860,12 +2887,13 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
@@ -2873,7 +2901,8 @@ var DefaultDataClient = class {
       state: options.pageState.compositionState,
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",
@@ -3134,11 +3163,12 @@ function dequal(foo, bar) {
   return foo !== foo && bar !== bar;
 }
 
-// ../../node_modules/.pnpm/js-cookie@3.0.5/node_modules/js-cookie/dist/js.cookie.mjs
+// ../../node_modules/.pnpm/js-cookie@3.0.7/node_modules/js-cookie/dist/js.cookie.mjs
 function assign(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i];
     for (var key in source) {
+      if (key === "__proto__") continue;
       target[key] = source[key];
     }
   }
@@ -3195,7 +3225,7 @@ function init(converter, defaultAttributes) {
       var value = parts.slice(1).join("=");
       try {
         var found = decodeURIComponent(parts[0]);
-        jar[found] = converter.read(value, found);
+        if (!(found in jar)) jar[found] = converter.read(value, found);
         if (name === found) {
           break;
         }
@@ -3391,7 +3421,6 @@ var ManifestInstance = class {
   constructor({
     manifest,
     evaluator = new GroupCriteriaEvaluator({}),
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
     onLogMessage = () => {
     }
   }) {
@@ -5422,7 +5451,8 @@ var retrieveRouteByPath = async ({
       withComponentIDs: true,
       withContentSourceMap: (_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing,
       releaseId,
-      locale
+      locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state })
     }
   });
 };
@@ -5549,7 +5579,7 @@ var handlePlaygroundRequest = async ({
     })
   });
   const context = await onDemandContext.getContext();
-  const { components, rules } = await extractAndEvaluateRunnables({
+  const { components, rules, allComponentIds } = await extractAndEvaluateRunnables({
     composition: composition.composition,
     routePath: id,
     state: composition.state,
@@ -5589,7 +5619,8 @@ var handlePlaygroundRequest = async ({
     isPrefetch: void 0
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
-    payload: pageState
+    payload: pageState,
+    allComponentIds
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "playground" }) : void 0);
   if (!pathToRewriteTo) {
@@ -5603,15 +5634,16 @@ var handleRouteRequest = async ({
   dataClient,
   options
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g;
+  const releaseId = (_b = (_a = options.release) == null ? void 0 : _a.id) != null ? _b : draftModeEnabled ? request.nextUrl.searchParams.get("releaseId") || void 0 : void 0;
   const states = await determineState({
     searchParams: request.nextUrl.searchParams,
     draftModeEnabled
   });
-  const requestPath = (_b = await ((_a = options.rewriteRequestPath) == null ? void 0 : _a.call(options, {
+  const requestPath = (_d = await ((_c = options.rewriteRequestPath) == null ? void 0 : _c.call(options, {
     request,
     url: new URL(request.url)
-  }))) != null ? _b : {
+  }))) != null ? _d : {
     path: `${request.nextUrl.pathname}${request.nextUrl.search}`
   };
   const serverConfig = getServerConfig();
@@ -5622,7 +5654,7 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       draftModeEnabled,
       dataClient,
-      releaseId: (_c = options.release) == null ? void 0 : _c.id,
+      releaseId,
       locale: options.locale
     }),
     createOnDemandContext({
@@ -5634,10 +5666,10 @@ var handleRouteRequest = async ({
       })
     })
   ]);
-  if (!(routeResult == null ? void 0 : routeResult.route) || ((_d = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _d.type) === "notFound") {
+  if (!(routeResult == null ? void 0 : routeResult.route) || ((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "notFound") {
     return import_server.NextResponse.rewrite(new URL("/404", request.url));
   }
-  if (((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "redirect") {
+  if (((_f = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _f.type) === "redirect") {
     return handleRedirect({ request, route: routeResult.route });
   }
   const { route } = routeResult;
@@ -5671,14 +5703,14 @@ var handleRouteRequest = async ({
     isDraftModeEnabled: draftModeEnabled
   });
   const isPrefetch = isPrefetchRequest(request);
-  const { components, rules } = await extractAndEvaluateRunnables({
+  const { components, rules, allComponentIds } = await extractAndEvaluateRunnables({
     composition: route.compositionApiResponse.composition,
     routePath,
     state,
     context,
     matchedRoute: route.matchedRoute,
-    dynamicInputs: (_f = route.dynamicInputs) != null ? _f : {},
-    releaseId: (_g = options.release) == null ? void 0 : _g.id,
+    dynamicInputs: (_g = route.dynamicInputs) != null ? _g : {},
+    releaseId,
     defaultConsent: determineDefaultConsent({
       serverConfig,
       defaultConsent: options.defaultConsent
@@ -5696,7 +5728,7 @@ var handleRouteRequest = async ({
     compositionState: state,
     components,
     keys: requestPath.keys,
-    releaseId: (_h = options.release) == null ? void 0 : _h.id,
+    releaseId,
     defaultConsent: determineDefaultConsent({
       serverConfig,
       defaultConsent: options.defaultConsent
@@ -5707,7 +5739,8 @@ var handleRouteRequest = async ({
     isPrefetch: isPrefetch || void 0
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
-    payload: pageState
+    payload: pageState,
+    allComponentIds
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "route" }) : void 0);
   if (!pathToRewriteTo) {
@@ -5767,7 +5800,8 @@ var extractAndEvaluateRunnables = async ({
       }
     }
   });
-  return result;
+  const allComponentIds = extracted.filter((r) => r.type === "test" || r.type === "personalization").map((r) => r._id);
+  return { ...result, allComponentIds };
 };
 var handleRedirect = ({ request, route }) => {
   const href = resolveRedirectHref({
@@ -5866,5 +5900,5 @@ var determinePreviewMode = ({
 /*! Bundled license information:
 
 js-cookie/dist/js.cookie.mjs:
-  (*! js-cookie v3.0.5 | MIT *)
+  (*! js-cookie v3.0.7 | MIT *)
 */