@valbuild/next 0.84.0 → 0.84.1

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

@@ -3,9 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('client-only');
+var core = require('@valbuild/core');
 var stega = require('@valbuild/react/stega');
 var React = require('react');
 var ValOverlayContext = require('../../dist/ValOverlayContext-c82a4507.cjs.dev.js');
+var initValRouteFromVal = require('../../dist/initValRouteFromVal-12bdc5f5.cjs.dev.js');
+require('../../dist/createForOfIteratorHelper-0445603c.cjs.dev.js');
+require('../../dist/unsupportedIterableToArray-c8ab77c9.cjs.dev.js');
+require('../../dist/objectSpread2-792eb2c2.cjs.dev.js');
+require('../../dist/slicedToArray-44036a76.cjs.dev.js');
+require('../../dist/typeof-b568f48f.cjs.dev.js');
+require('@valbuild/shared/internal');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -33,11 +41,27 @@ function useValStega(selector) {
     }
   });
 }
+function useValRouteStega(selector, params) {
+  var val = useValStega(selector);
+  var resolvedParams = "then" in params ? undefined : params;
+  if ("then" in params) {
+    if ("use" in React__default["default"]) {
+      // This feels fairly safe: use should be possible to use inside if (?) and the if should most likely
+      resolvedParams = React__default["default"].use(params);
+    } else {
+      console.error("Val: useValRoute params argument was promise, but the React.use hook is available. Please resolve the promise before passing it to useValRoute (or upgrade to React 19+).");
+      return null;
+    }
+  }
+  var route = initValRouteFromVal.initValRouteFromVal(resolvedParams || {}, "useValRoute", selector && core.Internal.getValPath(selector), selector && core.Internal.getSchema(selector), val);
+  return route;
+}
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function initValClient(config) {
   return {
-    useValStega: useValStega
+    useValStega: useValStega,
+    useValRouteStega: useValRouteStega
   };
 }
 

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

@@ -3,9 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('client-only');
+var core = require('@valbuild/core');
 var stega = require('@valbuild/react/stega');
 var React = require('react');
 var ValOverlayContext = require('../../dist/ValOverlayContext-942f1294.cjs.prod.js');
+var initValRouteFromVal = require('../../dist/initValRouteFromVal-b9806908.cjs.prod.js');
+require('../../dist/createForOfIteratorHelper-d4afcad8.cjs.prod.js');
+require('../../dist/unsupportedIterableToArray-0d2087a2.cjs.prod.js');
+require('../../dist/objectSpread2-3c87fb4f.cjs.prod.js');
+require('../../dist/slicedToArray-ce613de6.cjs.prod.js');
+require('../../dist/typeof-16428c61.cjs.prod.js');
+require('@valbuild/shared/internal');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -33,11 +41,27 @@ function useValStega(selector) {
     }
   });
 }
+function useValRouteStega(selector, params) {
+  var val = useValStega(selector);
+  var resolvedParams = "then" in params ? undefined : params;
+  if ("then" in params) {
+    if ("use" in React__default["default"]) {
+      // This feels fairly safe: use should be possible to use inside if (?) and the if should most likely
+      resolvedParams = React__default["default"].use(params);
+    } else {
+      console.error("Val: useValRoute params argument was promise, but the React.use hook is available. Please resolve the promise before passing it to useValRoute (or upgrade to React 19+).");
+      return null;
+    }
+  }
+  var route = initValRouteFromVal.initValRouteFromVal(resolvedParams || {}, "useValRoute", selector && core.Internal.getValPath(selector), selector && core.Internal.getSchema(selector), val);
+  return route;
+}
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function initValClient(config) {
   return {
-    useValStega: useValStega
+    useValStega: useValStega,
+    useValRouteStega: useValRouteStega
   };
 }
 

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

@@ -1,7 +1,15 @@
 import 'client-only';
+import { Internal } from '@valbuild/core';
 import { getModuleIds, stegaEncode } from '@valbuild/react/stega';
 import React from 'react';
 import { useValOverlayContext } from '../../dist/ValOverlayContext-6635a4d7.esm.js';
+import { i as initValRouteFromVal } from '../../dist/initValRouteFromVal-d84b3563.esm.js';
+import '../../dist/createForOfIteratorHelper-5758a730.esm.js';
+import '../../dist/unsupportedIterableToArray-5baabfdc.esm.js';
+import '../../dist/objectSpread2-c1340c1c.esm.js';
+import '../../dist/slicedToArray-aa291011.esm.js';
+import '../../dist/typeof-a1531d8f.esm.js';
+import '@valbuild/shared/internal';
 
 function useValStega(selector) {
   var valOverlayContext = useValOverlayContext();
@@ -25,11 +33,27 @@ function useValStega(selector) {
     }
   });
 }
+function useValRouteStega(selector, params) {
+  var val = useValStega(selector);
+  var resolvedParams = "then" in params ? undefined : params;
+  if ("then" in params) {
+    if ("use" in React) {
+      // This feels fairly safe: use should be possible to use inside if (?) and the if should most likely
+      resolvedParams = React.use(params);
+    } else {
+      console.error("Val: useValRoute params argument was promise, but the React.use hook is available. Please resolve the promise before passing it to useValRoute (or upgrade to React 19+).");
+      return null;
+    }
+  }
+  var route = initValRouteFromVal(resolvedParams || {}, "useValRoute", selector && Internal.getValPath(selector), selector && Internal.getSchema(selector), val);
+  return route;
+}
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function initValClient(config) {
   return {
-    useValStega: useValStega
+    useValStega: useValStega,
+    useValRouteStega: useValRouteStega
   };
 }
 

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

@@ -1,9 +1,12 @@
-import { GenericSelector, SelectorOf, SelectorSource } from "@valbuild/core";
+import { GenericSelector, SelectorOf, SelectorSource, SourceObject, ValModule } from "@valbuild/core";
 import { StegaOfSource } from "@valbuild/react/stega";
 import { ValConfig } from "@valbuild/core";
 export type UseValType<T extends SelectorSource> = SelectorOf<T> extends GenericSelector<infer S> ? StegaOfSource<S> : never;
 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>;
 export declare function initValClient(config: ValConfig): {
     useValStega: typeof useValStega;
+    useValRouteStega: typeof useValRouteStega;
 };
 export {};

package/dist/initValRouteFromVal-12bdc5f5.cjs.dev.js

@@ -0,0 +1,116 @@
+'use strict';
+
+var createForOfIteratorHelper = require('./createForOfIteratorHelper-0445603c.cjs.dev.js');
+var objectSpread2 = require('./objectSpread2-792eb2c2.cjs.dev.js');
+var slicedToArray = require('./slicedToArray-44036a76.cjs.dev.js');
+var _typeof = require('./typeof-b568f48f.cjs.dev.js');
+var core = require('@valbuild/core');
+var internal = require('@valbuild/shared/internal');
+
+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) {
+  if (!path) {
+    console.error("Val: ".concat(methodName, " can only be used with a Val module (details: no Val path found)."));
+    return null;
+  }
+  if (val === null) {
+    return null;
+  }
+  if (_typeof._typeof(val) !== "object") {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: expected type object, found ").concat(_typeof._typeof(val), " instead)."));
+    return null;
+  }
+  if (Array.isArray(val)) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: expected type object, found array instead)."));
+    return null;
+  }
+  if (!schema) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: no schema found)."));
+    return null;
+  }
+  if (!(schema instanceof core.RecordSchema)) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: schema is not a record)."));
+  } else if (!schema["currentRouter"]) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: router is not set)."));
+  } else if (schema["currentRouter"].getRouterId() !== core.Internal.nextAppRouter.getRouterId()) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: router is not the Next.js App Router)."));
+    return null;
+  }
+  if (_typeof._typeof(resolvedParams) !== "object") {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: params is not an object)."));
+    return null;
+  }
+  var _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"))) {
+    console.error("Val: ".concat(methodName, " 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 null;
+  }
+  var srcFolder = internal.getNextAppRouterSourceFolder(moduleFilePath);
+  if (!srcFolder) {
+    console.error("Val: ".concat(methodName, " was used with a Val module that is not in the /app or /src/app folder"));
+    return null;
+  }
+  var pattern = internal.getPatternFromModuleFilePath(moduleFilePath, srcFolder);
+  var parsedPattern = internal.parseRoutePattern(pattern);
+  var missingPatterns = [];
+  var fullPathParts = [];
+  var missingParamKeys = objectSpread2._objectSpread2({}, resolvedParams);
+  var _iterator = createForOfIteratorHelper._createForOfIteratorHelper(parsedPattern !== null && parsedPattern !== void 0 ? parsedPattern : []),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var part = _step.value;
+      if (part.type === "literal") {
+        fullPathParts.push(part.name);
+      } else if (part.type === "array-param" || part.type === "string-param") {
+        var 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) {
+    var 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: ".concat(methodName, " 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 null;
+  }
+  if (Object.keys(missingParamKeys).length > 0) {
+    console.error("Val: ".concat(methodName, " 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 ${methodName} is used
+  }
+  var fullPath = fullPathParts.join("/");
+  var actualRoute = val["/".concat(fullPath)];
+  if (!actualRoute) {
+    return null;
+  }
+  return actualRoute;
+}
+
+exports.initValRouteFromVal = initValRouteFromVal;

package/dist/initValRouteFromVal-b9806908.cjs.prod.js

@@ -0,0 +1,116 @@
+'use strict';
+
+var createForOfIteratorHelper = require('./createForOfIteratorHelper-d4afcad8.cjs.prod.js');
+var objectSpread2 = require('./objectSpread2-3c87fb4f.cjs.prod.js');
+var slicedToArray = require('./slicedToArray-ce613de6.cjs.prod.js');
+var _typeof = require('./typeof-16428c61.cjs.prod.js');
+var core = require('@valbuild/core');
+var internal = require('@valbuild/shared/internal');
+
+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) {
+  if (!path) {
+    console.error("Val: ".concat(methodName, " can only be used with a Val module (details: no Val path found)."));
+    return null;
+  }
+  if (val === null) {
+    return null;
+  }
+  if (_typeof._typeof(val) !== "object") {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: expected type object, found ").concat(_typeof._typeof(val), " instead)."));
+    return null;
+  }
+  if (Array.isArray(val)) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: expected type object, found array instead)."));
+    return null;
+  }
+  if (!schema) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: no schema found)."));
+    return null;
+  }
+  if (!(schema instanceof core.RecordSchema)) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: schema is not a record)."));
+  } else if (!schema["currentRouter"]) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: router is not set)."));
+  } else if (schema["currentRouter"].getRouterId() !== core.Internal.nextAppRouter.getRouterId()) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: router is not the Next.js App Router)."));
+    return null;
+  }
+  if (_typeof._typeof(resolvedParams) !== "object") {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: params is not an object)."));
+    return null;
+  }
+  var _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"))) {
+    console.error("Val: ".concat(methodName, " 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 null;
+  }
+  var srcFolder = internal.getNextAppRouterSourceFolder(moduleFilePath);
+  if (!srcFolder) {
+    console.error("Val: ".concat(methodName, " was used with a Val module that is not in the /app or /src/app folder"));
+    return null;
+  }
+  var pattern = internal.getPatternFromModuleFilePath(moduleFilePath, srcFolder);
+  var parsedPattern = internal.parseRoutePattern(pattern);
+  var missingPatterns = [];
+  var fullPathParts = [];
+  var missingParamKeys = objectSpread2._objectSpread2({}, resolvedParams);
+  var _iterator = createForOfIteratorHelper._createForOfIteratorHelper(parsedPattern !== null && parsedPattern !== void 0 ? parsedPattern : []),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var part = _step.value;
+      if (part.type === "literal") {
+        fullPathParts.push(part.name);
+      } else if (part.type === "array-param" || part.type === "string-param") {
+        var 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) {
+    var 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: ".concat(methodName, " 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 null;
+  }
+  if (Object.keys(missingParamKeys).length > 0) {
+    console.error("Val: ".concat(methodName, " 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 ${methodName} is used
+  }
+  var fullPath = fullPathParts.join("/");
+  var actualRoute = val["/".concat(fullPath)];
+  if (!actualRoute) {
+    return null;
+  }
+  return actualRoute;
+}
+
+exports.initValRouteFromVal = initValRouteFromVal;

package/dist/initValRouteFromVal-d84b3563.esm.js

@@ -0,0 +1,114 @@
+import { _ as _createForOfIteratorHelper } from './createForOfIteratorHelper-5758a730.esm.js';
+import { _ as _objectSpread2 } from './objectSpread2-c1340c1c.esm.js';
+import { _ as _slicedToArray } from './slicedToArray-aa291011.esm.js';
+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,
+// 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) {
+  if (!path) {
+    console.error("Val: ".concat(methodName, " can only be used with a Val module (details: no Val path found)."));
+    return null;
+  }
+  if (val === null) {
+    return null;
+  }
+  if (_typeof(val) !== "object") {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: expected type object, found ").concat(_typeof(val), " instead)."));
+    return null;
+  }
+  if (Array.isArray(val)) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: expected type object, found array instead)."));
+    return null;
+  }
+  if (!schema) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: no schema found)."));
+    return null;
+  }
+  if (!(schema instanceof RecordSchema)) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: schema is not a record)."));
+  } else if (!schema["currentRouter"]) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: router is not set)."));
+  } else if (schema["currentRouter"].getRouterId() !== Internal.nextAppRouter.getRouterId()) {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: router is not the Next.js App Router)."));
+    return null;
+  }
+  if (_typeof(resolvedParams) !== "object") {
+    console.error("Val: ".concat(methodName, " must be used with a Val Module that is a s.record().router(...) (details: params is not an object)."));
+    return null;
+  }
+  var _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"))) {
+    console.error("Val: ".concat(methodName, " 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 null;
+  }
+  var srcFolder = getNextAppRouterSourceFolder(moduleFilePath);
+  if (!srcFolder) {
+    console.error("Val: ".concat(methodName, " was used with a Val module that is not in the /app or /src/app folder"));
+    return null;
+  }
+  var pattern = getPatternFromModuleFilePath(moduleFilePath, srcFolder);
+  var parsedPattern = parseRoutePattern(pattern);
+  var missingPatterns = [];
+  var fullPathParts = [];
+  var missingParamKeys = _objectSpread2({}, resolvedParams);
+  var _iterator = _createForOfIteratorHelper(parsedPattern !== null && parsedPattern !== void 0 ? parsedPattern : []),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var part = _step.value;
+      if (part.type === "literal") {
+        fullPathParts.push(part.name);
+      } else if (part.type === "array-param" || part.type === "string-param") {
+        var 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) {
+    var 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: ".concat(methodName, " 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 null;
+  }
+  if (Object.keys(missingParamKeys).length > 0) {
+    console.error("Val: ".concat(methodName, " 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 ${methodName} is used
+  }
+  var fullPath = fullPathParts.join("/");
+  var actualRoute = val["/".concat(fullPath)];
+  if (!actualRoute) {
+    return null;
+  }
+  return actualRoute;
+}
+
+export { initValRouteFromVal as i };

package/package.json

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

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

@@ -3,17 +3,18 @@
 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');
+var initValRouteFromVal = require('../../dist/initValRouteFromVal-12bdc5f5.cjs.dev.js');
+require('../../dist/createForOfIteratorHelper-0445603c.cjs.dev.js');
 require('../../dist/unsupportedIterableToArray-c8ab77c9.cjs.dev.js');
+require('../../dist/slicedToArray-44036a76.cjs.dev.js');
+require('../../dist/typeof-b568f48f.cjs.dev.js');
 
 stega.SET_RSC(true);
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
@@ -182,161 +183,31 @@ 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;
+      var fetchVal, resolvedParams, path, schema, val, route;
       return asyncToGenerator._regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
+            _context2.next = 3;
+            return Promise.resolve(params);
+          case 3:
+            resolvedParams = _context2.sent;
             path = selector && core.Internal.getValPath(selector);
-            if (path) {
-              _context2.next = 5;
+            schema = selector && core.Internal.getSchema(selector);
+            _context2.t0 = selector;
+            if (!_context2.t0) {
+              _context2.next = 11;
               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;
+            _context2.next = 10;
             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:
+            _context2.t0 = _context2.sent;
+          case 11:
+            val = _context2.t0;
+            route = initValRouteFromVal.initValRouteFromVal(resolvedParams, "fetchValRoute", path, schema, val);
+            return _context2.abrupt("return", route);
+          case 14:
           case "end":
             return _context2.stop();
         }

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

@@ -3,17 +3,18 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
-var createForOfIteratorHelper = require('../../dist/createForOfIteratorHelper-d4afcad8.cjs.prod.js');
 var objectSpread2 = require('../../dist/objectSpread2-3c87fb4f.cjs.prod.js');
-var slicedToArray = require('../../dist/slicedToArray-ce613de6.cjs.prod.js');
-var _typeof = require('../../dist/typeof-16428c61.cjs.prod.js');
 var asyncToGenerator = require('../../dist/asyncToGenerator-67a5ff70.cjs.prod.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-a9a6a619.cjs.prod.js');
+var initValRouteFromVal = require('../../dist/initValRouteFromVal-b9806908.cjs.prod.js');
+require('../../dist/createForOfIteratorHelper-d4afcad8.cjs.prod.js');
 require('../../dist/unsupportedIterableToArray-0d2087a2.cjs.prod.js');
+require('../../dist/slicedToArray-ce613de6.cjs.prod.js');
+require('../../dist/typeof-16428c61.cjs.prod.js');
 
 stega.SET_RSC(true);
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
@@ -182,161 +183,31 @@ 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;
+      var fetchVal, resolvedParams, path, schema, val, route;
       return asyncToGenerator._regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
+            _context2.next = 3;
+            return Promise.resolve(params);
+          case 3:
+            resolvedParams = _context2.sent;
             path = selector && core.Internal.getValPath(selector);
-            if (path) {
-              _context2.next = 5;
+            schema = selector && core.Internal.getSchema(selector);
+            _context2.t0 = selector;
+            if (!_context2.t0) {
+              _context2.next = 11;
               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;
+            _context2.next = 10;
             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:
+            _context2.t0 = _context2.sent;
+          case 11:
+            val = _context2.t0;
+            route = initValRouteFromVal.initValRouteFromVal(resolvedParams, "fetchValRoute", path, schema, val);
+            return _context2.abrupt("return", route);
+          case 14:
           case "end":
             return _context2.stop();
         }

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

@@ -1,15 +1,16 @@
 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, RecordSchema } from '@valbuild/core';
-import { getPatternFromModuleFilePath, parseRoutePattern, getNextAppRouterSourceFolder, VAL_SESSION_COOKIE } from '@valbuild/shared/internal';
+import { Internal } from '@valbuild/core';
+import { VAL_SESSION_COOKIE } from '@valbuild/shared/internal';
 import { createValServer } from '@valbuild/server';
 import { V as VERSION } from '../../dist/version-98ec5c7a.esm.js';
+import { i as initValRouteFromVal } from '../../dist/initValRouteFromVal-d84b3563.esm.js';
+import '../../dist/createForOfIteratorHelper-5758a730.esm.js';
 import '../../dist/unsupportedIterableToArray-5baabfdc.esm.js';
+import '../../dist/slicedToArray-aa291011.esm.js';
+import '../../dist/typeof-a1531d8f.esm.js';
 
 SET_RSC(true);
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
@@ -178,161 +179,31 @@ 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;
+      var fetchVal, resolvedParams, path, schema, val, route;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             fetchVal = initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies);
+            _context2.next = 3;
+            return Promise.resolve(params);
+          case 3:
+            resolvedParams = _context2.sent;
             path = selector && Internal.getValPath(selector);
-            if (path) {
-              _context2.next = 5;
+            schema = selector && Internal.getSchema(selector);
+            _context2.t0 = selector;
+            if (!_context2.t0) {
+              _context2.next = 11;
               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;
+            _context2.next = 10;
             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:
+            _context2.t0 = _context2.sent;
+          case 11:
+            val = _context2.t0;
+            route = initValRouteFromVal(resolvedParams, "fetchValRoute", path, schema, val);
+            return _context2.abrupt("return", route);
+          case 14:
           case "end":
             return _context2.stop();
         }