@uniformdev/next-app-router 20.49.3-alpha.9 → 20.49.4-alpha.102

package/dist/cache.js

@@ -330,11 +330,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) {
@@ -1118,20 +1132,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 _contentTypesUrl;
 var _entriesUrl;
 var _ContentClient = class _ContentClient2 extends ApiClient {
@@ -1148,7 +1148,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);
@@ -1715,6 +1715,9 @@ var getRouteClient = (options) => {
 // src/config/helpers.ts
 var import_resolved = __toESM(require("@uniformdev/next-app-router/config/resolved"));
 var getMiddlewareRuntimeCache = () => {
+  if (process.env.NODE_ENV === "development" && !process.env.RUNTIME_CACHE_ENDPOINT) {
+    return false;
+  }
   if (typeof import_resolved.default.middlewareRuntimeCache === "boolean") {
     return import_resolved.default.middlewareRuntimeCache;
   }

package/dist/cache.mjs

@@ -317,11 +317,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) {
@@ -1105,20 +1119,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 _contentTypesUrl;
 var _entriesUrl;
 var _ContentClient = class _ContentClient2 extends ApiClient {
@@ -1135,7 +1135,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);
@@ -1702,6 +1702,9 @@ var getRouteClient = (options) => {
 // 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;
   }

package/dist/component.js

@@ -385,11 +385,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) {
@@ -982,20 +996,6 @@ var require_retry2 = __commonJS2({
 });
 var import_p_limit2 = __toESM2(require_p_limit2());
 var import_retry = __toESM2(require_retry2(), 1);
-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 _contentTypesUrl;
 var _entriesUrl;
 var _ContentClient = class _ContentClient2 extends ApiClient {
@@ -1012,7 +1012,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);

package/dist/component.mjs

@@ -370,11 +370,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) {
@@ -967,20 +981,6 @@ var require_retry2 = __commonJS2({
 });
 var import_p_limit2 = __toESM2(require_p_limit2());
 var import_retry = __toESM2(require_retry2(), 1);
-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 _contentTypesUrl;
 var _entriesUrl;
 var _ContentClient = class _ContentClient2 extends ApiClient {
@@ -997,7 +997,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);

package/dist/handler.js

@@ -329,11 +329,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) {
@@ -1116,20 +1130,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) {
@@ -1145,7 +1145,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);
@@ -1265,7 +1265,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);
@@ -1544,6 +1544,9 @@ var import_server = require("next/server");
 // src/config/helpers.ts
 var import_resolved = __toESM(require("@uniformdev/next-app-router/config/resolved"));
 var getMiddlewareRuntimeCache = () => {
+  if (process.env.NODE_ENV === "development" && !process.env.RUNTIME_CACHE_ENDPOINT) {
+    return false;
+  }
   if (typeof import_resolved.default.middlewareRuntimeCache === "boolean") {
     return import_resolved.default.middlewareRuntimeCache;
   }

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);
@@ -1529,6 +1529,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;
   }

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);
@@ -2749,6 +2749,13 @@ var createTestComponentProps = ({
   test
 }) => {
   var _a;
+  if (pageState.isPrefetch) {
+    return {
+      ...common,
+      index: void 0,
+      test
+    };
+  }
   const component = resolveComponentFromPageState({
     pageState,
     componentId
@@ -2787,6 +2794,7 @@ var applyEditableParameters = ({
 };
 
 // src/components/Test.tsx
+import { ClientTest } from "@uniformdev/next-app-router-client";
 import { createElement, Fragment } from "react";
 
 // src/components/ContextTestTransfer.tsx
@@ -2799,7 +2807,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,
@@ -2856,6 +2871,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;
   }
@@ -3577,7 +3595,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 }));

package/dist/index.js

@@ -347,11 +347,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) {
@@ -1135,20 +1149,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) {
@@ -1164,7 +1164,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);
@@ -1284,7 +1284,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);
@@ -2678,7 +2678,7 @@ var getRouteClient = (options) => {
 
 // src/components/UniformComposition.tsx
 var import_core = require("@uniformdev/canvas-react/core");
-var import_next_app_router_client4 = require("@uniformdev/next-app-router-client");
+var import_next_app_router_client5 = require("@uniformdev/next-app-router-client");
 var import_next_app_router_shared4 = require("@uniformdev/next-app-router-shared");
 var import_navigation = require("next/navigation");
 var import_react6 = __toESM(require("react"));
@@ -2772,6 +2772,13 @@ var createTestComponentProps = ({
   test
 }) => {
   var _a;
+  if (pageState.isPrefetch) {
+    return {
+      ...common,
+      index: void 0,
+      test
+    };
+  }
   const component = (0, import_next_app_router_shared2.resolveComponentFromPageState)({
     pageState,
     componentId
@@ -2810,6 +2817,7 @@ var applyEditableParameters = ({
 };
 
 // src/components/Test.tsx
+var import_next_app_router_client2 = require("@uniformdev/next-app-router-client");
 var import_react2 = require("react");
 
 // src/components/ContextTestTransfer.tsx
@@ -2822,7 +2830,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 (0, import_react2.createElement)(import_next_app_router_client2.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,
@@ -2854,7 +2869,7 @@ var UniformCompositionWrapper = ({
 };
 
 // src/components/UniformContext.tsx
-var import_next_app_router_client2 = require("@uniformdev/next-app-router-client");
+var import_next_app_router_client3 = require("@uniformdev/next-app-router-client");
 var import_react4 = __toESM(require("react"));
 
 // src/config/helpers.ts
@@ -2879,6 +2894,9 @@ var getQuirkSerialization = () => {
   return true;
 };
 var getMiddlewareRuntimeCache = () => {
+  if (process.env.NODE_ENV === "development" && !process.env.RUNTIME_CACHE_ENDPOINT) {
+    return false;
+  }
   if (typeof import_resolved.default.middlewareRuntimeCache === "boolean") {
     return import_resolved.default.middlewareRuntimeCache;
   }
@@ -2904,7 +2922,7 @@ var UniformContext = async ({ clientContextComponent, result }) => {
     dynamicInputs: route.dynamicInputs,
     matchedRoute: route.matchedRoute
   } : void 0;
-  const ContextComponent = clientContextComponent || import_next_app_router_client2.DefaultUniformClientContext;
+  const ContextComponent = clientContextComponent || import_next_app_router_client3.DefaultUniformClientContext;
   const disableDevTools = getDisabledDevTools();
   const defaultConsent = (_a = result == null ? void 0 : result.pageState.defaultConsent) != null ? _a : getDefaultConsent();
   const experimentalQuirkSerialization = getQuirkSerialization();
@@ -2921,14 +2939,14 @@ var UniformContext = async ({ clientContextComponent, result }) => {
 };
 
 // src/components/VisibilityRulesWrapper.tsx
-var import_next_app_router_client3 = require("@uniformdev/next-app-router-client");
+var import_next_app_router_client4 = require("@uniformdev/next-app-router-client");
 var import_react5 = __toESM(require("react"));
 var VisibilityRulesWrapper = ({
   parameter,
   initialIsVisible,
   children
 }) => {
-  return /* @__PURE__ */ import_react5.default.createElement(import_next_app_router_client3.VisibilityRulesWrapperClient, { parameter, initialIsVisible }, children);
+  return /* @__PURE__ */ import_react5.default.createElement(import_next_app_router_client4.VisibilityRulesWrapperClient, { parameter, initialIsVisible }, children);
 };
 
 // src/components/UniformComposition.tsx
@@ -2991,7 +3009,7 @@ async function UniformCompositionInner({
         route
       }
     }
-  )), (pageState.compositionState === CANVAS_EDITOR_STATE || pageState.compositionState === CANVAS_DRAFT_STATE) && /* @__PURE__ */ import_react6.default.createElement(import_next_app_router_client4.UniformScript, null));
+  )), (pageState.compositionState === CANVAS_EDITOR_STATE || pageState.compositionState === CANVAS_DRAFT_STATE) && /* @__PURE__ */ import_react6.default.createElement(import_next_app_router_client5.UniformScript, null));
 }
 var resolveComponents = ({
   target,
@@ -3087,7 +3105,7 @@ var resolveComponents = ({
     }
     let tagElement = null;
     if (enrichmentTags == null ? void 0 : enrichmentTags.length) {
-      tagElement = (0, import_react6.createElement)(import_next_app_router_client4.ContextUpdateTransfer, {
+      tagElement = (0, import_react6.createElement)(import_next_app_router_client5.ContextUpdateTransfer, {
         key: `${slotName}-${componentIndex}-tags`,
         update: {
           enrichments: enrichmentTags
@@ -3162,7 +3180,7 @@ var createResolvedComponent = ({
       componentId: component._id,
       pageState
     });
-    return (0, import_react6.createElement)(import_next_app_router_client4.Personalize, { ...personalizeProps, key });
+    return (0, import_react6.createElement)(import_next_app_router_client5.Personalize, { ...personalizeProps, key });
   }
   if (component.type === CANVAS_TEST_TYPE) {
     const extractedTest = extractTest({
@@ -3598,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) => (0, import_next_app_router_shared8.serializeEvaluationResult)({ payload }));

package/dist/index.mjs

@@ -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);
@@ -2749,6 +2749,13 @@ var createTestComponentProps = ({
   test
 }) => {
   var _a;
+  if (pageState.isPrefetch) {
+    return {
+      ...common,
+      index: void 0,
+      test
+    };
+  }
   const component = resolveComponentFromPageState({
     pageState,
     componentId
@@ -2787,6 +2794,7 @@ var applyEditableParameters = ({
 };
 
 // src/components/Test.tsx
+import { ClientTest } from "@uniformdev/next-app-router-client";
 import { createElement, Fragment } from "react";
 
 // src/components/ContextTestTransfer.tsx
@@ -2799,7 +2807,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,
@@ -2856,6 +2871,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;
   }
@@ -3577,7 +3595,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 }));

package/dist/middleware.js

@@ -525,11 +525,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) {
@@ -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);
@@ -2093,11 +2093,34 @@ var stringOperatorEvaluators = {
   endswith: endsWithEvaluator,
   empty: emptyEvaluator
 };
+var numericOperatorEvaluators = {
+  gt: (left, right) => left > right,
+  lt: (left, right) => left < right
+};
+function evaluateNumericOperator(criteria, matchValue) {
+  const { op, value } = criteria;
+  const evaluator = numericOperatorEvaluators[op];
+  if (!evaluator) {
+    return null;
+  }
+  if (typeof matchValue === "string" && matchValue.trim() === "" || typeof value === "string" && value.trim() === "") {
+    return false;
+  }
+  const leftNum = Number(matchValue);
+  const rightNum = Number(value);
+  if (isNaN(leftNum) || isNaN(rightNum)) {
+    return false;
+  }
+  return evaluator(leftNum, rightNum);
+}
 function evaluateStringMatch(criteria, matchValue, allow) {
   const { op, value } = criteria;
   if (allow && !allow.has(op)) {
     return null;
   }
+  if (op in numericOperatorEvaluators) {
+    return evaluateNumericOperator(criteria, matchValue);
+  }
   let opMatch = op;
   const negation = op.startsWith("!");
   if (negation) {
@@ -2586,6 +2609,9 @@ var getQuirkSerialization = () => {
   return true;
 };
 var getMiddlewareRuntimeCache = () => {
+  if (process.env.NODE_ENV === "development" && !process.env.RUNTIME_CACHE_ENDPOINT) {
+    return false;
+  }
   if (typeof import_resolved.default.middlewareRuntimeCache === "boolean") {
     return import_resolved.default.middlewareRuntimeCache;
   }
@@ -3021,7 +3047,8 @@ var import_next_app_router_shared4 = require("@uniformdev/next-app-router-shared
 var evaluateRunnables = async ({
   runnables,
   context,
-  compositionContext
+  compositionContext,
+  isPrefetch
 }) => {
   var _a;
   const result = {
@@ -3031,6 +3058,9 @@ var evaluateRunnables = async ({
   const runnablesToProcess = runnables.filter((item2) => item2.variantId === void 0);
   let item;
   while (item = runnablesToProcess.shift()) {
+    if (item.type === "test" && isPrefetch) {
+      continue;
+    }
     if (item.type === "test") {
       const testResult = (0, import_next_app_router_shared4.evaluateTest)({
         context,
@@ -5536,7 +5566,8 @@ var handlePlaygroundRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch: false
   });
   const pageState = {
     routePath: id,
@@ -5554,7 +5585,8 @@ var handlePlaygroundRequest = async ({
       // this is checked above
     }),
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: void 0
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
     payload: pageState
@@ -5603,7 +5635,7 @@ var handleRouteRequest = async ({
     })
   ]);
   if (!(routeResult == null ? void 0 : routeResult.route) || ((_d = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _d.type) === "notFound") {
-    return import_server.NextResponse.next();
+    return import_server.NextResponse.rewrite(new URL("/404", request.url));
   }
   if (((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "redirect") {
     return handleRedirect({ request, route: routeResult.route });
@@ -5638,6 +5670,7 @@ var handleRouteRequest = async ({
     searchParams: request.nextUrl.searchParams,
     isDraftModeEnabled: draftModeEnabled
   });
+  const isPrefetch = isPrefetchRequest(request);
   const { components, rules } = await extractAndEvaluateRunnables({
     composition: route.compositionApiResponse.composition,
     routePath,
@@ -5655,7 +5688,8 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch
   });
   const pageState = {
     routePath,
@@ -5669,7 +5703,8 @@ var handleRouteRequest = async ({
     }),
     previewMode,
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: isPrefetch || void 0
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
     payload: pageState
@@ -5689,6 +5724,9 @@ var handleRouteRequest = async ({
     headers
   });
 };
+var isPrefetchRequest = (request) => {
+  return request.headers.has("next-url");
+};
 var extractAndEvaluateRunnables = async ({
   composition,
   routePath,
@@ -5699,12 +5737,14 @@ var extractAndEvaluateRunnables = async ({
   releaseId,
   defaultConsent,
   keys,
-  previewMode
+  previewMode,
+  isPrefetch
 }) => {
   const extracted = extractRunnables(composition);
   const result = await evaluateRunnables({
     runnables: extracted,
     context,
+    isPrefetch,
     compositionContext: {
       _id: composition._id,
       type: composition.type,
@@ -5722,7 +5762,8 @@ var extractAndEvaluateRunnables = async ({
         defaultConsent,
         previewMode,
         rules: void 0,
-        locale: void 0
+        locale: void 0,
+        isPrefetch: isPrefetch || void 0
       }
     }
   });

package/dist/middleware.mjs

@@ -510,11 +510,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) {
@@ -1298,20 +1312,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) {
@@ -1327,7 +1327,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);
@@ -1447,7 +1447,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);
@@ -2078,11 +2078,34 @@ var stringOperatorEvaluators = {
   endswith: endsWithEvaluator,
   empty: emptyEvaluator
 };
+var numericOperatorEvaluators = {
+  gt: (left, right) => left > right,
+  lt: (left, right) => left < right
+};
+function evaluateNumericOperator(criteria, matchValue) {
+  const { op, value } = criteria;
+  const evaluator = numericOperatorEvaluators[op];
+  if (!evaluator) {
+    return null;
+  }
+  if (typeof matchValue === "string" && matchValue.trim() === "" || typeof value === "string" && value.trim() === "") {
+    return false;
+  }
+  const leftNum = Number(matchValue);
+  const rightNum = Number(value);
+  if (isNaN(leftNum) || isNaN(rightNum)) {
+    return false;
+  }
+  return evaluator(leftNum, rightNum);
+}
 function evaluateStringMatch(criteria, matchValue, allow) {
   const { op, value } = criteria;
   if (allow && !allow.has(op)) {
     return null;
   }
+  if (op in numericOperatorEvaluators) {
+    return evaluateNumericOperator(criteria, matchValue);
+  }
   let opMatch = op;
   const negation = op.startsWith("!");
   if (negation) {
@@ -2573,6 +2596,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;
   }
@@ -3013,7 +3039,8 @@ import {
 var evaluateRunnables = async ({
   runnables,
   context,
-  compositionContext
+  compositionContext,
+  isPrefetch
 }) => {
   var _a;
   const result = {
@@ -3023,6 +3050,9 @@ var evaluateRunnables = async ({
   const runnablesToProcess = runnables.filter((item2) => item2.variantId === void 0);
   let item;
   while (item = runnablesToProcess.shift()) {
+    if (item.type === "test" && isPrefetch) {
+      continue;
+    }
     if (item.type === "test") {
       const testResult = evaluateTest({
         context,
@@ -5528,7 +5558,8 @@ var handlePlaygroundRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch: false
   });
   const pageState = {
     routePath: id,
@@ -5546,7 +5577,8 @@ var handlePlaygroundRequest = async ({
       // this is checked above
     }),
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: void 0
   };
   const code = serializeEvaluationResult({
     payload: pageState
@@ -5595,7 +5627,7 @@ var handleRouteRequest = async ({
     })
   ]);
   if (!(routeResult == null ? void 0 : routeResult.route) || ((_d = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _d.type) === "notFound") {
-    return NextResponse.next();
+    return NextResponse.rewrite(new URL("/404", request.url));
   }
   if (((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "redirect") {
     return handleRedirect({ request, route: routeResult.route });
@@ -5630,6 +5662,7 @@ var handleRouteRequest = async ({
     searchParams: request.nextUrl.searchParams,
     isDraftModeEnabled: draftModeEnabled
   });
+  const isPrefetch = isPrefetchRequest(request);
   const { components, rules } = await extractAndEvaluateRunnables({
     composition: route.compositionApiResponse.composition,
     routePath,
@@ -5647,7 +5680,8 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch
   });
   const pageState = {
     routePath,
@@ -5661,7 +5695,8 @@ var handleRouteRequest = async ({
     }),
     previewMode,
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: isPrefetch || void 0
   };
   const code = serializeEvaluationResult({
     payload: pageState
@@ -5681,6 +5716,9 @@ var handleRouteRequest = async ({
     headers
   });
 };
+var isPrefetchRequest = (request) => {
+  return request.headers.has("next-url");
+};
 var extractAndEvaluateRunnables = async ({
   composition,
   routePath,
@@ -5691,12 +5729,14 @@ var extractAndEvaluateRunnables = async ({
   releaseId,
   defaultConsent,
   keys,
-  previewMode
+  previewMode,
+  isPrefetch
 }) => {
   const extracted = extractRunnables(composition);
   const result = await evaluateRunnables({
     runnables: extracted,
     context,
+    isPrefetch,
     compositionContext: {
       _id: composition._id,
       type: composition.type,
@@ -5714,7 +5754,8 @@ var extractAndEvaluateRunnables = async ({
         defaultConsent,
         previewMode,
         rules: void 0,
-        locale: void 0
+        locale: void 0,
+        isPrefetch: isPrefetch || void 0
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router",
-  "version": "20.49.3-alpha.9+e5b9a8ca05",
+  "version": "20.49.4-alpha.102+140d1a56b4",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -99,12 +99,12 @@
     "vitest": "3.2.4"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.49.3-alpha.9+e5b9a8ca05",
-    "@uniformdev/next-app-router-client": "20.49.3-alpha.9+e5b9a8ca05",
-    "@uniformdev/next-app-router-shared": "20.49.3-alpha.9+e5b9a8ca05",
-    "@uniformdev/redirect": "20.49.3-alpha.9+e5b9a8ca05",
-    "@uniformdev/richtext": "20.49.3-alpha.9+e5b9a8ca05",
-    "@uniformdev/webhooks": "20.49.3-alpha.9+e5b9a8ca05",
+    "@uniformdev/canvas-react": "20.49.4-alpha.102+140d1a56b4",
+    "@uniformdev/next-app-router-client": "20.49.4-alpha.102+140d1a56b4",
+    "@uniformdev/next-app-router-shared": "20.49.4-alpha.102+140d1a56b4",
+    "@uniformdev/redirect": "20.49.4-alpha.102+140d1a56b4",
+    "@uniformdev/richtext": "20.49.4-alpha.102+140d1a56b4",
+    "@uniformdev/webhooks": "20.49.4-alpha.102+140d1a56b4",
     "@vercel/functions": "^2.2.2",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -121,5 +121,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e5b9a8ca05d0b8b26886079b687417e53d44f9cb"
+  "gitHead": "140d1a56b4b45021216a166bcaf7ebe629681b0b"
 }