@redneckz/wildless-cms-uni-blocks 0.8.5 → 0.8.7

package/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/src/components/Footer/Footer.fallback.ts

@@ -1,13 +1,8 @@
-import { readFile } from 'fs/promises';
 import type { FallbackMap } from '../../model/Fallback';
 import { projectSettings } from '../../ProjectSettings';
+import { fallbackWCMSResource } from '../../services/sitemap/fallbackWCMSResource';
 
 export const fallback = (): FallbackMap => ({
   ...fallbackWCMSResource(projectSettings.SITEMAP || 'sitemap'),
   ...fallbackWCMSResource(projectSettings.FOOTER || 'footer'),
 });
-
-const fallbackWCMSResource = (filename: string): FallbackMap => ({
-  [filename]: async () =>
-    JSON.parse(await readFile(`./content/wcms-resources/${filename}.json`, 'utf-8')),
-});

package/mobile/src/components/Footer/Sitemap.tsx

@@ -3,25 +3,21 @@ import { useLink } from '../../hooks/useLink';
 import type { Fallback } from '../../model/Fallback';
 import type { LinkProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
-import { mergeTopItems } from '../../services/sitemap/mergeTopItems';
 import type { SitemapDataProps, TopMenuItem } from '../../services/sitemap/SitemapProps';
 import { useSWRResource } from '../../services/sitemap/useSWRResource';
 
 export interface SitemapProps {
   className?: string;
-  items?: TopMenuItem[];
   fallback?: Fallback;
 }
 
-export const Sitemap = JSX<SitemapProps>(({ className = '', items, fallback }) => {
+export const Sitemap = JSX<SitemapProps>(({ className = '', fallback }) => {
   const link = useLink();
-
   const sitemap = useSWRResource<SitemapDataProps>(projectSettings.SITEMAP || 'sitemap', fallback);
-  const mergedItems = mergeTopItems(sitemap.topItems, items);
 
   return (
     <div className={`flex flex-grow items-start justify-between gap-[54px] xl:gap-5 ${className}`}>
-      {mergedItems?.map((_, i) => renderColumn(link(_), i))}
+      {sitemap.topItems?.map((_, i) => renderColumn(link(_), i))}
     </div>
   );
 });

package/mobile/src/components/Header/Header.fallback.ts

@@ -1,14 +1,4 @@
-import { readFile } from 'fs/promises';
 import { projectSettings } from '../../ProjectSettings';
-import type { FallbackMap } from '../../model/Fallback';
+import { fallbackWCMSResource } from '../../services/sitemap/fallbackWCMSResource';
 
-export const fallback = (): FallbackMap => ({
-  [`/wcms-resources/${projectSettings.SITEMAP || 'sitemap'}.json`]: async () => {
-    const data = await readFile(
-      `./content/wcms-resources/${projectSettings.SITEMAP || 'sitemap'}.json`,
-      'utf-8',
-    );
-
-    return JSON.parse(data);
-  },
-});
+export const fallback = () => fallbackWCMSResource(projectSettings.SITEMAP || 'sitemap');

package/mobile/src/hooks/useLink.ts

@@ -1,23 +1,43 @@
-import type { LinkProps, Target } from '../model/LinkProps';
+import type { LinkProps } from '../model/LinkProps';
+import { projectSettings } from '../ProjectSettings';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
-import { isHash, isLocalURL } from '../utils/url';
+import { isHash, isLocalURL, joinPath } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
 
-interface ClickHandler {
-  onClick(ev?: { preventDefault: () => void }): void;
+interface PreventableEvent {
+  preventDefault: () => void;
 }
 
-export function useLink(
-  isRemote?: boolean,
-): <L extends Partial<LinkProps & ClickHandler>>(props: L) => L & ClickHandler {
+interface Clickable {
+  onClick(ev?: PreventableEvent): void;
+}
+
+export function useLink(isRemote?: boolean) {
   const router = useRouter();
   const blockRouter = useBlockRouter();
 
-  const handleLocalURL =
-    (href: string | undefined, target?: Target) => (ev?: { preventDefault: () => void }) => {
+  return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
+    ...props,
+    href: adjustHref(props.href),
+    'aria-label': props.text,
+    onClick: handlerDecorator(handleHref(props), props),
+  });
+
+  function adjustHref(href: string | undefined) {
+    const isRelativeToBase = !isRemote && href?.startsWith('/');
+
+    return projectSettings.BASE_PATH && href && isRelativeToBase
+      ? joinPath(projectSettings.BASE_PATH, href)
+      : href;
+  }
+
+  function handleHref({ href, target, onClick }: Partial<LinkProps & Clickable>) {
+    return (ev?: PreventableEvent) => {
+      onClick && onClick(ev);
+
       if (isRemote || !isLocalURL(href, target)) {
-        // Proceed with native handle
+        // Default routing
         return;
       }
 
@@ -29,14 +49,5 @@ export function useLink(
         router.push(href);
       }
     };
-
-  return (props) => ({
-    ...props,
-    'aria-label': props.text,
-    onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
-      props.onClick && props.onClick(ev);
-
-      handleLocalURL(props.href, props.target)(ev);
-    }, props),
-  });
+  }
 }

package/mobile/src/services/BlockRouter/BlockRouter.ts

@@ -15,7 +15,7 @@ interface EventMap {
   intersection: BlockIntersectionEvent;
 }
 
-const normalizeAnchor = (rawAnchor?: string) => rawAnchor?.replace('#', '');
+const normalizeAnchor = (rawAnchor?: string) => rawAnchor?.replace('#', '') || '';
 const getURLWithAnchor = (rawAnchor?: string) =>
   `${globalThis.location?.pathname}#${normalizeAnchor(rawAnchor)}`;
 

package/mobile/src/services/sitemap/fallbackWCMSResource.ts

@@ -0,0 +1,7 @@
+import { readFile } from 'fs/promises';
+import type { FallbackMap } from '../../model/Fallback';
+
+export const fallbackWCMSResource = (filename: string): FallbackMap => ({
+  [`/wcms-resources/${filename}.json`]: async () =>
+    JSON.parse(await readFile(`./content/wcms-resources/${filename}.json`, 'utf-8')),
+});

package/mobile/src/services/sitemap/isHrefActive.ts

@@ -1,15 +1,6 @@
-import type { Router } from '../../hooks/useRouter';
-import { projectSettings } from '../../ProjectSettings';
 import { isURL, withoutQuery } from '../../utils/url';
 
 export const isHrefActive =
-  (router: Router) =>
-  ({ href }: { href?: string }): boolean => {
-    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),
-    );
-  };
+  (router: { href?: string; pathname: string }) =>
+  ({ href }: { href?: string }): boolean =>
+    withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(href));

package/mobile/src/services/sitemap/isTopItemActive.ts

@@ -1,8 +1,11 @@
 import type { Router } from '../../hooks/useRouter';
+import { projectSettings } from '../../ProjectSettings';
 import { isHrefActive } from './isHrefActive';
 import { TopMenuItem } from './SitemapProps';
 
 export const isTopItemActive =
   (router: Router) =>
   (topItem: TopMenuItem): boolean =>
-    topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
+    projectSettings.BASE_PATH
+      ? isHrefActive({ pathname: projectSettings.BASE_PATH })(topItem)
+      : topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);

package/mobile/src/services/sitemap/useSWRResource.ts

@@ -2,8 +2,8 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import type { Fallback } from '../../model/Fallback';
 import { fetchJSONUnsafe } from '../../utils/fetchJSON';
 
-export function useSWRResource<Data>(fileName: string, fallback: Fallback = {}): Data {
-  const { data } = useAsyncData<Data>(`/wcms-resources/${fileName}.json`, fetchJSONUnsafe, {
+export function useSWRResource<Data>(filename: string, fallback: Fallback = {}): Data {
+  const { data } = useAsyncData<Data>(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
     fallback,
   });
 

package/mobile/src/setup-fixture.ts

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

package/mobile/src/utils/url.ts

@@ -8,8 +8,8 @@ export const isLocalURL = (href: string | undefined, target?: Target) =>
 
 export const isHash = (href?: string): href is `#${string}` => Boolean(href?.startsWith('#'));
 
-export const withoutQuery = (href?: string): string => (href || '').replace(/\/?\?.*/, '');
+export const withoutQuery = (href?: string): string =>
+  (href || '').replace(/\?.*/, '').replace(/\/$/, '');
 
-export const getOrigin = (href?: string) => (isURL(href) ? new URL(href).origin : undefined);
-export const getPathname = (href?: string) => (isURL(href) ? new URL(href).pathname : undefined);
-export const getHash = (href?: string) => (isURL(href) ? new URL(href).hash : undefined);
+export const joinPath = (...path: string[]): string =>
+  path.filter(Boolean).join('/').replace(/\/+/g, '/');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/Footer/Footer.fallback.ts

@@ -1,13 +1,8 @@
-import { readFile } from 'fs/promises';
 import type { FallbackMap } from '../../model/Fallback';
 import { projectSettings } from '../../ProjectSettings';
+import { fallbackWCMSResource } from '../../services/sitemap/fallbackWCMSResource';
 
 export const fallback = (): FallbackMap => ({
   ...fallbackWCMSResource(projectSettings.SITEMAP || 'sitemap'),
   ...fallbackWCMSResource(projectSettings.FOOTER || 'footer'),
 });
-
-const fallbackWCMSResource = (filename: string): FallbackMap => ({
-  [filename]: async () =>
-    JSON.parse(await readFile(`./content/wcms-resources/${filename}.json`, 'utf-8')),
-});

package/src/components/Footer/Sitemap.tsx

@@ -3,25 +3,21 @@ import { useLink } from '../../hooks/useLink';
 import type { Fallback } from '../../model/Fallback';
 import type { LinkProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
-import { mergeTopItems } from '../../services/sitemap/mergeTopItems';
 import type { SitemapDataProps, TopMenuItem } from '../../services/sitemap/SitemapProps';
 import { useSWRResource } from '../../services/sitemap/useSWRResource';
 
 export interface SitemapProps {
   className?: string;
-  items?: TopMenuItem[];
   fallback?: Fallback;
 }
 
-export const Sitemap = JSX<SitemapProps>(({ className = '', items, fallback }) => {
+export const Sitemap = JSX<SitemapProps>(({ className = '', fallback }) => {
   const link = useLink();
-
   const sitemap = useSWRResource<SitemapDataProps>(projectSettings.SITEMAP || 'sitemap', fallback);
-  const mergedItems = mergeTopItems(sitemap.topItems, items);
 
   return (
     <div className={`flex flex-grow items-start justify-between gap-[54px] xl:gap-5 ${className}`}>
-      {mergedItems?.map((_, i) => renderColumn(link(_), i))}
+      {sitemap.topItems?.map((_, i) => renderColumn(link(_), i))}
     </div>
   );
 });

package/src/components/Header/Header.fallback.ts

@@ -1,14 +1,4 @@
-import { readFile } from 'fs/promises';
 import { projectSettings } from '../../ProjectSettings';
-import type { FallbackMap } from '../../model/Fallback';
+import { fallbackWCMSResource } from '../../services/sitemap/fallbackWCMSResource';
 
-export const fallback = (): FallbackMap => ({
-  [`/wcms-resources/${projectSettings.SITEMAP || 'sitemap'}.json`]: async () => {
-    const data = await readFile(
-      `./content/wcms-resources/${projectSettings.SITEMAP || 'sitemap'}.json`,
-      'utf-8',
-    );
-
-    return JSON.parse(data);
-  },
-});
+export const fallback = () => fallbackWCMSResource(projectSettings.SITEMAP || 'sitemap');

package/src/hooks/useLink.ts

@@ -1,23 +1,43 @@
-import type { LinkProps, Target } from '../model/LinkProps';
+import type { LinkProps } from '../model/LinkProps';
+import { projectSettings } from '../ProjectSettings';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
-import { isHash, isLocalURL } from '../utils/url';
+import { isHash, isLocalURL, joinPath } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
 
-interface ClickHandler {
-  onClick(ev?: { preventDefault: () => void }): void;
+interface PreventableEvent {
+  preventDefault: () => void;
 }
 
-export function useLink(
-  isRemote?: boolean,
-): <L extends Partial<LinkProps & ClickHandler>>(props: L) => L & ClickHandler {
+interface Clickable {
+  onClick(ev?: PreventableEvent): void;
+}
+
+export function useLink(isRemote?: boolean) {
   const router = useRouter();
   const blockRouter = useBlockRouter();
 
-  const handleLocalURL =
-    (href: string | undefined, target?: Target) => (ev?: { preventDefault: () => void }) => {
+  return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
+    ...props,
+    href: adjustHref(props.href),
+    'aria-label': props.text,
+    onClick: handlerDecorator(handleHref(props), props),
+  });
+
+  function adjustHref(href: string | undefined) {
+    const isRelativeToBase = !isRemote && href?.startsWith('/');
+
+    return projectSettings.BASE_PATH && href && isRelativeToBase
+      ? joinPath(projectSettings.BASE_PATH, href)
+      : href;
+  }
+
+  function handleHref({ href, target, onClick }: Partial<LinkProps & Clickable>) {
+    return (ev?: PreventableEvent) => {
+      onClick && onClick(ev);
+
       if (isRemote || !isLocalURL(href, target)) {
-        // Proceed with native handle
+        // Default routing
         return;
       }
 
@@ -29,14 +49,5 @@ export function useLink(
         router.push(href);
       }
     };
-
-  return (props) => ({
-    ...props,
-    'aria-label': props.text,
-    onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
-      props.onClick && props.onClick(ev);
-
-      handleLocalURL(props.href, props.target)(ev);
-    }, props),
-  });
+  }
 }

package/src/services/BlockRouter/BlockRouter.ts

@@ -15,7 +15,7 @@ interface EventMap {
   intersection: BlockIntersectionEvent;
 }
 
-const normalizeAnchor = (rawAnchor?: string) => rawAnchor?.replace('#', '');
+const normalizeAnchor = (rawAnchor?: string) => rawAnchor?.replace('#', '') || '';
 const getURLWithAnchor = (rawAnchor?: string) =>
   `${globalThis.location?.pathname}#${normalizeAnchor(rawAnchor)}`;
 

package/src/services/sitemap/fallbackWCMSResource.ts

@@ -0,0 +1,7 @@
+import { readFile } from 'fs/promises';
+import type { FallbackMap } from '../../model/Fallback';
+
+export const fallbackWCMSResource = (filename: string): FallbackMap => ({
+  [`/wcms-resources/${filename}.json`]: async () =>
+    JSON.parse(await readFile(`./content/wcms-resources/${filename}.json`, 'utf-8')),
+});

package/src/services/sitemap/isHrefActive.ts

@@ -1,15 +1,6 @@
-import type { Router } from '../../hooks/useRouter';
-import { projectSettings } from '../../ProjectSettings';
 import { isURL, withoutQuery } from '../../utils/url';
 
 export const isHrefActive =
-  (router: Router) =>
-  ({ href }: { href?: string }): boolean => {
-    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),
-    );
-  };
+  (router: { href?: string; pathname: string }) =>
+  ({ href }: { href?: string }): boolean =>
+    withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(href));

package/src/services/sitemap/isTopItemActive.ts

@@ -1,8 +1,11 @@
 import type { Router } from '../../hooks/useRouter';
+import { projectSettings } from '../../ProjectSettings';
 import { isHrefActive } from './isHrefActive';
 import { TopMenuItem } from './SitemapProps';
 
 export const isTopItemActive =
   (router: Router) =>
   (topItem: TopMenuItem): boolean =>
-    topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
+    projectSettings.BASE_PATH
+      ? isHrefActive({ pathname: projectSettings.BASE_PATH })(topItem)
+      : topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);

package/src/services/sitemap/useSWRResource.ts

@@ -2,8 +2,8 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import type { Fallback } from '../../model/Fallback';
 import { fetchJSONUnsafe } from '../../utils/fetchJSON';
 
-export function useSWRResource<Data>(fileName: string, fallback: Fallback = {}): Data {
-  const { data } = useAsyncData<Data>(`/wcms-resources/${fileName}.json`, fetchJSONUnsafe, {
+export function useSWRResource<Data>(filename: string, fallback: Fallback = {}): Data {
+  const { data } = useAsyncData<Data>(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
     fallback,
   });
 

package/src/setup-fixture.ts

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

package/src/utils/url.ts

@@ -8,8 +8,8 @@ export const isLocalURL = (href: string | undefined, target?: Target) =>
 
 export const isHash = (href?: string): href is `#${string}` => Boolean(href?.startsWith('#'));
 
-export const withoutQuery = (href?: string): string => (href || '').replace(/\/?\?.*/, '');
+export const withoutQuery = (href?: string): string =>
+  (href || '').replace(/\?.*/, '').replace(/\/$/, '');
 
-export const getOrigin = (href?: string) => (isURL(href) ? new URL(href).origin : undefined);
-export const getPathname = (href?: string) => (isURL(href) ? new URL(href).pathname : undefined);
-export const getHash = (href?: string) => (isURL(href) ? new URL(href).hash : undefined);
+export const joinPath = (...path: string[]): string =>
+  path.filter(Boolean).join('/').replace(/\/+/g, '/');

package/bundle/services/sitemap/mergeTopItems.d.ts

@@ -1,2 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const mergeTopItems: <L extends LinkProps>(left?: L[] | undefined, right?: L[] | undefined) => L[];

package/dist/services/sitemap/mergeTopItems.d.ts

@@ -1,2 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const mergeTopItems: <L extends LinkProps>(left?: L[] | undefined, right?: L[] | undefined) => L[];

package/dist/services/sitemap/mergeTopItems.js

@@ -1,8 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeTopItems = void 0;
-const cmp = (a) => (b) => a?.href === b?.href;
-const substitute = (items, substitution) => (items || []).map((_) => substitution?.find(cmp(_)) || _);
-const subtract = (minuend, subtrahend) => (minuend || []).filter((_) => !subtrahend?.find(cmp(_)));
-const mergeTopItems = (left, right) => substitute(left, right).concat(subtract(right, left));
-exports.mergeTopItems = mergeTopItems;
-//# sourceMappingURL=mergeTopItems.js.map

package/dist/services/sitemap/mergeTopItems.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mergeTopItems.js","sourceRoot":"","sources":["../../../src/services/sitemap/mergeTopItems.ts"],"names":[],"mappings":";;AAEA,MAAM,GAAG,GAAG,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,IAAI,CAAC;AAEtE,MAAM,UAAU,GAAG,CAAsB,KAAW,EAAE,YAAkB,EAAO,EAAE,CAC/E,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5D,MAAM,QAAQ,GAAG,CAAsB,OAAa,EAAE,UAAgB,EAAO,EAAE,CAC7E,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpD,MAAM,aAAa,GAAG,CAAsB,IAAU,EAAE,KAAW,EAAO,EAAE,CACjF,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAD3C,QAAA,aAAa,iBAC8B"}

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

@@ -1,2 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const mergeTopItems: <L extends LinkProps>(left?: L[] | undefined, right?: L[] | undefined) => L[];

package/lib/services/sitemap/mergeTopItems.js

@@ -1,5 +0,0 @@
-const cmp = (a) => (b) => a?.href === b?.href;
-const substitute = (items, substitution) => (items || []).map((_) => substitution?.find(cmp(_)) || _);
-const subtract = (minuend, subtrahend) => (minuend || []).filter((_) => !subtrahend?.find(cmp(_)));
-export const mergeTopItems = (left, right) => substitute(left, right).concat(subtract(right, left));
-//# sourceMappingURL=mergeTopItems.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"mergeTopItems.js","sourceRoot":"","sources":["../../../src/services/sitemap/mergeTopItems.ts"],"names":[],"mappings":"AAEA,MAAM,GAAG,GAAG,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,IAAI,CAAC;AAEtE,MAAM,UAAU,GAAG,CAAsB,KAAW,EAAE,YAAkB,EAAO,EAAE,CAC/E,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5D,MAAM,QAAQ,GAAG,CAAsB,OAAa,EAAE,UAAgB,EAAO,EAAE,CAC7E,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAsB,IAAU,EAAE,KAAW,EAAO,EAAE,CACjF,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC"}

package/mobile/bundle/services/sitemap/mergeTopItems.d.ts

@@ -1,2 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const mergeTopItems: <L extends LinkProps>(left?: L[] | undefined, right?: L[] | undefined) => L[];

package/mobile/dist/services/sitemap/mergeTopItems.d.ts

@@ -1,2 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const mergeTopItems: <L extends LinkProps>(left?: L[] | undefined, right?: L[] | undefined) => L[];

package/mobile/dist/services/sitemap/mergeTopItems.js

@@ -1,8 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeTopItems = void 0;
-const cmp = (a) => (b) => a?.href === b?.href;
-const substitute = (items, substitution) => (items || []).map((_) => substitution?.find(cmp(_)) || _);
-const subtract = (minuend, subtrahend) => (minuend || []).filter((_) => !subtrahend?.find(cmp(_)));
-const mergeTopItems = (left, right) => substitute(left, right).concat(subtract(right, left));
-exports.mergeTopItems = mergeTopItems;
-//# sourceMappingURL=mergeTopItems.js.map

package/mobile/dist/services/sitemap/mergeTopItems.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mergeTopItems.js","sourceRoot":"","sources":["../../../src/services/sitemap/mergeTopItems.ts"],"names":[],"mappings":";;AAEA,MAAM,GAAG,GAAG,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,IAAI,CAAC;AAEtE,MAAM,UAAU,GAAG,CAAsB,KAAW,EAAE,YAAkB,EAAO,EAAE,CAC/E,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5D,MAAM,QAAQ,GAAG,CAAsB,OAAa,EAAE,UAAgB,EAAO,EAAE,CAC7E,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpD,MAAM,aAAa,GAAG,CAAsB,IAAU,EAAE,KAAW,EAAO,EAAE,CACjF,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAD3C,QAAA,aAAa,iBAC8B"}

package/mobile/lib/services/sitemap/mergeTopItems.d.ts

@@ -1,2 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const mergeTopItems: <L extends LinkProps>(left?: L[] | undefined, right?: L[] | undefined) => L[];

package/mobile/lib/services/sitemap/mergeTopItems.js

@@ -1,5 +0,0 @@
-const cmp = (a) => (b) => a?.href === b?.href;
-const substitute = (items, substitution) => (items || []).map((_) => substitution?.find(cmp(_)) || _);
-const subtract = (minuend, subtrahend) => (minuend || []).filter((_) => !subtrahend?.find(cmp(_)));
-export const mergeTopItems = (left, right) => substitute(left, right).concat(subtract(right, left));
-//# sourceMappingURL=mergeTopItems.js.map