@uniformdev/next-app-router 20.50.2-alpha.9 → 20.50.2-alpha.96

package/dist/handler.mjs

@@ -319,6 +319,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) {
@@ -1101,20 +1115,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) {
@@ -1130,7 +1130,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);
@@ -1250,7 +1250,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(__privateGet2(_ContentClient2, _entriesUrl), { ...params, ...rewrittenFilters, projectId });
       return this.apiClient(url);
@@ -1488,6 +1488,7 @@ var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2
 _baseUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd2(_IntegrationPropertyEditorsClient, _baseUrl, "/api/v1/integration-property-editors");
 var _url22;
+var _projectsUrl;
 var _ProjectClient = class _ProjectClient2 extends ApiClient {
   constructor(options) {
     super({ ...options, bypassCache: true });
@@ -1497,6 +1498,15 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
     const fetchUri = this.createUrl(__privateGet2(_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(__privateGet2(_ProjectClient2, _projectsUrl), options ? { ...options } : {});
+    return await this.apiClient(fetchUri);
+  }
   /** Updates or creates (based on id) a Project */
   async upsert(body) {
     const fetchUri = this.createUrl(__privateGet2(_ProjectClient2, _url22));
@@ -1516,7 +1526,9 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
   }
 };
 _url22 = /* @__PURE__ */ new WeakMap();
+_projectsUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd2(_ProjectClient, _url22, "/api/v1/project");
+__privateAdd2(_ProjectClient, _projectsUrl, "/api/v1/projects");
 var isAllowedReferrer = (referrer) => {
   return Boolean(referrer == null ? void 0 : referrer.match(/(^https:\/\/|\.)(uniform.app|uniform.wtf|localhost:\d{4})\//));
 };
@@ -1759,6 +1771,9 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1780,7 +1795,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",

package/dist/index.d.mts

@@ -2,12 +2,12 @@ import { CanvasClient, RouteClient, ComponentInstance } from '@uniformdev/canvas
 import { CacheMode, CanvasCacheMode, ManifestCacheMode, ProjectMapCacheMode, RewriteRequestPathResult } from '@uniformdev/next-app-router-shared';
 import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient } from '@uniformdev/project-map';
-import { U as UniformCompositionProps } from './UniformComposition-hhRIBHmn.mjs';
-export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-hhRIBHmn.mjs';
+import { U as UniformCompositionProps } from './UniformComposition-scIgVvIH.mjs';
+export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-scIgVvIH.mjs';
 import React from 'react';
-export { D as DataClient, a as DefaultDataClient, E as EnhanceRouteOptions, G as GetRouteFromMiddlewareOptions, b as GetRouteFromPageStateOptions, c as GetRouteOptions, R as RewriteRouteOptions, d as RewriteRouteResult, e as expireMiddlewareCacheTag } from './client-BCGVjYM-.mjs';
-import { a as ResolvedRouteResult } from './resolveRouteFromCode-CKaYNXte.mjs';
-export { R as ResolveRouteFunction, r as resolveRouteFromCode } from './resolveRouteFromCode-CKaYNXte.mjs';
+export { D as DataClient, a as DefaultDataClient, E as EnhanceRouteOptions, G as GetRouteFromMiddlewareOptions, b as GetRouteFromPageStateOptions, c as GetRouteOptions, R as RewriteRouteOptions, d as RewriteRouteResult, e as expireMiddlewareCacheTag } from './client-BlKZeE6C.mjs';
+import { a as ResolvedRouteResult } from './resolveRouteFromCode-_CdAMtVM.mjs';
+export { R as ResolveRouteFunction, r as resolveRouteFromCode } from './resolveRouteFromCode-_CdAMtVM.mjs';
 import '@uniformdev/next-app-router-client';
 import '@uniformdev/context';
 

package/dist/index.d.ts

@@ -2,12 +2,12 @@ import { CanvasClient, RouteClient, ComponentInstance } from '@uniformdev/canvas
 import { CacheMode, CanvasCacheMode, ManifestCacheMode, ProjectMapCacheMode, RewriteRequestPathResult } from '@uniformdev/next-app-router-shared';
 import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient } from '@uniformdev/project-map';
-import { U as UniformCompositionProps } from './UniformComposition-d7_93l3F.js';
-export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-d7_93l3F.js';
+import { U as UniformCompositionProps } from './UniformComposition-BV6YnA2a.js';
+export { C as CompositionCache, a as ResolveComponentFunction, R as ResolveComponentResult, b as UniformComposition, c as createCompositionCache } from './UniformComposition-BV6YnA2a.js';
 import React from 'react';
-export { D as DataClient, a as DefaultDataClient, E as EnhanceRouteOptions, G as GetRouteFromMiddlewareOptions, b as GetRouteFromPageStateOptions, c as GetRouteOptions, R as RewriteRouteOptions, d as RewriteRouteResult, e as expireMiddlewareCacheTag } from './client-BCGVjYM-.js';
-import { a as ResolvedRouteResult } from './resolveRouteFromCode-DgTsfMK8.js';
-export { R as ResolveRouteFunction, r as resolveRouteFromCode } from './resolveRouteFromCode-DgTsfMK8.js';
+export { D as DataClient, a as DefaultDataClient, E as EnhanceRouteOptions, G as GetRouteFromMiddlewareOptions, b as GetRouteFromPageStateOptions, c as GetRouteOptions, R as RewriteRouteOptions, d as RewriteRouteResult, e as expireMiddlewareCacheTag } from './client-BlKZeE6C.js';
+import { a as ResolvedRouteResult } from './resolveRouteFromCode-3u61IwOW.js';
+export { R as ResolveRouteFunction, r as resolveRouteFromCode } from './resolveRouteFromCode-3u61IwOW.js';
 import '@uniformdev/next-app-router-client';
 import '@uniformdev/context';
 

package/dist/index.esm.js

@@ -325,6 +325,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) {
@@ -1108,20 +1122,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) {
@@ -1137,7 +1137,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);
@@ -1257,7 +1257,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(__privateGet2(_ContentClient2, _entriesUrl), { ...params, ...rewrittenFilters, projectId });
       return this.apiClient(url);
@@ -1506,7 +1506,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" }],
@@ -1514,12 +1514,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 = {
@@ -1706,39 +1708,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;
         }
@@ -1758,13 +1732,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",
@@ -1779,6 +1752,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) {
@@ -1849,6 +1852,7 @@ var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2
 _baseUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd2(_IntegrationPropertyEditorsClient, _baseUrl, "/api/v1/integration-property-editors");
 var _url22;
+var _projectsUrl;
 var _ProjectClient = class _ProjectClient2 extends ApiClient {
   constructor(options) {
     super({ ...options, bypassCache: true });
@@ -1858,6 +1862,15 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
     const fetchUri = this.createUrl(__privateGet2(_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(__privateGet2(_ProjectClient2, _projectsUrl), options ? { ...options } : {});
+    return await this.apiClient(fetchUri);
+  }
   /** Updates or creates (based on id) a Project */
   async upsert(body) {
     const fetchUri = this.createUrl(__privateGet2(_ProjectClient2, _url22));
@@ -1877,7 +1890,9 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
   }
 };
 _url22 = /* @__PURE__ */ new WeakMap();
+_projectsUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd2(_ProjectClient, _url22, "/api/v1/project");
+__privateAdd2(_ProjectClient, _projectsUrl, "/api/v1/projects");
 var ROUTE_URL = "/api/v1/route";
 var RouteClient = class extends ApiClient {
   constructor(options) {
@@ -1979,8 +1994,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;
 };
@@ -2007,7 +2029,9 @@ var resolveCache = ({
 }) => {
   let cache2 = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache2 = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache2 = {
           type: "no-cache",
@@ -2763,7 +2787,7 @@ var createTestComponentProps = ({
   const [testIndex] = (_a = component == null ? void 0 : component.indexes) != null ? _a : [];
   return {
     ...common,
-    index: testIndex != null ? testIndex : 0,
+    index: testIndex,
     test
   };
 };
@@ -3598,8 +3622,9 @@ var generatePossiblePageStates = ({
     locale,
     isPrefetch: void 0
   };
+  const allComponentIds = runnables.filter((r) => r.type === "test" || r.type === "personalization").map((r) => r._id);
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
-  return allStates.map((payload) => serializeEvaluationResult({ payload }));
+  return allStates.map((payload) => serializeEvaluationResult({ payload, allComponentIds }));
 };
 function permutationsWithoutRepetition(options, k) {
   if (k === 0) return [[]];
@@ -3648,7 +3673,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -3751,12 +3779,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 = {
@@ -3764,7 +3793,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",