@valbuild/next 0.135.0 → 0.136.1

package/rsc/dist/valbuild-next-rsc.esm.js

@@ -1,121 +1,250 @@
 import 'server-only';
 import { i as initValRouteFromVal, g as getJsonEntryStegaRoot, a as isJsonValuesRecordSchema, b as getValRouteUrlFromVal, _ as _typeof } from '../../dist/routeFromVal-544e8318.esm.js';
+import { _ as _defineProperty } from '../../dist/defineProperty-cca5affa.esm.js';
 import { _ as _objectSpread2 } from '../../dist/objectSpread2-60d1bd93.esm.js';
 import { _ as _asyncToGenerator, a as _regenerator } from '../../dist/asyncToGenerator-500f022f.esm.js';
-import { _ as _defineProperty } from '../../dist/defineProperty-cca5affa.esm.js';
 import { SET_RSC, stegaEncode, SET_AUTO_TAG_JSX_ENABLED } from '@valbuild/react/stega';
 import { Internal } from '@valbuild/core';
-import { VAL_SESSION_COOKIE } from '@valbuild/shared/internal';
+import { cache } from 'react';
+import { VAL_SESSION_COOKIE, memoizePerRequest } from '@valbuild/shared/internal';
 import { createValServer } from '@valbuild/server';
-import { V as VERSION } from '../../dist/version-12fffb44.esm.js';
+import { V as VERSION } from '../../dist/version-b626279e.esm.js';
 import '../../dist/createForOfIteratorHelper-5758a730.esm.js';
 import '../../dist/unsupportedIterableToArray-5baabfdc.esm.js';
 import '../../dist/slicedToArray-aa291011.esm.js';
 import '@valbuild/shared/client';
 
 SET_RSC(true);
-var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
+
+/**
+ * The `modules` map every `fetchVal` in one render 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 — in jest, React's non-`react-server` build makes `cache` a
+ * pass-through, so the real wiring memoises nothing there.
+ */
+
+/**
+ * A per-request memo box, from React's request memoisation.
+ *
+ * `cache()` is what makes this safe: in an RSC render React hands back the SAME
+ * object for the length of one request and a fresh one for the next. Outside
+ * that — a route handler, a test, the non-`react-server` build of React —
+ * `cache` is a pass-through, so every call gets its own object, the memo misses,
+ * and the reader does exactly what it did before. Ineffective, never shared.
+ * See `memoizePerRequest`. `fetchVal` is an RSC API (`SET_RSC(true)` above, and
+ * its own error messages say so), so the effective case is the normal one.
+ *
+ * Built PER `initValRsc` rather than once for the module, because the box is
+ * only as specific as the `cache()` 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 createReactCacheScope() {
+  var getBox = cache(function () {
+    return {};
+  });
+  return /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          return _context.a(2, getBox());
+      }
+    }, _callee);
+  }));
+}
+
+/**
+ * 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 _callee18(valServerPromise, sessionCookie) {
+    var valServer, treeRes;
+    return _regenerator().w(function (_context18) {
+      while (1) switch (_context18.n) {
+        case 0:
+          _context18.n = 1;
+          return valServerPromise;
+        case 1:
+          valServer = _context18.v;
+          _context18.n = 2;
+          return valServer["/sources/~"]["PUT"]({
+            path: "/",
+            query: {
+              validate_sources: true,
+              validate_binary_files: false,
+              exclude_patches: false,
+              // RSC pre-render uses the legacy "server applies patches" path.
+              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 = _context18.v;
+          if (!(treeRes.status === 200)) {
+            _context18.n = 3;
+            break;
+          }
+          return _context18.a(2, treeRes.json.modules);
+        case 3:
+          if (!(treeRes.status === 401)) {
+            _context18.n = 4;
+            break;
+          }
+          console.warn("Val: authentication error: ", treeRes.json.message);
+          return _context18.a(2, null);
+        case 4:
+          throw Error(JSON.stringify(treeRes.json, null, 2));
+        case 5:
+          return _context18.a(2);
+      }
+    }, _callee18);
+  }));
+  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, _t, _t2, _t3, _t4;
+        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;
+              _context2.p = 3;
+              _t = _context2.v;
               console.error("Val: could not check if Val is enabled! This might be due to an error to check draftMode. fetchVal can only be used server-side. Use useVal on clients.", _t);
             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;
+              _context2.p = 8;
+              _t2 = _context2.v;
               console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", _t2);
               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;
+              _context2.p = 11;
+              _t3 = _context2.v;
               console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", _t3);
               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 render 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`.
+               */
+              _t4 = 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,
-                  // RSC pre-render uses the legacy "server applies patches" path.
-                  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 _t4(_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];
@@ -125,24 +254,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) {
@@ -192,17 +311,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, _t6;
+      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);
@@ -211,78 +330,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);
+            _t6 = valModule;
+            if (!_t6) {
+              _context3.n = 13;
               break;
             }
-            _context2.n = 12;
+            _context3.n = 12;
             return fetchVal(valModule);
           case 12:
-            _t5 = _context2.v;
+            _t6 = _context3.v;
           case 13:
-            val = _t5;
+            val = _t6;
             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);
     };
   }();
 };
@@ -292,7 +411,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);
 }
 /**
@@ -317,37 +436,37 @@ function loadJsonEntryContent(_x3, _x4) {
  * to the whole server type.
  */
 function _loadJsonEntryContent() {
-  _loadJsonEntryContent = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(source, key) {
+  _loadJsonEntryContent = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(source, key) {
     var marker, thunk;
-    return _regenerator().w(function (_context17) {
-      while (1) switch (_context17.n) {
+    return _regenerator().w(function (_context19) {
+      while (1) switch (_context19.n) {
         case 0:
           if (!(!source || _typeof(source) !== "object")) {
-            _context17.n = 1;
+            _context19.n = 1;
             break;
           }
-          return _context17.a(2, undefined);
+          return _context19.a(2, undefined);
         case 1:
           marker = source[key];
           if (Internal.isJson(marker)) {
-            _context17.n = 2;
+            _context19.n = 2;
             break;
           }
-          return _context17.a(2, undefined);
+          return _context19.a(2, undefined);
         case 2:
           thunk = Internal.getJsonImport(marker);
           if (thunk) {
-            _context17.n = 3;
+            _context19.n = 3;
             break;
           }
-          return _context17.a(2, undefined);
+          return _context19.a(2, undefined);
         case 3:
-          _context17.n = 4;
+          _context19.n = 4;
           return thunk();
         case 4:
-          return _context17.a(2, _context17.v["default"]);
+          return _context19.a(2, _context19.v["default"]);
       }
-    }, _callee17);
+    }, _callee19);
   }));
   return _loadJsonEntryContent.apply(this, arguments);
 }
@@ -360,33 +479,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 _callee18(draft, loadCommitted) {
-    return _regenerator().w(function (_context18) {
-      while (1) switch (_context18.n) {
+  _resolveDraftOrCommittedEntry = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee20(draft, loadCommitted) {
+    return _regenerator().w(function (_context20) {
+      while (1) switch (_context20.n) {
         case 0:
           if (!(draft.status === "content")) {
-            _context18.n = 1;
+            _context20.n = 1;
             break;
           }
-          return _context18.a(2, draft.content);
+          return _context20.a(2, draft.content);
         case 1:
           if (!(draft.status === "absent")) {
-            _context18.n = 2;
+            _context20.n = 2;
             break;
           }
-          return _context18.a(2, undefined);
+          return _context20.a(2, undefined);
         case 2:
-          return _context18.a(2, loadCommitted());
+          return _context20.a(2, loadCommitted());
       }
-    }, _callee18);
+    }, _callee20);
   }));
   return _resolveDraftOrCommittedEntry.apply(this, arguments);
 }
-function loadDraftJsonEntry(_x7, _x8, _x9, _x0) {
+function loadDraftJsonEntry(_x9, _x0, _x1, _x10) {
   return _loadDraftJsonEntry.apply(this, arguments);
 }
 /**
@@ -401,31 +520,31 @@ function loadDraftJsonEntry(_x7, _x8, _x9, _x0) {
  * the draft read yields nothing.
  */
 function _loadDraftJsonEntry() {
-  _loadDraftJsonEntry = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(valServerPromise, getCookies, moduleFilePath, key) {
+  _loadDraftJsonEntry = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee21(valServerPromise, getCookies, moduleFilePath, key) {
     var _cookies3;
     var cookies, valServer, res;
-    return _regenerator().w(function (_context19) {
-      while (1) switch (_context19.p = _context19.n) {
+    return _regenerator().w(function (_context21) {
+      while (1) switch (_context21.p = _context21.n) {
         case 0:
-          _context19.p = 0;
-          _context19.n = 1;
+          _context21.p = 0;
+          _context21.n = 1;
           return getCookies();
         case 1:
-          cookies = _context19.v;
-          _context19.n = 3;
+          cookies = _context21.v;
+          _context21.n = 3;
           break;
         case 2:
-          _context19.p = 2;
-          _context19.v;
-          return _context19.a(2, {
+          _context21.p = 2;
+          _context21.v;
+          return _context21.a(2, {
             status: "unavailable"
           });
         case 3:
-          _context19.n = 4;
+          _context21.n = 4;
           return valServerPromise;
         case 4:
-          valServer = _context19.v;
-          _context19.n = 5;
+          valServer = _context21.v;
+          _context21.n = 5;
           return valServer["/json"]["GET"]({
             query: {
               path: moduleFilePath,
@@ -448,60 +567,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 = _context19.v;
+          res = _context21.v;
           if (!(res.status === 200 && "content" in res.json)) {
-            _context19.n = 6;
+            _context21.n = 6;
             break;
           }
-          return _context19.a(2, {
+          return _context21.a(2, {
             status: "content",
             content: res.json.content
           });
         case 6:
           if (!(res.status === 401)) {
-            _context19.n = 7;
+            _context21.n = 7;
             break;
           }
           console.warn("Val: authentication error: ", res.json.message);
-          return _context19.a(2, {
+          return _context21.a(2, {
             status: "unavailable"
           });
         case 7:
           if (!(res.status === 404)) {
-            _context19.n = 8;
+            _context21.n = 8;
             break;
           }
-          return _context19.a(2, {
+          return _context21.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 _context19.a(2, {
+          return _context21.a(2, {
             status: "unavailable"
           });
       }
-    }, _callee19, null, [[0, 2]]);
+    }, _callee21, 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`.
@@ -512,84 +631,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, _t8, _t9;
+      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;
+            _t8 = undefined;
+            _context5.n = 3;
             break;
           case 1:
-            _context4.n = 2;
+            _context5.n = 2;
             return Promise.resolve(params);
           case 2:
-            _t7 = _context4.v;
+            _t8 = _context5.v;
           case 3:
-            resolvedParams = _t7;
+            resolvedParams = _t8;
             // 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;
+            _t9 = valModule;
+            if (!_t9) {
+              _context5.n = 5;
               break;
             }
-            _context4.n = 4;
+            _context5.n = 4;
             return fetchVal(valModule);
           case 4:
-            _t8 = _context4.v;
+            _t9 = _context5.v;
           case 5:
-            val = _t8;
+            val = _t9;
             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);
     };
   }();
 };
@@ -603,6 +722,7 @@ function initValRsc(config, valModules, rscNextConfig) {
   if (!nextVersion) {
     throw new Error("Could not get @valbuild/next package version");
   }
+  var draftSourcesScope = createReactCacheScope();
   var valServerPromise = createValServer(valModules, "/api/val", _objectSpread2({
     versions: {
       next: nextVersion,
@@ -610,19 +730,6 @@ function initValRsc(config, valModules, rscNextConfig) {
     }
   }, config), config, {
     isEnabled: function isEnabled() {
-      return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.n) {
-            case 0:
-              _context5.n = 1;
-              return rscNextConfig.draftMode();
-            case 1:
-              return _context5.a(2, _context5.v.isEnabled);
-          }
-        }, _callee5);
-      }))();
-    },
-    onEnable: function onEnable() {
       return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.n) {
@@ -630,14 +737,12 @@ function initValRsc(config, valModules, rscNextConfig) {
               _context6.n = 1;
               return rscNextConfig.draftMode();
             case 1:
-              _context6.v.enable();
-            case 2:
-              return _context6.a(2);
+              return _context6.a(2, _context6.v.isEnabled);
           }
         }, _callee6);
       }))();
     },
-    onDisable: function onDisable() {
+    onEnable: function onEnable() {
       return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
@@ -645,35 +750,40 @@ function initValRsc(config, valModules, rscNextConfig) {
               _context7.n = 1;
               return rscNextConfig.draftMode();
             case 1:
-              _context7.v.disable();
+              _context7.v.enable();
             case 2:
               return _context7.a(2);
           }
         }, _callee7);
       }))();
+    },
+    onDisable: function onDisable() {
+      return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.n) {
+            case 0:
+              _context8.n = 1;
+              return rscNextConfig.draftMode();
+            case 1:
+              _context8.v.disable();
+            case 2:
+              return _context8.a(2);
+          }
+        }, _callee8);
+      }))();
     }
   });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
-      return _regenerator().w(function (_context8) {
-        while (1) switch (_context8.n) {
-          case 0:
-            _context8.n = 1;
-            return rscNextConfig.draftMode();
-          case 1:
-            return _context8.a(2, _context8.v.isEnabled);
-        }
-      }, _callee8);
-    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
+    valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
       return _regenerator().w(function (_context9) {
         while (1) switch (_context9.n) {
           case 0:
             _context9.n = 1;
-            return rscNextConfig.headers();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context9.a(2, _context9.v);
+            return _context9.a(2, _context9.v.isEnabled);
         }
       }, _callee9);
     })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
@@ -681,51 +791,51 @@ function initValRsc(config, valModules, rscNextConfig) {
         while (1) switch (_context0.n) {
           case 0:
             _context0.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.headers();
           case 1:
             return _context0.a(2, _context0.v);
         }
       }, _callee0);
-    }))),
-    fetchValKeyStega: initFetchValKeyStega(valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
       return _regenerator().w(function (_context1) {
         while (1) switch (_context1.n) {
           case 0:
             _context1.n = 1;
-            return rscNextConfig.draftMode();
+            return rscNextConfig.cookies();
           case 1:
-            return _context1.a(2, _context1.v.isEnabled);
+            return _context1.a(2, _context1.v);
         }
       }, _callee1);
-    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
+    })), draftSourcesScope),
+    fetchValKeyStega: initFetchValKeyStega(valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
       return _regenerator().w(function (_context10) {
         while (1) switch (_context10.n) {
           case 0:
             _context10.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context10.a(2, _context10.v);
+            return _context10.a(2, _context10.v.isEnabled);
         }
       }, _callee10);
-    }))),
-    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
       return _regenerator().w(function (_context11) {
         while (1) switch (_context11.n) {
           case 0:
             _context11.n = 1;
-            return rscNextConfig.draftMode();
+            return rscNextConfig.cookies();
           case 1:
-            return _context11.a(2, _context11.v.isEnabled);
+            return _context11.a(2, _context11.v);
         }
       }, _callee11);
-    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
+    }))),
+    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
       return _regenerator().w(function (_context12) {
         while (1) switch (_context12.n) {
           case 0:
             _context12.n = 1;
-            return rscNextConfig.headers();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context12.a(2, _context12.v);
+            return _context12.a(2, _context12.v.isEnabled);
         }
       }, _callee12);
     })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13() {
@@ -733,30 +843,30 @@ function initValRsc(config, valModules, rscNextConfig) {
         while (1) switch (_context13.n) {
           case 0:
             _context13.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.headers();
           case 1:
             return _context13.a(2, _context13.v);
         }
       }, _callee13);
-    }))),
-    fetchValRouteUrl: initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14() {
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14() {
       return _regenerator().w(function (_context14) {
         while (1) switch (_context14.n) {
           case 0:
             _context14.n = 1;
-            return rscNextConfig.draftMode();
+            return rscNextConfig.cookies();
           case 1:
-            return _context14.a(2, _context14.v.isEnabled);
+            return _context14.a(2, _context14.v);
         }
       }, _callee14);
-    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
+    })), draftSourcesScope),
+    fetchValRouteUrl: initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
       return _regenerator().w(function (_context15) {
         while (1) switch (_context15.n) {
           case 0:
             _context15.n = 1;
-            return rscNextConfig.headers();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context15.a(2, _context15.v);
+            return _context15.a(2, _context15.v.isEnabled);
         }
       }, _callee15);
     })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
@@ -764,12 +874,22 @@ function initValRsc(config, valModules, rscNextConfig) {
         while (1) switch (_context16.n) {
           case 0:
             _context16.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.headers();
           case 1:
             return _context16.a(2, _context16.v);
         }
       }, _callee16);
-    })))
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17() {
+      return _regenerator().w(function (_context17) {
+        while (1) switch (_context17.n) {
+          case 0:
+            _context17.n = 1;
+            return rscNextConfig.cookies();
+          case 1:
+            return _context17.a(2, _context17.v);
+        }
+      }, _callee17);
+    })), draftSourcesScope)
   };
 }