@valbuild/tanstack 0.136.0 → 0.136.1

package/server/dist/valbuild-tanstack-server.esm.js

@@ -1,11 +1,11 @@
-import { _ as _asyncToGenerator, a as _regenerator, V as VERSION, s as setValEnableCookieReader } from '../../dist/version-22d55f6e.esm.js';
+import { _ as _asyncToGenerator, a as _regenerator, V as VERSION, s as setValEnableCookieReader } from '../../dist/version-eb1cf21e.esm.js';
 import { Internal } from '@valbuild/core';
 import { _ as _objectSpread2, a as _slicedToArray, d as _defineProperty } from '../../dist/createForOfIteratorHelper-485c2ce1.esm.js';
 import { createValApiRouter, createValServer } from '@valbuild/server';
 export { InMemoryPatchStore, createPrettierFormatter } from '@valbuild/server';
 import { b as initValRouteFromVal, g as getJsonEntryStegaRoot, i as isJsonValuesRecordSchema, a as getValRouteUrlFromVal, _ as _typeof } from '../../dist/routeFromVal-728295a0.esm.js';
 import { stegaEncode, SET_AUTO_TAG_JSX_ENABLED } from '@valbuild/react/stega';
-import { VAL_SESSION_COOKIE } from '@valbuild/shared/internal';
+import { VAL_SESSION_COOKIE, memoizePerRequest } from '@valbuild/shared/internal';
 import { initValMcp as initValMcp$1 } from '@valbuild/mcp';
 import '@valbuild/shared/client';
 
@@ -304,109 +304,260 @@ function initValServer(valModules, config, opts) {
  * is server-RENDERED and then hydrated, so every element it produces is a
  * normal client element and the distinction does not exist.
  */
-var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
+
+/**
+ * The `modules` map every `fetchVal` in one request shares.
+ *
+ * Derived from the route's own response type rather than restated, so it cannot
+ * drift from what `/sources/~` actually returns.
+ */
+
+/**
+ * The slice of `ValServer` the draft-sources reader uses.
+ *
+ * Narrower than `ValServer` for the same reason `JsonEntryValServer` below is:
+ * it says what the dependency IS, and it lets a test drive the reader with a
+ * one-route fake instead of casting a partial object to the whole server type.
+ */
+
+/** What the route readers need: the tree, plus the single-entry route. */
+
+/**
+ * Where the reader gets its per-request memo box.
+ *
+ * Injected rather than reached for, so that "this reader needs a request to
+ * scope its cache to" is part of its contract and a test can supply a scope it
+ * controls — there is no TanStack request in jest.
+ */
+
+/**
+ * A per-request memo box, keyed on the `Request` itself.
+ *
+ * That is what makes this safe: TanStack resolves one `Request` object per
+ * in-flight request out of async local storage, so two visitors cannot collide,
+ * and a `WeakMap` lets the entry go when the request does. This is the TanStack
+ * half of the Next package's `cache()` — there is no RSC here, so React's
+ * request memoisation does not exist (see the note at the top of this file).
+ *
+ * Outside a request there is nothing to scope to and `getRequest` throws;
+ * `null` then means "compute every time", which is what this did before the
+ * memo existed. See `memoizePerRequest`.
+ *
+ * Built PER `initValContent` rather than once for the module, because the box
+ * is only as specific as the map it came from: two Val servers in one process
+ * sharing one would answer each other's reads within a request, and they hold
+ * different content.
+ */
+function createTanStackRequestScope() {
+  var boxes = new WeakMap();
+  return /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+    var request, _yield$import, getRequest, existing, box;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
+        case 0:
+          _context.p = 0;
+          _context.n = 1;
+          return import('@tanstack/react-start/server');
+        case 1:
+          _yield$import = _context.v;
+          getRequest = _yield$import.getRequest;
+          request = getRequest();
+          _context.n = 3;
+          break;
+        case 2:
+          _context.p = 2;
+          _context.v;
+          return _context.a(2, null);
+        case 3:
+          existing = boxes.get(request);
+          if (!existing) {
+            _context.n = 4;
+            break;
+          }
+          return _context.a(2, existing);
+        case 4:
+          box = {};
+          boxes.set(request, box);
+          return _context.a(2, box);
+      }
+    }, _callee, null, [[0, 2]]);
+  }));
+}
+
+/**
+ * ONE read of the whole module tree, for the session in `sessionCookie`.
+ *
+ * `path` stays `"/"` on purpose, and the measurement is why. `/sources/~`
+ * evaluates, previews and validates EVERY module and only THEN filters the
+ * response by `req.path` (the two TODOs in `ValServer.ts` say so), so narrowing
+ * the path shrinks the answer and changes the work not at all: on a 60-module
+ * project, `path: "/"` took 53.6ms and a single-module path 53.5ms. And this is
+ * an in-process call rather than a round trip, so the object it builds is never
+ * serialised or sent anywhere — the bytes it saves are not bytes anyone pays
+ * for. Narrowing would also give each caller a different answer to cache, which
+ * is what would cost the saving that IS real (2.7x on the same project).
+ *
+ * `draftRead.perf.test.ts` prints both numbers; re-run it before believing
+ * anything different.
+ *
+ * Returns `null` when the session is not one the server accepts; the caller
+ * then renders published content, which is what it did before.
+ */
+function loadDraftSources(_x, _x2) {
+  return _loadDraftSources.apply(this, arguments);
+}
+function _loadDraftSources() {
+  _loadDraftSources = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(valServerPromise, sessionCookie) {
+    var valServer, treeRes;
+    return _regenerator().w(function (_context6) {
+      while (1) switch (_context6.n) {
+        case 0:
+          _context6.n = 1;
+          return valServerPromise;
+        case 1:
+          valServer = _context6.v;
+          _context6.n = 2;
+          return valServer["/sources/~"]["PUT"]({
+            path: "/",
+            query: {
+              validate_sources: true,
+              validate_binary_files: false,
+              exclude_patches: false,
+              // The server-side read uses the legacy "server applies patches"
+              // path, same as the Next package's.
+              apply_patches: undefined,
+              /*
+               * The caller's own staged work, and nobody else's.
+               *
+               * A draft render cannot name its group ids — it has no client
+               * state — so it asks for "mine" and the server resolves them from
+               * the session. Without this a preview shows base + every pending
+               * patch on the branch, so one person's half-finished edit appears
+               * in another person's draft.
+               *
+               * `patch_id` stays `undefined`: naming an explicit list is for a
+               * caller that already knows what it wants, and it would override
+               * the resolution rather than intersect with it.
+               */
+              patch_id: undefined,
+              own_patch_groups_only: true
+            },
+            cookies: _defineProperty({}, VAL_SESSION_COOKIE, sessionCookie)
+          });
+        case 2:
+          treeRes = _context6.v;
+          if (!(treeRes.status === 200)) {
+            _context6.n = 3;
+            break;
+          }
+          return _context6.a(2, treeRes.json.modules);
+        case 3:
+          if (!(treeRes.status === 401)) {
+            _context6.n = 4;
+            break;
+          }
+          console.warn("Val: authentication error: ", treeRes.json.message);
+          return _context6.a(2, null);
+        case 4:
+          throw Error(JSON.stringify(treeRes.json, null, 2));
+        case 5:
+          return _context6.a(2);
+      }
+    }, _callee6);
+  }));
+  return _loadDraftSources.apply(this, arguments);
+}
+var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope) {
   return function (selector) {
     var exec = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        var enabled, headers, cookies, host, _cookies, valServer, treeRes, modules, _t, _t2, _t3;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.p = _context.n) {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+        var enabled, headers, cookies, host, _cookies, sessionCookie, modules, _t2, _t3, _t4, _t5;
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.p = _context2.n) {
             case 0:
               enabled = false;
-              _context.p = 1;
-              _context.n = 2;
+              _context2.p = 1;
+              _context2.n = 2;
               return isEnabled();
             case 2:
-              enabled = _context.v;
-              _context.n = 4;
+              enabled = _context2.v;
+              _context2.n = 4;
               break;
             case 3:
-              _context.p = 3;
-              _t = _context.v;
-              console.error("Val: could not check if Val is enabled! This might be due to an error reading draft mode. fetchVal can only be used server-side (in a loader, a server function, or a server route). Use useVal in components.", _t);
+              _context2.p = 3;
+              _t2 = _context2.v;
+              console.error("Val: could not check if Val is enabled! This might be due to an error reading draft mode. fetchVal can only be used server-side (in a loader, a server function, or a server route). Use useVal in components.", _t2);
             case 4:
               if (!enabled) {
-                _context.n = 17;
+                _context2.n = 15;
                 break;
               }
               SET_AUTO_TAG_JSX_ENABLED(true);
-              _context.p = 5;
-              _context.n = 6;
+              _context2.p = 5;
+              _context2.n = 6;
               return getHeaders();
             case 6:
-              headers = _context.v;
+              headers = _context2.v;
               if (!(typeof headers.get !== "function")) {
-                _context.n = 7;
+                _context2.n = 7;
                 break;
               }
               throw new Error("Invalid headers");
             case 7:
-              _context.n = 9;
+              _context2.n = 9;
               break;
             case 8:
-              _context.p = 8;
-              _t2 = _context.v;
-              console.error("Val: could not read headers! fetchVal can only be used server-side (in a loader, a server function, or a server route). Use useVal in components.", _t2);
+              _context2.p = 8;
+              _t3 = _context2.v;
+              console.error("Val: could not read headers! fetchVal can only be used server-side (in a loader, a server function, or a server route). Use useVal in components.", _t3);
               headers = null;
             case 9:
-              _context.p = 9;
-              _context.n = 10;
+              _context2.p = 9;
+              _context2.n = 10;
               return getCookies();
             case 10:
-              cookies = _context.v;
-              _context.n = 12;
+              cookies = _context2.v;
+              _context2.n = 12;
               break;
             case 11:
-              _context.p = 11;
-              _t3 = _context.v;
-              console.error("Val: could not read cookies! fetchVal can only be used server-side (in a loader, a server function, or a server route). Use useVal in components.", _t3);
+              _context2.p = 11;
+              _t4 = _context2.v;
+              console.error("Val: could not read cookies! fetchVal can only be used server-side (in a loader, a server function, or a server route). Use useVal in components.", _t4);
               cookies = null;
             case 12:
               host = headers && getHost(headers);
               if (!(host && cookies)) {
-                _context.n = 17;
+                _context2.n = 15;
                 break;
               }
-              _context.n = 13;
-              return valServerPromise;
+              sessionCookie = (_cookies = cookies) === null || _cookies === void 0 || (_cookies = _cookies.get(VAL_SESSION_COOKIE)) === null || _cookies === void 0 ? void 0 : _cookies.value;
+              /*
+               * Once per request, however many times the page reads.
+               *
+               * Every `fetchVal` in one request asks the same question — same
+               * query, same session — so the second and third answer were identical
+               * and cost the same as the first. `fetchValRouteUrl` made that worse
+               * by calling `fetchVal` again on top of the caller's own.
+               *
+               * The key is the session, so a box that somehow outlived its request
+               * misses rather than serving another author's draft. See
+               * `memoizePerRequest`.
+               */
+              _t5 = memoizePerRequest;
+              _context2.n = 13;
+              return getDraftSourcesScope();
             case 13:
-              valServer = _context.v;
-              _context.n = 14;
-              return valServer["/sources/~"]["PUT"]({
-                path: "/",
-                query: {
-                  validate_sources: true,
-                  validate_binary_files: false,
-                  exclude_patches: false,
-                  // The server-side read uses the legacy "server applies patches"
-                  // path, same as the Next package's.
-                  apply_patches: undefined,
-                  /*
-                   * The caller's own staged work, and nobody else's.
-                   *
-                   * A draft render cannot name its group ids — it has no client
-                   * state — so it asks for "mine" and the server resolves them from
-                   * the session. Without this a preview shows base + every pending
-                   * patch on the branch, so one person's half-finished edit appears
-                   * in another person's draft.
-                   *
-                   * `patch_id` stays `undefined`: naming an explicit list is for a
-                   * caller that already knows what it wants, and it would override
-                   * the resolution rather than intersect with it.
-                   */
-                  patch_id: undefined,
-                  own_patch_groups_only: true
-                },
-                cookies: _defineProperty({}, VAL_SESSION_COOKIE, (_cookies = cookies) === null || _cookies === void 0 || (_cookies = _cookies.get(VAL_SESSION_COOKIE)) === null || _cookies === void 0 ? void 0 : _cookies.value)
+              _context2.n = 14;
+              return _t5(_context2.v, sessionCookie !== null && sessionCookie !== void 0 ? sessionCookie : "", function () {
+                return loadDraftSources(valServerPromise, sessionCookie);
               });
             case 14:
-              treeRes = _context.v;
-              if (!(treeRes.status === 200)) {
-                _context.n = 15;
+              modules = _context2.v;
+              if (!modules) {
+                _context2.n = 15;
                 break;
               }
-              modules = treeRes.json.modules;
-              return _context.a(2, stegaEncode(selector, {
+              return _context2.a(2, stegaEncode(selector, {
                 disabled: !enabled,
                 getModule: function getModule(path) {
                   var module = modules[path];
@@ -416,24 +567,14 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valS
                 }
               }));
             case 15:
-              if (!(treeRes.status === 401)) {
-                _context.n = 16;
-                break;
-              }
-              console.warn("Val: authentication error: ", treeRes.json.message);
-              _context.n = 17;
-              break;
-            case 16:
-              throw Error(JSON.stringify(treeRes.json, null, 2));
-            case 17:
-              return _context.a(2, stegaEncode(selector, {
+              return _context2.a(2, stegaEncode(selector, {
                 disabled: !enabled
               }));
           }
-        }, _callee, null, [[9, 11], [5, 8], [1, 3]]);
+        }, _callee2, null, [[9, 11], [5, 8], [1, 3]]);
       }));
       return function exec() {
-        return _ref.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
     return exec()["catch"](function (err) {
@@ -482,17 +623,17 @@ function getHost(headers) {
 //   }
 // }
 
-var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
+var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope) {
   return /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(selector, params) {
-      var resolvedParams, valModule, path, schema, source, url, enabled, draft, content, fetchVal, val, route, _t5;
-      return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.p = _context2.n) {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(selector, params) {
+      var resolvedParams, valModule, path, schema, source, url, enabled, draft, content, fetchVal, val, route, _t7;
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.p = _context3.n) {
           case 0:
-            _context2.n = 1;
+            _context3.n = 1;
             return Promise.resolve(params);
           case 1:
-            resolvedParams = _context2.v;
+            resolvedParams = _context3.v;
             // A view is a pointer: everything below reads a path, a schema and a source
             // off this, and a pointer has none of them. See `resolveViewedModule`.
             valModule = Internal.resolveViewedModule(selector);
@@ -501,78 +642,78 @@ var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpo
             // entry's backing `*.val.json`, instead of eagerly resolving the whole
             // record via `fetchVal`.
             if (!isJsonValuesRecordSchema(schema)) {
-              _context2.n = 11;
+              _context3.n = 11;
               break;
             }
             source = valModule && Internal.getSource(valModule);
             url = getValRouteUrlFromVal(resolvedParams, "fetchValRoute", path, schema, source);
             if (url) {
-              _context2.n = 2;
+              _context3.n = 2;
               break;
             }
-            return _context2.a(2, null);
+            return _context3.a(2, null);
           case 2:
             enabled = false;
-            _context2.p = 3;
-            _context2.n = 4;
+            _context3.p = 3;
+            _context3.n = 4;
             return isEnabled();
           case 4:
-            enabled = _context2.v;
-            _context2.n = 6;
+            enabled = _context3.v;
+            _context3.n = 6;
             break;
           case 5:
-            _context2.p = 5;
-            _context2.v;
+            _context3.p = 5;
+            _context3.v;
           case 6:
             draft = {
               status: "unavailable"
             };
             if (!(enabled && path)) {
-              _context2.n = 8;
+              _context3.n = 8;
               break;
             }
             SET_AUTO_TAG_JSX_ENABLED(true);
-            _context2.n = 7;
+            _context3.n = 7;
             return loadDraftJsonEntry(valServerPromise, getCookies, path, url);
           case 7:
-            draft = _context2.v;
+            draft = _context3.v;
           case 8:
-            _context2.n = 9;
+            _context3.n = 9;
             return resolveDraftOrCommittedEntry(draft, function () {
               return loadJsonEntryContent(source, url);
             });
           case 9:
-            content = _context2.v;
+            content = _context3.v;
             if (!(content === undefined)) {
-              _context2.n = 10;
+              _context3.n = 10;
               break;
             }
-            return _context2.a(2, null);
+            return _context3.a(2, null);
           case 10:
-            return _context2.a(2, stegaEncode(content, {
+            return _context3.a(2, stegaEncode(content, {
               disabled: !enabled,
               root: getJsonEntryStegaRoot(valModule, url)
             }));
           case 11:
-            fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
-            _t5 = valModule;
-            if (!_t5) {
-              _context2.n = 13;
+            fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope);
+            _t7 = valModule;
+            if (!_t7) {
+              _context3.n = 13;
               break;
             }
-            _context2.n = 12;
+            _context3.n = 12;
             return fetchVal(valModule);
           case 12:
-            _t5 = _context2.v;
+            _t7 = _context3.v;
           case 13:
-            val = _t5;
+            val = _t7;
             route = initValRouteFromVal(resolvedParams, "fetchValRoute", path, schema, val);
-            return _context2.a(2, route);
+            return _context3.a(2, route);
         }
-      }, _callee2, null, [[3, 5]]);
+      }, _callee3, null, [[3, 5]]);
     }));
-    return function (_x, _x2) {
-      return _ref2.apply(this, arguments);
+    return function (_x3, _x4) {
+      return _ref3.apply(this, arguments);
     };
   }();
 };
@@ -582,7 +723,7 @@ var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpo
  * source markers (one dynamic import). Returns `undefined` when the key is
  * missing or its marker has no runtime thunk (transport marker / draft entry).
  */
-function loadJsonEntryContent(_x3, _x4) {
+function loadJsonEntryContent(_x5, _x6) {
   return _loadJsonEntryContent.apply(this, arguments);
 }
 /**
@@ -607,37 +748,37 @@ function loadJsonEntryContent(_x3, _x4) {
  * to the whole server type.
  */
 function _loadJsonEntryContent() {
-  _loadJsonEntryContent = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(source, key) {
+  _loadJsonEntryContent = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(source, key) {
     var marker, thunk;
-    return _regenerator().w(function (_context5) {
-      while (1) switch (_context5.n) {
+    return _regenerator().w(function (_context7) {
+      while (1) switch (_context7.n) {
         case 0:
           if (!(!source || _typeof(source) !== "object")) {
-            _context5.n = 1;
+            _context7.n = 1;
             break;
           }
-          return _context5.a(2, undefined);
+          return _context7.a(2, undefined);
         case 1:
           marker = source[key];
           if (Internal.isJson(marker)) {
-            _context5.n = 2;
+            _context7.n = 2;
             break;
           }
-          return _context5.a(2, undefined);
+          return _context7.a(2, undefined);
         case 2:
           thunk = Internal.getJsonImport(marker);
           if (thunk) {
-            _context5.n = 3;
+            _context7.n = 3;
             break;
           }
-          return _context5.a(2, undefined);
+          return _context7.a(2, undefined);
         case 3:
-          _context5.n = 4;
+          _context7.n = 4;
           return thunk();
         case 4:
-          return _context5.a(2, _context5.v["default"]);
+          return _context7.a(2, _context7.v["default"]);
       }
-    }, _callee5);
+    }, _callee7);
   }));
   return _loadJsonEntryContent.apply(this, arguments);
 }
@@ -650,33 +791,33 @@ function _loadJsonEntryContent() {
  * ask). Returning `undefined` means "render nothing"; both callers turn that into
  * a null/undefined result.
  */
-function resolveDraftOrCommittedEntry(_x5, _x6) {
+function resolveDraftOrCommittedEntry(_x7, _x8) {
   return _resolveDraftOrCommittedEntry.apply(this, arguments);
 }
 function _resolveDraftOrCommittedEntry() {
-  _resolveDraftOrCommittedEntry = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(draft, loadCommitted) {
-    return _regenerator().w(function (_context6) {
-      while (1) switch (_context6.n) {
+  _resolveDraftOrCommittedEntry = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(draft, loadCommitted) {
+    return _regenerator().w(function (_context8) {
+      while (1) switch (_context8.n) {
         case 0:
           if (!(draft.status === "content")) {
-            _context6.n = 1;
+            _context8.n = 1;
             break;
           }
-          return _context6.a(2, draft.content);
+          return _context8.a(2, draft.content);
         case 1:
           if (!(draft.status === "absent")) {
-            _context6.n = 2;
+            _context8.n = 2;
             break;
           }
-          return _context6.a(2, undefined);
+          return _context8.a(2, undefined);
         case 2:
-          return _context6.a(2, loadCommitted());
+          return _context8.a(2, loadCommitted());
       }
-    }, _callee6);
+    }, _callee8);
   }));
   return _resolveDraftOrCommittedEntry.apply(this, arguments);
 }
-function loadDraftJsonEntry(_x7, _x8, _x9, _x0) {
+function loadDraftJsonEntry(_x9, _x0, _x1, _x10) {
   return _loadDraftJsonEntry.apply(this, arguments);
 }
 /**
@@ -691,31 +832,31 @@ function loadDraftJsonEntry(_x7, _x8, _x9, _x0) {
  * the draft read yields nothing.
  */
 function _loadDraftJsonEntry() {
-  _loadDraftJsonEntry = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(valServerPromise, getCookies, moduleFilePath, key) {
+  _loadDraftJsonEntry = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(valServerPromise, getCookies, moduleFilePath, key) {
     var _cookies3;
     var cookies, valServer, res;
-    return _regenerator().w(function (_context7) {
-      while (1) switch (_context7.p = _context7.n) {
+    return _regenerator().w(function (_context9) {
+      while (1) switch (_context9.p = _context9.n) {
         case 0:
-          _context7.p = 0;
-          _context7.n = 1;
+          _context9.p = 0;
+          _context9.n = 1;
           return getCookies();
         case 1:
-          cookies = _context7.v;
-          _context7.n = 3;
+          cookies = _context9.v;
+          _context9.n = 3;
           break;
         case 2:
-          _context7.p = 2;
-          _context7.v;
-          return _context7.a(2, {
+          _context9.p = 2;
+          _context9.v;
+          return _context9.a(2, {
             status: "unavailable"
           });
         case 3:
-          _context7.n = 4;
+          _context9.n = 4;
           return valServerPromise;
         case 4:
-          valServer = _context7.v;
-          _context7.n = 5;
+          valServer = _context9.v;
+          _context9.n = 5;
           return valServer["/json"]["GET"]({
             query: {
               path: moduleFilePath,
@@ -738,60 +879,60 @@ function _loadDraftJsonEntry() {
             cookies: _defineProperty({}, VAL_SESSION_COOKIE, (_cookies3 = cookies) === null || _cookies3 === void 0 || (_cookies3 = _cookies3.get(VAL_SESSION_COOKIE)) === null || _cookies3 === void 0 ? void 0 : _cookies3.value)
           });
         case 5:
-          res = _context7.v;
+          res = _context9.v;
           if (!(res.status === 200 && "content" in res.json)) {
-            _context7.n = 6;
+            _context9.n = 6;
             break;
           }
-          return _context7.a(2, {
+          return _context9.a(2, {
             status: "content",
             content: res.json.content
           });
         case 6:
           if (!(res.status === 401)) {
-            _context7.n = 7;
+            _context9.n = 7;
             break;
           }
           console.warn("Val: authentication error: ", res.json.message);
-          return _context7.a(2, {
+          return _context9.a(2, {
             status: "unavailable"
           });
         case 7:
           if (!(res.status === 404)) {
-            _context7.n = 8;
+            _context9.n = 8;
             break;
           }
-          return _context7.a(2, {
+          return _context9.a(2, {
             status: "absent"
           });
         case 8:
           console.error("Val: could not load draft JSON entry: ", "message" in res.json ? res.json.message : "status ".concat(res.status));
-          return _context7.a(2, {
+          return _context9.a(2, {
             status: "unavailable"
           });
       }
-    }, _callee7, null, [[0, 2]]);
+    }, _callee9, null, [[0, 2]]);
   }));
   return _loadDraftJsonEntry.apply(this, arguments);
 }
 var initFetchValKeyStega = function initFetchValKeyStega(valServerPromise, isEnabled, getCookies) {
   return /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(selector, key) {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(selector, key) {
       var enabled, valModule, source, moduleFilePath, draft, content;
-      return _regenerator().w(function (_context3) {
-        while (1) switch (_context3.p = _context3.n) {
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.p = _context4.n) {
           case 0:
             enabled = false;
-            _context3.p = 1;
-            _context3.n = 2;
+            _context4.p = 1;
+            _context4.n = 2;
             return isEnabled();
           case 2:
-            enabled = _context3.v;
-            _context3.n = 4;
+            enabled = _context4.v;
+            _context4.n = 4;
             break;
           case 3:
-            _context3.p = 3;
-            _context3.v;
+            _context4.p = 3;
+            _context4.v;
           case 4:
             // A view is a pointer: everything below reads a path and a source off this,
             // and a pointer has neither. See `resolveViewedModule`.
@@ -802,84 +943,84 @@ var initFetchValKeyStega = function initFetchValKeyStega(valServerPromise, isEna
               status: "unavailable"
             };
             if (!(enabled && moduleFilePath)) {
-              _context3.n = 6;
+              _context4.n = 6;
               break;
             }
             SET_AUTO_TAG_JSX_ENABLED(true);
-            _context3.n = 5;
+            _context4.n = 5;
             return loadDraftJsonEntry(valServerPromise, getCookies, moduleFilePath, key);
           case 5:
-            draft = _context3.v;
+            draft = _context4.v;
           case 6:
-            _context3.n = 7;
+            _context4.n = 7;
             return resolveDraftOrCommittedEntry(draft, function () {
               return loadJsonEntryContent(source, key);
             });
           case 7:
-            content = _context3.v;
+            content = _context4.v;
             if (!(content === undefined)) {
-              _context3.n = 8;
+              _context4.n = 8;
               break;
             }
-            return _context3.a(2, undefined);
+            return _context4.a(2, undefined);
           case 8:
-            return _context3.a(2, stegaEncode(content, {
+            return _context4.a(2, stegaEncode(content, {
               disabled: !enabled,
               root: getJsonEntryStegaRoot(valModule, key)
             }));
         }
-      }, _callee3, null, [[1, 3]]);
+      }, _callee4, null, [[1, 3]]);
     }));
-    return function (_x1, _x10) {
-      return _ref3.apply(this, arguments);
+    return function (_x11, _x12) {
+      return _ref4.apply(this, arguments);
     };
   }();
 };
-var initFetchValRouteUrl = function initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
+var initFetchValRouteUrl = function initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope) {
   return /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(selector, params) {
-      var fetchVal, resolvedParams, valModule, path, schema, val, route, _t7, _t8;
-      return _regenerator().w(function (_context4) {
-        while (1) switch (_context4.n) {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(selector, params) {
+      var fetchVal, resolvedParams, valModule, path, schema, val, route, _t9, _t0;
+      return _regenerator().w(function (_context5) {
+        while (1) switch (_context5.n) {
           case 0:
-            fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
+            fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope);
             if (!(params === undefined)) {
-              _context4.n = 1;
+              _context5.n = 1;
               break;
             }
-            _t7 = undefined;
-            _context4.n = 3;
+            _t9 = undefined;
+            _context5.n = 3;
             break;
           case 1:
-            _context4.n = 2;
+            _context5.n = 2;
             return Promise.resolve(params);
           case 2:
-            _t7 = _context4.v;
+            _t9 = _context5.v;
           case 3:
-            resolvedParams = _t7;
+            resolvedParams = _t9;
             // A view is a pointer: everything below reads a path, a schema and a source
             // off this, and a pointer has none of them. See `resolveViewedModule`.
             valModule = Internal.resolveViewedModule(selector);
             path = valModule && Internal.getValPath(valModule);
             schema = valModule && Internal.getSchema(valModule);
-            _t8 = valModule;
-            if (!_t8) {
-              _context4.n = 5;
+            _t0 = valModule;
+            if (!_t0) {
+              _context5.n = 5;
               break;
             }
-            _context4.n = 4;
+            _context5.n = 4;
             return fetchVal(valModule);
           case 4:
-            _t8 = _context4.v;
+            _t0 = _context5.v;
           case 5:
-            val = _t8;
+            val = _t0;
             route = getValRouteUrlFromVal(resolvedParams, "fetchValRouteUrl", path, schema, val);
-            return _context4.a(2, route);
+            return _context5.a(2, route);
         }
-      }, _callee4);
+      }, _callee5);
     }));
-    return function (_x11, _x12) {
-      return _ref4.apply(this, arguments);
+    return function (_x13, _x14) {
+      return _ref5.apply(this, arguments);
     };
   }();
 };
@@ -897,25 +1038,25 @@ function requestHeaders() {
 }
 /** The request's cookies, in the `{ name, value }` shape the readers want. */
 function _requestHeaders() {
-  _requestHeaders = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
-    var _yield$import, getRequestHeaders, headers;
-    return _regenerator().w(function (_context8) {
-      while (1) switch (_context8.n) {
+  _requestHeaders = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
+    var _yield$import2, getRequestHeaders, headers;
+    return _regenerator().w(function (_context0) {
+      while (1) switch (_context0.n) {
         case 0:
-          _context8.n = 1;
+          _context0.n = 1;
           return import('@tanstack/react-start/server');
         case 1:
-          _yield$import = _context8.v;
-          getRequestHeaders = _yield$import.getRequestHeaders;
+          _yield$import2 = _context0.v;
+          getRequestHeaders = _yield$import2.getRequestHeaders;
           headers = getRequestHeaders();
-          return _context8.a(2, {
+          return _context0.a(2, {
             get: function get(name) {
               var _headers$get2;
               return (_headers$get2 = headers.get(name)) !== null && _headers$get2 !== void 0 ? _headers$get2 : null;
             }
           });
       }
-    }, _callee8);
+    }, _callee0);
   }));
   return _requestHeaders.apply(this, arguments);
 }
@@ -943,17 +1084,17 @@ function requestCookies() {
  * } = initValContent(config, valModules);
  */
 function _requestCookies() {
-  _requestCookies = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
-    var _yield$import2, getCookie;
-    return _regenerator().w(function (_context9) {
-      while (1) switch (_context9.n) {
+  _requestCookies = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+    var _yield$import3, getCookie;
+    return _regenerator().w(function (_context1) {
+      while (1) switch (_context1.n) {
         case 0:
-          _context9.n = 1;
+          _context1.n = 1;
           return import('@tanstack/react-start/server');
         case 1:
-          _yield$import2 = _context9.v;
-          getCookie = _yield$import2.getCookie;
-          return _context9.a(2, {
+          _yield$import3 = _context1.v;
+          getCookie = _yield$import3.getCookie;
+          return _context1.a(2, {
             get: function get(name) {
               var value = getCookie(name);
               return value === undefined ? undefined : {
@@ -963,7 +1104,7 @@ function _requestCookies() {
             }
           });
       }
-    }, _callee9);
+    }, _callee1);
   }));
   return _requestCookies.apply(this, arguments);
 }
@@ -977,6 +1118,7 @@ function initValContent(config, valModules, opts) {
   if (!tanstackVersion) {
     throw new Error("Could not get @valbuild/tanstack package version");
   }
+  var draftSourcesScope = createTanStackRequestScope();
   var draftMode = (_opts$draftMode = opts === null || opts === void 0 ? void 0 : opts.draftMode) !== null && _opts$draftMode !== void 0 ? _opts$draftMode : valDraftMode();
   var isEnabled = function isEnabled() {
     return draftMode.isEnabled();
@@ -1005,10 +1147,10 @@ function initValContent(config, valModules, opts) {
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    valServerPromise, isEnabled, requestHeaders, requestCookies),
+    valServerPromise, isEnabled, requestHeaders, requestCookies, draftSourcesScope),
     fetchValKeyStega: initFetchValKeyStega(valServerPromise, isEnabled, requestCookies),
-    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, isEnabled, requestHeaders, requestCookies),
-    fetchValRouteUrl: initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, isEnabled, requestHeaders, requestCookies)
+    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, isEnabled, requestHeaders, requestCookies, draftSourcesScope),
+    fetchValRouteUrl: initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, isEnabled, requestHeaders, requestCookies, draftSourcesScope)
   };
 }