@uniformdev/next-app-router 20.61.2-alpha.4 → 20.63.1-alpha.12

package/dist/{UniformComposition-d7_93l3F.d.ts → UniformComposition-BV6YnA2a.d.ts}

@@ -1,8 +1,8 @@
 import { RootComponentInstance, ComponentInstance } from '@uniformdev/canvas';
 import { ComponentProps } from '@uniformdev/next-app-router-shared';
 import React, { ComponentType } from 'react';
-import { D as DataClient } from './client-BCGVjYM-.js';
-import { a as ResolvedRouteResult, R as ResolveRouteFunction } from './resolveRouteFromCode-DgTsfMK8.js';
+import { D as DataClient } from './client-BlKZeE6C.js';
+import { a as ResolvedRouteResult, R as ResolveRouteFunction } from './resolveRouteFromCode-3u61IwOW.js';
 import { ClientContextComponent } from '@uniformdev/next-app-router-client';
 
 type CompositionCache = {

package/dist/{UniformComposition-hhRIBHmn.d.mts → UniformComposition-scIgVvIH.d.mts}

@@ -1,8 +1,8 @@
 import { RootComponentInstance, ComponentInstance } from '@uniformdev/canvas';
 import { ComponentProps } from '@uniformdev/next-app-router-shared';
 import React, { ComponentType } from 'react';
-import { D as DataClient } from './client-BCGVjYM-.mjs';
-import { a as ResolvedRouteResult, R as ResolveRouteFunction } from './resolveRouteFromCode-CKaYNXte.mjs';
+import { D as DataClient } from './client-BlKZeE6C.mjs';
+import { a as ResolvedRouteResult, R as ResolveRouteFunction } from './resolveRouteFromCode-_CdAMtVM.mjs';
 import { ClientContextComponent } from '@uniformdev/next-app-router-client';
 
 type CompositionCache = {

package/dist/cache.d.mts

@@ -1,7 +1,7 @@
-import { R as ResolveRouteFunction } from './resolveRouteFromCode-CKaYNXte.mjs';
+import { R as ResolveRouteFunction } from './resolveRouteFromCode-_CdAMtVM.mjs';
 import '@uniformdev/canvas';
 import '@uniformdev/next-app-router-shared';
-import './client-BCGVjYM-.mjs';
+import './client-BlKZeE6C.mjs';
 import '@uniformdev/context';
 
 declare const resolveRouteFromCode: ResolveRouteFunction;

package/dist/cache.d.ts

@@ -1,7 +1,7 @@
-import { R as ResolveRouteFunction } from './resolveRouteFromCode-DgTsfMK8.js';
+import { R as ResolveRouteFunction } from './resolveRouteFromCode-3u61IwOW.js';
 import '@uniformdev/canvas';
 import '@uniformdev/next-app-router-shared';
-import './client-BCGVjYM-.js';
+import './client-BlKZeE6C.js';
 import '@uniformdev/context';
 
 declare const resolveRouteFromCode: ResolveRouteFunction;

package/dist/{client-BCGVjYM-.d.mts → client-BlKZeE6C.d.mts}

@@ -1,4 +1,4 @@
-import { RouteGetParameters, RouteGetResponseEdgehancedComposition, RouteClient, RouteGetResponse } from '@uniformdev/canvas';
+import { RouteGetParameters, RouteGetResponse, RouteClient, RouteGetResponseEdgehancedComposition } from '@uniformdev/canvas';
 import { ManifestV2 } from '@uniformdev/context';
 import { PageState } from '@uniformdev/next-app-router-shared';
 

package/dist/{client-BCGVjYM-.d.ts → client-BlKZeE6C.d.ts}

@@ -1,4 +1,4 @@
-import { RouteGetParameters, RouteGetResponseEdgehancedComposition, RouteClient, RouteGetResponse } from '@uniformdev/canvas';
+import { RouteGetParameters, RouteGetResponse, RouteClient, RouteGetResponseEdgehancedComposition } from '@uniformdev/canvas';
 import { ManifestV2 } from '@uniformdev/context';
 import { PageState } from '@uniformdev/next-app-router-shared';
 

package/dist/compat.d.mts

@@ -1,12 +1,12 @@
 import React, { ComponentType } from 'react';
 import { ComponentProps as ComponentProps$1, ComponentParameter } from '@uniformdev/next-app-router-shared';
 import { U as UniformTextProps$1 } from './UniformText-ChMwHBw4.mjs';
-import { R as ResolveComponentResult, a as ResolveComponentFunction } from './UniformComposition-hhRIBHmn.mjs';
+import { R as ResolveComponentResult, a as ResolveComponentFunction } from './UniformComposition-scIgVvIH.mjs';
 import '@uniformdev/next-app-router-client';
 import '@uniformdev/canvas';
-import './client-BCGVjYM-.mjs';
+import './client-BlKZeE6C.mjs';
 import '@uniformdev/context';
-import './resolveRouteFromCode-CKaYNXte.mjs';
+import './resolveRouteFromCode-_CdAMtVM.mjs';
 
 type ComponentContext = ComponentProps$1['component'] & {
     parameters: Record<string, ComponentParameter>;

package/dist/compat.d.ts

@@ -1,12 +1,12 @@
 import React, { ComponentType } from 'react';
 import { ComponentProps as ComponentProps$1, ComponentParameter } from '@uniformdev/next-app-router-shared';
 import { U as UniformTextProps$1 } from './UniformText-ChMwHBw4.js';
-import { R as ResolveComponentResult, a as ResolveComponentFunction } from './UniformComposition-d7_93l3F.js';
+import { R as ResolveComponentResult, a as ResolveComponentFunction } from './UniformComposition-BV6YnA2a.js';
 import '@uniformdev/next-app-router-client';
 import '@uniformdev/canvas';
-import './client-BCGVjYM-.js';
+import './client-BlKZeE6C.js';
 import '@uniformdev/context';
-import './resolveRouteFromCode-DgTsfMK8.js';
+import './resolveRouteFromCode-3u61IwOW.js';
 
 type ComponentContext = ComponentProps$1['component'] & {
     parameters: Record<string, ComponentParameter>;

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

@@ -1575,7 +1575,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" }],
@@ -1583,12 +1583,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 = {
@@ -1775,39 +1777,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;
         }
@@ -1827,13 +1801,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",
@@ -1848,6 +1821,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) {

package/dist/index.js

@@ -1602,7 +1602,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" }],
@@ -1610,12 +1610,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 = {
@@ -1802,39 +1804,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;
         }
@@ -1854,13 +1828,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",
@@ -1875,6 +1848,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) {

package/dist/index.mjs

@@ -1575,7 +1575,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" }],
@@ -1583,12 +1583,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 = {
@@ -1775,39 +1777,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;
         }
@@ -1827,13 +1801,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",
@@ -1848,6 +1821,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) {

package/dist/middleware.d.mts

@@ -1,7 +1,7 @@
 import { Quirks } from '@uniformdev/context';
-import { PageState, RewriteRequestPathResult } from '@uniformdev/next-app-router-shared';
+import { RewriteRequestPathResult, PageState } from '@uniformdev/next-app-router-shared';
 import { NextRequest, NextResponse } from 'next/server';
-import { D as DataClient } from './client-BCGVjYM-.mjs';
+import { D as DataClient } from './client-BlKZeE6C.mjs';
 import '@uniformdev/canvas';
 
 type RewriteOptions = {

package/dist/middleware.d.ts

@@ -1,7 +1,7 @@
 import { Quirks } from '@uniformdev/context';
-import { PageState, RewriteRequestPathResult } from '@uniformdev/next-app-router-shared';
+import { RewriteRequestPathResult, PageState } from '@uniformdev/next-app-router-shared';
 import { NextRequest, NextResponse } from 'next/server';
-import { D as DataClient } from './client-BCGVjYM-.js';
+import { D as DataClient } from './client-BlKZeE6C.js';
 import '@uniformdev/canvas';
 
 type RewriteOptions = {

package/dist/middleware.js

@@ -1771,7 +1771,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" }],
@@ -1779,12 +1779,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 = {
@@ -1971,39 +1973,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;
         }
@@ -2023,13 +1997,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",
@@ -2044,6 +2017,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) {

package/dist/middleware.mjs

@@ -1756,7 +1756,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" }],
@@ -1764,12 +1764,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 = {
@@ -1956,39 +1958,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;
         }
@@ -2008,13 +1982,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",
@@ -2029,6 +2002,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) {

package/dist/{resolveRouteFromCode-DgTsfMK8.d.ts → resolveRouteFromCode-3u61IwOW.d.ts}

@@ -1,6 +1,6 @@
 import { RouteGetResponseEdgehancedComposition } from '@uniformdev/canvas';
 import { PageState } from '@uniformdev/next-app-router-shared';
-import { D as DataClient } from './client-BCGVjYM-.js';
+import { D as DataClient } from './client-BlKZeE6C.js';
 
 type ResolvedRouteResult = {
     pageState: PageState;

package/dist/{resolveRouteFromCode-CKaYNXte.d.mts → resolveRouteFromCode-_CdAMtVM.d.mts}

@@ -1,6 +1,6 @@
 import { RouteGetResponseEdgehancedComposition } from '@uniformdev/canvas';
 import { PageState } from '@uniformdev/next-app-router-shared';
-import { D as DataClient } from './client-BCGVjYM-.mjs';
+import { D as DataClient } from './client-BlKZeE6C.mjs';
 
 type ResolvedRouteResult = {
     pageState: PageState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router",
-  "version": "20.61.2-alpha.4+06664f4ab6",
+  "version": "20.63.1-alpha.12+914935b899",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -91,7 +91,7 @@
     "@types/node": "20.19.25",
     "@types/react": "19.0.8",
     "@types/react-dom": "19.0.3",
-    "next": "16.0.7",
+    "next": "16.2.3",
     "react": "19.2.0",
     "react-dom": "19.2.0",
     "typescript": "5.9.2",
@@ -99,12 +99,12 @@
     "vitest": "3.2.4"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.61.2-alpha.4+06664f4ab6",
-    "@uniformdev/next-app-router-client": "20.61.2-alpha.4+06664f4ab6",
-    "@uniformdev/next-app-router-shared": "20.61.2-alpha.4+06664f4ab6",
-    "@uniformdev/redirect": "20.61.2-alpha.4+06664f4ab6",
-    "@uniformdev/richtext": "20.61.2-alpha.4+06664f4ab6",
-    "@uniformdev/webhooks": "20.61.2-alpha.4+06664f4ab6",
+    "@uniformdev/canvas-react": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/next-app-router-client": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/next-app-router-shared": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/redirect": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/richtext": "20.63.1-alpha.12+914935b899",
+    "@uniformdev/webhooks": "20.63.1-alpha.12+914935b899",
     "@vercel/functions": "^2.2.2",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -121,5 +121,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "06664f4ab66e0ea0fcf234095dd2024c86739a83"
+  "gitHead": "914935b89907018dde56a2c49b72e6899d9fb0e2"
 }