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

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);
@@ -1638,13 +1638,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;
@@ -1666,11 +1672,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;
@@ -2072,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) {
@@ -2153,6 +2182,7 @@ var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2
 _baseUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd3(_IntegrationPropertyEditorsClient, _baseUrl, "/api/v1/integration-property-editors");
 var _url22;
+var _projectsUrl;
 var _ProjectClient = class _ProjectClient2 extends ApiClient {
   constructor(options) {
     super({ ...options, bypassCache: true });
@@ -2162,6 +2192,15 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
     const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22), { ...options });
     return await this.apiClient(fetchUri);
   }
+  /**
+   * Fetches projects grouped by team.
+   * When teamId is provided, returns a single team with its projects.
+   * When omitted, returns all accessible teams and their projects.
+   */
+  async getProjects(options) {
+    const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _projectsUrl), options ? { ...options } : {});
+    return await this.apiClient(fetchUri);
+  }
   /** Updates or creates (based on id) a Project */
   async upsert(body) {
     const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22));
@@ -2181,7 +2220,9 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
   }
 };
 _url22 = /* @__PURE__ */ new WeakMap();
+_projectsUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd3(_ProjectClient, _url22, "/api/v1/project");
+__privateAdd3(_ProjectClient, _projectsUrl, "/api/v1/projects");
 var ROUTE_URL = "/api/v1/route";
 var RouteClient = class extends ApiClient {
   constructor(options) {
@@ -2297,8 +2338,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;
 };
@@ -2320,7 +2368,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",
@@ -2567,6 +2617,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;
   }
@@ -2712,7 +2765,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -2815,12 +2871,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 = {
@@ -2828,7 +2885,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",
@@ -3007,7 +3065,8 @@ import {
 var evaluateRunnables = async ({
   runnables,
   context,
-  compositionContext
+  compositionContext,
+  isPrefetch
 }) => {
   var _a;
   const result = {
@@ -3017,6 +3076,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,
@@ -5378,7 +5440,8 @@ var retrieveRouteByPath = async ({
       withComponentIDs: true,
       withContentSourceMap: (_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing,
       releaseId,
-      locale
+      locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state })
     }
   });
 };
@@ -5522,7 +5585,8 @@ var handlePlaygroundRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch: false
   });
   const pageState = {
     routePath: id,
@@ -5540,7 +5604,8 @@ var handlePlaygroundRequest = async ({
       // this is checked above
     }),
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: void 0
   };
   const code = serializeEvaluationResult({
     payload: pageState
@@ -5589,7 +5654,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 });
@@ -5624,6 +5689,7 @@ var handleRouteRequest = async ({
     searchParams: request.nextUrl.searchParams,
     isDraftModeEnabled: draftModeEnabled
   });
+  const isPrefetch = isPrefetchRequest(request);
   const { components, rules } = await extractAndEvaluateRunnables({
     composition: route.compositionApiResponse.composition,
     routePath,
@@ -5641,7 +5707,8 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch
   });
   const pageState = {
     routePath,
@@ -5655,7 +5722,8 @@ var handleRouteRequest = async ({
     }),
     previewMode,
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: isPrefetch || void 0
   };
   const code = serializeEvaluationResult({
     payload: pageState
@@ -5675,6 +5743,9 @@ var handleRouteRequest = async ({
     headers
   });
 };
+var isPrefetchRequest = (request) => {
+  return request.headers.has("next-url");
+};
 var extractAndEvaluateRunnables = async ({
   composition,
   routePath,
@@ -5685,12 +5756,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,
@@ -5708,7 +5781,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.48.0",
+  "version": "20.48.1-alpha.11+129de094d4",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -99,12 +99,12 @@
     "vitest": "3.2.4"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.48.0",
-    "@uniformdev/next-app-router-client": "20.48.0",
-    "@uniformdev/next-app-router-shared": "20.48.0",
-    "@uniformdev/redirect": "20.48.0",
-    "@uniformdev/richtext": "20.48.0",
-    "@uniformdev/webhooks": "20.48.0",
+    "@uniformdev/canvas-react": "20.48.1-alpha.11+129de094d4",
+    "@uniformdev/next-app-router-client": "20.48.1-alpha.11+129de094d4",
+    "@uniformdev/next-app-router-shared": "20.48.1-alpha.11+129de094d4",
+    "@uniformdev/redirect": "20.48.1-alpha.11+129de094d4",
+    "@uniformdev/richtext": "20.48.1-alpha.11+129de094d4",
+    "@uniformdev/webhooks": "20.48.1-alpha.11+129de094d4",
     "@vercel/functions": "^2.2.2",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -121,5 +121,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "20645902724e610cbd4f75fe062aa5034db0a7db"
+  "gitHead": "129de094d4db58d4adfcae07d6ab0fe506ca739e"
 }