@valbuild/next 0.84.3 → 0.85.1

package/dist/{ValNextProvider-c7952bdc.cjs.dev.js → ValNextProvider-726026f9.cjs.dev.js}

@@ -13,7 +13,7 @@ var React = require('react');
 var ValOverlayContext = require('./ValOverlayContext-c82a4507.cjs.dev.js');
 var stega = require('@valbuild/react/stega');
 var internal = require('@valbuild/shared/internal');
-var useRemoteConfigSender = require('./useRemoteConfigSender-c78b81c5.cjs.dev.js');
+var cssUtils = require('./cssUtils-9c11102f.cjs.dev.js');
 var jsxRuntime = require('react/jsx-runtime');
 require('./unsupportedIterableToArray-c8ab77c9.cjs.dev.js');
 
@@ -37,8 +37,8 @@ var ValNextProvider = function ValNextProvider(props) {
   }, []);
   var _React$useState = React__default["default"].useState(),
     _React$useState2 = slicedToArray._slicedToArray(_React$useState, 2),
-    showOverlay = _React$useState2[0],
-    setShowOverlay = _React$useState2[1];
+    mountOverlay = _React$useState2[0],
+    setMountOverlay = _React$useState2[1];
   var _React$useState3 = React__default["default"].useState(null),
     _React$useState4 = slicedToArray._slicedToArray(_React$useState3, 2),
     draftMode = _React$useState4[0],
@@ -46,7 +46,7 @@ var ValNextProvider = function ValNextProvider(props) {
   var _React$useState5 = React__default["default"].useState(false),
     _React$useState6 = slicedToArray._slicedToArray(_React$useState5, 2),
     spaReady = _React$useState6[0],
-    setSpaReady = _React$useState6[1];
+    setSpaReady = _React$useState6[1]; // TODO: consider removing spaReady - it is not used? If we remove, clean up the custom events that send the message too...
   var router = navigation.useRouter();
   var _React$useTransition = React__default["default"].useTransition(),
     _React$useTransition2 = slicedToArray._slicedToArray(_React$useTransition, 2),
@@ -56,20 +56,20 @@ var ValNextProvider = function ValNextProvider(props) {
     _React$useState8 = slicedToArray._slicedToArray(_React$useState7, 2),
     iframeSrc = _React$useState8[0],
     setIframeSrc = _React$useState8[1];
-  useConsoleLogEnableVal(showOverlay);
+  useConsoleLogEnableVal(mountOverlay);
   React__default["default"].useEffect(function () {
     if (location.search === "?message_onready=true") {
       console.warn("Val is verifying draft mode...");
       return;
     }
     if (isValStudioPath(location.pathname)) {
-      setShowOverlay(false);
+      setMountOverlay(false);
       return;
     }
-    setShowOverlay(document.cookie.includes("".concat(core.Internal.VAL_ENABLE_COOKIE_NAME, "=true")));
+    setMountOverlay(document.cookie.includes("".concat(core.Internal.VAL_ENABLE_COOKIE_NAME, "=true")));
   }, []);
   React__default["default"].useEffect(function () {
-    if (!showOverlay) {
+    if (!mountOverlay) {
       return;
     }
     var interval = setInterval(function () {
@@ -85,9 +85,9 @@ var ValNextProvider = function ValNextProvider(props) {
     return function () {
       clearInterval(interval);
     };
-  }, [showOverlay, props.disableRefresh]);
+  }, [mountOverlay, props.disableRefresh]);
   React__default["default"].useEffect(function () {
-    if (!showOverlay) {
+    if (!mountOverlay) {
       return;
     }
     if (draftMode === null) {
@@ -128,14 +128,14 @@ var ValNextProvider = function ValNextProvider(props) {
     return function () {
       window.removeEventListener("val-overlay-provider", valProviderOverlayListener);
     };
-  }, [showOverlay, draftMode]);
+  }, [mountOverlay, draftMode]);
   var pollDraftStatIdRef = React__default["default"].useRef(0);
   React__default["default"].useEffect(function () {
-    // continous polling to check for updates:
+    // continuous polling to check for updates:
 
     var timeout;
     function pollCurrentDraftMode() {
-      if (!showOverlay) {
+      if (!mountOverlay) {
         return;
       }
       window.dispatchEvent(new CustomEvent("val-overlay-spa", {
@@ -182,9 +182,9 @@ var ValNextProvider = function ValNextProvider(props) {
     return function () {
       clearTimeout(timeout);
     };
-  }, [showOverlay, iframeSrc]);
+  }, [mountOverlay, iframeSrc]);
   React__default["default"].useEffect(function () {
-    if (!showOverlay) {
+    if (!mountOverlay) {
       return;
     }
     window.dispatchEvent(new CustomEvent("val-overlay-spa", {
@@ -193,9 +193,9 @@ var ValNextProvider = function ValNextProvider(props) {
         value: draftMode
       }
     }));
-  }, [showOverlay, draftMode, spaReady]);
+  }, [mountOverlay, draftMode, spaReady]);
   React__default["default"].useEffect(function () {
-    if (!showOverlay) {
+    if (!mountOverlay) {
       stega.SET_AUTO_TAG_JSX_ENABLED(false);
     } else {
       if (draftMode) {
@@ -228,9 +228,9 @@ var ValNextProvider = function ValNextProvider(props) {
         };
       }
     }
-  }, [showOverlay, draftMode, props.disableRefresh]);
+  }, [mountOverlay, draftMode, props.disableRefresh]);
   React__default["default"].useEffect(function () {
-    if (!showOverlay) {
+    if (!mountOverlay) {
       return;
     }
     var listener = function listener(event) {
@@ -242,7 +242,7 @@ var ValNextProvider = function ValNextProvider(props) {
     return function () {
       window.removeEventListener("message", listener);
     };
-  }, [showOverlay]);
+  }, [mountOverlay]);
   var _React$useState9 = React__default["default"].useState(null),
     _React$useState10 = slicedToArray._slicedToArray(_React$useState9, 2),
     dropZone = _React$useState10[0],
@@ -255,38 +255,64 @@ var ValNextProvider = function ValNextProvider(props) {
       setDropZone("val-menu-right-center");
     }
   }, []);
-  useRemoteConfigSender.useRemoteConfigSender(props.config);
+  cssUtils.useConfigStorageSave(props.config);
+  var _React$useState11 = React__default["default"].useState(false),
+    _React$useState12 = slicedToArray._slicedToArray(_React$useState11, 2),
+    spaLoaded = _React$useState12[0],
+    setSpaLoaded = _React$useState12[1];
+  var commonStyles = React__default["default"].useMemo(function () {
+    return {
+      "backdrop-blur": "backdrop-filter: blur(10px);",
+      "text-white": "color: white;",
+      "bg-black": "background: black;",
+      rounded: "border-radius: 0.25rem;",
+      fixed: "position: fixed;",
+      "bottom-4": "bottom: 1rem;",
+      "right-12": "right: 3rem;",
+      "right-16": "right: 4rem;",
+      "p-4": "padding: 1rem;",
+      "p-2": "padding: 0.5rem;",
+      "p-1": "padding: 0.25rem;",
+      flex: "display: flex;",
+      "items-center": "align-items: center;",
+      "justify-center": "justify-content: center;"
+    };
+  }, [cssUtils.valPrefixedClass]);
   return /*#__PURE__*/jsxRuntime.jsxs(ValOverlayContext.ValOverlayProvider, {
     draftMode: draftMode,
     store: valStore,
-    children: [props.children, !spaReady && showOverlay && dropZone && /*#__PURE__*/jsxRuntime.jsxs(React__default["default"].Fragment, {
+    children: [props.children, dropZone !== null && !spaLoaded && mountOverlay && /*#__PURE__*/jsxRuntime.jsxs(React__default["default"].Fragment, {
       children: [/*#__PURE__*/jsxRuntime.jsx("style", {
-        children: "\n".concat(positionStyles, "\n.backdrop-blur {\n  backdrop-filter: blur(10px);\n}\n.text-white {\n  color: white;\n}\n.bg-black {\n  background: black;\n}\n.rounded {\n  border-radius: 0.25rem;\n}\n.fixed {\n  position: fixed;\n}\n.bottom-4 {\n  bottom: 1rem;\n}\n.right-12 {\n  right: 3rem;\n}\n.right-16 {\n  right: 4rem;\n}\n.p-4 {\n  padding: 1rem;\n}\n.p-2 {\n  padding: 0.5rem;\n}\n.p-1 {\n  padding: 0.25rem;\n}\n.flex {\n  display: flex;\n}\n.items-center {\n  align-items: center;\n}\n.justify-center {\n  justify-content: center;\n}\n.animate-spin {\n  animation: spin 2s linear infinite;\n}\n@keyframes spin {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}")
+        children: "\n".concat(positionStyles, "\n").concat(cssUtils.prefixStyles(commonStyles), "\n.").concat(cssUtils.valPrefixedClass, "animate-spin {\n  animation: ").concat(cssUtils.valPrefixedClass, "spin 2s linear infinite;\n}\n@keyframes ").concat(cssUtils.valPrefixedClass, "spin {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(360deg);\n  }\n}")
       }), /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: getPositionClassName(dropZone) + " p-4",
+        className: "".concat(getPositionClassName(dropZone), " ").concat(cssUtils.cn(["p-4"])),
         children: /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "flex justify-center items-center p-2 text-white bg-black rounded backdrop-blur",
+          className: "".concat(cssUtils.cn(["flex", "justify-center", "items-center", "p-2"]), " ") + "".concat(cssUtils.cn(["text-white", "bg-black", "rounded", "backdrop-blur"])),
           children: /*#__PURE__*/jsxRuntime.jsx(Clock, {
-            className: "animate-spin",
+            className: "".concat(cssUtils.cn(["animate-spin"])),
             size: 16
           })
         })
       })]
-    }), showOverlay && draftMode !== undefined && /*#__PURE__*/jsxRuntime.jsxs(React__default["default"].Fragment, {
+    }), mountOverlay && /*#__PURE__*/jsxRuntime.jsxs(React__default["default"].Fragment, {
       children: [/*#__PURE__*/jsxRuntime.jsx(Script__default["default"], {
         type: "module",
         src: "".concat(route, "/static").concat(ui.VERSION ? "/".concat(ui.VERSION) : "").concat(ui.VAL_APP_PATH),
-        crossOrigin: "anonymous"
+        crossOrigin: "anonymous",
+        onLoad: function onLoad() {
+          setSpaLoaded(true);
+        }
       }), /*#__PURE__*/jsxRuntime.jsx("div", {
         id: ui.VAL_OVERLAY_ID
       })]
-    }), iframeSrc && draftMode !== null && showOverlay && /*#__PURE__*/jsxRuntime.jsx("iframe", {
+    }), mountOverlay && iframeSrc && /*#__PURE__*/jsxRuntime.jsx("iframe", {
+      loading: "eager",
       style: {
-        top: 0,
-        left: 0,
+        top: 10,
+        left: 10,
         position: "absolute",
-        width: 0,
-        height: 0
+        width: 1000,
+        height: 1000
       },
       src: iframeSrc
     }, iframeSrc)]
@@ -299,28 +325,38 @@ function useConsoleLogEnableVal(showOverlay) {
     }
   }, [showOverlay]);
 }
-var positionStyles = "\n.left-0 {\n  left: 0;\n}\n.top-0 {\n  top: 0;\n}\n.left-1\\/2 {\n  left: 50%;\n}\n.top-1\\/2 {\n  top: 50%;\n}\n.-translate-y-1\\/2 {\n  transform: translateY(-50%);\n}\n.-translate-x-1\\/2 {\n  transform: translateX(-50%);\n}\n.right-0 {\n  right: 0;\n}\n.bottom-0 {\n  bottom: 0;\n}";
+var positionStyles = cssUtils.prefixStyles({
+  "left-0": "left: 0;",
+  "top-0": "top: 0;",
+  "left-1/2": "left: 50%;",
+  "top-1/2": "top: 50%;",
+  "-translate-y-1/2": "transform: translateY(-50%);",
+  "-translate-x-1/2": "transform: translateX(-50%);",
+  "right-0": "right: 0;",
+  "bottom-0": "bottom: 0;"
+});
+
 // This is a copy of the function from the ValMenu component.
 function getPositionClassName(dropZone) {
-  var className = "fixed transform";
+  var className = cssUtils.cn(["fixed", "transform"]);
   if (dropZone === "val-menu-left-top") {
-    className += " left-0 top-0";
+    className += " ".concat(cssUtils.cn(["left-0", "top-0"]));
   } else if (dropZone === "val-menu-left-center") {
-    className += " left-0 top-1/2 -translate-y-1/2";
+    className += " ".concat(cssUtils.cn(["left-0", "top-1/2", "-translate-y-1/2"]));
   } else if (dropZone === "val-menu-left-bottom") {
-    className += " left-0 bottom-0";
+    className += " ".concat(cssUtils.cn(["left-0", "bottom-0"]));
   } else if (dropZone === "val-menu-center-top") {
-    className += " left-1/2 -translate-x-1/2 top-0";
+    className += " ".concat(cssUtils.cn(["left-1/2", "-translate-x-1/2", "top-0"]));
   } else if (dropZone === "val-menu-center-bottom") {
-    className += " left-1/2 -translate-x-1/2 bottom-0";
+    className += " ".concat(cssUtils.cn(["left-1/2", "-translate-x-1/2", "bottom-0"]));
   } else if (dropZone === "val-menu-right-top") {
-    className += " right-0 top-0";
+    className += " ".concat(cssUtils.cn(["right-0", "top-0"]));
   } else if (dropZone === "val-menu-right-center") {
-    className += " right-0 top-1/2 -translate-y-1/2";
+    className += " ".concat(cssUtils.cn(["right-0", "top-1/2", "-translate-y-1/2"]));
   } else if (dropZone === "val-menu-right-bottom") {
-    className += " right-0 bottom-0";
+    className += " ".concat(cssUtils.cn(["right-0", "bottom-0"]));
   } else {
-    className += " right-0 bottom-0";
+    className += " ".concat(cssUtils.cn(["right-0", "bottom-0"]));
   }
   return className;
 }

package/dist/cssUtils-9c11102f.cjs.dev.js

@@ -0,0 +1,41 @@
+'use strict';
+
+var internal = require('@valbuild/shared/internal');
+var React = require('react');
+var slicedToArray = require('./slicedToArray-44036a76.cjs.dev.js');
+var core = require('@valbuild/core');
+var ui = require('@valbuild/ui');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefault(React);
+
+/*
+ * See the useConfig.tsx where the config is loaded from session storage
+ */
+function useConfigStorageSave(config) {
+  React__default["default"].useEffect(function () {
+    sessionStorage.setItem(internal.VAL_CONFIG_SESSION_STORAGE_KEY, JSON.stringify(config));
+  }, [config]);
+}
+
+// All DOM element that are outside the Shadow DOM should use this class name prefix
+var valPrefixedClass = "val-prefix-" + core.Internal.getSHA256Hash(new TextEncoder().encode(ui.VERSION || "")).slice(0, 8) + "-";
+var prefixStyles = function prefixStyles(styles) {
+  return Object.entries(styles).map(function (_ref) {
+    var _ref2 = slicedToArray._slicedToArray(_ref, 2),
+      key = _ref2[0],
+      value = _ref2[1];
+    return ".".concat(valPrefixedClass).concat(key.replace(/\//g, "\\/"), " { ").concat(value, " }");
+  }).join("\n");
+};
+var cn = function cn(className) {
+  return className.map(function (c) {
+    return "".concat(valPrefixedClass).concat(c);
+  }).join(" ");
+};
+
+exports.cn = cn;
+exports.prefixStyles = prefixStyles;
+exports.useConfigStorageSave = useConfigStorageSave;
+exports.valPrefixedClass = valPrefixedClass;

package/dist/cssUtils-b5651c03.esm.js

@@ -0,0 +1,32 @@
+import { VAL_CONFIG_SESSION_STORAGE_KEY } from '@valbuild/shared/internal';
+import React from 'react';
+import { _ as _slicedToArray } from './slicedToArray-aa291011.esm.js';
+import { Internal } from '@valbuild/core';
+import { VERSION } from '@valbuild/ui';
+
+/*
+ * See the useConfig.tsx where the config is loaded from session storage
+ */
+function useConfigStorageSave(config) {
+  React.useEffect(function () {
+    sessionStorage.setItem(VAL_CONFIG_SESSION_STORAGE_KEY, JSON.stringify(config));
+  }, [config]);
+}
+
+// All DOM element that are outside the Shadow DOM should use this class name prefix
+var valPrefixedClass = "val-prefix-" + Internal.getSHA256Hash(new TextEncoder().encode(VERSION || "")).slice(0, 8) + "-";
+var prefixStyles = function prefixStyles(styles) {
+  return Object.entries(styles).map(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      key = _ref2[0],
+      value = _ref2[1];
+    return ".".concat(valPrefixedClass).concat(key.replace(/\//g, "\\/"), " { ").concat(value, " }");
+  }).join("\n");
+};
+var cn = function cn(className) {
+  return className.map(function (c) {
+    return "".concat(valPrefixedClass).concat(c);
+  }).join(" ");
+};
+
+export { cn as c, prefixStyles as p, useConfigStorageSave as u, valPrefixedClass as v };

package/dist/cssUtils-d97a757c.cjs.prod.js

@@ -0,0 +1,41 @@
+'use strict';
+
+var internal = require('@valbuild/shared/internal');
+var React = require('react');
+var slicedToArray = require('./slicedToArray-ce613de6.cjs.prod.js');
+var core = require('@valbuild/core');
+var ui = require('@valbuild/ui');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefault(React);
+
+/*
+ * See the useConfig.tsx where the config is loaded from session storage
+ */
+function useConfigStorageSave(config) {
+  React__default["default"].useEffect(function () {
+    sessionStorage.setItem(internal.VAL_CONFIG_SESSION_STORAGE_KEY, JSON.stringify(config));
+  }, [config]);
+}
+
+// All DOM element that are outside the Shadow DOM should use this class name prefix
+var valPrefixedClass = "val-prefix-" + core.Internal.getSHA256Hash(new TextEncoder().encode(ui.VERSION || "")).slice(0, 8) + "-";
+var prefixStyles = function prefixStyles(styles) {
+  return Object.entries(styles).map(function (_ref) {
+    var _ref2 = slicedToArray._slicedToArray(_ref, 2),
+      key = _ref2[0],
+      value = _ref2[1];
+    return ".".concat(valPrefixedClass).concat(key.replace(/\//g, "\\/"), " { ").concat(value, " }");
+  }).join("\n");
+};
+var cn = function cn(className) {
+  return className.map(function (c) {
+    return "".concat(valPrefixedClass).concat(c);
+  }).join(" ");
+};
+
+exports.cn = cn;
+exports.prefixStyles = prefixStyles;
+exports.useConfigStorageSave = useConfigStorageSave;
+exports.valPrefixedClass = valPrefixedClass;

package/dist/declarations/src/ValApp.d.ts

@@ -1,4 +1,4 @@
 import { ValConfig } from "@valbuild/core";
 export declare const ValApp: ({ config }: {
     config: ValConfig;
-}) => import("react/jsx-runtime").JSX.Element | null;
+}) => import("react/jsx-runtime").JSX.Element;

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

@@ -5,8 +5,10 @@ export type UseValType<T extends SelectorSource> = SelectorOf<T> extends Generic
 declare function useValStega<T extends SelectorSource>(selector: T): UseValType<T>;
 type UseValRouteReturnType<T extends ValModule<GenericSelector<SourceObject>>> = T extends ValModule<infer S> ? S extends SourceObject ? StegaOfSource<NonNullable<S>[string]> | null : never : never;
 declare function useValRouteStega<T extends ValModule<GenericSelector<SourceObject>>>(selector: T, params: Record<string, string | string[]> | Promise<Record<string, string | string[]>>): UseValRouteReturnType<T>;
+declare function useValRouteUrl<T extends ValModule<GenericSelector<SourceObject>>>(selector: T, params?: Record<string, string | string[]> | Promise<Record<string, string | string[]>>): string | null;
 export declare function initValClient(config: ValConfig): {
     useValStega: typeof useValStega;
     useValRouteStega: typeof useValRouteStega;
+    useValRouteUrl: typeof useValRouteUrl;
 };
 export {};

package/dist/declarations/src/rsc/initValRsc.d.ts

@@ -19,6 +19,14 @@ declare const initFetchValRouteStega: (config: ValConfig, valApiEndpoints: strin
         value: string;
     } | undefined;
 }>) => <T extends ValModule<GenericSelector<SourceObject, undefined>>>(selector: T, params: Promise<Record<string, string | string[]>> | Record<string, string | string[]> | unknown) => Promise<FetchValRouteReturnType<T>>;
+declare const initFetchValRouteUrl: (config: ValConfig, valApiEndpoints: string, valServerPromise: Promise<ValServer>, isEnabled: () => Promise<boolean>, getHeaders: () => Promise<{
+    get(name: string): string | null;
+}>, getCookies: () => Promise<{
+    get(name: string): {
+        name: string;
+        value: string;
+    } | undefined;
+}>) => <T extends ValModule<GenericSelector<SourceObject, undefined>>>(selector: T, params?: Promise<Record<string, string | string[]>> | Record<string, string | string[]> | unknown) => Promise<string | null>;
 type ValNextRscConfig = {
     draftMode: typeof draftMode;
     headers: typeof headers;
@@ -27,5 +35,6 @@ type ValNextRscConfig = {
 export declare function initValRsc(config: ValConfig, valModules: ValModules, rscNextConfig: ValNextRscConfig): {
     fetchValStega: ReturnType<typeof initFetchValStega>;
     fetchValRouteStega: ReturnType<typeof initFetchValRouteStega>;
+    fetchValRouteUrl: ReturnType<typeof initFetchValRouteUrl>;
 };
 export {};

package/dist/{initValRouteFromVal-4e6253bf.esm.js → routeFromVal-248c62f1.esm.js}

@@ -5,7 +5,7 @@ import { _ as _typeof } from './typeof-a1531d8f.esm.js';
 import { RecordSchema, Internal } from '@valbuild/core';
 import { getNextAppRouterSourceFolder, getPatternFromModuleFilePath, parseRoutePattern } from '@valbuild/shared/internal';
 
-function initValRouteFromVal(resolvedParams, methodName,
+function getValRouteUrlFromVal(resolvedParams, methodName,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 path,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -59,7 +59,7 @@ val) {
   var parsedPattern = parseRoutePattern(pattern);
   var missingPatterns = [];
   var fullPathParts = [];
-  var missingParamKeys = _objectSpread2({}, resolvedParams);
+  var missingParamKeys = _typeof(resolvedParams) === "object" && resolvedParams !== null && !Array.isArray(resolvedParams) ? _objectSpread2({}, resolvedParams) : {};
   var _iterator = _createForOfIteratorHelper(parsedPattern !== null && parsedPattern !== void 0 ? parsedPattern : []),
     _step;
   try {
@@ -124,11 +124,24 @@ val) {
     // though chances are that there's something wrong in the way ${methodName} is used
   }
   var fullPath = fullPathParts.join("/");
-  var actualRoute = val["/".concat(fullPath)];
+  return "/".concat(fullPath);
+}
+function initValRouteFromVal(resolvedParams, methodName,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+path,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+schema,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+val) {
+  var url = getValRouteUrlFromVal(resolvedParams, methodName, path, schema, val);
+  if (!url) {
+    return null;
+  }
+  var actualRoute = val[url];
   if (!actualRoute) {
     return null;
   }
   return actualRoute;
 }
 
-export { initValRouteFromVal as i };
+export { getValRouteUrlFromVal as g, initValRouteFromVal as i };

package/dist/{initValRouteFromVal-0f4f2d39.cjs.prod.js → routeFromVal-a317debc.cjs.prod.js}

@@ -7,7 +7,7 @@ var _typeof = require('./typeof-16428c61.cjs.prod.js');
 var core = require('@valbuild/core');
 var internal = require('@valbuild/shared/internal');
 
-function initValRouteFromVal(resolvedParams, methodName,
+function getValRouteUrlFromVal(resolvedParams, methodName,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 path,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -61,7 +61,7 @@ val) {
   var parsedPattern = internal.parseRoutePattern(pattern);
   var missingPatterns = [];
   var fullPathParts = [];
-  var missingParamKeys = objectSpread2._objectSpread2({}, resolvedParams);
+  var missingParamKeys = _typeof._typeof(resolvedParams) === "object" && resolvedParams !== null && !Array.isArray(resolvedParams) ? objectSpread2._objectSpread2({}, resolvedParams) : {};
   var _iterator = createForOfIteratorHelper._createForOfIteratorHelper(parsedPattern !== null && parsedPattern !== void 0 ? parsedPattern : []),
     _step;
   try {
@@ -126,11 +126,25 @@ val) {
     // though chances are that there's something wrong in the way ${methodName} is used
   }
   var fullPath = fullPathParts.join("/");
-  var actualRoute = val["/".concat(fullPath)];
+  return "/".concat(fullPath);
+}
+function initValRouteFromVal(resolvedParams, methodName,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+path,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+schema,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+val) {
+  var url = getValRouteUrlFromVal(resolvedParams, methodName, path, schema, val);
+  if (!url) {
+    return null;
+  }
+  var actualRoute = val[url];
   if (!actualRoute) {
     return null;
   }
   return actualRoute;
 }
 
+exports.getValRouteUrlFromVal = getValRouteUrlFromVal;
 exports.initValRouteFromVal = initValRouteFromVal;

package/dist/{initValRouteFromVal-65dd1262.cjs.dev.js → routeFromVal-a3987ae3.cjs.dev.js}

@@ -7,7 +7,7 @@ var _typeof = require('./typeof-b568f48f.cjs.dev.js');
 var core = require('@valbuild/core');
 var internal = require('@valbuild/shared/internal');
 
-function initValRouteFromVal(resolvedParams, methodName,
+function getValRouteUrlFromVal(resolvedParams, methodName,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 path,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -61,7 +61,7 @@ val) {
   var parsedPattern = internal.parseRoutePattern(pattern);
   var missingPatterns = [];
   var fullPathParts = [];
-  var missingParamKeys = objectSpread2._objectSpread2({}, resolvedParams);
+  var missingParamKeys = _typeof._typeof(resolvedParams) === "object" && resolvedParams !== null && !Array.isArray(resolvedParams) ? objectSpread2._objectSpread2({}, resolvedParams) : {};
   var _iterator = createForOfIteratorHelper._createForOfIteratorHelper(parsedPattern !== null && parsedPattern !== void 0 ? parsedPattern : []),
     _step;
   try {
@@ -126,11 +126,25 @@ val) {
     // though chances are that there's something wrong in the way ${methodName} is used
   }
   var fullPath = fullPathParts.join("/");
-  var actualRoute = val["/".concat(fullPath)];
+  return "/".concat(fullPath);
+}
+function initValRouteFromVal(resolvedParams, methodName,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+path,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+schema,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+val) {
+  var url = getValRouteUrlFromVal(resolvedParams, methodName, path, schema, val);
+  if (!url) {
+    return null;
+  }
+  var actualRoute = val[url];
   if (!actualRoute) {
     return null;
   }
   return actualRoute;
 }
 
+exports.getValRouteUrlFromVal = getValRouteUrlFromVal;
 exports.initValRouteFromVal = initValRouteFromVal;

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

@@ -7,10 +7,10 @@ var objectSpread2 = require('./objectSpread2-792eb2c2.cjs.dev.js');
 var core = require('@valbuild/core');
 var stega = require('@valbuild/react/stega');
 var internal = require('@valbuild/react/internal');
-var ValNextProvider = require('./ValNextProvider-c7952bdc.cjs.dev.js');
+var ValNextProvider = require('./ValNextProvider-726026f9.cjs.dev.js');
 var NextImage = require('next/image');
 var jsxRuntime = require('react/jsx-runtime');
-var ValApp = require('./ValApp-0efa0e5d.cjs.dev.js');
+var ValApp = require('./ValApp-0ded607c.cjs.dev.js');
 var version = require('./version-82faa1d0.cjs.dev.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }

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

@@ -7,10 +7,10 @@ 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-a618d775.cjs.prod.js');
+var ValNextProvider = require('./ValNextProvider-7042b86d.cjs.prod.js');
 var NextImage = require('next/image');
 var jsxRuntime = require('react/jsx-runtime');
-var ValApp = require('./ValApp-a808cf89.cjs.prod.js');
+var ValApp = require('./ValApp-b10c2084.cjs.prod.js');
 var version = require('./version-a9a6a619.cjs.prod.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }

package/dist/valbuild-next.esm.js

@@ -6,10 +6,10 @@ 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-25f1f5c9.esm.js';
+import { ValNextProvider } from './ValNextProvider-10c232b6.esm.js';
 import NextImage from 'next/image';
 import { jsx } from 'react/jsx-runtime';
-export { ValApp } from './ValApp-3ab62a2b.esm.js';
+export { ValApp } from './ValApp-489d97dc.esm.js';
 import { V as VERSION } from './version-98ec5c7a.esm.js';
 
 function raw(val) {

package/package.json

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