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

package/dist/handler.mjs

@@ -314,11 +314,25 @@ async function handleRateLimits(callApi) {
     }
     const base = Math.pow(2, backoffRetries - backoffRetriesLeft) * 333;
     const backoffWait = base + Math.round(Math.random() * (base / 2)) * (Math.random() > 0.5 ? 1 : -1);
-    await new Promise((resolve) => setTimeout(resolve, resetWait + backoffWait));
+    await new Promise((resolve) => setTimeout(resolve, Math.max(0, resetWait + backoffWait)));
     backoffRetriesLeft -= 1;
   }
   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);
@@ -1400,13 +1400,19 @@ function parseVariableExpression(serialized, onToken) {
         bufferEndIndex = index + 1;
         continue;
       }
-      state = "variable";
-      if (bufferEndIndex > bufferStartIndex) {
+      if (state === "variable") {
+        const textStart = bufferStartIndex - variablePrefix.length;
+        if (handleToken(serialized.substring(textStart, bufferEndIndex), "text") === false) {
+          return tokenCount;
+        }
+        bufferStartIndex = bufferEndIndex;
+      } else if (bufferEndIndex > bufferStartIndex) {
         if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "text") === false) {
           return tokenCount;
         }
         bufferStartIndex = bufferEndIndex;
       }
+      state = "variable";
       index += variablePrefix.length - 1;
       bufferStartIndex += variablePrefix.length;
       continue;
@@ -1428,11 +1434,11 @@ function parseVariableExpression(serialized, onToken) {
     }
     bufferEndIndex++;
   }
-  if (bufferEndIndex > bufferStartIndex) {
-    if (state === "variable") {
-      state = "text";
-      bufferStartIndex -= variablePrefix.length;
-    }
+  if (state === "variable") {
+    state = "text";
+    bufferStartIndex -= variablePrefix.length;
+  }
+  if (bufferStartIndex < serialized.length) {
     handleToken(serialized.substring(bufferStartIndex), state);
   }
   return tokenCount;
@@ -1482,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 });
@@ -1491,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));
@@ -1510,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})\//));
 };
@@ -1523,6 +1541,9 @@ import { NextResponse } from "next/server";
 // src/config/helpers.ts
 import config from "@uniformdev/next-app-router/config/resolved";
 var getMiddlewareRuntimeCache = () => {
+  if (process.env.NODE_ENV === "development" && !process.env.RUNTIME_CACHE_ENDPOINT) {
+    return false;
+  }
   if (typeof config.middlewareRuntimeCache === "boolean") {
     return config.middlewareRuntimeCache;
   }
@@ -1750,6 +1771,9 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1771,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.esm.js

@@ -320,11 +320,25 @@ async function handleRateLimits(callApi) {
     }
     const base = Math.pow(2, backoffRetries - backoffRetriesLeft) * 333;
     const backoffWait = base + Math.round(Math.random() * (base / 2)) * (Math.random() > 0.5 ? 1 : -1);
-    await new Promise((resolve) => setTimeout(resolve, resetWait + backoffWait));
+    await new Promise((resolve) => setTimeout(resolve, Math.max(0, resetWait + backoffWait)));
     backoffRetriesLeft -= 1;
   }
   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);
@@ -1450,13 +1450,19 @@ function parseVariableExpression(serialized, onToken) {
         bufferEndIndex = index + 1;
         continue;
       }
-      state = "variable";
-      if (bufferEndIndex > bufferStartIndex) {
+      if (state === "variable") {
+        const textStart = bufferStartIndex - variablePrefix.length;
+        if (handleToken(serialized.substring(textStart, bufferEndIndex), "text") === false) {
+          return tokenCount;
+        }
+        bufferStartIndex = bufferEndIndex;
+      } else if (bufferEndIndex > bufferStartIndex) {
         if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "text") === false) {
           return tokenCount;
         }
         bufferStartIndex = bufferEndIndex;
       }
+      state = "variable";
       index += variablePrefix.length - 1;
       bufferStartIndex += variablePrefix.length;
       continue;
@@ -1478,11 +1484,11 @@ function parseVariableExpression(serialized, onToken) {
     }
     bufferEndIndex++;
   }
-  if (bufferEndIndex > bufferStartIndex) {
-    if (state === "variable") {
-      state = "text";
-      bufferStartIndex -= variablePrefix.length;
-    }
+  if (state === "variable") {
+    state = "text";
+    bufferStartIndex -= variablePrefix.length;
+  }
+  if (bufferStartIndex < serialized.length) {
     handleToken(serialized.substring(bufferStartIndex), state);
   }
   return tokenCount;
@@ -1843,6 +1849,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 });
@@ -1852,6 +1859,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));
@@ -1871,7 +1887,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) {
@@ -1973,8 +1991,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;
 };
@@ -2001,7 +2026,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",
@@ -2743,6 +2770,13 @@ var createTestComponentProps = ({
   test
 }) => {
   var _a;
+  if (pageState.isPrefetch) {
+    return {
+      ...common,
+      index: void 0,
+      test
+    };
+  }
   const component = resolveComponentFromPageState({
     pageState,
     componentId
@@ -2781,6 +2815,7 @@ var applyEditableParameters = ({
 };
 
 // src/components/Test.tsx
+import { ClientTest } from "@uniformdev/next-app-router-client";
 import { createElement, Fragment } from "react";
 
 // src/components/ContextTestTransfer.tsx
@@ -2793,7 +2828,14 @@ var ContextTestTransfer = ({ event }) => {
 // src/components/Test.tsx
 var Test = ({ index, slots, test, component, context: compositionContext }) => {
   var _a, _b, _c, _d, _e, _f;
-  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;
+  if (typeof index !== "number") {
+    return createElement(ClientTest, {
+      slots,
+      test,
+      context: compositionContext
+    });
+  }
+  const indexToShow = (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null;
   const event = {
     name: test.name,
     control: (_d = (_c = test.variations[index]) == null ? void 0 : _c.control) != null ? _d : false,
@@ -2850,6 +2892,9 @@ var getQuirkSerialization = () => {
   return true;
 };
 var getMiddlewareRuntimeCache = () => {
+  if (process.env.NODE_ENV === "development" && !process.env.RUNTIME_CACHE_ENDPOINT) {
+    return false;
+  }
   if (typeof config.middlewareRuntimeCache === "boolean") {
     return config.middlewareRuntimeCache;
   }
@@ -3571,7 +3616,8 @@ var generatePossiblePageStates = ({
     defaultConsent: void 0,
     previewMode: void 0,
     rules: void 0,
-    locale
+    locale,
+    isPrefetch: void 0
   };
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
   return allStates.map((payload) => serializeEvaluationResult({ payload }));
@@ -3623,7 +3669,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -3726,12 +3775,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 = {
@@ -3739,7 +3789,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",