@valbuild/next 0.34.0 → 0.36.0

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

@@ -0,0 +1,159 @@
+import 'server-only';
+import { getModuleIds, stegaEncode } from '@valbuild/react/stega';
+import { ValApi, Internal } from '@valbuild/core';
+import { result } from '@valbuild/core/fp';
+
+function optimizeTreePath(ids) {
+  return findUpperDirectory(ids);
+}
+function findUpperDirectory(paths) {
+  if (paths.length === 0) {
+    return null;
+  }
+  var pathSegments = paths[0].split("/");
+  for (var i = 1; i < paths.length; i++) {
+    var currentPathSegments = paths[i].split("/");
+    // Find the minimum length of the two paths
+    var minLength = Math.min(pathSegments.length, currentPathSegments.length);
+
+    // Iterate through the segments and find the common prefix
+    var commonPrefix = "";
+    for (var j = 0; j < minLength; j++) {
+      if (pathSegments[j] === currentPathSegments[j]) {
+        commonPrefix += pathSegments[j] + "/";
+      } else {
+        break;
+      }
+    }
+    pathSegments = commonPrefix.split("/").slice(0, -1);
+
+    // If there is no common prefix, return /
+    if (pathSegments.length <= 1) {
+      return "/";
+    }
+  }
+  var upperDirectory = pathSegments.join("/");
+  return upperDirectory;
+}
+
+var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
+  return function (selector) {
+    var enabled = false;
+    try {
+      enabled = isEnabled();
+    } catch (err) {
+      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.", err);
+    }
+    if (enabled) {
+      var headers;
+      try {
+        headers = getHeaders();
+        if (!(headers instanceof Headers)) {
+          throw new Error("Expected an instance of Headers. Check Val rsc config.");
+        }
+      } catch (err) {
+        console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", err);
+        headers = null;
+      }
+      var cookies;
+      try {
+        cookies = getCookies();
+      } catch (err) {
+        console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
+        cookies = null;
+      }
+      var host = headers && getHost(headers);
+      if (host && cookies && isProxyMode(config)) {
+        var _optimizeTreePath;
+        var api = new ValApi("".concat(host).concat(valApiEndpoints));
+        var valModuleIds = getModuleIds(selector);
+        return api.getTree({
+          // TODO: get tree should probably have a list of ids instead
+          treePath: (_optimizeTreePath = optimizeTreePath(valModuleIds)) !== null && _optimizeTreePath !== void 0 ? _optimizeTreePath : undefined,
+          patch: true,
+          includeSource: true,
+          headers: getValAuthHeaders(cookies)
+        }).then(function (res) {
+          if (result.isOk(res)) {
+            var modules = res.value.modules;
+            return stegaEncode(selector, {
+              disabled: !enabled,
+              getModule: function getModule(moduleId) {
+                var module = modules[moduleId];
+                if (module) {
+                  return module.source;
+                }
+              }
+            });
+          } else {
+            console.error("Val: could not fetch modules", res.error);
+            throw Error(JSON.stringify(res.error, null, 2));
+          }
+        })["catch"](function (err) {
+          console.error("Val: failed while fetching modules", err);
+          if (process.env.NODE_ENV === "development") {
+            throw Error('You are running in "proxy" mode in development and Val could not fetch remote / proxy data. This is likely due to a misconfiguration. Check the console for more details.');
+          }
+          return stegaEncode(selector, {});
+        });
+      }
+    }
+    return stegaEncode(selector, {
+      disabled: !enabled
+    });
+  };
+};
+function getHost(headers) {
+  var _headers$get;
+  // TODO: does NextJs have a way to determine this?
+  var host = headers.get("host");
+  var proto = "https";
+  if (headers.get("x-forwarded-proto") === "http") {
+    proto = "http";
+  } else if ((_headers$get = headers.get("referer")) !== null && _headers$get !== void 0 && _headers$get.startsWith("http://")) {
+    proto = "http";
+  } else if (host !== null && host !== void 0 && host.startsWith("localhost")) {
+    proto = "http";
+  }
+  if (host && proto) {
+    return "".concat(proto, "://").concat(host);
+  }
+  return null;
+}
+function isProxyMode(opts) {
+  var maybeApiKey = opts.apiKey || process.env.VAL_API_KEY;
+  var maybeValSecret = opts.valSecret || process.env.VAL_SECRET;
+  var isProxyMode = opts.mode === "proxy" || opts.mode === undefined && (maybeApiKey || maybeValSecret);
+  return !!isProxyMode;
+}
+function getValAuthHeaders(cookies) {
+  try {
+    var session = cookies.get(Internal.VAL_SESSION_COOKIE);
+    if (session) {
+      return {
+        Cookie: "".concat(Internal.VAL_SESSION_COOKIE, "=").concat(encodeURIComponent(session.value))
+      };
+    }
+    return {};
+  } catch (err) {
+    console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
+    return {};
+  }
+}
+var valApiEndpoints = "/api/val";
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function initValRsc(config, rscNextConfig) {
+  return {
+    fetchValStega: initFetchValStega(config, valApiEndpoints,
+    // TODO: get from config
+    function () {
+      return rscNextConfig.draftMode().isEnabled;
+    }, function () {
+      return rscNextConfig.headers();
+    }, function () {
+      return rscNextConfig.cookies();
+    })
+  };
+}
+
+export { initValRsc };

package/rsc/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/valbuild-next-rsc.cjs.js",
+  "module": "dist/valbuild-next-rsc.esm.js"
+}

package/server/dist/valbuild-next-server.cjs.dev.js

@@ -3,28 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
-var stega = require('@valbuild/react/stega');
-var core = require('@valbuild/core');
-var fp = require('@valbuild/core/fp');
-var headers = require('next/headers');
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
+var slicedToArray = require('../../dist/slicedToArray-1471796d.cjs.dev.js');
+var server = require('@valbuild/server');
+var server$1 = require('next/server');
 
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
@@ -359,121 +340,85 @@ function _asyncToGenerator(fn) {
   };
 }
 
-var valApiEndpoints = "/api/val"; // TODO: get from config
-function fetchVal(selector) {
-  var enabled = safeDraftModeEnabled();
-  if (enabled) {
-    getHost().then(function (host) {
-      //
-      if (host) {
-        // TODO: Use the content.val.build endpoints directly
-        var api = new core.ValApi("".concat(host).concat(valApiEndpoints));
-        // Optimize: only fetch the modules needed, also cache by module id and revalidate when patched
-        // const valModuleIds = getModuleIds(selector);
-        return api.getModules({
-          patch: true,
-          includeSource: true,
-          headers: getValHeaders()
-        }).then(function (res) {
-          if (fp.result.isOk(res)) {
-            var modules = res.value.modules;
-            return stega.stegaEncode(selector, {
-              getModule: function getModule(moduleId) {
-                var module = modules[moduleId];
-                if (module) {
-                  return module.source;
-                }
-              }
-            });
-          } else {
-            console.error("Val: could not fetch modules", res.error);
+var initValNextAppRouter = function initValNextAppRouter(config, nextConfig) {
+  var route = "/api/val"; // TODO: get from config
+  return server.createValApiRouter(route, server.createValServer(route, config, {
+    isEnabled: function isEnabled() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", nextConfig.draftMode().isEnabled);
+            case 1:
+            case "end":
+              return _context.stop();
           }
-          return stega.stegaEncode(selector, {});
-        })["catch"](function (err) {
-          console.error("Val: failed while checking modules", err);
-          return selector;
-        });
-      }
-    });
-  }
-  return stega.stegaEncode(selector, {
-    disabled: !enabled
-  });
-}
-function getHost() {
-  return _getHost.apply(this, arguments);
-}
-function _getHost() {
-  _getHost = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _hs$get, _yield$import, headers, hs, host, proto;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          _context.next = 3;
-          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('next/headers')); });
-        case 3:
-          _yield$import = _context.sent;
-          headers = _yield$import.headers;
-          hs = headers();
-          host = hs.get("host");
-          proto = "https";
-          if (hs.get("x-forwarded-proto") === "http") {
-            proto = "http";
-          } else if ((_hs$get = hs.get("referer")) !== null && _hs$get !== void 0 && _hs$get.startsWith("http://")) {
-            proto = "http";
-          } else if (host !== null && host !== void 0 && host.startsWith("localhost")) {
-            proto = "http";
+        }, _callee);
+      }))();
+    },
+    onEnable: function onEnable() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              nextConfig.draftMode().enable();
+            case 1:
+            case "end":
+              return _context2.stop();
           }
-          if (!(host && proto)) {
-            _context.next = 11;
-            break;
+        }, _callee2);
+      }))();
+    },
+    onDisable: function onDisable() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              nextConfig.draftMode().disable();
+            case 1:
+            case "end":
+              return _context3.stop();
           }
-          return _context.abrupt("return", "".concat(proto, "://").concat(host));
-        case 11:
-          return _context.abrupt("return", null);
-        case 14:
-          _context.prev = 14;
-          _context.t0 = _context["catch"](0);
-          console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", _context.t0);
-          return _context.abrupt("return", null);
-        case 18:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0, 14]]);
-  }));
-  return _getHost.apply(this, arguments);
-}
-function getValHeaders() {
-  try {
-    // const cs = cookies(); // TODO: simply get all headers?
-    var cs = {
-      get: function get(s) {
-        return {
-          value: s
-        };
+        }, _callee3);
+      }))();
+    }
+  }), function (valRes) {
+    var headers = "headers" in valRes ? new Headers(valRes.headers) : new Headers({});
+    if ("cookies" in valRes && valRes.cookies) {
+      headers.set("Set-Cookie", "");
+      for (var _i = 0, _Object$entries = Object.entries(valRes.cookies); _i < _Object$entries.length; _i++) {
+        var _cookie$options, _cookie$options2, _cookie$options3, _cookie$options4, _cookie$options5;
+        var _Object$entries$_i = slicedToArray._slicedToArray(_Object$entries[_i], 2),
+          cookieName = _Object$entries$_i[0],
+          cookie = _Object$entries$_i[1];
+        var cookieValue = "".concat(cookieName, "=").concat(encodeURIComponent(cookie.value || "")).concat((_cookie$options = cookie.options) !== null && _cookie$options !== void 0 && _cookie$options.httpOnly ? "; HttpOnly" : "").concat((_cookie$options2 = cookie.options) !== null && _cookie$options2 !== void 0 && _cookie$options2.secure ? "; Secure" : "").concat((_cookie$options3 = cookie.options) !== null && _cookie$options3 !== void 0 && _cookie$options3.sameSite ? "; SameSite=".concat(cookie.options.sameSite) : "").concat((_cookie$options4 = cookie.options) !== null && _cookie$options4 !== void 0 && _cookie$options4.path ? "; Path=".concat(cookie.options.path) : "").concat((_cookie$options5 = cookie.options) !== null && _cookie$options5 !== void 0 && _cookie$options5.expires ? "; Expires=".concat(cookie.options.expires.toISOString()) : "".concat(!cookie.value ? "; Max-Age=0" : ""));
+        headers.append("Set-Cookie", cookieValue);
       }
-    };
-    var session = cs.get(core.Internal.VAL_SESSION_COOKIE);
-    if (session) {
-      return {
-        Cookie: "".concat(core.Internal.VAL_SESSION_COOKIE, "=").concat(session.value)
-      };
     }
-    return {};
-  } catch (err) {
-    console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-    return {};
-  }
-}
-function safeDraftModeEnabled() {
-  try {
-    return headers.draftMode().isEnabled;
-  } catch (err) {
-    console.error("Val: could not read draft mode! fetchVal can only be used server-side. Use useVal on clients.", err);
-    return false;
-  }
+    if ("json" in valRes) {
+      headers.set("Content-Type", "application/json");
+      return server$1.NextResponse.json(valRes.json, {
+        headers: headers,
+        status: valRes.status
+      });
+    } else if (valRes.status === 302) {
+      headers.set("Location", valRes.redirectTo);
+      return server$1.NextResponse.redirect(valRes.redirectTo, {
+        status: valRes.status,
+        headers: headers
+      });
+    }
+    return new server$1.NextResponse("body" in valRes ? valRes.body : null, {
+      headers: headers,
+      status: valRes.status
+    });
+  });
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function initValServer(config, nextConfig) {
+  return {
+    valNextAppRouter: initValNextAppRouter(config, nextConfig)
+  };
 }
 
-exports.fetchVal = fetchVal;
+exports.initValServer = initValServer;

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

@@ -3,28 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
-var stega = require('@valbuild/react/stega');
-var core = require('@valbuild/core');
-var fp = require('@valbuild/core/fp');
-var headers = require('next/headers');
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
+var slicedToArray = require('../../dist/slicedToArray-4190fac1.cjs.prod.js');
+var server = require('@valbuild/server');
+var server$1 = require('next/server');
 
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
@@ -359,121 +340,85 @@ function _asyncToGenerator(fn) {
   };
 }
 
-var valApiEndpoints = "/api/val"; // TODO: get from config
-function fetchVal(selector) {
-  var enabled = safeDraftModeEnabled();
-  if (enabled) {
-    getHost().then(function (host) {
-      //
-      if (host) {
-        // TODO: Use the content.val.build endpoints directly
-        var api = new core.ValApi("".concat(host).concat(valApiEndpoints));
-        // Optimize: only fetch the modules needed, also cache by module id and revalidate when patched
-        // const valModuleIds = getModuleIds(selector);
-        return api.getModules({
-          patch: true,
-          includeSource: true,
-          headers: getValHeaders()
-        }).then(function (res) {
-          if (fp.result.isOk(res)) {
-            var modules = res.value.modules;
-            return stega.stegaEncode(selector, {
-              getModule: function getModule(moduleId) {
-                var module = modules[moduleId];
-                if (module) {
-                  return module.source;
-                }
-              }
-            });
-          } else {
-            console.error("Val: could not fetch modules", res.error);
+var initValNextAppRouter = function initValNextAppRouter(config, nextConfig) {
+  var route = "/api/val"; // TODO: get from config
+  return server.createValApiRouter(route, server.createValServer(route, config, {
+    isEnabled: function isEnabled() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", nextConfig.draftMode().isEnabled);
+            case 1:
+            case "end":
+              return _context.stop();
           }
-          return stega.stegaEncode(selector, {});
-        })["catch"](function (err) {
-          console.error("Val: failed while checking modules", err);
-          return selector;
-        });
-      }
-    });
-  }
-  return stega.stegaEncode(selector, {
-    disabled: !enabled
-  });
-}
-function getHost() {
-  return _getHost.apply(this, arguments);
-}
-function _getHost() {
-  _getHost = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _hs$get, _yield$import, headers, hs, host, proto;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          _context.next = 3;
-          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('next/headers')); });
-        case 3:
-          _yield$import = _context.sent;
-          headers = _yield$import.headers;
-          hs = headers();
-          host = hs.get("host");
-          proto = "https";
-          if (hs.get("x-forwarded-proto") === "http") {
-            proto = "http";
-          } else if ((_hs$get = hs.get("referer")) !== null && _hs$get !== void 0 && _hs$get.startsWith("http://")) {
-            proto = "http";
-          } else if (host !== null && host !== void 0 && host.startsWith("localhost")) {
-            proto = "http";
+        }, _callee);
+      }))();
+    },
+    onEnable: function onEnable() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              nextConfig.draftMode().enable();
+            case 1:
+            case "end":
+              return _context2.stop();
           }
-          if (!(host && proto)) {
-            _context.next = 11;
-            break;
+        }, _callee2);
+      }))();
+    },
+    onDisable: function onDisable() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              nextConfig.draftMode().disable();
+            case 1:
+            case "end":
+              return _context3.stop();
           }
-          return _context.abrupt("return", "".concat(proto, "://").concat(host));
-        case 11:
-          return _context.abrupt("return", null);
-        case 14:
-          _context.prev = 14;
-          _context.t0 = _context["catch"](0);
-          console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", _context.t0);
-          return _context.abrupt("return", null);
-        case 18:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0, 14]]);
-  }));
-  return _getHost.apply(this, arguments);
-}
-function getValHeaders() {
-  try {
-    // const cs = cookies(); // TODO: simply get all headers?
-    var cs = {
-      get: function get(s) {
-        return {
-          value: s
-        };
+        }, _callee3);
+      }))();
+    }
+  }), function (valRes) {
+    var headers = "headers" in valRes ? new Headers(valRes.headers) : new Headers({});
+    if ("cookies" in valRes && valRes.cookies) {
+      headers.set("Set-Cookie", "");
+      for (var _i = 0, _Object$entries = Object.entries(valRes.cookies); _i < _Object$entries.length; _i++) {
+        var _cookie$options, _cookie$options2, _cookie$options3, _cookie$options4, _cookie$options5;
+        var _Object$entries$_i = slicedToArray._slicedToArray(_Object$entries[_i], 2),
+          cookieName = _Object$entries$_i[0],
+          cookie = _Object$entries$_i[1];
+        var cookieValue = "".concat(cookieName, "=").concat(encodeURIComponent(cookie.value || "")).concat((_cookie$options = cookie.options) !== null && _cookie$options !== void 0 && _cookie$options.httpOnly ? "; HttpOnly" : "").concat((_cookie$options2 = cookie.options) !== null && _cookie$options2 !== void 0 && _cookie$options2.secure ? "; Secure" : "").concat((_cookie$options3 = cookie.options) !== null && _cookie$options3 !== void 0 && _cookie$options3.sameSite ? "; SameSite=".concat(cookie.options.sameSite) : "").concat((_cookie$options4 = cookie.options) !== null && _cookie$options4 !== void 0 && _cookie$options4.path ? "; Path=".concat(cookie.options.path) : "").concat((_cookie$options5 = cookie.options) !== null && _cookie$options5 !== void 0 && _cookie$options5.expires ? "; Expires=".concat(cookie.options.expires.toISOString()) : "".concat(!cookie.value ? "; Max-Age=0" : ""));
+        headers.append("Set-Cookie", cookieValue);
       }
-    };
-    var session = cs.get(core.Internal.VAL_SESSION_COOKIE);
-    if (session) {
-      return {
-        Cookie: "".concat(core.Internal.VAL_SESSION_COOKIE, "=").concat(session.value)
-      };
     }
-    return {};
-  } catch (err) {
-    console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-    return {};
-  }
-}
-function safeDraftModeEnabled() {
-  try {
-    return headers.draftMode().isEnabled;
-  } catch (err) {
-    console.error("Val: could not read draft mode! fetchVal can only be used server-side. Use useVal on clients.", err);
-    return false;
-  }
+    if ("json" in valRes) {
+      headers.set("Content-Type", "application/json");
+      return server$1.NextResponse.json(valRes.json, {
+        headers: headers,
+        status: valRes.status
+      });
+    } else if (valRes.status === 302) {
+      headers.set("Location", valRes.redirectTo);
+      return server$1.NextResponse.redirect(valRes.redirectTo, {
+        status: valRes.status,
+        headers: headers
+      });
+    }
+    return new server$1.NextResponse("body" in valRes ? valRes.body : null, {
+      headers: headers,
+      status: valRes.status
+    });
+  });
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function initValServer(config, nextConfig) {
+  return {
+    valNextAppRouter: initValNextAppRouter(config, nextConfig)
+  };
 }
 
-exports.fetchVal = fetchVal;
+exports.initValServer = initValServer;