@esmx/router 3.0.0-rc.43 → 3.0.0-rc.44

package/dist/location.d.ts

@@ -1,4 +1,4 @@
-import type { RouteLocationInput } from './types';
+import type { RouteLocation, RouteLocationInput } from './types';
 /**
  * Normalizes a URL input into a URL object.
  * @param url - The URL or string to normalize.
@@ -13,3 +13,10 @@ export declare function normalizeURL(url: string | URL, base: URL): URL;
  * @returns The parsed URL object.
  */
 export declare function parseLocation(toInput: RouteLocationInput, baseURL: URL): URL;
+/**
+ * Resolves RouteLocationInput with fallback from previous route
+ * @param toInput - The route location input
+ * @param from - The previous route URL (optional)
+ * @returns Resolved RouteLocation object
+ */
+export declare function resolveRouteLocationInput(toInput?: RouteLocationInput, from?: URL | null): RouteLocation;

package/dist/location.mjs

@@ -52,3 +52,12 @@ export function parseLocation(toInput, baseURL) {
   }
   return url;
 }
+export function resolveRouteLocationInput(toInput = "/", from = null) {
+  if (typeof toInput === "string") {
+    return { path: toInput };
+  }
+  if (toInput && typeof toInput === "object" && typeof toInput.path !== "string" && typeof toInput.url !== "string" && from !== null) {
+    return { ...toInput, url: from.href };
+  }
+  return toInput;
+}

package/dist/route.mjs

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { parseLocation } from "./location.mjs";
+import { parseLocation, resolveRouteLocationInput } from "./location.mjs";
 import { parsedOptions } from "./options.mjs";
 import {
   RouteType
@@ -74,7 +74,6 @@ export class Route {
     var _a;
     const {
       toType = RouteType.push,
-      toInput = "/",
       from = null,
       options = parsedOptions()
     } = routeOptions;
@@ -84,6 +83,7 @@ export class Route {
     this.res = options.res;
     this.context = options.context;
     const base = options.base;
+    const toInput = resolveRouteLocationInput(routeOptions.toInput, from);
     const to = options.normalizeURL(parseLocation(toInput, base), from);
     const isSameOrigin = to.origin === base.origin;
     const isSameBase = to.pathname.startsWith(base.pathname);
@@ -92,13 +92,13 @@ export class Route {
     this.path = match ? to.pathname.substring(base.pathname.length - 1) : to.pathname;
     this.fullPath = (match ? this.path : to.pathname) + to.search + to.hash;
     this.matched = match ? match.matches : Object.freeze([]);
-    this.keepScrollPosition = isPlainObject(toInput) ? Boolean(toInput.keepScrollPosition) : false;
-    this.confirm = isPlainObject(toInput) && toInput.confirm ? toInput.confirm : null;
-    this.layer = toType === RouteType.pushLayer && isPlainObject(toInput) && toInput.layer ? toInput.layer : null;
+    this.keepScrollPosition = Boolean(toInput.keepScrollPosition);
+    this.confirm = toInput.confirm || null;
+    this.layer = toType === RouteType.pushLayer && toInput.layer ? toInput.layer : null;
     this.config = this.matched.length > 0 ? this.matched[this.matched.length - 1] : null;
     this.meta = ((_a = this.config) == null ? void 0 : _a.meta) || {};
     const state = {};
-    if (isPlainObject(toInput) && toInput.state) {
+    if (toInput.state) {
       Object.assign(state, toInput.state);
     }
     this.state = state;
@@ -111,7 +111,7 @@ export class Route {
       applyRouteParams(match, toInput, base, to);
       Object.assign(this.params, match.params);
     }
-    if (isPlainObject(toInput) && typeof toInput.statusCode === "number") {
+    if (typeof toInput.statusCode === "number") {
       this.statusCode = toInput.statusCode;
     }
     for (const property of NON_ENUMERABLE_PROPERTIES) {

package/package.json

@@ -32,7 +32,7 @@
     },
     "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@esmx/lint": "3.0.0-rc.43",
+        "@esmx/lint": "3.0.0-rc.44",
         "@types/node": "^24.0.0",
         "@vitest/coverage-v8": "3.2.4",
         "happy-dom": "^18.0.1",
@@ -41,7 +41,7 @@
         "unbuild": "3.5.0",
         "vitest": "3.2.4"
     },
-    "version": "3.0.0-rc.43",
+    "version": "3.0.0-rc.44",
     "type": "module",
     "private": false,
     "exports": {
@@ -60,5 +60,5 @@
         "template",
         "public"
     ],
-    "gitHead": "ad53bf2019b9386abe0ad46feeccca2b97082419"
+    "gitHead": "c83ac6a9b183e5f1a98884d9ae18ff99aacf1a54"
 }

package/src/location.ts

@@ -1,4 +1,4 @@
-import type { RouteLocationInput } from './types';
+import type { RouteLocation, RouteLocationInput } from './types';
 import { isNotNullish } from './util';
 
 /**
@@ -94,3 +94,30 @@ export function parseLocation(toInput: RouteLocationInput, baseURL: URL): URL {
 
     return url;
 }
+
+/**
+ * Resolves RouteLocationInput with fallback from previous route
+ * @param toInput - The route location input
+ * @param from - The previous route URL (optional)
+ * @returns Resolved RouteLocation object
+ */
+export function resolveRouteLocationInput(
+    toInput: RouteLocationInput = '/',
+    from: URL | null = null
+): RouteLocation {
+    if (typeof toInput === 'string') {
+        return { path: toInput };
+    }
+
+    if (
+        toInput &&
+        typeof toInput === 'object' &&
+        typeof toInput.path !== 'string' &&
+        typeof toInput.url !== 'string' &&
+        from !== null
+    ) {
+        return { ...toInput, url: from.href };
+    }
+
+    return toInput;
+}

package/src/route.ts

@@ -1,5 +1,5 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { parseLocation } from './location';
+import { parseLocation, resolveRouteLocationInput } from './location';
 import { parsedOptions } from './options';
 import type { Router } from './router';
 
@@ -140,7 +140,6 @@ export class Route {
     constructor(routeOptions: Partial<RouteOptions> = {}) {
         const {
             toType = RouteType.push,
-            toInput = '/',
             from = null,
             options = parsedOptions()
         } = routeOptions;
@@ -152,6 +151,7 @@ export class Route {
         this.context = options.context;
 
         const base = options.base;
+        const toInput = resolveRouteLocationInput(routeOptions.toInput, from);
         const to = options.normalizeURL(parseLocation(toInput, base), from);
         const isSameOrigin = to.origin === base.origin;
         const isSameBase = to.pathname.startsWith(base.pathname);
@@ -164,15 +164,10 @@ export class Route {
             : to.pathname;
         this.fullPath = (match ? this.path : to.pathname) + to.search + to.hash;
         this.matched = match ? match.matches : Object.freeze([]);
-        this.keepScrollPosition = isPlainObject(toInput)
-            ? Boolean(toInput.keepScrollPosition)
-            : false;
-        this.confirm =
-            isPlainObject(toInput) && toInput.confirm ? toInput.confirm : null;
+        this.keepScrollPosition = Boolean(toInput.keepScrollPosition);
+        this.confirm = toInput.confirm || null;
         this.layer =
-            toType === RouteType.pushLayer &&
-            isPlainObject(toInput) &&
-            toInput.layer
+            toType === RouteType.pushLayer && toInput.layer
                 ? toInput.layer
                 : null;
         this.config =
@@ -183,7 +178,7 @@ export class Route {
 
         // Initialize state object - create new local object, merge externally passed state
         const state: RouteState = {};
-        if (isPlainObject(toInput) && toInput.state) {
+        if (toInput.state) {
             Object.assign(state, toInput.state);
         }
         this.state = state;
@@ -204,7 +199,7 @@ export class Route {
 
         // Set status code
         // Prioritize user-provided statusCode
-        if (isPlainObject(toInput) && typeof toInput.statusCode === 'number') {
+        if (typeof toInput.statusCode === 'number') {
             this.statusCode = toInput.statusCode;
         }
         // If statusCode is not provided, keep default null value