@redneckz/wildless-cms-uni-blocks 0.8.4 → 0.8.6

package/lib/hooks/useLink.js

@@ -1,31 +1,35 @@
+import { projectSettings } from '../ProjectSettings.js';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter.js';
-import { isHash, isLocalURL } from '../utils/url.js';
+import { isHash, isLocalURL, isURL, joinPath } from '../utils/url.js';
 import { handlerDecorator } from './handlerDecorator.js';
 import { useRouter } from './useRouter.js';
 export function useLink(isRemote) {
     const router = useRouter();
     const blockRouter = useBlockRouter();
-    const handleLocalURL = (href, target) => (ev) => {
-        if (isRemote || !isLocalURL(href, target)) {
-            // Proceed with native handle
-            return;
-        }
-        // Client routing
-        ev?.preventDefault();
-        if (isHash(href)) {
-            blockRouter.goto(href);
-        }
-        else if (href) {
-            router.push(href);
-        }
-    };
     return (props) => ({
         ...props,
+        href: projectSettings.BASE_PATH && props.href && !(isRemote || isURL(props.href))
+            ? joinPath(projectSettings.BASE_PATH, props.href)
+            : props.href,
         'aria-label': props.text,
-        onClick: handlerDecorator((ev) => {
-            props.onClick && props.onClick(ev);
-            handleLocalURL(props.href, props.target)(ev);
-        }, props),
+        onClick: handlerDecorator(handleHref(props), props),
     });
+    function handleHref({ href, target, onClick }) {
+        return (ev) => {
+            onClick && onClick(ev);
+            if (isRemote || !isLocalURL(href, target)) {
+                // Default routing
+                return;
+            }
+            // Client routing
+            ev?.preventDefault();
+            if (isHash(href)) {
+                blockRouter.goto(href);
+            }
+            else if (href) {
+                router.push(href);
+            }
+        };
+    }
 }
 //# sourceMappingURL=useLink.js.map

package/lib/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO,CACrB,QAAkB;IAElB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,cAAc,GAClB,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CAAC,CAAC,EAAmC,EAAE,EAAE;QACrF,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YACzC,6BAA6B;YAC7B,OAAO;SACR;QAED,iBAAiB;QACjB,EAAE,EAAE,cAAc,EAAE,CAAC;QACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;YAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACxB;aAAM,IAAI,IAAI,EAAE;YACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;IACH,CAAC,CAAC;IAEJ,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjB,GAAG,KAAK;QACR,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAmC,EAAE,EAAE;YAChE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAEnC,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC,EAAE,KAAK,CAAC;KACV,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAUxC,MAAM,UAAU,OAAO,CAAC,QAAkB;IACxC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EACF,eAAe,CAAC,SAAS,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzE,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC;YACjD,CAAC,CAAC,KAAK,CAAC,IAAI;QAChB,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;gBAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACxB;iBAAM,IAAI,IAAI,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}

package/lib/services/BlockRouter/BlockRouter.js

@@ -1,5 +1,5 @@
 import { EventBus } from '../../EventBus/EventBus.js';
-const normalizeAnchor = (rawAnchor) => rawAnchor?.replace('#', '');
+const normalizeAnchor = (rawAnchor) => rawAnchor?.replace('#', '') || '';
 const getURLWithAnchor = (rawAnchor) => `${globalThis.location?.pathname}#${normalizeAnchor(rawAnchor)}`;
 export class BlockRouter {
     static inst = new BlockRouter();

package/lib/services/BlockRouter/BlockRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAiBnD,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC5E,MAAM,gBAAgB,GAAG,CAAC,SAAkB,EAAE,EAAE,CAC9C,GAAG,UAAU,CAAC,QAAQ,EAAE,QAAQ,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;AAEnE,MAAM,OAAO,WAAW;IACf,MAAM,CAAU,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;IAEvC,QAAQ,GAAG,IAAI,QAAQ,EAAY,CAAC;IAE7C;QACE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,IAAI,CAAC,SAAkB;QACrB,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxC;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,CAAC,SAAiB;QACvB,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK;QACH,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACjE,CAAC"}
+{"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAiBnD,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;AAClF,MAAM,gBAAgB,GAAG,CAAC,SAAkB,EAAE,EAAE,CAC9C,GAAG,UAAU,CAAC,QAAQ,EAAE,QAAQ,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;AAEnE,MAAM,OAAO,WAAW;IACf,MAAM,CAAU,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;IAEvC,QAAQ,GAAG,IAAI,QAAQ,EAAY,CAAC;IAE7C;QACE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,IAAI,CAAC,SAAkB;QACrB,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxC;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,CAAC,SAAiB;QACvB,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK;QACH,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACjE,CAAC"}

package/lib/services/sitemap/fallbackWCMSResource.d.ts

@@ -0,0 +1,2 @@
+import type { FallbackMap } from '../../model/Fallback';
+export declare const fallbackWCMSResource: (filename: string) => FallbackMap;

package/lib/services/sitemap/fallbackWCMSResource.js

@@ -0,0 +1,5 @@
+import { readFile } from 'fs/promises';
+export const fallbackWCMSResource = (filename) => ({
+    [`/wcms-resources/${filename}.json`]: async () => JSON.parse(await readFile(`./content/wcms-resources/${filename}.json`, 'utf-8')),
+});
+//# sourceMappingURL=fallbackWCMSResource.js.map

package/lib/services/sitemap/fallbackWCMSResource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fallbackWCMSResource.js","sourceRoot":"","sources":["../../../src/services/sitemap/fallbackWCMSResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,QAAgB,EAAe,EAAE,CAAC,CAAC;IACtE,CAAC,mBAAmB,QAAQ,OAAO,CAAC,EAAE,KAAK,IAAI,EAAE,CAC/C,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,4BAA4B,QAAQ,OAAO,EAAE,OAAO,CAAC,CAAC;CACnF,CAAC,CAAC"}

package/lib/services/sitemap/isHrefActive.d.ts

@@ -1,4 +1,6 @@
-import type { Router } from '../../hooks/useRouter';
-export declare const isHrefActive: (router: Router) => ({ href }: {
+export declare const isHrefActive: (router: {
+    href?: string;
+    pathname: string;
+}) => ({ href }: {
     href?: string | undefined;
 }) => boolean;

package/lib/services/sitemap/isHrefActive.js

@@ -1,8 +1,3 @@
-import { projectSettings } from '../../ProjectSettings.js';
 import { isURL, withoutQuery } from '../../utils/url.js';
-export const isHrefActive = (router) => ({ href }) => {
-    const { BASE_PATH } = projectSettings;
-    const relativeHref = BASE_PATH && href?.startsWith(BASE_PATH) ? href.substring(BASE_PATH.length) : href;
-    return withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(relativeHref));
-};
+export const isHrefActive = (router) => ({ href }) => withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(href));
 //# sourceMappingURL=isHrefActive.js.map

package/lib/services/sitemap/isHrefActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isHrefActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isHrefActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,CAAC,MAAM,YAAY,GACvB,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,EAAE,IAAI,EAAqB,EAAW,EAAE;IACvC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IACtC,MAAM,YAAY,GAChB,SAAS,IAAI,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAErF,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CACzE,YAAY,CAAC,YAAY,CAAC,CAC3B,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"isHrefActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isHrefActive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,CAAC,MAAM,YAAY,GACvB,CAAC,MAA2C,EAAE,EAAE,CAChD,CAAC,EAAE,IAAI,EAAqB,EAAW,EAAE,CACvC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC"}

package/lib/services/sitemap/isTopItemActive.js

@@ -1,3 +1,6 @@
+import { projectSettings } from '../../ProjectSettings.js';
 import { isHrefActive } from './isHrefActive.js';
-export const isTopItemActive = (router) => (topItem) => topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
+export const isTopItemActive = (router) => (topItem) => projectSettings.BASE_PATH
+    ? isHrefActive({ pathname: projectSettings.BASE_PATH })(topItem)
+    : topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
 //# sourceMappingURL=isTopItemActive.js.map

package/lib/services/sitemap/isTopItemActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isTopItemActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,OAAoB,EAAW,EAAE,CAChC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"isTopItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isTopItemActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,OAAoB,EAAW,EAAE,CAChC,eAAe,CAAC,SAAS;IACvB,CAAC,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC;IAChE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC"}

package/lib/services/sitemap/useSWRResource.d.ts

@@ -1,2 +1,2 @@
 import type { Fallback } from '../../model/Fallback';
-export declare function useSWRResource<Data>(fileName: string, fallback?: Fallback): Data;
+export declare function useSWRResource<Data>(filename: string, fallback?: Fallback): Data;

package/lib/services/sitemap/useSWRResource.js

@@ -1,7 +1,7 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSONUnsafe } from '../../utils/fetchJSON.js';
-export function useSWRResource(fileName, fallback = {}) {
-    const { data } = useAsyncData(`/wcms-resources/${fileName}.json`, fetchJSONUnsafe, {
+export function useSWRResource(filename, fallback = {}) {
+    const { data } = useAsyncData(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
         fallback,
     });
     return data || {};

package/lib/setup-fixture.js

@@ -18,7 +18,9 @@ useRouter.setup(() => {
     }, []);
     return {
         href,
-        pathname: '',
+        pathname: projectSettings.BASE_PATH
+            ? new URL(href).pathname.substring(projectSettings.BASE_PATH.length - 1)
+            : '',
         query: {},
         push: (url) => {
             globalThis.history.pushState(null, '', url);

package/lib/setup-fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAC9B,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,eAAe,CAAC,SAAS,cAAc,CACxE,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC9C,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}
+{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAC9B,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,eAAe,CAAC,SAAS,cAAc,CACxE,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,eAAe,CAAC,SAAS;YACjC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;YACxE,CAAC,CAAC,EAAE;QACN,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC9C,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}

package/lib/utils/url.d.ts

@@ -3,6 +3,4 @@ export declare const isURL: (href?: string) => href is `${string}//${string}`;
 export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
 export declare const isHash: (href?: string) => href is `#${string}`;
 export declare const withoutQuery: (href?: string) => string;
-export declare const getOrigin: (href?: string) => string | undefined;
-export declare const getPathname: (href?: string) => string | undefined;
-export declare const getHash: (href?: string) => string | undefined;
+export declare const joinPath: (...path: string[]) => string;

package/lib/utils/url.js

@@ -1,8 +1,6 @@
 export const isURL = (href) => Boolean(href?.includes('//'));
 export const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
 export const isHash = (href) => Boolean(href?.startsWith('#'));
-export const withoutQuery = (href) => (href || '').replace(/\/?\?.*/, '');
-export const getOrigin = (href) => (isURL(href) ? new URL(href).origin : undefined);
-export const getPathname = (href) => (isURL(href) ? new URL(href).pathname : undefined);
-export const getHash = (href) => (isURL(href) ? new URL(href).hash : undefined);
+export const withoutQuery = (href) => (href || '').replace(/\?.*/, '').replace(/\/$/, '');
+export const joinPath = (...path) => path.filter(Boolean).join('/').replace(/\/+/g, '/');
 //# sourceMappingURL=url.js.map

package/lib/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAkC,EAAE,CACrE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAE3F,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACjG,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAkC,EAAE,CACrE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAc,EAAU,EAAE,CACpD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC"}

package/mobile/bundle/bundle.umd.js

@@ -336,7 +336,7 @@
             .concat(1);
     }
 
-    const normalizeAnchor = (rawAnchor) => rawAnchor?.replace('#', '');
+    const normalizeAnchor = (rawAnchor) => rawAnchor?.replace('#', '') || '';
     const getURLWithAnchor = (rawAnchor) => `${globalThis.location?.pathname}#${normalizeAnchor(rawAnchor)}`;
     class BlockRouter {
         static inst = new BlockRouter();
@@ -710,10 +710,8 @@
     const isURL = (href) => Boolean(href?.includes('//'));
     const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
     const isHash = (href) => Boolean(href?.startsWith('#'));
-    const withoutQuery = (href) => (href || '').replace(/\/?\?.*/, '');
-    const getOrigin = (href) => (isURL(href) ? new URL(href).origin : undefined);
-    const getPathname = (href) => (isURL(href) ? new URL(href).pathname : undefined);
-    const getHash = (href) => (isURL(href) ? new URL(href).hash : undefined);
+    const withoutQuery = (href) => (href || '').replace(/\?.*/, '').replace(/\/$/, '');
+    const joinPath = (...path) => path.filter(Boolean).join('/').replace(/\/+/g, '/');
 
     var url = /*#__PURE__*/Object.freeze({
         __proto__: null,
@@ -721,9 +719,7 @@
         isLocalURL: isLocalURL,
         isHash: isHash,
         withoutQuery: withoutQuery,
-        getOrigin: getOrigin,
-        getPathname: getPathname,
-        getHash: getHash
+        joinPath: joinPath
     });
 
     /* eslint-disable @typescript-eslint/ban-types */
@@ -756,28 +752,31 @@
     function useLink(isRemote) {
         const router = useRouter();
         const blockRouter = useBlockRouter();
-        const handleLocalURL = (href, target) => (ev) => {
-            if (isRemote || !isLocalURL(href, target)) {
-                // Proceed with native handle
-                return;
-            }
-            // Client routing
-            ev?.preventDefault();
-            if (isHash(href)) {
-                blockRouter.goto(href);
-            }
-            else if (href) {
-                router.push(href);
-            }
-        };
         return (props) => ({
             ...props,
+            href: projectSettings.BASE_PATH && props.href && !(isRemote || isURL(props.href))
+                ? joinPath(projectSettings.BASE_PATH, props.href)
+                : props.href,
             'aria-label': props.text,
-            onClick: handlerDecorator((ev) => {
-                props.onClick && props.onClick(ev);
-                handleLocalURL(props.href, props.target)(ev);
-            }, props),
+            onClick: handlerDecorator(handleHref(props), props),
         });
+        function handleHref({ href, target, onClick }) {
+            return (ev) => {
+                onClick && onClick(ev);
+                if (isRemote || !isLocalURL(href, target)) {
+                    // Default routing
+                    return;
+                }
+                // Client routing
+                ev?.preventDefault();
+                if (isHash(href)) {
+                    blockRouter.goto(href);
+                }
+                else if (href) {
+                    router.push(href);
+                }
+            };
+        }
     }
 
     const buttonStyleMap = {
@@ -964,8 +963,8 @@
         return await response.json();
     }
 
-    function useSWRResource(fileName, fallback = {}) {
-        const { data } = useAsyncData(`/wcms-resources/${fileName}.json`, fetchJSONUnsafe, {
+    function useSWRResource(filename, fallback = {}) {
+        const { data } = useAsyncData(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
             fallback,
         });
         return data || {};
@@ -1153,11 +1152,7 @@
         return (jsx("section", { className: "mt-3", children: items.map((item, i) => (jsxs("div", { children: [isDotted ? (jsx("div", { className: `rounded-full inline-block mr-3 mt-2 w-2 h-2 min-w-2 min-h-2 ${LIST_DOT_STYLE_MAP[version]}` })) : null, jsx("span", { className: "text-m font-medium", children: item.title }), jsx("span", { className: `text-s pl-2 ${version === 'primary' ? 'text-secondary-text' : ''}`, children: item.text })] }, String(i)))) }));
     }
 
-    const isHrefActive = (router) => ({ href }) => {
-        const { BASE_PATH } = projectSettings;
-        const relativeHref = BASE_PATH && href?.startsWith(BASE_PATH) ? href.substring(BASE_PATH.length) : href;
-        return withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(relativeHref));
-    };
+    const isHrefActive = (router) => ({ href }) => withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(href));
 
     const findActiveSubItem = (router) => (items = []) => {
         const possibleActiveSubItems = items?.filter(isHrefActive(router));
@@ -1166,7 +1161,9 @@
             : undefined;
     };
 
-    const isTopItemActive = (router) => (topItem) => topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
+    const isTopItemActive = (router) => (topItem) => projectSettings.BASE_PATH
+        ? isHrefActive({ pathname: projectSettings.BASE_PATH })(topItem)
+        : topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
 
     const HeaderItem = JSX(({ className = '', active, dataItemName, children, ...rest }) => {
         const link = useLink();
@@ -1725,7 +1722,7 @@
         return (list) => list.reduce((acc, el, i) => (acc.length ? acc.concat({ ...sep, key: i }, el) : [el]), []);
     }
 
-    const packageVersion = "0.8.4";
+    const packageVersion = "0.8.6";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;