@hybridly/core 0.0.1-alpha.19 → 0.0.1-alpha.20

package/dist/index.cjs

@@ -44,6 +44,21 @@ class NotAHybridResponseError extends Error {
 }
 class NavigationCancelledError extends Error {
 }
+class RoutingNotInitialized extends Error {
+  constructor() {
+    super("Routing is not initialized. Make sure the Vite plugin is enabled and that `virtual:hybridly/router` is imported and that `php artisan route:list` returns no error.");
+  }
+}
+class RouteNotFound extends Error {
+  constructor(name) {
+    super(`Route [${name}] does not exist.`);
+  }
+}
+class MissingRouteParameter extends Error {
+  constructor(parameter, routeName) {
+    super(`Parameter [${parameter}] is required for route [${routeName}].`);
+  }
+}
 
 function definePlugin(plugin) {
   return plugin;
@@ -163,14 +178,15 @@ async function restoreScrollPositions() {
   }
 }
 
-function normalizeUrl(href) {
-  return makeUrl(href).toString();
+function normalizeUrl(href, trailingSlash) {
+  return makeUrl(href, { trailingSlash }).toString();
 }
 function makeUrl(href, transformations = {}) {
   try {
     const base = document?.location?.href === "//" ? void 0 : document.location.href;
     const url = new URL(String(href), base);
-    Object.entries(transformations ?? {}).forEach(([key, value]) => {
+    transformations = typeof transformations === "function" ? transformations(url) ?? {} : transformations ?? {};
+    Object.entries(transformations).forEach(([key, value]) => {
       if (key === "query") {
         key = "search";
         value = qs__default.stringify(utils.merge(qs__default.parse(url.search, { ignoreQueryPrefix: true }), value), {
@@ -180,6 +196,10 @@ function makeUrl(href, transformations = {}) {
       }
       Reflect.set(url, key, value);
     });
+    if (transformations.trailingSlash === false) {
+      const _url = utils.removeTrailingSlash(url.toString().replace(/\/\?/, "?"));
+      url.toString = () => _url;
+    }
     return url;
   } catch (error) {
     throw new TypeError(`${href} is not resolvable to a valid URL.`);
@@ -311,131 +331,107 @@ function createSerializer(options) {
   };
 }
 
-class Route {
-  constructor(name, absolute) {
-    this.name = name;
-    this.absolute = absolute;
-    this.definition = Route.getDefinition(name);
-  }
-  static getDefinition(name) {
-    const context = getInternalRouterContext();
-    if (!context.routing) {
-      throw new Error("Routing is not initialized. Make sure the Vite plugin is enabled and that `virtual:hybridly/router` is imported and that `php artisan route:list` returns no error.");
+function generateRouteFromName(name, parameters, absolute, shouldThrow) {
+  const url = getUrlFromName(name, parameters, shouldThrow);
+  return absolute === false ? url.toString().replace(url.origin, "") : url.toString();
+}
+function getUrlFromName(name, parameters, shouldThrow) {
+  const routing = getRouting();
+  const definition = getRouteDefinition(name);
+  const transforms = getRouteTransformable(name, parameters, shouldThrow);
+  const url = makeUrl(routing.url, (url2) => ({
+    hostname: definition.domain || url2.hostname,
+    port: routing.port?.toString() || url2.port,
+    trailingSlash: false,
+    ...transforms
+  }));
+  return url;
+}
+function getRouteTransformable(routeName, routeParameters, shouldThrow) {
+  const routing = getRouting();
+  const definition = getRouteDefinition(routeName);
+  const parameters = routeParameters || {};
+  const missing = Object.keys(parameters);
+  const path = definition.uri.replace(/{([^}?]+)\??}/g, (match, parameterName) => {
+    const optional = /\?}$/.test(match);
+    const value = (() => {
+      const value2 = parameters[parameterName];
+      const bindingProperty = definition.bindings?.[parameterName];
+      if (bindingProperty && typeof value2 === "object") {
+        return value2[bindingProperty];
+      }
+      return value2;
+    })();
+    missing.splice(missing.indexOf(parameterName), 1);
+    if (value) {
+      const where = definition.wheres?.[parameterName];
+      if (where && !new RegExp(where).test(value)) {
+        console.warn(`[hybridly:routing] Parameter [${parameterName}] does not match the required format [${where}] for route [${routeName}].`);
+      }
+      return value;
     }
-    const route = context.routing?.routes?.[name];
-    if (!route) {
-      throw new Error(`Route ${name.toString()} does not exist.`);
+    if (routing.defaults?.[parameterName]) {
+      return routing.defaults?.[parameterName];
     }
-    return route;
-  }
-  get template() {
-    const context = getInternalRouterContext();
-    const origin = !this.absolute ? "" : this.definition.domain ? `${context.routing?.url.match(/^\w+:\/\//)?.[0]}${this.definition.domain}${context.routing?.port ? `:${context.routing?.port}` : ""}` : context.routing?.url;
-    return `${origin}/${this.definition.uri}`.replace(/\/+$/, "");
-  }
-  get parameterSegments() {
-    return this.template.match(/{[^}?]+\??}/g)?.map((segment) => ({
-      name: segment.replace(/{|\??}/g, ""),
-      required: !/\?}$/.test(segment)
-    })) ?? [];
-  }
-  matchesUrl(url) {
-    if (!this.definition.method.includes("GET")) {
-      return false;
+    if (optional) {
+      return "";
     }
-    const pattern = this.template.replace(/(\/?){([^}?]*)(\??)}/g, (_, slash, segment, optional) => {
-      const regex = `(?<${segment}>${this.definition.wheres?.[segment]?.replace(/(^\^)|(\$$)/g, "") || "[^/?]+"})`;
-      return optional ? `(${slash}${regex})?` : `${slash}${regex}`;
-    }).replace(/^\w+:\/\//, "");
-    const [location, query] = url.replace(/^\w+:\/\//, "").split("?");
-    const matches = new RegExp(`^${pattern}/?$`).exec(location);
-    return matches ? { params: matches.groups, query: qs.parse(query) } : false;
-  }
-  compile(params) {
-    const segments = this.parameterSegments;
-    if (!segments.length) {
-      return this.template;
+    if (shouldThrow === false) {
+      return "";
     }
-    return this.template.replace(/{([^}?]+)(\??)}/g, (_, segment, optional) => {
-      if (!optional && [null, void 0].includes(params?.[segment])) {
-        throw new Error(`Router error: [${segment}] parameter is required for route [${this.name}].`);
-      }
-      if (segments[segments.length - 1].name === segment && this.definition?.wheres?.[segment] === ".*") {
-        return encodeURIComponent(params[segment] ?? "").replace(/%2F/g, "/");
-      }
-      if (this.definition?.wheres?.[segment] && !new RegExp(`^${optional ? `(${this.definition?.wheres?.[segment]})?` : this.definition?.wheres?.[segment]}$`).test(params[segment] ?? "")) {
-        throw new Error(`Router error: [${segment}] parameter does not match required format [${this.definition?.wheres?.[segment]}] for route [${this.name}].`);
-      }
-      return encodeURIComponent(params[segment] ?? "");
-    }).replace(/\/+$/, "");
+    throw new MissingRouteParameter(parameterName, routeName);
+  });
+  const remaining = Object.keys(parameters).filter((key) => missing.includes(key)).reduce((obj, key) => ({
+    ...obj,
+    [key]: parameters[key]
+  }), {});
+  return {
+    pathname: path,
+    search: qs__default.stringify(remaining, {
+      encodeValuesOnly: true,
+      arrayFormat: "indices",
+      addQueryPrefix: true
+    })
+  };
+}
+function getRouteDefinition(name) {
+  const routing = getRouting();
+  const definition = routing.routes[name];
+  if (!definition) {
+    throw new RouteNotFound(name);
   }
+  return definition;
 }
-
-class Router extends String {
-  constructor(name, parameters, absolute = true) {
-    super();
-    const context = getInternalRouterContext();
-    this.route = new Route(name, absolute);
-    this.routing = context.routing;
-    this.setParameters(parameters);
-  }
-  toString() {
-    const unhandled = Object.keys(this.parameters).filter((key) => !this.route.parameterSegments.some(({ name }) => name === key)).filter((key) => key !== "_query").reduce((result, current) => ({ ...result, [current]: this.parameters[current] }), {});
-    return this.route.compile(this.parameters) + qs.stringify({ ...unhandled, ...this.parameters._query }, {
-      addQueryPrefix: true,
-      arrayFormat: "indices",
-      encodeValuesOnly: true,
-      skipNulls: true,
-      encoder: (value, encoder) => typeof value === "boolean" ? Number(value).toString() : encoder(value)
-    });
+function getRouting() {
+  const { routing } = getInternalRouterContext();
+  if (!routing) {
+    throw new RoutingNotInitialized();
   }
-  static has(name) {
+  return routing;
+}
+
+function isCurrentFromName(name, parameters, mode = "loose") {
+  const location = window.location;
+  const matchee = (() => {
     try {
-      Route.getDefinition(name);
-      return true;
-    } catch {
-      return false;
+      return makeUrl(generateRouteFromName(name, parameters, true, false));
+    } catch (error) {
     }
+  })();
+  if (!matchee) {
+    return false;
   }
-  setParameters(parameters) {
-    this.parameters = parameters ?? {};
-    this.parameters = ["string", "number"].includes(typeof this.parameters) ? [this.parameters] : this.parameters;
-    const segments = this.route.parameterSegments.filter(({ name }) => !this.routing.defaults[name]);
-    if (Array.isArray(this.parameters)) {
-      this.parameters = this.parameters.reduce((result, current, i) => segments[i] ? { ...result, [segments[i].name]: current } : typeof current === "object" ? { ...result, ...current } : { ...result, [current]: "" }, {});
-    } else if (segments.length === 1 && !this.parameters[segments[0].name] && (Reflect.has(this.parameters, Object.values(this.route.definition.bindings)[0]) || Reflect.has(this.parameters, "id"))) {
-      this.parameters = { [segments[0].name]: this.parameters };
-    }
-    this.parameters = {
-      ...this.getDefaults(),
-      ...this.substituteBindings()
-    };
-  }
-  getDefaults() {
-    return this.route.parameterSegments.filter(({ name }) => this.routing.defaults[name]).reduce((result, { name }) => ({ ...result, [name]: this.routing.defaults[name] }), {});
-  }
-  substituteBindings() {
-    return Object.entries(this.parameters).reduce((result, [key, value]) => {
-      if (!value || typeof value !== "object" || Array.isArray(value) || !this.route.parameterSegments.some(({ name }) => name === key)) {
-        return { ...result, [key]: value };
-      }
-      if (!Reflect.has(value, this.route.definition.bindings[key])) {
-        if (Reflect.has(value, "id")) {
-          this.route.definition.bindings[key] = "id";
-        } else {
-          throw new Error(`Router error: object passed as [${key}] parameter is missing route model binding key [${this.route.definition.bindings?.[key]}].`);
-        }
-      }
-      return { ...result, [key]: value[this.route.definition.bindings[key]] };
-    }, {});
-  }
-  valueOf() {
-    return this.toString();
+  if (mode === "strict") {
+    return location.href === matchee.href;
   }
+  return location.href.startsWith(matchee.href);
 }
 
 function route(name, parameters, absolute) {
-  return new Router(name, parameters, absolute).toString();
+  return generateRouteFromName(name, parameters, absolute);
+}
+function current(name, parameters, mode = "loose") {
+  return isCurrentFromName(name, parameters, mode);
 }
 function updateRoutingConfiguration(routing) {
   if (!routing) {
@@ -549,8 +545,8 @@ const router = {
   local: async (url, options) => await performLocalNavigation(url, options),
   external: (url, data = {}) => navigateToExternalUrl(url, data),
   to: async (name, parameters, options) => {
-    const url = new Router(name, parameters).toString();
-    const method = Route.getDefinition(name).method.at(0);
+    const url = generateRouteFromName(name, parameters);
+    const method = getRouteDefinition(name).method.at(0);
     return await performHybridNavigation({ url, ...options, method });
   },
   history: {
@@ -598,8 +594,7 @@ async function performHybridNavigation(options) {
     }
     saveScrollPositions();
     if (options.url && options.transformUrl) {
-      const transformUrl = typeof options.transformUrl === "function" ? options.transformUrl(makeUrl(options.url).toString()) : options.transformUrl;
-      options.url = makeUrl(options.url, transformUrl);
+      options.url = makeUrl(options.url, options.transformUrl);
     }
     const targetUrl = makeUrl(options.url ?? context.url);
     const abortController = new AbortController();
@@ -827,6 +822,7 @@ function can(resource, action) {
 exports.can = can;
 exports.constants = constants;
 exports.createRouter = createRouter;
+exports.current = current;
 exports.definePlugin = definePlugin;
 exports.getRouterContext = getRouterContext;
 exports.makeUrl = makeUrl;

package/dist/index.d.ts

@@ -87,8 +87,10 @@ interface Plugin extends Partial<Hooks> {
 declare function definePlugin(plugin: Plugin): Plugin;
 
 type UrlResolvable = string | URL | Location;
-type UrlTransformable = Partial<Omit<URL, 'searchParams' | 'toJSON' | 'toString'>> & {
+type UrlTransformable = BaseUrlTransformable | ((string: URL) => BaseUrlTransformable);
+type BaseUrlTransformable = Partial<Omit<URL, 'searchParams' | 'toJSON' | 'toString'>> & {
     query?: any;
+    trailingSlash?: boolean;
 };
 /**
  * Converts an input to an URL, optionally changing its properties after initialization.
@@ -138,7 +140,7 @@ interface NavigationOptions {
      * }
      * ```
      */
-    transformUrl?: UrlTransformable | ((url: string) => UrlTransformable);
+    transformUrl?: UrlTransformable;
     /**
      * Defines whether the history state should be updated.
      * @internal This is an advanced property meant to be used internally.
@@ -288,6 +290,7 @@ interface RouteDefinition {
     bindings: Record<string, string>;
     domain?: string;
     wheres?: Record<string, string>;
+    name: string;
 }
 interface GlobalRouteCollection extends RoutingConfiguration {
 }
@@ -393,6 +396,10 @@ declare function can<Authorizations extends Record<string, boolean>, Data extend
  * Generates a route from the given route name.
  */
 declare function route<T extends RouteName>(name: T, parameters?: RouteParameters<T>, absolute?: boolean): string;
+/**
+ * Determines if the current route correspond to the given route name and parameters.
+ */
+declare function current<T extends RouteName>(name: T, parameters?: RouteParameters<T>, mode?: 'loose' | 'strict'): boolean;
 
 declare const STORAGE_EXTERNAL_KEY = "hybridly:external";
 declare const HYBRIDLY_HEADER = "x-hybrid";
@@ -430,4 +437,4 @@ declare namespace constants {
   };
 }
 
-export { Authorizable, GlobalRouteCollection, HybridPayload, HybridRequestOptions, MaybePromise, Method, NavigationResponse, Plugin, Progress, ResolveComponent, RouteDefinition, RouteName, RouteParameters, Router, RouterContext, RouterContextOptions, RoutingConfiguration, UrlResolvable, can, constants, createRouter, definePlugin, getRouterContext, makeUrl, registerHook, route, router, sameUrls };
+export { Authorizable, GlobalRouteCollection, HybridPayload, HybridRequestOptions, MaybePromise, Method, NavigationResponse, Plugin, Progress, ResolveComponent, RouteDefinition, RouteName, RouteParameters, Router, RouterContext, RouterContextOptions, RoutingConfiguration, UrlResolvable, can, constants, createRouter, current, definePlugin, getRouterContext, makeUrl, registerHook, route, router, sameUrls };

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { debug, merge, debounce, random, hasFiles, objectToFormData, when, match, showResponseErrorModal } from '@hybridly/utils';
+import { debug, merge, removeTrailingSlash, debounce, random, hasFiles, objectToFormData, when, match, showResponseErrorModal } from '@hybridly/utils';
 import axios from 'axios';
-import qs, { parse, stringify } from 'qs';
+import qs from 'qs';
 
 const STORAGE_EXTERNAL_KEY = "hybridly:external";
 const HYBRIDLY_HEADER = "x-hybrid";
@@ -35,6 +35,21 @@ class NotAHybridResponseError extends Error {
 }
 class NavigationCancelledError extends Error {
 }
+class RoutingNotInitialized extends Error {
+  constructor() {
+    super("Routing is not initialized. Make sure the Vite plugin is enabled and that `virtual:hybridly/router` is imported and that `php artisan route:list` returns no error.");
+  }
+}
+class RouteNotFound extends Error {
+  constructor(name) {
+    super(`Route [${name}] does not exist.`);
+  }
+}
+class MissingRouteParameter extends Error {
+  constructor(parameter, routeName) {
+    super(`Parameter [${parameter}] is required for route [${routeName}].`);
+  }
+}
 
 function definePlugin(plugin) {
   return plugin;
@@ -154,14 +169,15 @@ async function restoreScrollPositions() {
   }
 }
 
-function normalizeUrl(href) {
-  return makeUrl(href).toString();
+function normalizeUrl(href, trailingSlash) {
+  return makeUrl(href, { trailingSlash }).toString();
 }
 function makeUrl(href, transformations = {}) {
   try {
     const base = document?.location?.href === "//" ? void 0 : document.location.href;
     const url = new URL(String(href), base);
-    Object.entries(transformations ?? {}).forEach(([key, value]) => {
+    transformations = typeof transformations === "function" ? transformations(url) ?? {} : transformations ?? {};
+    Object.entries(transformations).forEach(([key, value]) => {
       if (key === "query") {
         key = "search";
         value = qs.stringify(merge(qs.parse(url.search, { ignoreQueryPrefix: true }), value), {
@@ -171,6 +187,10 @@ function makeUrl(href, transformations = {}) {
       }
       Reflect.set(url, key, value);
     });
+    if (transformations.trailingSlash === false) {
+      const _url = removeTrailingSlash(url.toString().replace(/\/\?/, "?"));
+      url.toString = () => _url;
+    }
     return url;
   } catch (error) {
     throw new TypeError(`${href} is not resolvable to a valid URL.`);
@@ -302,131 +322,107 @@ function createSerializer(options) {
   };
 }
 
-class Route {
-  constructor(name, absolute) {
-    this.name = name;
-    this.absolute = absolute;
-    this.definition = Route.getDefinition(name);
-  }
-  static getDefinition(name) {
-    const context = getInternalRouterContext();
-    if (!context.routing) {
-      throw new Error("Routing is not initialized. Make sure the Vite plugin is enabled and that `virtual:hybridly/router` is imported and that `php artisan route:list` returns no error.");
+function generateRouteFromName(name, parameters, absolute, shouldThrow) {
+  const url = getUrlFromName(name, parameters, shouldThrow);
+  return absolute === false ? url.toString().replace(url.origin, "") : url.toString();
+}
+function getUrlFromName(name, parameters, shouldThrow) {
+  const routing = getRouting();
+  const definition = getRouteDefinition(name);
+  const transforms = getRouteTransformable(name, parameters, shouldThrow);
+  const url = makeUrl(routing.url, (url2) => ({
+    hostname: definition.domain || url2.hostname,
+    port: routing.port?.toString() || url2.port,
+    trailingSlash: false,
+    ...transforms
+  }));
+  return url;
+}
+function getRouteTransformable(routeName, routeParameters, shouldThrow) {
+  const routing = getRouting();
+  const definition = getRouteDefinition(routeName);
+  const parameters = routeParameters || {};
+  const missing = Object.keys(parameters);
+  const path = definition.uri.replace(/{([^}?]+)\??}/g, (match, parameterName) => {
+    const optional = /\?}$/.test(match);
+    const value = (() => {
+      const value2 = parameters[parameterName];
+      const bindingProperty = definition.bindings?.[parameterName];
+      if (bindingProperty && typeof value2 === "object") {
+        return value2[bindingProperty];
+      }
+      return value2;
+    })();
+    missing.splice(missing.indexOf(parameterName), 1);
+    if (value) {
+      const where = definition.wheres?.[parameterName];
+      if (where && !new RegExp(where).test(value)) {
+        console.warn(`[hybridly:routing] Parameter [${parameterName}] does not match the required format [${where}] for route [${routeName}].`);
+      }
+      return value;
     }
-    const route = context.routing?.routes?.[name];
-    if (!route) {
-      throw new Error(`Route ${name.toString()} does not exist.`);
+    if (routing.defaults?.[parameterName]) {
+      return routing.defaults?.[parameterName];
     }
-    return route;
-  }
-  get template() {
-    const context = getInternalRouterContext();
-    const origin = !this.absolute ? "" : this.definition.domain ? `${context.routing?.url.match(/^\w+:\/\//)?.[0]}${this.definition.domain}${context.routing?.port ? `:${context.routing?.port}` : ""}` : context.routing?.url;
-    return `${origin}/${this.definition.uri}`.replace(/\/+$/, "");
-  }
-  get parameterSegments() {
-    return this.template.match(/{[^}?]+\??}/g)?.map((segment) => ({
-      name: segment.replace(/{|\??}/g, ""),
-      required: !/\?}$/.test(segment)
-    })) ?? [];
-  }
-  matchesUrl(url) {
-    if (!this.definition.method.includes("GET")) {
-      return false;
+    if (optional) {
+      return "";
     }
-    const pattern = this.template.replace(/(\/?){([^}?]*)(\??)}/g, (_, slash, segment, optional) => {
-      const regex = `(?<${segment}>${this.definition.wheres?.[segment]?.replace(/(^\^)|(\$$)/g, "") || "[^/?]+"})`;
-      return optional ? `(${slash}${regex})?` : `${slash}${regex}`;
-    }).replace(/^\w+:\/\//, "");
-    const [location, query] = url.replace(/^\w+:\/\//, "").split("?");
-    const matches = new RegExp(`^${pattern}/?$`).exec(location);
-    return matches ? { params: matches.groups, query: parse(query) } : false;
-  }
-  compile(params) {
-    const segments = this.parameterSegments;
-    if (!segments.length) {
-      return this.template;
+    if (shouldThrow === false) {
+      return "";
     }
-    return this.template.replace(/{([^}?]+)(\??)}/g, (_, segment, optional) => {
-      if (!optional && [null, void 0].includes(params?.[segment])) {
-        throw new Error(`Router error: [${segment}] parameter is required for route [${this.name}].`);
-      }
-      if (segments[segments.length - 1].name === segment && this.definition?.wheres?.[segment] === ".*") {
-        return encodeURIComponent(params[segment] ?? "").replace(/%2F/g, "/");
-      }
-      if (this.definition?.wheres?.[segment] && !new RegExp(`^${optional ? `(${this.definition?.wheres?.[segment]})?` : this.definition?.wheres?.[segment]}$`).test(params[segment] ?? "")) {
-        throw new Error(`Router error: [${segment}] parameter does not match required format [${this.definition?.wheres?.[segment]}] for route [${this.name}].`);
-      }
-      return encodeURIComponent(params[segment] ?? "");
-    }).replace(/\/+$/, "");
+    throw new MissingRouteParameter(parameterName, routeName);
+  });
+  const remaining = Object.keys(parameters).filter((key) => missing.includes(key)).reduce((obj, key) => ({
+    ...obj,
+    [key]: parameters[key]
+  }), {});
+  return {
+    pathname: path,
+    search: qs.stringify(remaining, {
+      encodeValuesOnly: true,
+      arrayFormat: "indices",
+      addQueryPrefix: true
+    })
+  };
+}
+function getRouteDefinition(name) {
+  const routing = getRouting();
+  const definition = routing.routes[name];
+  if (!definition) {
+    throw new RouteNotFound(name);
   }
+  return definition;
 }
-
-class Router extends String {
-  constructor(name, parameters, absolute = true) {
-    super();
-    const context = getInternalRouterContext();
-    this.route = new Route(name, absolute);
-    this.routing = context.routing;
-    this.setParameters(parameters);
-  }
-  toString() {
-    const unhandled = Object.keys(this.parameters).filter((key) => !this.route.parameterSegments.some(({ name }) => name === key)).filter((key) => key !== "_query").reduce((result, current) => ({ ...result, [current]: this.parameters[current] }), {});
-    return this.route.compile(this.parameters) + stringify({ ...unhandled, ...this.parameters._query }, {
-      addQueryPrefix: true,
-      arrayFormat: "indices",
-      encodeValuesOnly: true,
-      skipNulls: true,
-      encoder: (value, encoder) => typeof value === "boolean" ? Number(value).toString() : encoder(value)
-    });
+function getRouting() {
+  const { routing } = getInternalRouterContext();
+  if (!routing) {
+    throw new RoutingNotInitialized();
   }
-  static has(name) {
+  return routing;
+}
+
+function isCurrentFromName(name, parameters, mode = "loose") {
+  const location = window.location;
+  const matchee = (() => {
     try {
-      Route.getDefinition(name);
-      return true;
-    } catch {
-      return false;
+      return makeUrl(generateRouteFromName(name, parameters, true, false));
+    } catch (error) {
     }
+  })();
+  if (!matchee) {
+    return false;
   }
-  setParameters(parameters) {
-    this.parameters = parameters ?? {};
-    this.parameters = ["string", "number"].includes(typeof this.parameters) ? [this.parameters] : this.parameters;
-    const segments = this.route.parameterSegments.filter(({ name }) => !this.routing.defaults[name]);
-    if (Array.isArray(this.parameters)) {
-      this.parameters = this.parameters.reduce((result, current, i) => segments[i] ? { ...result, [segments[i].name]: current } : typeof current === "object" ? { ...result, ...current } : { ...result, [current]: "" }, {});
-    } else if (segments.length === 1 && !this.parameters[segments[0].name] && (Reflect.has(this.parameters, Object.values(this.route.definition.bindings)[0]) || Reflect.has(this.parameters, "id"))) {
-      this.parameters = { [segments[0].name]: this.parameters };
-    }
-    this.parameters = {
-      ...this.getDefaults(),
-      ...this.substituteBindings()
-    };
-  }
-  getDefaults() {
-    return this.route.parameterSegments.filter(({ name }) => this.routing.defaults[name]).reduce((result, { name }) => ({ ...result, [name]: this.routing.defaults[name] }), {});
-  }
-  substituteBindings() {
-    return Object.entries(this.parameters).reduce((result, [key, value]) => {
-      if (!value || typeof value !== "object" || Array.isArray(value) || !this.route.parameterSegments.some(({ name }) => name === key)) {
-        return { ...result, [key]: value };
-      }
-      if (!Reflect.has(value, this.route.definition.bindings[key])) {
-        if (Reflect.has(value, "id")) {
-          this.route.definition.bindings[key] = "id";
-        } else {
-          throw new Error(`Router error: object passed as [${key}] parameter is missing route model binding key [${this.route.definition.bindings?.[key]}].`);
-        }
-      }
-      return { ...result, [key]: value[this.route.definition.bindings[key]] };
-    }, {});
-  }
-  valueOf() {
-    return this.toString();
+  if (mode === "strict") {
+    return location.href === matchee.href;
   }
+  return location.href.startsWith(matchee.href);
 }
 
 function route(name, parameters, absolute) {
-  return new Router(name, parameters, absolute).toString();
+  return generateRouteFromName(name, parameters, absolute);
+}
+function current(name, parameters, mode = "loose") {
+  return isCurrentFromName(name, parameters, mode);
 }
 function updateRoutingConfiguration(routing) {
   if (!routing) {
@@ -540,8 +536,8 @@ const router = {
   local: async (url, options) => await performLocalNavigation(url, options),
   external: (url, data = {}) => navigateToExternalUrl(url, data),
   to: async (name, parameters, options) => {
-    const url = new Router(name, parameters).toString();
-    const method = Route.getDefinition(name).method.at(0);
+    const url = generateRouteFromName(name, parameters);
+    const method = getRouteDefinition(name).method.at(0);
     return await performHybridNavigation({ url, ...options, method });
   },
   history: {
@@ -589,8 +585,7 @@ async function performHybridNavigation(options) {
     }
     saveScrollPositions();
     if (options.url && options.transformUrl) {
-      const transformUrl = typeof options.transformUrl === "function" ? options.transformUrl(makeUrl(options.url).toString()) : options.transformUrl;
-      options.url = makeUrl(options.url, transformUrl);
+      options.url = makeUrl(options.url, options.transformUrl);
     }
     const targetUrl = makeUrl(options.url ?? context.url);
     const abortController = new AbortController();
@@ -815,4 +810,4 @@ function can(resource, action) {
   return resource.authorization?.[action] ?? false;
 }
 
-export { can, constants, createRouter, definePlugin, getRouterContext, makeUrl, registerHook, route, router, sameUrls };
+export { can, constants, createRouter, current, definePlugin, getRouterContext, makeUrl, registerHook, route, router, sameUrls };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/core",
-  "version": "0.0.1-alpha.19",
+  "version": "0.0.1-alpha.20",
   "description": "A solution to develop server-driven, client-rendered applications",
   "keywords": [
     "hybridly",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "qs": "^6.11.0",
-    "@hybridly/utils": "0.0.1-alpha.19"
+    "@hybridly/utils": "0.0.1-alpha.20"
   },
   "devDependencies": {
     "defu": "^6.1.1"