@valbuild/next 0.83.0 → 0.84.0

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

@@ -1,11 +1,15 @@
 import 'server-only';
+import { _ as _createForOfIteratorHelper } from '../../dist/createForOfIteratorHelper-5758a730.esm.js';
 import { _ as _objectSpread2, a as _defineProperty } from '../../dist/objectSpread2-c1340c1c.esm.js';
+import { _ as _slicedToArray } from '../../dist/slicedToArray-aa291011.esm.js';
+import { _ as _typeof } from '../../dist/typeof-a1531d8f.esm.js';
 import { _ as _asyncToGenerator, a as _regeneratorRuntime } from '../../dist/asyncToGenerator-5f8c02f3.esm.js';
 import { SET_RSC, stegaEncode, SET_AUTO_TAG_JSX_ENABLED } from '@valbuild/react/stega';
-import { Internal } from '@valbuild/core';
-import { VAL_SESSION_COOKIE } from '@valbuild/shared/internal';
+import { Internal, RecordSchema } from '@valbuild/core';
+import { getPatternFromModuleFilePath, parseRoutePattern, getNextAppRouterSourceFolder, VAL_SESSION_COOKIE } from '@valbuild/shared/internal';
 import { createValServer } from '@valbuild/server';
 import { V as VERSION } from '../../dist/version-98ec5c7a.esm.js';
+import '../../dist/unsupportedIterableToArray-5baabfdc.esm.js';
 
 SET_RSC(true);
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
@@ -171,6 +175,174 @@ function getHost(headers) {
 //   }
 // }
 
+var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
+  return /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(selector, params) {
+      var fetchVal, path, val, schema, resolvedParams, _Internal$splitModule, _Internal$splitModule2, moduleFilePath, srcFolder, pattern, parsedPattern, missingPatterns, fullPathParts, missingParamKeys, _iterator, _step, part, value, errorMessageParams, fullPath, actualRoute;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
+            path = selector && Internal.getValPath(selector);
+            if (path) {
+              _context2.next = 5;
+              break;
+            }
+            console.error("Val: fetchValRoute can only be used with a Val module (details: no Val path found).");
+            return _context2.abrupt("return", null);
+          case 5:
+            _context2.next = 7;
+            return fetchVal(selector);
+          case 7:
+            val = _context2.sent;
+            if (!(val === null)) {
+              _context2.next = 10;
+              break;
+            }
+            return _context2.abrupt("return", null);
+          case 10:
+            if (!(_typeof(val) !== "object")) {
+              _context2.next = 13;
+              break;
+            }
+            console.error("Val: fetchValRoute must be used with a Val Module that is a s.record().router(...) (details: expected type object, found ".concat(_typeof(val), " instead)."));
+            return _context2.abrupt("return", null);
+          case 13:
+            if (!Array.isArray(val)) {
+              _context2.next = 16;
+              break;
+            }
+            console.error("Val: fetchValRoute must be used with a Val Module that is a s.record().router(...) (details: expected type object, found array instead).");
+            return _context2.abrupt("return", null);
+          case 16:
+            schema = Internal.getSchema(selector);
+            if (schema) {
+              _context2.next = 20;
+              break;
+            }
+            console.error("Val: fetchValRoute must be used with a Val Module that is a s.record().router(...) (details: no schema found).");
+            return _context2.abrupt("return", null);
+          case 20:
+            if (schema instanceof RecordSchema) {
+              _context2.next = 24;
+              break;
+            }
+            console.error("Val: fetchValRoute must be used with a Val Module that is a s.record().router(...) (details: schema is not a record).");
+            _context2.next = 31;
+            break;
+          case 24:
+            if (schema["currentRouter"]) {
+              _context2.next = 28;
+              break;
+            }
+            console.error("Val: fetchValRoute must be used with a Val Module that is a s.record().router(...) (details: router is not set).");
+            _context2.next = 31;
+            break;
+          case 28:
+            if (!(schema["currentRouter"].getRouterId() !== Internal.nextAppRouter.getRouterId())) {
+              _context2.next = 31;
+              break;
+            }
+            console.error("Val: fetchValRoute must be used with a Val Module that is a s.record().router(...) (details: router is not the Next.js App Router).");
+            return _context2.abrupt("return", null);
+          case 31:
+            _context2.next = 33;
+            return Promise.resolve(params);
+          case 33:
+            resolvedParams = _context2.sent;
+            if (!(_typeof(resolvedParams) !== "object")) {
+              _context2.next = 37;
+              break;
+            }
+            console.error("Val: fetchValRoute must be used with a Val Module that is a s.record().router(...) (details: params is not an object).");
+            return _context2.abrupt("return", null);
+          case 37:
+            _Internal$splitModule = Internal.splitModuleFilePathAndModulePath(path), _Internal$splitModule2 = _slicedToArray(_Internal$splitModule, 1), moduleFilePath = _Internal$splitModule2[0];
+            if (moduleFilePath.endsWith("page.val.ts") || moduleFilePath.endsWith("page.val.js")) {
+              _context2.next = 41;
+              break;
+            }
+            console.error("Val: fetchValRoute is used with a Val module that does not have a page.val.ts or page.val.js file. Make sure the Val module is in the same directory as your page.tsx or page.js file.");
+            return _context2.abrupt("return", null);
+          case 41:
+            srcFolder = getNextAppRouterSourceFolder(moduleFilePath);
+            if (srcFolder) {
+              _context2.next = 45;
+              break;
+            }
+            console.error("Val: fetchValRoute was used with a Val module that is not in the /app or /src/app folder");
+            return _context2.abrupt("return", null);
+          case 45:
+            pattern = getPatternFromModuleFilePath(moduleFilePath, srcFolder);
+            parsedPattern = parseRoutePattern(pattern);
+            missingPatterns = [];
+            fullPathParts = [];
+            missingParamKeys = _objectSpread2({}, resolvedParams);
+            _iterator = _createForOfIteratorHelper(parsedPattern !== null && parsedPattern !== void 0 ? parsedPattern : []);
+            try {
+              for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                part = _step.value;
+                if (part.type === "literal") {
+                  fullPathParts.push(part.name);
+                } else if (part.type === "array-param" || part.type === "string-param") {
+                  value = resolvedParams[part.paramName];
+                  if (typeof value !== "string" && !Array.isArray(value)) {
+                    missingPatterns.push(part);
+                  } else if (Array.isArray(value)) {
+                    delete missingParamKeys[part.paramName];
+                    fullPathParts.push(value.join("/"));
+                  } else {
+                    delete missingParamKeys[part.paramName];
+                    fullPathParts.push(value);
+                  }
+                }
+              }
+            } catch (err) {
+              _iterator.e(err);
+            } finally {
+              _iterator.f();
+            }
+            if (!(missingPatterns.length > 0)) {
+              _context2.next = 56;
+              break;
+            }
+            errorMessageParams = missingPatterns.map(function (part) {
+              if (part.type === "literal") {
+                return part.name;
+              } else if (part.type === "string-param") {
+                return "[".concat(part.paramName, "]");
+              } else if (part.type === "array-param") {
+                return "[...".concat(part.paramName, "]");
+              }
+            });
+            console.error("Val: fetchValRoute could not find route since parameters: ".concat(errorMessageParams.join(", "), " where not provided. Make sure the Val module is in the same directory as your page.tsx or page.js file and that the Val module filename is called page.val.ts or page.val.js."));
+            return _context2.abrupt("return", null);
+          case 56:
+            if (Object.keys(missingParamKeys).length > 0) {
+              console.error("Val: fetchValRoute could not find route since parameters: ".concat(Object.keys(missingParamKeys).join(", "), " where not found in the path of: ").concat(moduleFilePath, ". Make sure  ").concat(moduleFilePath, " in the same directory as your page.tsx or page.js file."));
+              // We do not return null here since we found a route that matches the path
+              // though chances are that there's something wrong in the way fetchValRoute is used
+            }
+            fullPath = fullPathParts.join("/");
+            actualRoute = val["/".concat(fullPath)];
+            if (actualRoute) {
+              _context2.next = 61;
+              break;
+            }
+            return _context2.abrupt("return", null);
+          case 61:
+            return _context2.abrupt("return", actualRoute);
+          case 62:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+};
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function initValRsc(config, valModules, rscNextConfig) {
@@ -189,22 +361,6 @@ function initValRsc(config, valModules, rscNextConfig) {
     }
   }, config), config, {
     isEnabled: function isEnabled() {
-      return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return rscNextConfig.draftMode();
-            case 2:
-              return _context2.abrupt("return", _context2.sent.isEnabled);
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }))();
-    },
-    onEnable: function onEnable() {
       return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -212,7 +368,7 @@ function initValRsc(config, valModules, rscNextConfig) {
               _context3.next = 2;
               return rscNextConfig.draftMode();
             case 2:
-              _context3.sent.enable();
+              return _context3.abrupt("return", _context3.sent.isEnabled);
             case 3:
             case "end":
               return _context3.stop();
@@ -220,7 +376,7 @@ function initValRsc(config, valModules, rscNextConfig) {
         }, _callee3);
       }))();
     },
-    onDisable: function onDisable() {
+    onEnable: function onEnable() {
       return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -228,39 +384,42 @@ function initValRsc(config, valModules, rscNextConfig) {
               _context4.next = 2;
               return rscNextConfig.draftMode();
             case 2:
-              _context4.sent.disable();
+              _context4.sent.enable();
             case 3:
             case "end":
               return _context4.stop();
           }
         }, _callee4);
       }))();
+    },
+    onDisable: function onDisable() {
+      return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return rscNextConfig.draftMode();
+            case 2:
+              _context5.sent.disable();
+            case 3:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5);
+      }))();
     }
   });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            _context5.next = 2;
-            return rscNextConfig.draftMode();
-          case 2:
-            return _context5.abrupt("return", _context5.sent.isEnabled);
-          case 3:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5);
-    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             _context6.next = 2;
-            return rscNextConfig.headers();
+            return rscNextConfig.draftMode();
           case 2:
-            return _context6.abrupt("return", _context6.sent);
+            return _context6.abrupt("return", _context6.sent.isEnabled);
           case 3:
           case "end":
             return _context6.stop();
@@ -271,7 +430,7 @@ function initValRsc(config, valModules, rscNextConfig) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             _context7.next = 2;
-            return rscNextConfig.cookies();
+            return rscNextConfig.headers();
           case 2:
             return _context7.abrupt("return", _context7.sent);
           case 3:
@@ -279,6 +438,59 @@ function initValRsc(config, valModules, rscNextConfig) {
             return _context7.stop();
         }
       }, _callee7);
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            _context8.next = 2;
+            return rscNextConfig.cookies();
+          case 2:
+            return _context8.abrupt("return", _context8.sent);
+          case 3:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8);
+    }))),
+    fetchValRouteStega: initFetchValRouteStega(config, valApiEndpoints, valServerPromise, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            _context9.next = 2;
+            return rscNextConfig.draftMode();
+          case 2:
+            return _context9.abrupt("return", _context9.sent.isEnabled);
+          case 3:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9);
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
+          case 0:
+            _context10.next = 2;
+            return rscNextConfig.headers();
+          case 2:
+            return _context10.abrupt("return", _context10.sent);
+          case 3:
+          case "end":
+            return _context10.stop();
+        }
+      }, _callee10);
+    })), /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
+          case 0:
+            _context11.next = 2;
+            return rscNextConfig.cookies();
+          case 2:
+            return _context11.abrupt("return", _context11.sent);
+          case 3:
+          case "end":
+            return _context11.stop();
+        }
+      }, _callee11);
     })))
   };
 }

package/dist/ValNextProvider-9ff1bb92.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./ValNextProvider-9ff1bb92.cjs.prod.js");
-} else {
-  module.exports = require("./ValNextProvider-9ff1bb92.cjs.dev.js");
-}

package/dist/ValOverlayContext-811e9be9.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./ValOverlayContext-811e9be9.cjs.prod.js");
-} else {
-  module.exports = require("./ValOverlayContext-811e9be9.cjs.dev.js");
-}