@matthamlin/react-client 0.0.0-experimental-2b4064eb-20250602 → 0.0.0-experimental-93f16680-20250605

package/cjs/react-client-flight.development.js

@@ -896,6 +896,16 @@
       registerBoundServerReference(action, id, bound, encodeFormAction);
       return action;
     }
+    function getIOColor(functionName) {
+      switch (functionName.charCodeAt(0) % 3) {
+        case 0:
+          return "tertiary-light";
+        case 1:
+          return "tertiary";
+        default:
+          return "tertiary-dark";
+      }
+    }
     function getComponentNameFromType(type) {
       if (null == type) return null;
       if ("function" === typeof type)
@@ -1115,6 +1125,14 @@
         "pending" === chunk.status && triggerErrorOnChunk(chunk, error);
       });
       supportsUserTiming &&
+        (console.timeStamp(
+          "Server Requests Track",
+          0.001,
+          0.001,
+          "Server Requests \u269b",
+          void 0,
+          "primary-light"
+        ),
         console.timeStamp(
           "Server Components Track",
           0.001,
@@ -1122,7 +1140,7 @@
           "Primary",
           "Server Components \u269b",
           "primary-light"
-        );
+        ));
       flushComponentPerformance(
         response,
         getChunk(response, 0),
@@ -1920,6 +1938,7 @@
         response,
         errorInfo.stack,
         env,
+        !1,
         Error.bind(
           null,
           errorInfo.message ||
@@ -1937,6 +1956,7 @@
         response,
         stack,
         env,
+        !1,
         Error.bind(null, reason || "")
       );
       stack = response._debugRootTask;
@@ -2048,10 +2068,20 @@
       }
       return fn;
     }
-    function buildFakeCallStack(response, stack, environmentName, innerCall) {
+    function buildFakeCallStack(
+      response,
+      stack,
+      environmentName,
+      useEnclosingLine,
+      innerCall
+    ) {
       for (var i = 0; i < stack.length; i++) {
         var frame = stack[i],
-          frameKey = frame.join("-") + "-" + environmentName,
+          frameKey =
+            frame.join("-") +
+            "-" +
+            environmentName +
+            (useEnclosingLine ? "-e" : "-n"),
           fn = fakeFunctionCache.get(frameKey);
         if (void 0 === fn) {
           fn = frame[0];
@@ -2070,8 +2100,8 @@
             findSourceMapURL,
             line,
             col,
-            enclosingLine,
-            frame,
+            useEnclosingLine ? line : enclosingLine,
+            useEnclosingLine ? col : frame,
             environmentName
           );
           fakeFunctionCache.set(frameKey, fn);
@@ -2094,7 +2124,8 @@
     }
     function initializeFakeTask(response, debugInfo, childEnvironmentName) {
       if (!supportsCreateTask || null == debugInfo.stack) return null;
-      var stack = debugInfo.stack,
+      var useEnclosingLine = void 0 === debugInfo.key,
+        stack = debugInfo.stack,
         env =
           null == debugInfo.env ? response._rootEnvironmentName : debugInfo.env;
       if (env !== childEnvironmentName)
@@ -2108,7 +2139,8 @@
             debugInfo,
             stack,
             '"use ' + childEnvironmentName.toLowerCase() + '"',
-            env
+            env,
+            useEnclosingLine
           )
         );
       childEnvironmentName = debugInfo.debugTask;
@@ -2121,13 +2153,31 @@
         response,
         childEnvironmentName,
         stack,
-        "<" + (debugInfo.name || "...") + ">",
-        env
+        void 0 !== debugInfo.key
+          ? "<" + (debugInfo.name || "...") + ">"
+          : void 0 !== debugInfo.name
+            ? debugInfo.name || "unknown"
+            : "await " + (debugInfo.awaited.name || "unknown"),
+        env,
+        useEnclosingLine
       ));
     }
-    function buildFakeTask(response, ownerTask, stack, taskName, env) {
+    function buildFakeTask(
+      response,
+      ownerTask,
+      stack,
+      taskName,
+      env,
+      useEnclosingLine
+    ) {
       taskName = console.createTask.bind(console, taskName);
-      stack = buildFakeCallStack(response, stack, env, taskName);
+      stack = buildFakeCallStack(
+        response,
+        stack,
+        env,
+        useEnclosingLine,
+        taskName
+      );
       return null === ownerTask
         ? ((response = getRootTask(response, env)),
           null != response ? response.run(stack) : stack())
@@ -2238,6 +2288,66 @@
         );
       }
     }
+    function initializeIOInfo(response, ioInfo) {
+      var env =
+        void 0 === ioInfo.env ? response._rootEnvironmentName : ioInfo.env;
+      void 0 !== ioInfo.stack &&
+        (initializeFakeTask(response, ioInfo, env),
+        initializeFakeStack(response, ioInfo));
+      ioInfo.start += response._timeOrigin;
+      ioInfo.end += response._timeOrigin;
+      env = ioInfo.start;
+      var endTime = ioInfo.end;
+      if (supportsUserTiming && 0 <= endTime) {
+        var name = ioInfo.name,
+          env$jscomp$0 = ioInfo.env;
+        response =
+          env$jscomp$0 === response._rootEnvironmentName ||
+          void 0 === env$jscomp$0
+            ? name
+            : name + " [" + env$jscomp$0 + "]";
+        ioInfo = ioInfo.debugTask;
+        name = getIOColor(name);
+        ioInfo
+          ? ioInfo.run(
+              console.timeStamp.bind(
+                console,
+                response,
+                0 > env ? 0 : env,
+                endTime,
+                "Server Requests \u269b",
+                void 0,
+                name
+              )
+            )
+          : console.timeStamp(
+              response,
+              0 > env ? 0 : env,
+              endTime,
+              "Server Requests \u269b",
+              void 0,
+              name
+            );
+      }
+    }
+    function resolveIOInfo(response, id, model) {
+      var chunks = response._chunks,
+        chunk = chunks.get(id);
+      chunk
+        ? (resolveModelChunk(chunk, model),
+          "resolved_model" === chunk.status && initializeModelChunk(chunk))
+        : ((chunk = new ReactPromise("resolved_model", model, null, response)),
+          chunks.set(id, chunk),
+          initializeModelChunk(chunk));
+      "fulfilled" === chunk.status
+        ? initializeIOInfo(response, chunk.value)
+        : chunk.then(
+            function (v) {
+              initializeIOInfo(response, v);
+            },
+            function () {}
+          );
+    }
     function mergeBuffer(buffer, lastChunk) {
       for (
         var l = buffer.length, byteLength = lastChunk.length, i = 0;
@@ -2281,119 +2391,117 @@
       parentEndTime
     ) {
       if (!isArrayImpl(root._children)) {
-        response = root._children;
-        root = response.endTime;
+        root = root._children;
+        var previousEndTime = root.endTime;
         if (
           -Infinity < parentEndTime &&
-          parentEndTime < root &&
-          null !== response.component
+          parentEndTime < previousEndTime &&
+          null !== root.component
         ) {
-          var componentInfo = response.component,
-            trackIdx = trackIdx$jscomp$0,
-            startTime = parentEndTime;
-          supportsUserTiming &&
-            0 <= root &&
-            10 > trackIdx &&
-            ((parentEndTime = componentInfo.name + " [deduped]"),
+          var componentInfo = root.component,
+            trackIdx = trackIdx$jscomp$0;
+          if (supportsUserTiming && 0 <= previousEndTime && 10 > trackIdx) {
+            response =
+              componentInfo.env === response._rootEnvironmentName
+                ? "primary-light"
+                : "secondary-light";
+            var entryName = componentInfo.name + " [deduped]";
             (componentInfo = componentInfo.debugTask)
               ? componentInfo.run(
                   console.timeStamp.bind(
                     console,
-                    parentEndTime,
-                    0 > startTime ? 0 : startTime,
-                    root,
+                    entryName,
+                    0 > parentEndTime ? 0 : parentEndTime,
+                    previousEndTime,
                     trackNames[trackIdx],
                     "Server Components \u269b",
-                    "tertiary-light"
+                    response
                   )
                 )
               : console.timeStamp(
-                  parentEndTime,
-                  0 > startTime ? 0 : startTime,
-                  root,
+                  entryName,
+                  0 > parentEndTime ? 0 : parentEndTime,
+                  previousEndTime,
                   trackNames[trackIdx],
                   "Server Components \u269b",
-                  "tertiary-light"
-                ));
+                  response
+                );
+          }
         }
-        response.track = trackIdx$jscomp$0;
-        return response;
+        root.track = trackIdx$jscomp$0;
+        return root;
       }
-      var children = root._children;
+      entryName = root._children;
       "resolved_model" === root.status && initializeModelChunk(root);
-      if ((trackIdx = root._debugInfo)) {
-        for (
-          componentInfo = 1;
-          componentInfo < trackIdx.length;
-          componentInfo++
-        )
+      if ((previousEndTime = root._debugInfo)) {
+        for (trackIdx = 1; trackIdx < previousEndTime.length; trackIdx++)
           if (
-            "string" === typeof trackIdx[componentInfo].name &&
-            ((startTime = trackIdx[componentInfo - 1]),
-            "number" === typeof startTime.time)
+            "string" === typeof previousEndTime[trackIdx].name &&
+            ((componentInfo = previousEndTime[trackIdx - 1]),
+            "number" === typeof componentInfo.time)
           ) {
-            componentInfo = startTime.time;
-            componentInfo < trackTime && trackIdx$jscomp$0++;
-            trackTime = componentInfo;
+            trackIdx = componentInfo.time;
+            trackIdx < trackTime && trackIdx$jscomp$0++;
+            trackTime = trackIdx;
             break;
           }
-        for (
-          componentInfo = trackIdx.length - 1;
-          0 <= componentInfo;
-          componentInfo--
-        )
-          (startTime = trackIdx[componentInfo]),
-            "number" === typeof startTime.time &&
-              startTime.time > parentEndTime &&
-              (parentEndTime = startTime.time);
+        for (trackIdx = previousEndTime.length - 1; 0 <= trackIdx; trackIdx--)
+          (componentInfo = previousEndTime[trackIdx]),
+            "number" === typeof componentInfo.time &&
+              componentInfo.time > parentEndTime &&
+              (parentEndTime = componentInfo.time);
       }
-      componentInfo = {
+      trackIdx = {
         track: trackIdx$jscomp$0,
         endTime: -Infinity,
         component: null
       };
-      root._children = componentInfo;
-      startTime = -Infinity;
+      root._children = trackIdx;
+      componentInfo = -Infinity;
       var childTrackIdx = trackIdx$jscomp$0,
         childTrackTime = trackTime;
-      for (trackTime = 0; trackTime < children.length; trackTime++) {
+      for (trackTime = 0; trackTime < entryName.length; trackTime++) {
         childTrackTime = flushComponentPerformance(
           response,
-          children[trackTime],
+          entryName[trackTime],
           childTrackIdx,
           childTrackTime,
           parentEndTime
         );
         null !== childTrackTime.component &&
-          (componentInfo.component = childTrackTime.component);
+          (trackIdx.component = childTrackTime.component);
         childTrackIdx = childTrackTime.track;
         var childEndTime = childTrackTime.endTime;
         childTrackTime = childEndTime;
-        childEndTime > startTime && (startTime = childEndTime);
+        childEndTime > componentInfo && (componentInfo = childEndTime);
       }
-      if (trackIdx)
+      if (previousEndTime)
         for (
-          parentEndTime = 0, childTrackIdx = !0, children = trackIdx.length - 1;
-          0 <= children;
-          children--
+          entryName = 0,
+            childTrackTime = !0,
+            parentEndTime = previousEndTime.length - 1;
+          0 <= parentEndTime;
+          parentEndTime--
         )
           if (
-            ((trackTime = trackIdx[children]),
+            ((trackTime = previousEndTime[parentEndTime]),
             "number" === typeof trackTime.time &&
-              ((parentEndTime = trackTime.time),
-              parentEndTime > startTime && (startTime = parentEndTime)),
-            "string" === typeof trackTime.name && 0 < children)
+              (trackTime.time > componentInfo &&
+                (componentInfo = trackTime.time),
+              0 === entryName && (entryName = trackTime.time)),
+            "string" === typeof trackTime.name && 0 < parentEndTime)
           ) {
-            childTrackTime = trackIdx[children - 1];
-            if ("number" === typeof childTrackTime.time) {
-              childTrackTime = childTrackTime.time;
+            childTrackIdx = previousEndTime[parentEndTime - 1];
+            if ("number" === typeof childTrackIdx.time) {
+              childTrackIdx = childTrackIdx.time;
               if (
-                childTrackIdx &&
+                childTrackTime &&
                 "rejected" === root.status &&
                 root.reason !== response._closedReason
               ) {
-                childTrackIdx = trackIdx$jscomp$0;
-                childEndTime = startTime;
+                entryName = trackIdx$jscomp$0;
+                childTrackTime = childTrackIdx;
+                childEndTime = componentInfo;
                 var error = root.reason;
                 if (supportsUserTiming) {
                   var env = trackTime.env,
@@ -2410,7 +2518,7 @@
                         detail: {
                           devtools: {
                             color: "error",
-                            track: trackNames[childTrackIdx],
+                            track: trackNames[entryName],
                             trackGroup: "Server Components \u269b",
                             tooltipText: env + " Errored",
                             properties: [
@@ -2430,30 +2538,31 @@
                         env,
                         0 > childTrackTime ? 0 : childTrackTime,
                         childEndTime,
-                        trackNames[childTrackIdx],
+                        trackNames[entryName],
                         "Server Components \u269b",
                         "error"
                       );
                 }
               } else if (
-                ((childTrackIdx = trackIdx$jscomp$0),
-                (childEndTime = startTime),
-                supportsUserTiming && 0 <= childEndTime && 10 > childTrackIdx)
+                ((childTrackTime = trackIdx$jscomp$0),
+                (childEndTime = childTrackIdx),
+                (error = componentInfo),
+                supportsUserTiming && 0 <= error && 10 > childTrackTime)
               ) {
                 env = trackTime.env;
                 name = trackTime.name;
                 var isPrimaryEnv = env === response._rootEnvironmentName;
-                error = parentEndTime - childTrackTime;
-                error =
-                  0.5 > error
+                entryName -= childEndTime;
+                entryName =
+                  0.5 > entryName
                     ? isPrimaryEnv
                       ? "primary-light"
                       : "secondary-light"
-                    : 50 > error
+                    : 50 > entryName
                       ? isPrimaryEnv
                         ? "primary"
                         : "secondary"
-                      : 500 > error
+                      : 500 > entryName
                         ? isPrimaryEnv
                           ? "primary-dark"
                           : "secondary-dark"
@@ -2467,28 +2576,72 @@
                       console.timeStamp.bind(
                         console,
                         env,
-                        0 > childTrackTime ? 0 : childTrackTime,
-                        childEndTime,
-                        trackNames[childTrackIdx],
+                        0 > childEndTime ? 0 : childEndTime,
+                        error,
+                        trackNames[childTrackTime],
                         "Server Components \u269b",
-                        error
+                        entryName
                       )
                     )
                   : console.timeStamp(
                       env,
-                      0 > childTrackTime ? 0 : childTrackTime,
-                      childEndTime,
-                      trackNames[childTrackIdx],
+                      0 > childEndTime ? 0 : childEndTime,
+                      error,
+                      trackNames[childTrackTime],
                       "Server Components \u269b",
-                      error
+                      entryName
                     );
               }
-              componentInfo.component = trackTime;
+              trackIdx.component = trackTime;
+              entryName = childTrackIdx;
             }
-            childTrackIdx = !1;
+            childTrackTime = !1;
+          } else if (
+            trackTime.awaited &&
+            0 < parentEndTime &&
+            parentEndTime < previousEndTime.length - 2 &&
+            ((childEndTime = previousEndTime[parentEndTime - 1]),
+            (error = previousEndTime[parentEndTime + 1]),
+            "number" === typeof childEndTime.time &&
+              "number" === typeof error.time &&
+              ((childTrackIdx = trackTime),
+              (trackTime = trackIdx$jscomp$0),
+              (childEndTime = childEndTime.time),
+              (error = error.time),
+              supportsUserTiming && 0 < error))
+          ) {
+            name = childTrackIdx.env;
+            isPrimaryEnv = childTrackIdx.awaited.name;
+            var isPrimaryEnv$jscomp$0 = name === response._rootEnvironmentName;
+            env = getIOColor(isPrimaryEnv);
+            name =
+              "await " +
+              (isPrimaryEnv$jscomp$0 || void 0 === name
+                ? isPrimaryEnv
+                : isPrimaryEnv + " [" + name + "]");
+            (childTrackIdx = childTrackIdx.debugTask)
+              ? childTrackIdx.run(
+                  console.timeStamp.bind(
+                    console,
+                    name,
+                    0 > childEndTime ? 0 : childEndTime,
+                    error,
+                    trackNames[trackTime],
+                    "Server Components \u269b",
+                    env
+                  )
+                )
+              : console.timeStamp(
+                  name,
+                  0 > childEndTime ? 0 : childEndTime,
+                  error,
+                  trackNames[trackTime],
+                  "Server Components \u269b",
+                  env
+                );
           }
-      componentInfo.endTime = startTime;
-      return componentInfo;
+      trackIdx.endTime = componentInfo;
+      return trackIdx;
     }
     function processFullBinaryRow(response, id, tag, buffer, chunk) {
       switch (tag) {
@@ -2581,6 +2734,9 @@
                 function () {}
               );
           break;
+        case 74:
+          resolveIOInfo(response, id, row);
+          break;
         case 87:
           resolveConsoleEntry(response, row);
           break;
@@ -2662,7 +2818,13 @@
             supportsCreateTask &&
               null !== stack &&
               ((type = console.createTask.bind(console, getTaskName(type))),
-              (stack = buildFakeCallStack(response, stack, validated, type)),
+              (stack = buildFakeCallStack(
+                response,
+                stack,
+                validated,
+                !1,
+                type
+              )),
               (type =
                 null === key
                   ? null
@@ -2771,6 +2933,7 @@
         ReactSharedInteralsServer;
     ReactPromise.prototype = Object.create(Promise.prototype);
     ReactPromise.prototype.then = function (resolve, reject) {
+      var _this = this;
       switch (this.status) {
         case "resolved_model":
           initializeModelChunk(this);
@@ -2778,6 +2941,19 @@
         case "resolved_module":
           initializeModuleChunk(this);
       }
+      var resolveCallback = resolve,
+        rejectCallback = reject,
+        wrapperPromise = new Promise(function (res, rej) {
+          resolve = function (value) {
+            wrapperPromise._debugInfo = _this._debugInfo;
+            res(value);
+          };
+          reject = function (reason) {
+            wrapperPromise._debugInfo = _this._debugInfo;
+            rej(reason);
+          };
+        });
+      wrapperPromise.then(resolveCallback, rejectCallback);
       switch (this.status) {
         case "fulfilled":
           resolve(this.value);
@@ -2810,6 +2986,7 @@
             response,
             stack,
             environmentName,
+            !1,
             fakeJSXCallSite
           )();
         }
@@ -2835,6 +3012,7 @@
               response,
               stackTrace,
               env,
+              !1,
               bindToConsole(methodName, args, env)
             );
             if (null != owner) {
@@ -2893,7 +3071,7 @@
         version: rendererVersion,
         rendererPackageName: rendererPackageName,
         currentDispatcherRef: ReactSharedInternals,
-        reconcilerVersion: "19.2.0-experimental-2b4064eb-20250602",
+        reconcilerVersion: "19.2.0-experimental-93f16680-20250605",
         getCurrentComponentInfo: getCurrentOwnerInDEV
       };
       if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__)

package/cjs/react-client-flight.production.js

@@ -1430,6 +1430,7 @@ module.exports = function ($$$config) {
         break;
       case 78:
       case 68:
+      case 74:
       case 87:
         throw Error(formatProdErrorMessage(504));
       case 82:
@@ -1600,7 +1601,7 @@ module.exports = function ($$$config) {
       version: rendererVersion,
       rendererPackageName: rendererPackageName,
       currentDispatcherRef: ReactSharedInternals,
-      reconcilerVersion: "19.2.0-experimental-2b4064eb-20250602",
+      reconcilerVersion: "19.2.0-experimental-93f16680-20250605",
       getCurrentComponentInfo: getCurrentOwnerInDEV
     };
     if ("undefined" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@matthamlin/react-client",
   "description": "React package for consuming streaming models.",
-  "version": "0.0.0-experimental-2b4064eb-20250602",
+  "version": "0.0.0-experimental-93f16680-20250605",
   "keywords": [
     "react"
   ],
@@ -23,6 +23,6 @@
     "node": ">=0.10.0"
   },
   "peerDependencies": {
-    "react": "0.0.0-experimental-2b4064eb-20250602"
+    "react": "0.0.0-experimental-93f16680-20250605"
   }
 }