@valbuild/next 0.144.11 → 0.144.12

package/rsc/dist/valbuild-next-rsc.cjs.prod.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
-var routeFromVal = require('../../dist/routeFromVal-e0995830.cjs.prod.js');
+var routeFromVal = require('../../dist/routeFromVal-6fc9f240.cjs.prod.js');
 var defineProperty = require('../../dist/defineProperty-8951f469.cjs.prod.js');
 var objectSpread2 = require('../../dist/objectSpread2-13f847a9.cjs.prod.js');
 var asyncToGenerator = require('../../dist/asyncToGenerator-8e5c36c8.cjs.prod.js');
@@ -12,7 +12,7 @@ var core = require('@valbuild/core');
 var React = require('react');
 var internal = require('@valbuild/shared/internal');
 var server = require('@valbuild/server');
-var version = require('../../dist/version-4bc7cf5e.cjs.prod.js');
+var version = require('../../dist/version-0810b6c6.cjs.prod.js');
 require('../../dist/createForOfIteratorHelper-d4afcad8.cjs.prod.js');
 require('../../dist/unsupportedIterableToArray-0d2087a2.cjs.prod.js');
 require('../../dist/slicedToArray-ce613de6.cjs.prod.js');
@@ -99,16 +99,16 @@ function loadDraftSources(_x, _x2) {
   return _loadDraftSources.apply(this, arguments);
 }
 function _loadDraftSources() {
-  _loadDraftSources = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee18(valServerPromise, sessionCookie) {
+  _loadDraftSources = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee19(valServerPromise, sessionCookie) {
     var valServer, treeRes;
-    return asyncToGenerator._regenerator().w(function (_context18) {
-      while (1) switch (_context18.n) {
+    return asyncToGenerator._regenerator().w(function (_context19) {
+      while (1) switch (_context19.n) {
         case 0:
-          _context18.n = 1;
+          _context19.n = 1;
           return valServerPromise;
         case 1:
-          valServer = _context18.v;
-          _context18.n = 2;
+          valServer = _context19.v;
+          _context19.n = 2;
           return valServer["/sources/~"]["PUT"]({
             path: "/",
             query: {
@@ -136,25 +136,25 @@ function _loadDraftSources() {
             cookies: defineProperty._defineProperty({}, internal.VAL_SESSION_COOKIE, sessionCookie)
           });
         case 2:
-          treeRes = _context18.v;
+          treeRes = _context19.v;
           if (!(treeRes.status === 200)) {
-            _context18.n = 3;
+            _context19.n = 3;
             break;
           }
-          return _context18.a(2, treeRes.json.modules);
+          return _context19.a(2, treeRes.json.modules);
         case 3:
           if (!(treeRes.status === 401)) {
-            _context18.n = 4;
+            _context19.n = 4;
             break;
           }
           console.warn("Val: authentication error: ", treeRes.json.message);
-          return _context18.a(2, null);
+          return _context19.a(2, null);
         case 4:
           throw Error(JSON.stringify(treeRes.json, null, 2));
         case 5:
-          return _context18.a(2);
+          return _context19.a(2);
       }
-    }, _callee18);
+    }, _callee19);
   }));
   return _loadDraftSources.apply(this, arguments);
 }
@@ -162,7 +162,7 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valS
   return function (selector) {
     var exec = /*#__PURE__*/function () {
       var _ref2 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee2() {
-        var enabled, headers, cookies, host, _cookies, sessionCookie, modules, _t, _t2, _t3, _t4;
+        var enabled, headers, cookies, host, _cookies, sessionCookie, modules, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0, _t1, _t10;
         return asyncToGenerator._regenerator().w(function (_context2) {
           while (1) switch (_context2.p = _context2.n) {
             case 0:
@@ -180,7 +180,7 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valS
               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) {
-                _context2.n = 15;
+                _context2.n = 16;
                 break;
               }
               stega.SET_AUTO_TAG_JSX_ENABLED(true);
@@ -218,7 +218,7 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valS
             case 12:
               host = headers && getHost(headers);
               if (!(host && cookies)) {
-                _context2.n = 15;
+                _context2.n = 16;
                 break;
               }
               sessionCookie = (_cookies = cookies) === null || _cookies === void 0 || (_cookies = _cookies.get(internal.VAL_SESSION_COOKIE)) === null || _cookies === void 0 ? void 0 : _cookies.value;
@@ -245,21 +245,36 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valS
             case 14:
               modules = _context2.v;
               if (!modules) {
-                _context2.n = 15;
+                _context2.n = 16;
                 break;
               }
-              return _context2.a(2, stega.stegaEncode(selector, {
-                disabled: !enabled,
-                getModule: function getModule(path) {
-                  var module = modules[path];
-                  if (module) {
-                    return module.source;
-                  }
-                }
-              }));
+              _t5 = stega.stegaEncode;
+              _t6 = selector;
+              _t7 = !enabled;
+              _context2.n = 15;
+              return withJsonValuesEntries(selector, function (path) {
+                var _modules$path;
+                return [(_modules$path = modules[path]) === null || _modules$path === void 0 ? void 0 : _modules$path.source];
+              });
             case 15:
-              return _context2.a(2, stega.stegaEncode(selector, {
-                disabled: !enabled
+              _t8 = _context2.v;
+              return _context2.a(2, _t5(_t6, {
+                disabled: _t7,
+                getModule: _t8
+              }));
+            case 16:
+              _t9 = stega.stegaEncode;
+              _t0 = selector;
+              _t1 = !enabled;
+              _context2.n = 17;
+              return withJsonValuesEntries(selector, function () {
+                return [];
+              });
+            case 17:
+              _t10 = _context2.v;
+              return _context2.a(2, _t9(_t0, {
+                disabled: _t1,
+                getModule: _t10
               }));
           }
         }, _callee2, null, [[9, 11], [5, 8], [1, 3]]);
@@ -268,12 +283,111 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valS
         return _ref2.apply(this, arguments);
       };
     }();
-    return exec()["catch"](function (err) {
-      console.error("Val: failed to fetch ", err);
-      return stega.stegaEncode(selector, {});
-    });
+    return exec()["catch"](/*#__PURE__*/function () {
+      var _ref3 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee3(err) {
+        var _t11, _t12, _t13;
+        return asyncToGenerator._regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
+            case 0:
+              console.error("Val: failed to fetch ", err);
+              _t11 = stega.stegaEncode;
+              _t12 = selector;
+              _context3.n = 1;
+              return withJsonValuesEntries(selector, function () {
+                return [];
+              })["catch"](function () {
+                return function () {
+                  return undefined;
+                };
+              });
+            case 1:
+              _t13 = _context3.v;
+              return _context3.a(2, _t11(_t12, {
+                getModule: _t13
+              }));
+          }
+        }, _callee3);
+      }));
+      return function (_x3) {
+        return _ref3.apply(this, arguments);
+      };
+    }());
   };
 };
+
+/**
+ * `getModule` for `stegaEncode`, with a whole `.jsonValues()` record's entries
+ * filled in: its own source holds only lazy markers, so the entries the draft
+ * does not have are imported from the bundle, together. Every other module,
+ * and a selector that is not such a record, reads the first of `sourcesOf`
+ * that has it, as before. `fetchValKey` is the reader for one entry.
+ */
+function withJsonValuesEntries(_x4, _x5) {
+  return _withJsonValuesEntries.apply(this, arguments);
+}
+function _withJsonValuesEntries() {
+  _withJsonValuesEntries = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee21(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  selector, sourcesOf) {
+    var first, plan, loaded, filled, _t22;
+    return asyncToGenerator._regenerator().w(function (_context21) {
+      while (1) switch (_context21.n) {
+        case 0:
+          first = function first(path) {
+            return sourcesOf(path).find(function (source) {
+              return source !== undefined;
+            });
+          };
+          plan = routeFromVal.jsonValuesRecordToFill(selector, sourcesOf);
+          if (!(plan === null)) {
+            _context21.n = 1;
+            break;
+          }
+          return _context21.a(2, first);
+        case 1:
+          _t22 = Object;
+          _context21.n = 2;
+          return Promise.all(plan.load.map(/*#__PURE__*/function () {
+            var _ref16 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee20(key) {
+              var thunk, _t19, _t20, _t21;
+              return asyncToGenerator._regenerator().w(function (_context20) {
+                while (1) switch (_context20.n) {
+                  case 0:
+                    thunk = routeFromVal.bundledJsonEntryImport(plan.module, key);
+                    _t19 = key;
+                    if (!thunk) {
+                      _context20.n = 2;
+                      break;
+                    }
+                    _context20.n = 1;
+                    return thunk();
+                  case 1:
+                    _t20 = _context20.v["default"];
+                    _context20.n = 3;
+                    break;
+                  case 2:
+                    _t20 = undefined;
+                  case 3:
+                    _t21 = _t20;
+                    return _context20.a(2, [_t19, _t21]);
+                }
+              }, _callee20);
+            }));
+            return function (_x18) {
+              return _ref16.apply(this, arguments);
+            };
+          }()));
+        case 2:
+          loaded = _t22.fromEntries.call(_t22, _context21.v);
+          filled = routeFromVal.fillJsonValuesRecord(plan.record, loaded);
+          return _context21.a(2, function (path) {
+            return path === plan.modulePath ? filled : first(path);
+          });
+      }
+    }, _callee21);
+  }));
+  return _withJsonValuesEntries.apply(this, arguments);
+}
 function getHost(headers) {
   var _headers$get;
   // TODO: does NextJs have a way to determine this?
@@ -317,15 +431,15 @@ function getHost(headers) {
 
 var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope) {
   return /*#__PURE__*/function () {
-    var _ref3 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee3(selector, params) {
-      var resolvedParams, valModule, path, schema, source, url, enabled, draft, content, fetchVal, val, route, _t6;
-      return asyncToGenerator._regenerator().w(function (_context3) {
-        while (1) switch (_context3.p = _context3.n) {
+    var _ref4 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee4(selector, params) {
+      var resolvedParams, valModule, path, schema, source, url, enabled, draft, content, fetchVal, val, route, _t15;
+      return asyncToGenerator._regenerator().w(function (_context4) {
+        while (1) switch (_context4.p = _context4.n) {
           case 0:
-            _context3.n = 1;
+            _context4.n = 1;
             return Promise.resolve(params);
           case 1:
-            resolvedParams = _context3.v;
+            resolvedParams = _context4.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 = core.Internal.resolveViewedModule(selector);
@@ -334,78 +448,78 @@ var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpo
             // entry's backing `*.val.json`, instead of eagerly resolving the whole
             // record via `fetchVal`.
             if (!routeFromVal.isJsonValuesRecordSchema(schema)) {
-              _context3.n = 11;
+              _context4.n = 11;
               break;
             }
             source = valModule && core.Internal.getSource(valModule);
             url = routeFromVal.getValRouteUrlFromVal(resolvedParams, "fetchValRoute", path, schema, source);
             if (url) {
-              _context3.n = 2;
+              _context4.n = 2;
               break;
             }
-            return _context3.a(2, null);
+            return _context4.a(2, null);
           case 2:
             enabled = false;
-            _context3.p = 3;
-            _context3.n = 4;
+            _context4.p = 3;
+            _context4.n = 4;
             return isEnabled();
           case 4:
-            enabled = _context3.v;
-            _context3.n = 6;
+            enabled = _context4.v;
+            _context4.n = 6;
             break;
           case 5:
-            _context3.p = 5;
-            _context3.v;
+            _context4.p = 5;
+            _context4.v;
           case 6:
             draft = {
               status: "unavailable"
             };
             if (!(enabled && path)) {
-              _context3.n = 8;
+              _context4.n = 8;
               break;
             }
             stega.SET_AUTO_TAG_JSX_ENABLED(true);
-            _context3.n = 7;
+            _context4.n = 7;
             return loadDraftJsonEntry(valServerPromise, getCookies, path, url);
           case 7:
-            draft = _context3.v;
+            draft = _context4.v;
           case 8:
-            _context3.n = 9;
+            _context4.n = 9;
             return resolveDraftOrCommittedEntry(draft, function () {
               return loadJsonEntryContent(source, url);
             });
           case 9:
-            content = _context3.v;
+            content = _context4.v;
             if (!(content === undefined)) {
-              _context3.n = 10;
+              _context4.n = 10;
               break;
             }
-            return _context3.a(2, null);
+            return _context4.a(2, null);
           case 10:
-            return _context3.a(2, stega.stegaEncode(content, {
+            return _context4.a(2, stega.stegaEncode(content, {
               disabled: !enabled,
               root: routeFromVal.getJsonEntryStegaRoot(valModule, url)
             }));
           case 11:
             fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope);
-            _t6 = valModule;
-            if (!_t6) {
-              _context3.n = 13;
+            _t15 = valModule;
+            if (!_t15) {
+              _context4.n = 13;
               break;
             }
-            _context3.n = 12;
+            _context4.n = 12;
             return fetchVal(valModule);
           case 12:
-            _t6 = _context3.v;
+            _t15 = _context4.v;
           case 13:
-            val = _t6;
+            val = _t15;
             route = routeFromVal.initValRouteFromVal(resolvedParams, "fetchValRoute", path, schema, val);
-            return _context3.a(2, route);
+            return _context4.a(2, route);
         }
-      }, _callee3, null, [[3, 5]]);
+      }, _callee4, null, [[3, 5]]);
     }));
-    return function (_x3, _x4) {
-      return _ref3.apply(this, arguments);
+    return function (_x6, _x7) {
+      return _ref4.apply(this, arguments);
     };
   }();
 };
@@ -415,7 +529,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(_x5, _x6) {
+function loadJsonEntryContent(_x8, _x9) {
   return _loadJsonEntryContent.apply(this, arguments);
 }
 /**
@@ -440,37 +554,37 @@ function loadJsonEntryContent(_x5, _x6) {
  * to the whole server type.
  */
 function _loadJsonEntryContent() {
-  _loadJsonEntryContent = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee19(source, key) {
+  _loadJsonEntryContent = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee22(source, key) {
     var marker, thunk;
-    return asyncToGenerator._regenerator().w(function (_context19) {
-      while (1) switch (_context19.n) {
+    return asyncToGenerator._regenerator().w(function (_context22) {
+      while (1) switch (_context22.n) {
         case 0:
           if (!(!source || routeFromVal._typeof(source) !== "object")) {
-            _context19.n = 1;
+            _context22.n = 1;
             break;
           }
-          return _context19.a(2, undefined);
+          return _context22.a(2, undefined);
         case 1:
           marker = source[key];
           if (core.Internal.isJson(marker)) {
-            _context19.n = 2;
+            _context22.n = 2;
             break;
           }
-          return _context19.a(2, undefined);
+          return _context22.a(2, undefined);
         case 2:
           thunk = core.Internal.getJsonImport(marker);
           if (thunk) {
-            _context19.n = 3;
+            _context22.n = 3;
             break;
           }
-          return _context19.a(2, undefined);
+          return _context22.a(2, undefined);
         case 3:
-          _context19.n = 4;
+          _context22.n = 4;
           return thunk();
         case 4:
-          return _context19.a(2, _context19.v["default"]);
+          return _context22.a(2, _context22.v["default"]);
       }
-    }, _callee19);
+    }, _callee22);
   }));
   return _loadJsonEntryContent.apply(this, arguments);
 }
@@ -483,33 +597,33 @@ function _loadJsonEntryContent() {
  * ask). Returning `undefined` means "render nothing"; both callers turn that into
  * a null/undefined result.
  */
-function resolveDraftOrCommittedEntry(_x7, _x8) {
+function resolveDraftOrCommittedEntry(_x0, _x1) {
   return _resolveDraftOrCommittedEntry.apply(this, arguments);
 }
 function _resolveDraftOrCommittedEntry() {
-  _resolveDraftOrCommittedEntry = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee20(draft, loadCommitted) {
-    return asyncToGenerator._regenerator().w(function (_context20) {
-      while (1) switch (_context20.n) {
+  _resolveDraftOrCommittedEntry = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee23(draft, loadCommitted) {
+    return asyncToGenerator._regenerator().w(function (_context23) {
+      while (1) switch (_context23.n) {
         case 0:
           if (!(draft.status === "content")) {
-            _context20.n = 1;
+            _context23.n = 1;
             break;
           }
-          return _context20.a(2, draft.content);
+          return _context23.a(2, draft.content);
         case 1:
           if (!(draft.status === "absent")) {
-            _context20.n = 2;
+            _context23.n = 2;
             break;
           }
-          return _context20.a(2, undefined);
+          return _context23.a(2, undefined);
         case 2:
-          return _context20.a(2, loadCommitted());
+          return _context23.a(2, loadCommitted());
       }
-    }, _callee20);
+    }, _callee23);
   }));
   return _resolveDraftOrCommittedEntry.apply(this, arguments);
 }
-function loadDraftJsonEntry(_x9, _x0, _x1, _x10) {
+function loadDraftJsonEntry(_x10, _x11, _x12, _x13) {
   return _loadDraftJsonEntry.apply(this, arguments);
 }
 /**
@@ -524,31 +638,31 @@ function loadDraftJsonEntry(_x9, _x0, _x1, _x10) {
  * the draft read yields nothing.
  */
 function _loadDraftJsonEntry() {
-  _loadDraftJsonEntry = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee21(valServerPromise, getCookies, moduleFilePath, key) {
+  _loadDraftJsonEntry = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee24(valServerPromise, getCookies, moduleFilePath, key) {
     var _cookies3;
     var cookies, valServer, res;
-    return asyncToGenerator._regenerator().w(function (_context21) {
-      while (1) switch (_context21.p = _context21.n) {
+    return asyncToGenerator._regenerator().w(function (_context24) {
+      while (1) switch (_context24.p = _context24.n) {
         case 0:
-          _context21.p = 0;
-          _context21.n = 1;
+          _context24.p = 0;
+          _context24.n = 1;
           return getCookies();
         case 1:
-          cookies = _context21.v;
-          _context21.n = 3;
+          cookies = _context24.v;
+          _context24.n = 3;
           break;
         case 2:
-          _context21.p = 2;
-          _context21.v;
-          return _context21.a(2, {
+          _context24.p = 2;
+          _context24.v;
+          return _context24.a(2, {
             status: "unavailable"
           });
         case 3:
-          _context21.n = 4;
+          _context24.n = 4;
           return valServerPromise;
         case 4:
-          valServer = _context21.v;
-          _context21.n = 5;
+          valServer = _context24.v;
+          _context24.n = 5;
           return valServer["/json"]["GET"]({
             query: {
               path: moduleFilePath,
@@ -571,60 +685,60 @@ function _loadDraftJsonEntry() {
             cookies: defineProperty._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies3 = cookies) === null || _cookies3 === void 0 || (_cookies3 = _cookies3.get(internal.VAL_SESSION_COOKIE)) === null || _cookies3 === void 0 ? void 0 : _cookies3.value)
           });
         case 5:
-          res = _context21.v;
+          res = _context24.v;
           if (!(res.status === 200 && "content" in res.json)) {
-            _context21.n = 6;
+            _context24.n = 6;
             break;
           }
-          return _context21.a(2, {
+          return _context24.a(2, {
             status: "content",
             content: res.json.content
           });
         case 6:
           if (!(res.status === 401)) {
-            _context21.n = 7;
+            _context24.n = 7;
             break;
           }
           console.warn("Val: authentication error: ", res.json.message);
-          return _context21.a(2, {
+          return _context24.a(2, {
             status: "unavailable"
           });
         case 7:
           if (!(res.status === 404)) {
-            _context21.n = 8;
+            _context24.n = 8;
             break;
           }
-          return _context21.a(2, {
+          return _context24.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 _context21.a(2, {
+          return _context24.a(2, {
             status: "unavailable"
           });
       }
-    }, _callee21, null, [[0, 2]]);
+    }, _callee24, null, [[0, 2]]);
   }));
   return _loadDraftJsonEntry.apply(this, arguments);
 }
 var initFetchValKeyStega = function initFetchValKeyStega(valServerPromise, isEnabled, getCookies) {
   return /*#__PURE__*/function () {
-    var _ref4 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee4(selector, key) {
+    var _ref5 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee5(selector, key) {
       var enabled, valModule, source, moduleFilePath, draft, content;
-      return asyncToGenerator._regenerator().w(function (_context4) {
-        while (1) switch (_context4.p = _context4.n) {
+      return asyncToGenerator._regenerator().w(function (_context5) {
+        while (1) switch (_context5.p = _context5.n) {
           case 0:
             enabled = false;
-            _context4.p = 1;
-            _context4.n = 2;
+            _context5.p = 1;
+            _context5.n = 2;
             return isEnabled();
           case 2:
-            enabled = _context4.v;
-            _context4.n = 4;
+            enabled = _context5.v;
+            _context5.n = 4;
             break;
           case 3:
-            _context4.p = 3;
-            _context4.v;
+            _context5.p = 3;
+            _context5.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`.
@@ -635,84 +749,84 @@ var initFetchValKeyStega = function initFetchValKeyStega(valServerPromise, isEna
               status: "unavailable"
             };
             if (!(enabled && moduleFilePath)) {
-              _context4.n = 6;
+              _context5.n = 6;
               break;
             }
             stega.SET_AUTO_TAG_JSX_ENABLED(true);
-            _context4.n = 5;
+            _context5.n = 5;
             return loadDraftJsonEntry(valServerPromise, getCookies, moduleFilePath, key);
           case 5:
-            draft = _context4.v;
+            draft = _context5.v;
           case 6:
-            _context4.n = 7;
+            _context5.n = 7;
             return resolveDraftOrCommittedEntry(draft, function () {
               return loadJsonEntryContent(source, key);
             });
           case 7:
-            content = _context4.v;
+            content = _context5.v;
             if (!(content === undefined)) {
-              _context4.n = 8;
+              _context5.n = 8;
               break;
             }
-            return _context4.a(2, undefined);
+            return _context5.a(2, undefined);
           case 8:
-            return _context4.a(2, stega.stegaEncode(content, {
+            return _context5.a(2, stega.stegaEncode(content, {
               disabled: !enabled,
               root: routeFromVal.getJsonEntryStegaRoot(valModule, key)
             }));
         }
-      }, _callee4, null, [[1, 3]]);
+      }, _callee5, null, [[1, 3]]);
     }));
-    return function (_x11, _x12) {
-      return _ref4.apply(this, arguments);
+    return function (_x14, _x15) {
+      return _ref5.apply(this, arguments);
     };
   }();
 };
 var initFetchValRouteUrl = function initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope) {
   return /*#__PURE__*/function () {
-    var _ref5 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee5(selector, params) {
-      var fetchVal, resolvedParams, valModule, path, schema, val, route, _t8, _t9;
-      return asyncToGenerator._regenerator().w(function (_context5) {
-        while (1) switch (_context5.n) {
+    var _ref6 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee6(selector, params) {
+      var fetchVal, resolvedParams, valModule, path, schema, val, route, _t17, _t18;
+      return asyncToGenerator._regenerator().w(function (_context6) {
+        while (1) switch (_context6.n) {
           case 0:
             fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies, getDraftSourcesScope);
             if (!(params === undefined)) {
-              _context5.n = 1;
+              _context6.n = 1;
               break;
             }
-            _t8 = undefined;
-            _context5.n = 3;
+            _t17 = undefined;
+            _context6.n = 3;
             break;
           case 1:
-            _context5.n = 2;
+            _context6.n = 2;
             return Promise.resolve(params);
           case 2:
-            _t8 = _context5.v;
+            _t17 = _context6.v;
           case 3:
-            resolvedParams = _t8;
+            resolvedParams = _t17;
             // 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 = core.Internal.resolveViewedModule(selector);
             path = valModule && core.Internal.getValPath(valModule);
             schema = valModule && core.Internal.getSchema(valModule);
-            _t9 = valModule;
-            if (!_t9) {
-              _context5.n = 5;
+            _t18 = valModule;
+            if (!_t18) {
+              _context6.n = 5;
               break;
             }
-            _context5.n = 4;
+            _context6.n = 4;
             return fetchVal(valModule);
           case 4:
-            _t9 = _context5.v;
+            _t18 = _context6.v;
           case 5:
-            val = _t9;
+            val = _t18;
             route = routeFromVal.getValRouteUrlFromVal(resolvedParams, "fetchValRouteUrl", path, schema, val);
-            return _context5.a(2, route);
+            return _context6.a(2, route);
         }
-      }, _callee5);
+      }, _callee6);
     }));
-    return function (_x13, _x14) {
-      return _ref5.apply(this, arguments);
+    return function (_x16, _x17) {
+      return _ref6.apply(this, arguments);
     };
   }();
 };
@@ -734,19 +848,6 @@ function initValRsc(config, valModules, rscNextConfig) {
     }
   }, config), config, {
     isEnabled: function isEnabled() {
-      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee6() {
-        return asyncToGenerator._regenerator().w(function (_context6) {
-          while (1) switch (_context6.n) {
-            case 0:
-              _context6.n = 1;
-              return rscNextConfig.draftMode();
-            case 1:
-              return _context6.a(2, _context6.v.isEnabled);
-          }
-        }, _callee6);
-      }))();
-    },
-    onEnable: function onEnable() {
       return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee7() {
         return asyncToGenerator._regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
@@ -754,14 +855,12 @@ function initValRsc(config, valModules, rscNextConfig) {
               _context7.n = 1;
               return rscNextConfig.draftMode();
             case 1:
-              _context7.v.enable();
-            case 2:
-              return _context7.a(2);
+              return _context7.a(2, _context7.v.isEnabled);
           }
         }, _callee7);
       }))();
     },
-    onDisable: function onDisable() {
+    onEnable: function onEnable() {
       return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee8() {
         return asyncToGenerator._regenerator().w(function (_context8) {
           while (1) switch (_context8.n) {
@@ -769,35 +868,40 @@ function initValRsc(config, valModules, rscNextConfig) {
               _context8.n = 1;
               return rscNextConfig.draftMode();
             case 1:
-              _context8.v.disable();
+              _context8.v.enable();
             case 2:
               return _context8.a(2);
           }
         }, _callee8);
       }))();
+    },
+    onDisable: function onDisable() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee9() {
+        return asyncToGenerator._regenerator().w(function (_context9) {
+          while (1) switch (_context9.n) {
+            case 0:
+              _context9.n = 1;
+              return rscNextConfig.draftMode();
+            case 1:
+              _context9.v.disable();
+            case 2:
+              return _context9.a(2);
+          }
+        }, _callee9);
+      }))();
     }
   });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee9() {
-      return asyncToGenerator._regenerator().w(function (_context9) {
-        while (1) switch (_context9.n) {
-          case 0:
-            _context9.n = 1;
-            return rscNextConfig.draftMode();
-          case 1:
-            return _context9.a(2, _context9.v.isEnabled);
-        }
-      }, _callee9);
-    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee0() {
+    valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee0() {
       return asyncToGenerator._regenerator().w(function (_context0) {
         while (1) switch (_context0.n) {
           case 0:
             _context0.n = 1;
-            return rscNextConfig.headers();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context0.a(2, _context0.v);
+            return _context0.a(2, _context0.v.isEnabled);
         }
       }, _callee0);
     })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee1() {
@@ -805,51 +909,51 @@ function initValRsc(config, valModules, rscNextConfig) {
         while (1) switch (_context1.n) {
           case 0:
             _context1.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.headers();
           case 1:
             return _context1.a(2, _context1.v);
         }
       }, _callee1);
-    })), draftSourcesScope),
-    fetchValKeyStega: initFetchValKeyStega(valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee10() {
+    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee10() {
       return asyncToGenerator._regenerator().w(function (_context10) {
         while (1) switch (_context10.n) {
           case 0:
             _context10.n = 1;
-            return rscNextConfig.draftMode();
+            return rscNextConfig.cookies();
           case 1:
-            return _context10.a(2, _context10.v.isEnabled);
+            return _context10.a(2, _context10.v);
         }
       }, _callee10);
-    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee11() {
+    })), draftSourcesScope),
+    fetchValKeyStega: initFetchValKeyStega(valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee11() {
       return asyncToGenerator._regenerator().w(function (_context11) {
         while (1) switch (_context11.n) {
           case 0:
             _context11.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context11.a(2, _context11.v);
+            return _context11.a(2, _context11.v.isEnabled);
         }
       }, _callee11);
-    }))),
-    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee12() {
+    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee12() {
       return asyncToGenerator._regenerator().w(function (_context12) {
         while (1) switch (_context12.n) {
           case 0:
             _context12.n = 1;
-            return rscNextConfig.draftMode();
+            return rscNextConfig.cookies();
           case 1:
-            return _context12.a(2, _context12.v.isEnabled);
+            return _context12.a(2, _context12.v);
         }
       }, _callee12);
-    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee13() {
+    }))),
+    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee13() {
       return asyncToGenerator._regenerator().w(function (_context13) {
         while (1) switch (_context13.n) {
           case 0:
             _context13.n = 1;
-            return rscNextConfig.headers();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context13.a(2, _context13.v);
+            return _context13.a(2, _context13.v.isEnabled);
         }
       }, _callee13);
     })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee14() {
@@ -857,30 +961,30 @@ function initValRsc(config, valModules, rscNextConfig) {
         while (1) switch (_context14.n) {
           case 0:
             _context14.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.headers();
           case 1:
             return _context14.a(2, _context14.v);
         }
       }, _callee14);
-    })), draftSourcesScope),
-    fetchValRouteUrl: initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee15() {
+    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee15() {
       return asyncToGenerator._regenerator().w(function (_context15) {
         while (1) switch (_context15.n) {
           case 0:
             _context15.n = 1;
-            return rscNextConfig.draftMode();
+            return rscNextConfig.cookies();
           case 1:
-            return _context15.a(2, _context15.v.isEnabled);
+            return _context15.a(2, _context15.v);
         }
       }, _callee15);
-    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee16() {
+    })), draftSourcesScope),
+    fetchValRouteUrl: initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee16() {
       return asyncToGenerator._regenerator().w(function (_context16) {
         while (1) switch (_context16.n) {
           case 0:
             _context16.n = 1;
-            return rscNextConfig.headers();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context16.a(2, _context16.v);
+            return _context16.a(2, _context16.v.isEnabled);
         }
       }, _callee16);
     })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee17() {
@@ -888,11 +992,21 @@ function initValRsc(config, valModules, rscNextConfig) {
         while (1) switch (_context17.n) {
           case 0:
             _context17.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.headers();
           case 1:
             return _context17.a(2, _context17.v);
         }
       }, _callee17);
+    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regenerator().m(function _callee18() {
+      return asyncToGenerator._regenerator().w(function (_context18) {
+        while (1) switch (_context18.n) {
+          case 0:
+            _context18.n = 1;
+            return rscNextConfig.cookies();
+          case 1:
+            return _context18.a(2, _context18.v);
+        }
+      }, _callee18);
     })), draftSourcesScope)
   };
 }