react-markup 0.0.0-experimental-e06c72fc-20241215 → 0.0.0-experimental-7eb8234f-20241218

package/cjs/react-markup.development.js

@@ -8633,5 +8633,5 @@
         });
       });
     };
-    exports.version = "19.1.0-experimental-e06c72fc-20241215";
+    exports.version = "19.1.0-experimental-7eb8234f-20241218";
   })();

package/cjs/react-markup.production.js

@@ -5709,4 +5709,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.1.0-experimental-e06c72fc-20241215";
+exports.version = "19.1.0-experimental-7eb8234f-20241218";

package/cjs/react-markup.react-server.development.js

@@ -2419,12 +2419,12 @@
     }
     function forwardDebugInfo(request, id, debugInfo) {
       for (var i = 0; i < debugInfo.length; i++)
-        request.pendingChunks++,
-          "number" === typeof debugInfo[i].time
-            ? emitTimingChunk(request, id, debugInfo[i].time)
-            : ("string" === typeof debugInfo[i].name &&
-                outlineComponentInfo(request, debugInfo[i]),
-              emitDebugChunk(request, id, debugInfo[i]));
+        "number" === typeof debugInfo[i].time
+          ? emitTimingChunk(request, id, debugInfo[i].time)
+          : (request.pendingChunks++,
+            "string" === typeof debugInfo[i].name &&
+              outlineComponentInfo(request, debugInfo[i]),
+            emitDebugChunk(request, id, debugInfo[i]));
     }
     function emitTimingChunk(request, id, timestamp) {
       request.pendingChunks++;
@@ -3614,7 +3614,15 @@
       response._chunks.forEach(function (chunk) {
         "pending" === chunk.status && triggerErrorOnChunk(chunk, error);
       });
-      flushComponentPerformance(getChunk(response, 0));
+      supportsUserTiming &&
+        performance.mark("Server Components Track", componentsTrackMarker);
+      flushComponentPerformance(
+        response,
+        getChunk(response, 0),
+        0,
+        -Infinity,
+        -Infinity
+      );
     }
     function nullRefGetter() {
       return null;
@@ -4471,49 +4479,133 @@
         );
       }
     }
-    function flushComponentPerformance(root) {
-      if (!isArrayImpl(root._children)) return root._children.endTime;
+    function flushComponentPerformance(
+      response,
+      root,
+      trackIdx$jscomp$0,
+      trackTime,
+      parentEndTime
+    ) {
+      if (!isArrayImpl(root._children)) {
+        response = root._children;
+        var previousEndTime = response.endTime;
+        if (
+          -Infinity < parentEndTime &&
+          parentEndTime < previousEndTime &&
+          null !== response.component
+        ) {
+          var trackIdx = trackIdx$jscomp$0;
+          root = parentEndTime;
+          supportsUserTiming &&
+            0 <= previousEndTime &&
+            10 > trackIdx &&
+            ((parentEndTime = response.component.name),
+            (reusableComponentDevToolDetails.color = "tertiary-light"),
+            (reusableComponentDevToolDetails.track = trackNames[trackIdx]),
+            (reusableComponentOptions.start = 0 > root ? 0 : root),
+            (reusableComponentOptions.end = previousEndTime),
+            performance.measure(
+              parentEndTime + " [deduped]",
+              reusableComponentOptions
+            ));
+        }
+        response.track = trackIdx$jscomp$0;
+        return response;
+      }
       var children = root._children;
       "resolved_model" === root.status && initializeModelChunk(root);
-      var result = { endTime: -Infinity };
-      root._children = result;
-      for (var childrenEndTime = -Infinity, i = 0; i < children.length; i++) {
-        var childEndTime = flushComponentPerformance(children[i]);
-        childEndTime > childrenEndTime && (childrenEndTime = childEndTime);
-      }
-      if ((root = root._debugInfo))
-        for (children = 0, i = root.length - 1; 0 <= i; i--)
+      if ((previousEndTime = root._debugInfo)) {
+        for (trackIdx = 1; trackIdx < previousEndTime.length; trackIdx++)
+          if ("string" === typeof previousEndTime[trackIdx].name) {
+            var startTimeInfo = previousEndTime[trackIdx - 1];
+            if ("number" === typeof startTimeInfo.time) {
+              trackIdx = startTimeInfo.time;
+              trackIdx < trackTime && trackIdx$jscomp$0++;
+              trackTime = trackIdx;
+              break;
+            }
+          }
+        for (trackIdx = previousEndTime.length - 1; 0 <= trackIdx; trackIdx--)
+          (startTimeInfo = previousEndTime[trackIdx]),
+            "number" === typeof startTimeInfo.time &&
+              startTimeInfo.time > parentEndTime &&
+              (parentEndTime = startTimeInfo.time);
+      }
+      trackIdx = {
+        track: trackIdx$jscomp$0,
+        endTime: -Infinity,
+        component: null
+      };
+      root._children = trackIdx;
+      root = -Infinity;
+      startTimeInfo = trackIdx$jscomp$0;
+      var childTrackTime = trackTime;
+      for (trackTime = 0; trackTime < children.length; trackTime++) {
+        childTrackTime = flushComponentPerformance(
+          response,
+          children[trackTime],
+          startTimeInfo,
+          childTrackTime,
+          parentEndTime
+        );
+        null !== childTrackTime.component &&
+          (trackIdx.component = childTrackTime.component);
+        startTimeInfo = childTrackTime.track;
+        var childEndTime = childTrackTime.endTime;
+        childTrackTime = childEndTime;
+        childEndTime > root && (root = childEndTime);
+      }
+      if (previousEndTime)
+        for (
+          parentEndTime = 0, children = previousEndTime.length - 1;
+          0 <= children;
+          children--
+        )
           if (
-            ((childEndTime = root[i]),
-            "number" === typeof childEndTime.time &&
-              ((children = childEndTime.time),
-              children > childrenEndTime && (childrenEndTime = children)),
-            "string" === typeof childEndTime.name && 0 < i)
+            ((trackTime = previousEndTime[children]),
+            "number" === typeof trackTime.time &&
+              ((parentEndTime = trackTime.time),
+              parentEndTime > root && (root = parentEndTime)),
+            "string" === typeof trackTime.name &&
+              0 < children &&
+              ((childTrackTime = previousEndTime[children - 1]),
+              "number" === typeof childTrackTime.time))
           ) {
-            var componentInfo = childEndTime;
-            childEndTime = root[i - 1];
-            if ("number" === typeof childEndTime.time) {
-              childEndTime = childEndTime.time;
-              var childrenEndTime$jscomp$0 = childrenEndTime;
-              if (supportsUserTiming && 0 <= childrenEndTime$jscomp$0) {
-                componentInfo = componentInfo.name;
-                var selfTime = children - childEndTime;
-                reusableComponentDevToolDetails.color =
-                  0.5 > selfTime
+            startTimeInfo = trackIdx$jscomp$0;
+            childTrackTime = childTrackTime.time;
+            childEndTime = root;
+            if (supportsUserTiming && 0 <= childEndTime && 10 > startTimeInfo) {
+              var env = trackTime.env,
+                name = trackTime.name,
+                isPrimaryEnv = env === response._rootEnvironmentName,
+                selfTime = parentEndTime - childTrackTime;
+              reusableComponentDevToolDetails.color =
+                0.5 > selfTime
+                  ? isPrimaryEnv
                     ? "primary-light"
-                    : 50 > selfTime
+                    : "secondary-light"
+                  : 50 > selfTime
+                    ? isPrimaryEnv
                       ? "primary"
-                      : 500 > selfTime
+                      : "secondary"
+                    : 500 > selfTime
+                      ? isPrimaryEnv
                         ? "primary-dark"
-                        : "error";
-                reusableComponentOptions.start =
-                  0 > childEndTime ? 0 : childEndTime;
-                reusableComponentOptions.end = childrenEndTime$jscomp$0;
-                performance.measure(componentInfo, reusableComponentOptions);
-              }
+                        : "secondary-dark"
+                      : "error";
+              reusableComponentDevToolDetails.track = trackNames[startTimeInfo];
+              reusableComponentOptions.start =
+                0 > childTrackTime ? 0 : childTrackTime;
+              reusableComponentOptions.end = childEndTime;
+              performance.measure(
+                isPrimaryEnv || void 0 === env ? name : name + " [" + env + "]",
+                reusableComponentOptions
+              );
             }
+            trackIdx.component = trackTime;
           }
-      return (result.endTime = childrenEndTime);
+      trackIdx.endTime = root;
+      return trackIdx;
     }
     function processFullStringRow(response, id, tag, row) {
       switch (tag) {
@@ -11962,15 +12054,30 @@
       supportsUserTiming =
         "undefined" !== typeof performance &&
         "function" === typeof performance.measure,
+      componentsTrackMarker = {
+        startTime: 0.001,
+        detail: {
+          devtools: {
+            color: "primary-light",
+            track: "Primary",
+            trackGroup: "Server Components \u269b"
+          }
+        }
+      },
       reusableComponentDevToolDetails = {
         color: "primary",
-        track: "Server Components \u269b"
+        track: "",
+        trackGroup: "Server Components \u269b"
       },
       reusableComponentOptions = {
         start: -0,
         end: -0,
         detail: { devtools: reusableComponentDevToolDetails }
       },
+      trackNames =
+        "Primary Parallel Parallel\u200b Parallel\u200b\u200b Parallel\u200b\u200b\u200b Parallel\u200b\u200b\u200b\u200b Parallel\u200b\u200b\u200b\u200b\u200b Parallel\u200b\u200b\u200b\u200b\u200b\u200b Parallel\u200b\u200b\u200b\u200b\u200b\u200b\u200b Parallel\u200b\u200b\u200b\u200b\u200b\u200b\u200b\u200b".split(
+          " "
+        ),
       REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"),
       ReactSharedInteralsServer =
         React.__SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,
@@ -13189,5 +13296,5 @@
         });
       });
     };
-    exports.version = "19.1.0-experimental-e06c72fc-20241215";
+    exports.version = "19.1.0-experimental-7eb8234f-20241218";
   })();

package/cjs/react-markup.react-server.production.js

@@ -8623,4 +8623,4 @@ exports.experimental_renderToHTML = function (children, options) {
     });
   });
 };
-exports.version = "19.1.0-experimental-e06c72fc-20241215";
+exports.version = "19.1.0-experimental-7eb8234f-20241218";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-markup",
-  "version": "0.0.0-experimental-e06c72fc-20241215",
+  "version": "0.0.0-experimental-7eb8234f-20241218",
   "description": "React package generating embedded markup such as e-mails with support for Server Components.",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://react.dev/",
   "peerDependencies": {
-    "react": "0.0.0-experimental-e06c72fc-20241215"
+    "react": "0.0.0-experimental-7eb8234f-20241218"
   },
   "files": [
     "LICENSE",