@allurereport/web-commons 3.6.1 → 3.7.0

package/dist/stores/router/index.js

@@ -1,6 +1,6 @@
 import { computed } from "@preact/signals-core";
 import { paramsToSearchParams } from "../url/helpers.js";
-import { currentUrl, goTo } from "../url/index.js";
+import { currentUrl, getCurrentUrl, goTo } from "../url/index.js";
 export const router = computed(() => {
     const hash = currentUrl.value.hash.startsWith("#") ? currentUrl.value.hash.slice(1) : currentUrl.value.hash;
     return {
@@ -31,9 +31,9 @@ const createRouteUrl = (path, params) => {
 };
 export const navigateTo = (to) => {
     const { path, params = {}, replace = false, searchParams = {}, keepSearchParams = false } = to;
-    const currentPathname = currentUrl.value.pathname;
-    const newUrl = new URL(currentPathname, currentUrl.value.origin);
+    const newUrl = new URL(getCurrentUrl());
     const routeUrl = createRouteUrl(path, params);
+    newUrl.search = "";
     newUrl.hash = routeUrl === "" || routeUrl === "/" ? "" : `#${routeUrl}`;
     if (keepSearchParams) {
         paramsToSearchParams(currentUrl.value.params, newUrl.searchParams);

package/dist/stores/url/helpers.d.ts

@@ -5,6 +5,9 @@ type NavigateTo = URL | string | {
 type NavigateToOptions = {
     replace?: boolean;
 };
+export declare const isSameDocumentUrl: (url: URL, currentHref?: string) => boolean;
+export declare const toSameDocumentHistoryUrl: (url: URL) => string;
+export declare const getHistoryUrl: (to: NavigateTo, currentHref?: string) => string | URL;
 export declare const goTo: (to: NavigateTo, options?: NavigateToOptions) => void;
 export declare const getCurrentUrl: () => string;
 export declare const paramsToSearchParams: (params: Record<string, string | string[]>, searchParams?: URLSearchParams) => URLSearchParams;

package/dist/stores/url/helpers.js

@@ -22,11 +22,42 @@ const getUrl = (to) => {
     }
     return new URL(to.path, getCurrentUrl());
 };
+export const isSameDocumentUrl = (url, currentHref = getCurrentUrl()) => {
+    try {
+        const currentUrl = new URL(currentHref);
+        return url.protocol === currentUrl.protocol && url.host === currentUrl.host && url.pathname === currentUrl.pathname;
+    }
+    catch {
+        return false;
+    }
+};
+export const toSameDocumentHistoryUrl = (url) => {
+    if (url.search) {
+        return `${url.search}${url.hash}`;
+    }
+    if (url.hash) {
+        return url.hash;
+    }
+    return url.pathname.split("/").pop() || ".";
+};
+export const getHistoryUrl = (to, currentHref = getCurrentUrl()) => {
+    const url = getUrl(to);
+    if (url instanceof URL) {
+        return isSameDocumentUrl(url, currentHref) ? toSameDocumentHistoryUrl(url) : url;
+    }
+    try {
+        const absoluteUrl = new URL(url, currentHref);
+        return isSameDocumentUrl(absoluteUrl, currentHref) ? toSameDocumentHistoryUrl(absoluteUrl) : url;
+    }
+    catch {
+        return url;
+    }
+};
 export const goTo = (to, options) => {
     if (typeof window === "undefined") {
         return;
     }
-    const url = getUrl(to);
+    const url = getHistoryUrl(to);
     if (options?.replace) {
         window.history.replaceState(null, "", url);
         window.dispatchEvent(new Event("replaceState"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/web-commons",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "Collection of utilities used across the web Allure reports",
   "keywords": [
     "allure",
@@ -26,10 +26,10 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/aql": "3.6.1",
-    "@allurereport/charts-api": "3.6.1",
-    "@allurereport/core-api": "3.6.1",
-    "@allurereport/plugin-api": "3.6.1",
+    "@allurereport/aql": "3.7.0",
+    "@allurereport/charts-api": "3.7.0",
+    "@allurereport/core-api": "3.7.0",
+    "@allurereport/plugin-api": "3.7.0",
     "@preact/signals": "^2.6.1",
     "@preact/signals-core": "^1.12.2",
     "ansi-to-html": "^0.7.2",