@next-core/runtime 1.62.0 → 1.62.2

package/dist/esm/internal/Renderer.js

@@ -101,7 +101,7 @@ export async function renderRoutes(returnNode, routes, _runtimeContext, renderer
           if (route.type === "routes") {
             newOutput = await renderRoutes(returnNode, route.routes, runtimeContext, rendererContext, routePath, menuRequestNode, slotId, undefined, initialTracker);
           } else {
-            newOutput = await renderBricks(returnNode, route.bricks, runtimeContext, rendererContext, routePath, menuRequestNode, slotId, undefined, undefined, initialTracker);
+            newOutput = await renderBricks(returnNode, route.bricks, runtimeContext, rendererContext, routePath, menuRequestNode, slotId, undefined, initialTracker);
           }
           mergeRenderOutput(output, newOutput);
           appendMenuRequestNode(menuRequestNode, newOutput.menuRequestNode);
@@ -110,27 +110,21 @@ export async function renderRoutes(returnNode, routes, _runtimeContext, renderer
   }
   return output;
 }
-export async function renderBricks(returnNode, bricks, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, keyPath, initialTracker) {
+export async function renderBricks(returnNode, bricks, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, initialTracker) {
   setupRootRuntimeContext(bricks, runtimeContext, true);
   const output = getEmptyRenderOutput();
-  const kPath = keyPath !== null && keyPath !== void 0 ? keyPath : [];
   // 多个构件并行异步转换，但转换的结果按原顺序串行合并。
-  const rendered = await Promise.all(bricks.map((brickConf, index) => renderBrick(returnNode, brickConf, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, kPath.concat(index), tplStack && new Map(tplStack), initialTracker)));
-  rendered.forEach((item, index) => {
-    if (item.hasTrackingControls) {
-      // Memoize a render node before it's been merged.
-      rendererContext.memoize(slotId, kPath.concat(index), item.node, returnNode);
-    }
+  const rendered = await Promise.all(bricks.map(brickConf => renderBrick(returnNode, brickConf, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack && new Map(tplStack), initialTracker)));
+  rendered.forEach(item => {
     mergeRenderOutput(output, item);
   });
   return output;
 }
 export async function renderBrick(returnNode, brickConf, _runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId) {
-  let keyPath = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : [];
-  let tplStack = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : new Map();
-  let initialTracker = arguments.length > 9 ? arguments[9] : undefined;
+  let tplStack = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : new Map();
+  let initialTracker = arguments.length > 8 ? arguments[8] : undefined;
   try {
-    return await legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, keyPath, tplStack, initialTracker);
+    return await legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, initialTracker);
   } catch (error) {
     if (brickConf.errorBoundary) {
       // eslint-disable-next-line no-console
@@ -144,7 +138,7 @@ export async function renderBrick(returnNode, brickConf, _runtimeContext, render
     }
   }
 }
-async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, keyPath, tplStack, initialTracker) {
+async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, initialTracker) {
   var _hooks$checkPermissio2, _runtimeContext$app;
   const output = getEmptyRenderOutput();
   if (!brickConf.brick) {
@@ -182,7 +176,7 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
         ...acc,
         [symbol]: brickConf[symbol]
       }), {})
-    }, _runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, keyPath, tplStack, initialTracker);
+    }, _runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, initialTracker);
   }
   const tplStateStoreId = brickConf[symbolForTplStateStoreId];
   const formStateStoreId = brickConf[symbolForFormStateStoreId];
@@ -244,26 +238,41 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
 
       // Then, get the bricks in that matched slot.
       const bricks = slots && hasOwnProperty(slots, slot) && ((_slots$slot = slots[slot]) === null || _slots$slot === void 0 ? void 0 : _slots$slot.bricks);
+      const output = getEmptyRenderOutput();
+      const controlNode = {
+        tag: RenderTag.ABSTRACT,
+        return: returnNode
+      };
+      output.node = controlNode;
       if (!Array.isArray(bricks)) {
-        return getEmptyRenderOutput();
+        return output;
       }
+      let childrenOutput;
       switch (brickName) {
         case ":forEach":
           {
             if (!Array.isArray(computedDataSource)) {
-              return getEmptyRenderOutput();
+              break;
             }
-            return renderForEach(returnNode, computedDataSource, bricks, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, keyPath, tracker);
+            childrenOutput = await renderForEach(controlNode, computedDataSource, bricks, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, tracker);
+            break;
           }
         case ":if":
         case ":switch":
           {
-            return renderBricks(returnNode, bricks, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, keyPath, tracker);
+            childrenOutput = await renderBricks(controlNode, bricks, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, tracker);
           }
       }
+      if (childrenOutput) {
+        controlNode.child = childrenOutput.node;
+        mergeRenderOutput(output, {
+          ...childrenOutput,
+          node: undefined
+        });
+      }
+      return output;
     };
     const renderControlNode = async _ref => {
-      var _ref2, _ref2$node;
       let {
         type,
         runtimeContext,
@@ -304,14 +313,9 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
           throw new Error(`Maximum rerender stack overflowed (iid: ${brickConf.iid})`);
         }
       }
-      (_ref2$node = (_ref2 = rawOutput).node) !== null && _ref2$node !== void 0 ? _ref2$node : _ref2.node = {
-        tag: RenderTag.PLACEHOLDER,
-        return: returnNode,
-        tracking
-      };
       return rawOutput;
     };
-    const controlledOutput = await renderControlNode({
+    let controlledOutput = await renderControlNode({
       type: "initial",
       runtimeContext
     });
@@ -321,7 +325,6 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
     } = (_brickConf$lifeCycle = brickConf.lifeCycle) !== null && _brickConf$lifeCycle !== void 0 ? _brickConf$lifeCycle : {};
     if (tracking) {
       var _runtimeBrick$dispose;
-      controlledOutput.hasTrackingControls = true;
       let renderId = 0;
       const listener = async () => {
         const currentRenderId = ++renderId;
@@ -342,7 +345,8 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
               }
             }));
           }
-          rendererContext.reRender(slotId, keyPath, reControlledOutput.node, returnNode);
+          rendererContext.reRender(returnNode, reControlledOutput.node, controlledOutput.node);
+          controlledOutput = reControlledOutput;
           if (onMount) {
             listenerFactory(onMount, scopedRuntimeContext)(new CustomEvent("mount", {
               detail: {
@@ -527,11 +531,17 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
       return;
     }
     const routeSlotFromIndexToSlotId = new Map();
-    const rendered = await Promise.all(Object.entries(slots).map((_ref3, index) => {
-      let [childSlotId, slotConf] = _ref3;
+    const rendered = await Promise.all(Object.entries(slots).map(async (_ref2, index) => {
+      let [childSlotId, slotConf] = _ref2;
       if (slotConf.type !== "routes") {
-        return renderBricks(brick, slotConf.bricks, childRuntimeContext, rendererContext, parentRoutes, menuRequestReturnNode, childSlotId, tplStack, undefined, initialTracker);
+        return renderBricks(brick, slotConf.bricks, childRuntimeContext, rendererContext, parentRoutes, menuRequestReturnNode, childSlotId, tplStack, initialTracker);
       }
+      let lastOutput = getEmptyRenderOutput();
+      const controlNode = {
+        tag: RenderTag.ABSTRACT,
+        return: brick
+      };
+      lastOutput.node = controlNode;
       const parentRoute = parentRoutes[parentRoutes.length - 1];
       if (parentRoute !== null && parentRoute !== void 0 && parentRoute.incrementalSubRoutes) {
         routeSlotFromIndexToSlotId.set(index, childSlotId);
@@ -558,8 +568,14 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
           let failed = false;
           let incrementalOutput;
           let scopedStores = [];
+          const newOutput = getEmptyRenderOutput();
+          const newControlNode = {
+            tag: RenderTag.ABSTRACT,
+            return: brick
+          };
+          newOutput.node = newControlNode;
           try {
-            incrementalOutput = await renderRoutes(brick, slotConf.routes, scopedRuntimeContext, rendererContext, parentRoutes, menuRequestReturnNode, childSlotId, true);
+            incrementalOutput = await renderRoutes(newControlNode, slotConf.routes, scopedRuntimeContext, rendererContext, parentRoutes, menuRequestReturnNode, childSlotId, true);
 
             // Do not ignore incremental rendering even if all sub-routes are missed.
             // Since parent route is matched.
@@ -571,11 +587,10 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
               scopedStores = [...tplStateStoreScope, ...formStateStoreScope];
               await postAsyncRender(incrementalOutput, scopedRuntimeContext, [scopedRuntimeContext.ctxStore, ...scopedStores]);
             }
-            await rendererContext.reMergeMenuRequestNodes(menuRequestReturnNode, slotConf.routes, incrementalOutput.menuRequestNode);
           } catch (error) {
             // eslint-disable-next-line no-console
             console.error("Incremental sub-router failed:", error);
-            const result = await rendererContext.reCatch(error, brick);
+            const result = await rendererContext.reCatch(error, newControlNode);
             if (!result) {
               return true;
             }
@@ -583,11 +598,16 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
               failed,
               output: incrementalOutput
             } = result);
-
-            // Assert: no errors will be throw
-            await rendererContext.reMergeMenuRequestNodes(menuRequestReturnNode, slotConf.routes, incrementalOutput.menuRequestNode);
           }
-          rendererContext.reRender(childSlotId, [], incrementalOutput.node, brick);
+          newControlNode.child = incrementalOutput.node;
+          mergeRenderOutput(newOutput, {
+            ...incrementalOutput,
+            node: undefined
+          });
+          // Assert: no errors will be throw
+          await rendererContext.reMergeMenuRequestNodes(menuRequestReturnNode, slotConf.routes, incrementalOutput.menuRequestNode);
+          rendererContext.reRender(brick, newControlNode, lastOutput.node);
+          lastOutput = newOutput;
           if (!failed) {
             scopedRuntimeContext.ctxStore.mountAsyncData(incrementalOutput.route);
             for (const store of scopedStores) {
@@ -599,7 +619,14 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
           return true;
         });
       }
-      return renderRoutes(brick, slotConf.routes, childRuntimeContext, rendererContext, parentRoutes, menuRequestReturnNode, childSlotId, undefined, initialTracker);
+      const routesOutput = await renderRoutes(controlNode, slotConf.routes, childRuntimeContext, rendererContext, parentRoutes, menuRequestReturnNode, childSlotId, undefined, initialTracker);
+      controlNode.child = routesOutput.node;
+      mergeRenderOutput(output, {
+        ...routesOutput,
+        node: undefined
+      });
+      appendMenuRequestNode(menuRequestReturnNode, output.menuRequestNode = routesOutput.menuRequestNode);
+      return lastOutput;
     }));
     const childrenOutput = {
       ...output,
@@ -607,11 +634,7 @@ async function legacyRenderBrick(returnNode, brickConf, _runtimeContext, rendere
       blockingList: [],
       menuRequestNode: undefined
     };
-    rendered.forEach((item, index) => {
-      if (routeSlotFromIndexToSlotId.has(index)) {
-        // Memoize a render node before it's been merged.
-        rendererContext.memoize(routeSlotFromIndexToSlotId.get(index), [], item.node, brick);
-      }
+    rendered.forEach(item => {
       mergeRenderOutput(childrenOutput, item);
       mergeSiblingRenderMenuRequest(childrenOutput, item);
     });
@@ -638,22 +661,18 @@ function ensureValidControlBrick(brick) {
     throw new Error(`Unknown storyboard control node: "${brick}"`);
   }
 }
-async function renderForEach(returnNode, dataSource, bricks, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, keyPath, initialTracker) {
+async function renderForEach(returnNode, dataSource, bricks, runtimeContext, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack, initialTracker) {
   const output = getEmptyRenderOutput();
   const size = dataSource.length;
-  const rendered = await Promise.all(dataSource.map((item, i) => Promise.all(bricks.map((brickConf, j) => renderBrick(returnNode, brickConf, {
+  const rendered = await Promise.all(dataSource.map((item, i) => Promise.all(bricks.map(brickConf => renderBrick(returnNode, brickConf, {
     ...runtimeContext,
     forEachItem: item,
     forEachIndex: i,
     forEachSize: size
-  }, rendererContext, parentRoutes, menuRequestReturnNode, slotId, keyPath.concat(i * size + j), tplStack && new Map(tplStack), initialTracker)))));
+  }, rendererContext, parentRoutes, menuRequestReturnNode, slotId, tplStack && new Map(tplStack), initialTracker)))));
 
   // 多层构件并行异步转换，但转换的结果按原顺序串行合并。
-  rendered.flat().forEach((item, index) => {
-    if (item.hasTrackingControls) {
-      // Memoize a render node before it's been merged.
-      rendererContext.memoize(slotId, keyPath.concat(index), item.node, returnNode);
-    }
+  rendered.flat().forEach(item => {
     mergeRenderOutput(output, item);
   });
   return output;
@@ -700,7 +719,6 @@ function mergeRenderOutput(output, newOutput) {
     blockingList,
     node,
     menuRequestNode,
-    hasTrackingControls,
     ...rest
   } = newOutput;
   output.blockingList.push(...blockingList);