@valbuild/next 0.83.0 → 0.84.0

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

@@ -2,11 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _typeof = require('./typeof-16428c61.cjs.prod.js');
 var objectSpread2 = require('./objectSpread2-3c87fb4f.cjs.prod.js');
 var core = require('@valbuild/core');
 var stega = require('@valbuild/react/stega');
 var internal = require('@valbuild/react/internal');
-var ValNextProvider = require('./ValNextProvider-9ff1bb92.cjs.prod.js');
+var ValNextProvider = require('./ValNextProvider-a618d775.cjs.prod.js');
 var NextImage = require('next/image');
 var jsxRuntime = require('react/jsx-runtime');
 var ValApp = require('./ValApp-a808cf89.cjs.prod.js');
@@ -35,16 +36,6 @@ function _interopNamespace(e) {
 var core__namespace = /*#__PURE__*/_interopNamespace(core);
 var NextImage__default = /*#__PURE__*/_interopDefault(NextImage);
 
-function _typeof(o) {
-  "@babel/helpers - typeof";
-
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-    return typeof o;
-  } : function (o) {
-    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-  }, _typeof(o);
-}
-
 function raw(val) {
   if (typeof val === "string") {
     return stega.stegaClean(val);
@@ -54,7 +45,7 @@ function raw(val) {
       return raw(item);
     });
   }
-  if (_typeof(val) === "object" && val !== null) {
+  if (_typeof._typeof(val) === "object" && val !== null) {
     var result = {};
     for (var _key in val) {
       if (Object.prototype.hasOwnProperty.call(val, _key)) {
@@ -78,6 +69,7 @@ function decodeValPathOfString(encodedString) {
   return stega.stegaDecodeString(encodedString);
 }
 
+var nextAppRouter = core.Internal.nextAppRouter;
 var initVal = function initVal(config) {
   var _createValSystem = core.initVal(config),
     s = _createValSystem.s,
@@ -88,6 +80,7 @@ var initVal = function initVal(config) {
   return {
     s: s,
     c: c,
+    nextAppRouter: nextAppRouter,
     val: objectSpread2._objectSpread2(objectSpread2._objectSpread2({}, val), {}, {
       attrs: function attrs(target) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -97,7 +90,7 @@ var initVal = function initVal(config) {
           return {};
         }
         path = core.Internal.getValPath(anyTarget);
-        if (!path && _typeof(anyTarget) === "object") {
+        if (!path && _typeof._typeof(anyTarget) === "object") {
           path = anyTarget["valPath"];
         }
         if (typeof anyTarget === "string") {

package/dist/valbuild-next.esm.js

@@ -1,26 +1,17 @@
+import { _ as _typeof } from './typeof-a1531d8f.esm.js';
 import { _ as _objectSpread2 } from './objectSpread2-c1340c1c.esm.js';
-import { initVal as initVal$1, Internal as Internal$1 } from '@valbuild/core';
+import { Internal as Internal$1, initVal as initVal$1 } from '@valbuild/core';
 import * as core from '@valbuild/core';
 export { core as expr };
 export { FILE_REF_PROP, GenericSelector, Schema, VAL_EXTENSION, derefPatch, modules } from '@valbuild/core';
 import { stegaClean, stegaEncode, stegaDecodeString, autoTagJSX } from '@valbuild/react/stega';
 export { ValRichText } from '@valbuild/react/internal';
-import { ValNextProvider } from './ValNextProvider-5f8b7338.esm.js';
+import { ValNextProvider } from './ValNextProvider-25f1f5c9.esm.js';
 import NextImage from 'next/image';
 import { jsx } from 'react/jsx-runtime';
 export { ValApp } from './ValApp-3ab62a2b.esm.js';
 import { V as VERSION } from './version-98ec5c7a.esm.js';
 
-function _typeof(o) {
-  "@babel/helpers - typeof";
-
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-    return typeof o;
-  } : function (o) {
-    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-  }, _typeof(o);
-}
-
 function raw(val) {
   if (typeof val === "string") {
     return stegaClean(val);
@@ -54,6 +45,7 @@ function decodeValPathOfString(encodedString) {
   return stegaDecodeString(encodedString);
 }
 
+var nextAppRouter = Internal$1.nextAppRouter;
 var initVal = function initVal(config) {
   var _createValSystem = initVal$1(config),
     s = _createValSystem.s,
@@ -64,6 +56,7 @@ var initVal = function initVal(config) {
   return {
     s: s,
     c: c,
+    nextAppRouter: nextAppRouter,
     val: _objectSpread2(_objectSpread2({}, val), {}, {
       attrs: function attrs(target) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/package.json

@@ -8,7 +8,7 @@
     "next",
     "react"
   ],
-  "version": "0.83.0",
+  "version": "0.84.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest"
@@ -45,11 +45,11 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.83.0",
-    "@valbuild/react": "~0.83.0",
-    "@valbuild/server": "~0.83.0",
-    "@valbuild/shared": "~0.83.0",
-    "@valbuild/ui": "~0.83.0",
+    "@valbuild/core": "~0.84.0",
+    "@valbuild/react": "~0.84.0",
+    "@valbuild/server": "~0.84.0",
+    "@valbuild/shared": "~0.84.0",
+    "@valbuild/ui": "~0.84.0",
     "client-only": "^0.0.1",
     "server-only": "^0.0.1"
   },

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

@@ -3,13 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
+var createForOfIteratorHelper = require('../../dist/createForOfIteratorHelper-0445603c.cjs.dev.js');
 var objectSpread2 = require('../../dist/objectSpread2-792eb2c2.cjs.dev.js');
+var slicedToArray = require('../../dist/slicedToArray-44036a76.cjs.dev.js');
+var _typeof = require('../../dist/typeof-b568f48f.cjs.dev.js');
 var asyncToGenerator = require('../../dist/asyncToGenerator-6ba61221.cjs.dev.js');
 var stega = require('@valbuild/react/stega');
 var core = require('@valbuild/core');
 var internal = require('@valbuild/shared/internal');
 var server = require('@valbuild/server');
 var version = require('../../dist/version-82faa1d0.cjs.dev.js');
+require('../../dist/unsupportedIterableToArray-c8ab77c9.cjs.dev.js');
 
 stega.SET_RSC(true);
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
@@ -175,6 +179,174 @@ function getHost(headers) {
 //   }
 // }
 
+var initFetchValRouteStega = function initFetchValRouteStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
+  return /*#__PURE__*/function () {
+    var _ref2 = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._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 asyncToGenerator._regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
+            path = selector && core.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._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._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 = core.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 core.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() !== core.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._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 = core.Internal.splitModuleFilePathAndModulePath(path), _Internal$splitModule2 = slicedToArray._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 = internal.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 = internal.getPatternFromModuleFilePath(moduleFilePath, srcFolder);
+            parsedPattern = internal.parseRoutePattern(pattern);
+            missingPatterns = [];
+            fullPathParts = [];
+            missingParamKeys = objectSpread2._objectSpread2({}, resolvedParams);
+            _iterator = createForOfIteratorHelper._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) {
@@ -193,22 +365,6 @@ function initValRsc(config, valModules, rscNextConfig) {
     }
   }, config), config, {
     isEnabled: function isEnabled() {
-      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee2() {
-        return asyncToGenerator._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._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee3() {
         return asyncToGenerator._regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -216,7 +372,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();
@@ -224,7 +380,7 @@ function initValRsc(config, valModules, rscNextConfig) {
         }, _callee3);
       }))();
     },
-    onDisable: function onDisable() {
+    onEnable: function onEnable() {
       return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee4() {
         return asyncToGenerator._regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -232,39 +388,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._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee5() {
+        return asyncToGenerator._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._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee5() {
-      return asyncToGenerator._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._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee6() {
+    valServerPromise, /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee6() {
       return asyncToGenerator._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();
@@ -275,7 +434,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:
@@ -283,6 +442,59 @@ function initValRsc(config, valModules, rscNextConfig) {
             return _context7.stop();
         }
       }, _callee7);
+    })), /*#__PURE__*/asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee8() {
+      return asyncToGenerator._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._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee9() {
+      return asyncToGenerator._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._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee10() {
+      return asyncToGenerator._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._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee11() {
+      return asyncToGenerator._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);
     })))
   };
 }