@allurereport/web-commons 3.6.2 → 3.8.0

package/dist/prose.d.ts

@@ -1,2 +1,2 @@
-export declare const proseStyles = "\nhtml, body {\n  margin: 0;\n  padding: 0;\n  overflow-x: hidden;\n  overflow-y: hidden;\n  background: var(--bg-base-primary);\n}\n\nbody {\n  color: var(--on-text-primary);\n  font-family: var(--font-family);\n  font-size: var(--font-size-m);\n  line-height: var(--line-height-m);\n}\n\np {\n  margin-bottom: 10px;\n}\n\np:last-child {\n  margin-bottom: 0;\n}\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  font-weight: var(--font-weight-bold) !important;\n  line-height: var(--line-height-l) !important;\n  margin: 16px 0 10px;\n}\n\nh1:first-child,\nh2:first-child,\nh3:first-child,\nh4:first-child,\nh5:first-child,\nh6:first-child {\n  margin-top: 0;\n}\n\nh1 {\n  font-size: var(--font-size-xl) !important;\n}\n\nh2,\nh3 {\n  font-size: var(--font-size-l) !important;\n}\n\nh4 {\n  font-size: var(--font-size-m) !important;\n}\n\nh5,\nh6 {\n  font-size: var(--font-size-s) !important;\n}\n\nh6 {\n  color: var(--on-text-secondary);\n}\n\nstrong,\nb {\n  font-weight: var(--font-weight-bold) !important;\n}\n\nem,\ni {\n  font-style: italic !important;\n}\n\ndel,\ns {\n  text-decoration: line-through;\n}\n\na {\n  color: var(--on-text-primary);\n  text-decoration: underline;\n}\n\na:hover {\n  color: var(--on-text-secondary);\n}\n\ncode {\n  font-family: var(--font-family-mono) !important;\n  font-size: var(--font-size-m-code) !important;\n  padding: 0.2em 0.4em;\n  background: var(--bg-control-secondary);\n  border-radius: 4px;\n}\n\npre {\n  font-family: var(--font-family-mono) !important;\n  font-size: var(--font-size-s) !important;\n  line-height: 1.45 !important;\n  padding: 16px;\n  overflow: auto;\n  background: var(--bg-control-secondary);\n  border-radius: 6px;\n  margin-bottom: 16px;\n}\n\npre code {\n  padding: 0;\n  background: transparent;\n  font-size: inherit !important;\n  border-radius: 0;\n}\n\nblockquote {\n  padding: 0 1em;\n  border-left: 0.25em solid var(--on-border-primary);\n  color: var(--on-text-secondary);\n  margin-bottom: 16px;\n}\n\nul,\nol {\n  padding-left: 2em;\n  margin-bottom: 10px;\n}\n\nul {\n  list-style: disc !important;\n}\n\nol {\n  list-style: decimal !important;\n}\n\nli + li {\n  margin-top: 0.25em;\n}\n\nhr {\n  height: 0.25em;\n  padding: 0;\n  margin: 24px 0;\n  background-color: var(--on-border-primary);\n  border: 0 !important;\n}\n\ntable {\n  border-spacing: 0;\n  border-collapse: collapse;\n  margin-bottom: 16px;\n  display: block;\n  width: max-content;\n  max-width: 100%;\n  overflow-x: auto;\n  overflow-y: hidden;\n  transform: translateZ(0);\n  contain: layout paint;\n}\n\nth,\ntd {\n  padding: 6px 13px;\n  border: 1px solid var(--on-border-primary) !important;\n  white-space: nowrap;\n}\n\nth {\n  font-weight: var(--font-weight-bold) !important;\n  position: sticky;\n  top: 0;\n  z-index: 1;\n  background: var(--bg-base-primary);\n}\n\ntr:nth-child(2n) {\n  background: var(--bg-control-secondary);\n}\n\nimg {\n  max-width: 100% !important;\n  height: auto !important;\n  display: inline-block !important;\n  vertical-align: middle !important;\n}\n\nabbr,\nabbr[title] {\n  text-decoration: underline dotted;\n  cursor: help;\n  border-bottom: none;\n}\n\nkbd {\n  display: inline-block;\n  padding: 3px 5px;\n  font-family: var(--font-family-mono) !important;\n  font-size: 11px;\n  line-height: 10px;\n  color: var(--on-text-primary);\n  vertical-align: middle;\n  background-color: var(--bg-control-secondary);\n  border: solid 1px var(--on-border-medium);\n  border-bottom-color: var(--on-border-medium);\n  border-radius: 6px;\n  box-shadow: inset 0 -1px 0 var(--on-border-medium);\n}\n\nsamp {\n  font-family: var(--font-family-mono) !important;\n  font-size: 85% !important;\n}\n\nvar {\n  font-family: var(--font-family-mono) !important;\n  font-style: italic !important;\n  font-weight: var(--font-weight-bold) !important;\n}\n\nmark {\n  background-color: var(--bg-support-aldebaran);\n  color: var(--on-text-primary);\n  padding: 0.1em 0.2em;\n  border-radius: 2px;\n}\n\nsmall {\n  font-size: 85% !important;\n}\n\nsub,\nsup {\n  font-size: 75% !important;\n  line-height: 0 !important;\n  position: relative !important;\n  vertical-align: baseline !important;\n}\n\nsub {\n  bottom: -0.25em !important;\n}\n\nsup {\n  top: -0.5em !important;\n}\n\nins {\n  text-decoration: underline;\n  background-color: var(--bg-support-gliese);\n  color: var(--on-text-primary);\n  text-decoration-color: var(--on-support-gliese);\n}\n\ndfn {\n  font-style: italic !important;\n  font-weight: var(--font-weight-bold) !important;\n}\n\ncite {\n  font-style: italic !important;\n}\n\nq {\n  font-style: italic !important;\n}\n\nq::before {\n  content: open-quote;\n}\n\nq::after {\n  content: close-quote;\n}\n\ntime {\n  font-variant-numeric: tabular-nums;\n}\n\ndl {\n  padding: 0;\n  margin-bottom: 16px;\n}\n\ndt {\n  padding: 0;\n  margin-top: 16px;\n  font-size: 1em;\n  font-style: italic;\n  font-weight: var(--font-weight-bold) !important;\n}\n\ndt:first-child {\n  margin-top: 0;\n}\n\ndd {\n  padding: 0 0 0 16px;\n  margin-left: 0;\n  margin-bottom: 16px;\n}\n\nfigure {\n  margin: 16px 0;\n  display: block;\n}\n\nfigcaption {\n  margin-top: 8px;\n  font-size: var(--font-size-s) !important;\n  color: var(--on-text-secondary);\n  font-style: italic;\n  text-align: center;\n}\n\ndetails {\n  display: block;\n  margin-bottom: 16px;\n}\n\nsummary {\n  display: list-item;\n  cursor: pointer;\n  font-weight: var(--font-weight-bold) !important;\n  margin-bottom: 8px;\n}\n\nsummary:hover {\n  color: var(--on-text-secondary);\n}\n\nsummary::marker {\n  color: var(--on-text-secondary);\n}\n\ndetails[open] summary {\n  margin-bottom: 16px;\n}\n\narticle,\nsection,\naside,\nnav {\n  display: block;\n  margin-bottom: 16px;\n}\n\nheader,\nfooter {\n  display: block;\n  margin-bottom: 16px;\n}\n\naddress {\n  display: block;\n  font-style: italic;\n  margin-bottom: 16px;\n}\n";
+export declare const proseStyles = "\nhtml, body {\n  margin: 0;\n  padding: 0;\n  overflow-x: hidden;\n  overflow-y: hidden;\n  background: var(--bg-base-primary);\n}\n\nbody {\n  color: var(--on-text-primary);\n  font-family: var(--font-family);\n  font-size: var(--font-size-m);\n  line-height: var(--line-height-m);\n}\n\np {\n  margin-top: 0;\n  margin-bottom: 10px;\n}\n\np:last-child {\n  margin-bottom: 0;\n}\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  font-weight: var(--font-weight-bold) !important;\n  line-height: var(--line-height-l) !important;\n  margin: 16px 0 10px;\n}\n\nh1:first-child,\nh2:first-child,\nh3:first-child,\nh4:first-child,\nh5:first-child,\nh6:first-child {\n  margin-top: 0;\n}\n\nh1 {\n  font-size: var(--font-size-xl) !important;\n}\n\nh2,\nh3 {\n  font-size: var(--font-size-l) !important;\n}\n\nh4 {\n  font-size: var(--font-size-m) !important;\n}\n\nh5,\nh6 {\n  font-size: var(--font-size-s) !important;\n}\n\nh6 {\n  color: var(--on-text-secondary);\n}\n\nstrong,\nb {\n  font-weight: var(--font-weight-bold) !important;\n}\n\nem,\ni {\n  font-style: italic !important;\n}\n\ndel,\ns {\n  text-decoration: line-through;\n}\n\na {\n  color: var(--on-text-primary);\n  text-decoration: underline;\n}\n\na:hover {\n  color: var(--on-text-secondary);\n}\n\ncode {\n  font-family: var(--font-family-mono) !important;\n  font-size: var(--font-size-m-code) !important;\n  padding: 0.2em 0.4em;\n  background: var(--bg-control-secondary);\n  border-radius: 4px;\n}\n\npre {\n  font-family: var(--font-family-mono) !important;\n  font-size: var(--font-size-s) !important;\n  line-height: 1.45 !important;\n  padding: 16px;\n  overflow: auto;\n  background: var(--bg-control-secondary);\n  border-radius: 6px;\n  margin-bottom: 16px;\n}\n\npre code {\n  padding: 0;\n  background: transparent;\n  font-size: inherit !important;\n  border-radius: 0;\n}\n\nblockquote {\n  padding: 0 1em;\n  border-left: 0.25em solid var(--on-border-primary);\n  color: var(--on-text-secondary);\n  margin-bottom: 16px;\n}\n\nul,\nol {\n  padding-left: 2em;\n  margin-bottom: 10px;\n}\n\nul {\n  list-style: disc !important;\n}\n\nol {\n  list-style: decimal !important;\n}\n\nli + li {\n  margin-top: 0.25em;\n}\n\nhr {\n  height: 0.25em;\n  padding: 0;\n  margin: 24px 0;\n  background-color: var(--on-border-primary);\n  border: 0 !important;\n}\n\ntable {\n  border-spacing: 0;\n  border-collapse: collapse;\n  margin-bottom: 16px;\n  display: block;\n  width: max-content;\n  max-width: 100%;\n  overflow-x: auto;\n  overflow-y: hidden;\n  transform: translateZ(0);\n  contain: layout paint;\n}\n\nth,\ntd {\n  padding: 6px 13px;\n  border: 1px solid var(--on-border-primary) !important;\n  white-space: nowrap;\n}\n\nth {\n  font-weight: var(--font-weight-bold) !important;\n  position: sticky;\n  top: 0;\n  z-index: 1;\n  background: var(--bg-base-primary);\n}\n\ntr:nth-child(2n) {\n  background: var(--bg-control-secondary);\n}\n\nimg {\n  max-width: 100% !important;\n  height: auto !important;\n  display: inline-block !important;\n  vertical-align: middle !important;\n}\n\nabbr,\nabbr[title] {\n  text-decoration: underline dotted;\n  cursor: help;\n  border-bottom: none;\n}\n\nkbd {\n  display: inline-block;\n  padding: 3px 5px;\n  font-family: var(--font-family-mono) !important;\n  font-size: 11px;\n  line-height: 10px;\n  color: var(--on-text-primary);\n  vertical-align: middle;\n  background-color: var(--bg-control-secondary);\n  border: solid 1px var(--on-border-medium);\n  border-bottom-color: var(--on-border-medium);\n  border-radius: 6px;\n  box-shadow: inset 0 -1px 0 var(--on-border-medium);\n}\n\nsamp {\n  font-family: var(--font-family-mono) !important;\n  font-size: 85% !important;\n}\n\nvar {\n  font-family: var(--font-family-mono) !important;\n  font-style: italic !important;\n  font-weight: var(--font-weight-bold) !important;\n}\n\nmark {\n  background-color: var(--bg-support-aldebaran);\n  color: var(--on-text-primary);\n  padding: 0.1em 0.2em;\n  border-radius: 2px;\n}\n\nsmall {\n  font-size: 85% !important;\n}\n\nsub,\nsup {\n  font-size: 75% !important;\n  line-height: 0 !important;\n  position: relative !important;\n  vertical-align: baseline !important;\n}\n\nsub {\n  bottom: -0.25em !important;\n}\n\nsup {\n  top: -0.5em !important;\n}\n\nins {\n  text-decoration: underline;\n  background-color: var(--bg-support-gliese);\n  color: var(--on-text-primary);\n  text-decoration-color: var(--on-support-gliese);\n}\n\ndfn {\n  font-style: italic !important;\n  font-weight: var(--font-weight-bold) !important;\n}\n\ncite {\n  font-style: italic !important;\n}\n\nq {\n  font-style: italic !important;\n}\n\nq::before {\n  content: open-quote;\n}\n\nq::after {\n  content: close-quote;\n}\n\ntime {\n  font-variant-numeric: tabular-nums;\n}\n\ndl {\n  padding: 0;\n  margin-bottom: 16px;\n}\n\ndt {\n  padding: 0;\n  margin-top: 16px;\n  font-size: 1em;\n  font-style: italic;\n  font-weight: var(--font-weight-bold) !important;\n}\n\ndt:first-child {\n  margin-top: 0;\n}\n\ndd {\n  padding: 0 0 0 16px;\n  margin-left: 0;\n  margin-bottom: 16px;\n}\n\nfigure {\n  margin: 16px 0;\n  display: block;\n}\n\nfigcaption {\n  margin-top: 8px;\n  font-size: var(--font-size-s) !important;\n  color: var(--on-text-secondary);\n  font-style: italic;\n  text-align: center;\n}\n\ndetails {\n  display: block;\n  margin-bottom: 16px;\n}\n\nsummary {\n  display: list-item;\n  cursor: pointer;\n  font-weight: var(--font-weight-bold) !important;\n  margin-bottom: 8px;\n}\n\nsummary:hover {\n  color: var(--on-text-secondary);\n}\n\nsummary::marker {\n  color: var(--on-text-secondary);\n}\n\ndetails[open] summary {\n  margin-bottom: 16px;\n}\n\narticle,\nsection,\naside,\nnav {\n  display: block;\n  margin-bottom: 16px;\n}\n\nheader,\nfooter {\n  display: block;\n  margin-bottom: 16px;\n}\n\naddress {\n  display: block;\n  font-style: italic;\n  margin-bottom: 16px;\n}\n";
 export declare const resolveCssVarDeclarations: (cssText: string) => string;

package/dist/prose.js

@@ -15,6 +15,7 @@ body {
 }
 
 p {
+  margin-top: 0;
   margin-bottom: 10px;
 }
 

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.2",
+  "version": "3.8.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.2",
-    "@allurereport/charts-api": "3.6.2",
-    "@allurereport/core-api": "3.6.2",
-    "@allurereport/plugin-api": "3.6.2",
+    "@allurereport/aql": "3.8.0",
+    "@allurereport/charts-api": "3.8.0",
+    "@allurereport/core-api": "3.8.0",
+    "@allurereport/plugin-api": "3.8.0",
     "@preact/signals": "^2.6.1",
     "@preact/signals-core": "^1.12.2",
     "ansi-to-html": "^0.7.2",