@valbuild/next 0.99.1 → 0.101.0

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

@@ -1,4 +1,5 @@
 import 'server-only';
+import { i as initValRouteFromVal, g as getJsonEntryStegaRoot, a as isJsonValuesRecordSchema, b as getValRouteUrlFromVal, _ as _typeof } from '../../dist/routeFromVal-263eec96.esm.js';
 import { _ as _objectSpread2 } from '../../dist/objectSpread2-60d1bd93.esm.js';
 import { _ as _asyncToGenerator, V as VERSION, a as _regenerator } from '../../dist/version-4d7b692c.esm.js';
 import { _ as _defineProperty } from '../../dist/defineProperty-cca5affa.esm.js';
@@ -6,7 +7,6 @@ import { SET_RSC, stegaEncode, SET_AUTO_TAG_JSX_ENABLED } from '@valbuild/react/
 import { Internal } from '@valbuild/core';
 import { VAL_SESSION_COOKIE } from '@valbuild/shared/internal';
 import { createValServer } from '@valbuild/server';
-import { i as initValRouteFromVal, g as getValRouteUrlFromVal } from '../../dist/routeFromVal-8855a5cc.esm.js';
 import '../../dist/createForOfIteratorHelper-5758a730.esm.js';
 import '../../dist/unsupportedIterableToArray-5baabfdc.esm.js';
 import '../../dist/slicedToArray-aa291011.esm.js';
@@ -178,80 +178,383 @@ function getHost(headers) {
 var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
   return /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(selector, params) {
-      var fetchVal, resolvedParams, path, schema, val, route, _t4;
+      var resolvedParams, path, schema, source, url, enabled, draft, content, fetchVal, val, route, _t5;
       return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.n) {
+        while (1) switch (_context2.p = _context2.n) {
           case 0:
-            fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
             _context2.n = 1;
             return Promise.resolve(params);
           case 1:
             resolvedParams = _context2.v;
             path = selector && Internal.getValPath(selector);
-            schema = selector && Internal.getSchema(selector);
-            _t4 = selector;
-            if (!_t4) {
-              _context2.n = 3;
+            schema = selector && Internal.getSchema(selector); // `.jsonValues()` router: map params → the entry key and load ONLY that
+            // entry's backing `*.val.json`, instead of eagerly resolving the whole
+            // record via `fetchVal`.
+            if (!isJsonValuesRecordSchema(schema)) {
+              _context2.n = 11;
               break;
             }
-            _context2.n = 2;
-            return fetchVal(selector);
+            source = selector && Internal.getSource(selector);
+            url = getValRouteUrlFromVal(resolvedParams, "fetchValRoute", path, schema, source);
+            if (url) {
+              _context2.n = 2;
+              break;
+            }
+            return _context2.a(2, null);
           case 2:
-            _t4 = _context2.v;
-          case 3:
-            val = _t4;
+            enabled = false;
+            _context2.p = 3;
+            _context2.n = 4;
+            return isEnabled();
+          case 4:
+            enabled = _context2.v;
+            _context2.n = 6;
+            break;
+          case 5:
+            _context2.p = 5;
+            _context2.v;
+          case 6:
+            draft = {
+              status: "unavailable"
+            };
+            if (!(enabled && path)) {
+              _context2.n = 8;
+              break;
+            }
+            SET_AUTO_TAG_JSX_ENABLED(true);
+            _context2.n = 7;
+            return loadDraftJsonEntry(valServerPromise, getCookies, path, url);
+          case 7:
+            draft = _context2.v;
+          case 8:
+            _context2.n = 9;
+            return resolveDraftOrCommittedEntry(draft, function () {
+              return loadJsonEntryContent(source, url);
+            });
+          case 9:
+            content = _context2.v;
+            if (!(content === undefined)) {
+              _context2.n = 10;
+              break;
+            }
+            return _context2.a(2, null);
+          case 10:
+            return _context2.a(2, stegaEncode(content, {
+              disabled: !enabled,
+              root: getJsonEntryStegaRoot(selector, url)
+            }));
+          case 11:
+            fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
+            _t5 = selector;
+            if (!_t5) {
+              _context2.n = 13;
+              break;
+            }
+            _context2.n = 12;
+            return fetchVal(selector);
+          case 12:
+            _t5 = _context2.v;
+          case 13:
+            val = _t5;
             route = initValRouteFromVal(resolvedParams, "fetchValRoute", path, schema, val);
             return _context2.a(2, route);
         }
-      }, _callee2);
+      }, _callee2, null, [[3, 5]]);
     }));
     return function (_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
 };
-var initFetchValRouteUrl = function initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
+
+/**
+ * Resolves a single `.jsonValues()` entry's content by key from a module's local
+ * 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) {
+  return _loadJsonEntryContent.apply(this, arguments);
+}
+/**
+ * Loads a single `.jsonValues()` entry's DRAFT content via the in-process
+ * `/json` endpoint (which replays pending patches). Returns `undefined` when the
+ * entry has no draft content to serve — the caller then falls back to the
+ * locally-bundled committed content.
+ */
+/**
+ * What the draft state says about an entry.
+ *
+ * The three cases have to stay distinct: `absent` is an ANSWER — the entry is not
+ * there in the draft state, e.g. a pending patch removed it — while `unavailable`
+ * means we could not ask. Collapsing them into `undefined` is what made a
+ * draft-deleted entry keep rendering its committed content: the caller could not
+ * tell "it is gone" from "ask the committed source instead".
+ */
+/**
+ * The slice of `ValServer` the single-entry readers actually use. Narrower than
+ * `ValServer` on purpose: it says what the dependency IS, and it lets a test
+ * drive these readers with a one-route fake instead of casting a partial object
+ * to the whole server type.
+ */
+function _loadJsonEntryContent() {
+  _loadJsonEntryContent = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(source, key) {
+    var marker, thunk;
+    return _regenerator().w(function (_context17) {
+      while (1) switch (_context17.n) {
+        case 0:
+          if (!(!source || _typeof(source) !== "object")) {
+            _context17.n = 1;
+            break;
+          }
+          return _context17.a(2, undefined);
+        case 1:
+          marker = source[key];
+          if (Internal.isJson(marker)) {
+            _context17.n = 2;
+            break;
+          }
+          return _context17.a(2, undefined);
+        case 2:
+          thunk = Internal.getJsonImport(marker);
+          if (thunk) {
+            _context17.n = 3;
+            break;
+          }
+          return _context17.a(2, undefined);
+        case 3:
+          _context17.n = 4;
+          return thunk();
+        case 4:
+          return _context17.a(2, _context17.v["default"]);
+      }
+    }, _callee17);
+  }));
+  return _loadJsonEntryContent.apply(this, arguments);
+}
+/**
+ * Picks the content a draft-aware single-entry read should render.
+ *
+ * The rule the two callers share: the draft state WINS when it has an answer —
+ * including the answer "this entry is gone" — and the committed content is used
+ * only when there is no draft answer to be had (Val disabled, or we could not
+ * ask). Returning `undefined` means "render nothing"; both callers turn that into
+ * a null/undefined result.
+ */
+function resolveDraftOrCommittedEntry(_x5, _x6) {
+  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) {
+        case 0:
+          if (!(draft.status === "content")) {
+            _context18.n = 1;
+            break;
+          }
+          return _context18.a(2, draft.content);
+        case 1:
+          if (!(draft.status === "absent")) {
+            _context18.n = 2;
+            break;
+          }
+          return _context18.a(2, undefined);
+        case 2:
+          return _context18.a(2, loadCommitted());
+      }
+    }, _callee18);
+  }));
+  return _resolveDraftOrCommittedEntry.apply(this, arguments);
+}
+function loadDraftJsonEntry(_x7, _x8, _x9, _x0) {
+  return _loadDraftJsonEntry.apply(this, arguments);
+} // The (loosened) content type a single `.jsonValues()` entry resolves to.
+function _loadDraftJsonEntry() {
+  _loadDraftJsonEntry = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(valServerPromise, getCookies, moduleFilePath, key) {
+    var _cookies3;
+    var cookies, valServer, res;
+    return _regenerator().w(function (_context19) {
+      while (1) switch (_context19.p = _context19.n) {
+        case 0:
+          _context19.p = 0;
+          _context19.n = 1;
+          return getCookies();
+        case 1:
+          cookies = _context19.v;
+          _context19.n = 3;
+          break;
+        case 2:
+          _context19.p = 2;
+          _context19.v;
+          return _context19.a(2, {
+            status: "unavailable"
+          });
+        case 3:
+          _context19.n = 4;
+          return valServerPromise;
+        case 4:
+          valServer = _context19.v;
+          _context19.n = 5;
+          return valServer["/json"]["GET"]({
+            query: {
+              path: moduleFilePath,
+              key: key,
+              keys: undefined,
+              // single-entry shape
+              offset: undefined,
+              limit: undefined,
+              apply_patches: true
+            },
+            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;
+          if (!(res.status === 200 && "content" in res.json)) {
+            _context19.n = 6;
+            break;
+          }
+          return _context19.a(2, {
+            status: "content",
+            content: res.json.content
+          });
+        case 6:
+          if (!(res.status === 401)) {
+            _context19.n = 7;
+            break;
+          }
+          console.warn("Val: authentication error: ", res.json.message);
+          return _context19.a(2, {
+            status: "unavailable"
+          });
+        case 7:
+          if (!(res.status === 404)) {
+            _context19.n = 8;
+            break;
+          }
+          return _context19.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, {
+            status: "unavailable"
+          });
+      }
+    }, _callee19, null, [[0, 2]]);
+  }));
+  return _loadDraftJsonEntry.apply(this, arguments);
+}
+/**
+ * Resolves ONE `.jsonValues()` entry by key, loading only that entry instead of
+ * the whole record — the runtime-scaling counterpart to the eager `fetchVal`.
+ *
+ * Production (Val disabled): resolves the entry's lazy import thunk from the
+ * locally-bundled module. One dynamic import, no server round-trip.
+ *
+ * Enabled (draft mode): reads the entry through `/json`, which replays pending
+ * patches, so uncommitted Studio edits show up. Falls back to the local thunk if
+ * the draft read yields nothing.
+ */
+var initFetchValKeyStega = function initFetchValKeyStega(valServerPromise, isEnabled, getCookies) {
   return /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(selector, params) {
-      var fetchVal, resolvedParams, path, schema, val, route, _t5, _t6;
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(selector, key) {
+      var enabled, source, moduleFilePath, draft, content;
       return _regenerator().w(function (_context3) {
-        while (1) switch (_context3.n) {
+        while (1) switch (_context3.p = _context3.n) {
+          case 0:
+            enabled = false;
+            _context3.p = 1;
+            _context3.n = 2;
+            return isEnabled();
+          case 2:
+            enabled = _context3.v;
+            _context3.n = 4;
+            break;
+          case 3:
+            _context3.p = 3;
+            _context3.v;
+          case 4:
+            source = selector && Internal.getSource(selector);
+            moduleFilePath = selector && Internal.getValPath(selector);
+            draft = {
+              status: "unavailable"
+            };
+            if (!(enabled && moduleFilePath)) {
+              _context3.n = 6;
+              break;
+            }
+            SET_AUTO_TAG_JSX_ENABLED(true);
+            _context3.n = 5;
+            return loadDraftJsonEntry(valServerPromise, getCookies, moduleFilePath, key);
+          case 5:
+            draft = _context3.v;
+          case 6:
+            _context3.n = 7;
+            return resolveDraftOrCommittedEntry(draft, function () {
+              return loadJsonEntryContent(source, key);
+            });
+          case 7:
+            content = _context3.v;
+            if (!(content === undefined)) {
+              _context3.n = 8;
+              break;
+            }
+            return _context3.a(2, undefined);
+          case 8:
+            return _context3.a(2, stegaEncode(content, {
+              disabled: !enabled,
+              root: getJsonEntryStegaRoot(selector, key)
+            }));
+        }
+      }, _callee3, null, [[1, 3]]);
+    }));
+    return function (_x1, _x10) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+};
+var initFetchValRouteUrl = function initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
+  return /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(selector, params) {
+      var fetchVal, resolvedParams, path, schema, val, route, _t7, _t8;
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
             if (!(params === undefined)) {
-              _context3.n = 1;
+              _context4.n = 1;
               break;
             }
-            _t5 = undefined;
-            _context3.n = 3;
+            _t7 = undefined;
+            _context4.n = 3;
             break;
           case 1:
-            _context3.n = 2;
+            _context4.n = 2;
             return Promise.resolve(params);
           case 2:
-            _t5 = _context3.v;
+            _t7 = _context4.v;
           case 3:
-            resolvedParams = _t5;
+            resolvedParams = _t7;
             path = selector && Internal.getValPath(selector);
             schema = selector && Internal.getSchema(selector);
-            _t6 = selector;
-            if (!_t6) {
-              _context3.n = 5;
+            _t8 = selector;
+            if (!_t8) {
+              _context4.n = 5;
               break;
             }
-            _context3.n = 4;
+            _context4.n = 4;
             return fetchVal(selector);
           case 4:
-            _t6 = _context3.v;
+            _t8 = _context4.v;
           case 5:
-            val = _t6;
+            val = _t8;
             route = getValRouteUrlFromVal(resolvedParams, "fetchValRouteUrl", path, schema, val);
-            return _context3.a(2, route);
+            return _context4.a(2, route);
         }
-      }, _callee3);
+      }, _callee4);
     }));
-    return function (_x3, _x4) {
-      return _ref3.apply(this, arguments);
+    return function (_x11, _x12) {
+      return _ref4.apply(this, arguments);
     };
   }();
 };
@@ -272,19 +575,6 @@ function initValRsc(config, valModules, rscNextConfig) {
     }
   }, config), config, {
     isEnabled: function isEnabled() {
-      return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
-            case 0:
-              _context4.n = 1;
-              return rscNextConfig.draftMode();
-            case 1:
-              return _context4.a(2, _context4.v.isEnabled);
-          }
-        }, _callee4);
-      }))();
-    },
-    onEnable: function onEnable() {
       return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
         return _regenerator().w(function (_context5) {
           while (1) switch (_context5.n) {
@@ -292,14 +582,12 @@ function initValRsc(config, valModules, rscNextConfig) {
               _context5.n = 1;
               return rscNextConfig.draftMode();
             case 1:
-              _context5.v.enable();
-            case 2:
-              return _context5.a(2);
+              return _context5.a(2, _context5.v.isEnabled);
           }
         }, _callee5);
       }))();
     },
-    onDisable: function onDisable() {
+    onEnable: function onEnable() {
       return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.n) {
@@ -307,35 +595,40 @@ function initValRsc(config, valModules, rscNextConfig) {
               _context6.n = 1;
               return rscNextConfig.draftMode();
             case 1:
-              _context6.v.disable();
+              _context6.v.enable();
             case 2:
               return _context6.a(2);
           }
         }, _callee6);
       }))();
+    },
+    onDisable: function onDisable() {
+      return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.n) {
+            case 0:
+              _context7.n = 1;
+              return rscNextConfig.draftMode();
+            case 1:
+              _context7.v.disable();
+            case 2:
+              return _context7.a(2);
+          }
+        }, _callee7);
+      }))();
     }
   });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
-      return _regenerator().w(function (_context7) {
-        while (1) switch (_context7.n) {
-          case 0:
-            _context7.n = 1;
-            return rscNextConfig.draftMode();
-          case 1:
-            return _context7.a(2, _context7.v.isEnabled);
-        }
-      }, _callee7);
-    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
+    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.headers();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context8.a(2, _context8.v);
+            return _context8.a(2, _context8.v.isEnabled);
         }
       }, _callee8);
     })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
@@ -343,30 +636,30 @@ function initValRsc(config, valModules, rscNextConfig) {
         while (1) switch (_context9.n) {
           case 0:
             _context9.n = 1;
-            return rscNextConfig.cookies();
+            return rscNextConfig.headers();
           case 1:
             return _context9.a(2, _context9.v);
         }
       }, _callee9);
-    }))),
-    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
       return _regenerator().w(function (_context0) {
         while (1) switch (_context0.n) {
           case 0:
             _context0.n = 1;
-            return rscNextConfig.draftMode();
+            return rscNextConfig.cookies();
           case 1:
-            return _context0.a(2, _context0.v.isEnabled);
+            return _context0.a(2, _context0.v);
         }
       }, _callee0);
-    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+    }))),
+    fetchValKeyStega: initFetchValKeyStega(valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
       return _regenerator().w(function (_context1) {
         while (1) switch (_context1.n) {
           case 0:
             _context1.n = 1;
-            return rscNextConfig.headers();
+            return rscNextConfig.draftMode();
           case 1:
-            return _context1.a(2, _context1.v);
+            return _context1.a(2, _context1.v.isEnabled);
         }
       }, _callee1);
     })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
@@ -380,7 +673,7 @@ function initValRsc(config, valModules, rscNextConfig) {
         }
       }, _callee10);
     }))),
-    fetchValRouteUrl: initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
+    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
       return _regenerator().w(function (_context11) {
         while (1) switch (_context11.n) {
           case 0:
@@ -410,6 +703,37 @@ function initValRsc(config, valModules, rscNextConfig) {
             return _context13.a(2, _context13.v);
         }
       }, _callee13);
+    }))),
+    fetchValRouteUrl: initFetchValRouteUrl(config, valApiEndpoints, valServerPromise, /*#__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();
+          case 1:
+            return _context14.a(2, _context14.v.isEnabled);
+        }
+      }, _callee14);
+    })), /*#__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();
+          case 1:
+            return _context15.a(2, _context15.v);
+        }
+      }, _callee15);
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
+      return _regenerator().w(function (_context16) {
+        while (1) switch (_context16.n) {
+          case 0:
+            _context16.n = 1;
+            return rscNextConfig.cookies();
+          case 1:
+            return _context16.a(2, _context16.v);
+        }
+      }, _callee16);
     })))
   };
 }