@valbuild/next 0.34.0 → 0.36.0

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

@@ -1,8 +1,7 @@
 import 'server-only';
-import { stegaEncode } from '@valbuild/react/stega';
-import { ValApi, Internal } from '@valbuild/core';
-import { result } from '@valbuild/core/fp';
-import { draftMode } from 'next/headers';
+import { _ as _slicedToArray } from '../../dist/slicedToArray-62cd636a.esm.js';
+import { createValApiRouter, createValServer } from '@valbuild/server';
+import { NextResponse } from 'next/server';
 
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
@@ -337,121 +336,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 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 (result.isOk(res)) {
-            var modules = res.value.modules;
-            return 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 createValApiRouter(route, 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 stegaEncode(selector, {});
-        })["catch"](function (err) {
-          console.error("Val: failed while checking modules", err);
-          return selector;
-        });
-      }
-    });
-  }
-  return 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 import('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(_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(Internal.VAL_SESSION_COOKIE);
-    if (session) {
-      return {
-        Cookie: "".concat(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 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 NextResponse.json(valRes.json, {
+        headers: headers,
+        status: valRes.status
+      });
+    } else if (valRes.status === 302) {
+      headers.set("Location", valRes.redirectTo);
+      return NextResponse.redirect(valRes.redirectTo, {
+        status: valRes.status,
+        headers: headers
+      });
+    }
+    return new 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)
+  };
 }
 
-export { fetchVal };
+export { initValServer };

package/dist/declarations/src/client/useVal.d.ts

@@ -1,3 +0,0 @@
-import { GenericSelector, SelectorOf, SelectorSource } from "@valbuild/core";
-import { StegaOfSource } from "@valbuild/react/stega";
-export declare function useVal<T extends SelectorSource>(selector: T): SelectorOf<T> extends GenericSelector<infer S> ? StegaOfSource<S> : never;

package/dist/declarations/src/server/fetchVal.d.ts

@@ -1,3 +0,0 @@
-import { type StegaOfSource } from "@valbuild/react/stega";
-import { SelectorSource, SelectorOf, GenericSelector } from "@valbuild/core";
-export declare function fetchVal<T extends SelectorSource>(selector: T): SelectorOf<T> extends GenericSelector<infer S> ? Promise<StegaOfSource<S>> : never;