astro-accelerator-utils 0.1.1 → 0.1.3

package/lib/postQueries.mjs

@@ -1,6 +1,6 @@
 import { getItem, setItem } from './cache.mjs';
 import * as PostFiltering from './postFiltering.mjs';
-import * as Urls from './urls.mjs';
+import { UrlFormatter } from './v1/urls.mjs';
 
 /**
  * @typedef { import("../types/PagePredicate").PagePredicate } PagePredicate
@@ -189,6 +189,8 @@ export async function getBreadcrumbs (currentUrl, site) {
  */
 export function mapNavPage (page, site) {
 
+    const urlFormatter = new UrlFormatter(site.url);
+
     let url = page.url == null || (page.url ?? '').length == 0 
         ? '/'
         : page.url;
@@ -198,7 +200,7 @@ export function mapNavPage (page, site) {
       url += '/1/';
     }
   
-    url = Urls.addSlashToAddress(url, site);
+    url = urlFormatter.addSlashToAddress(url);
   
     if (page.frontmatter.layout == 'src/layouts/Redirect.astro') {
       // Skips past the redirect

package/lib/taxonomy.mjs

@@ -1,4 +1,4 @@
-import * as Urls from './urls.mjs';
+import { UrlFormatter } from './v1/urls.mjs';
 import * as Cache from './cache.mjs';
 import * as PostQueries from './postQueries.mjs';
 import * as PostFiltering from './postFiltering.mjs';
@@ -37,6 +37,7 @@ export function sortByTitle (a, b) {
  * @returns {TaxonomyLinks}
  */
 export function taxonomyLinks(translations, lang, site) {
+    const urlFormatter = new UrlFormatter(site.url);
     const category = lang(translations.articles.category) ?? 'category';
     const categoryLink = `${site.subfolder}/${category}/`;
 
@@ -47,10 +48,10 @@ export function taxonomyLinks(translations, lang, site) {
         tag: tag,
         category: category,
         getCategoryLink: (category) => {
-            return Urls.addSlashToAddress(categoryLink + category.toLowerCase().replace(/ /g, '-') + '/1/', site);
+            return urlFormatter.addSlashToAddress(categoryLink + category.toLowerCase().replace(/ /g, '-') + '/1/');
         },
         getTagLink: (tag) => {
-            return Urls.addSlashToAddress(tagLink + tag.toLowerCase().replace(/ /g, '-') + '/1/', site);
+            return urlFormatter.addSlashToAddress(tagLink + tag.toLowerCase().replace(/ /g, '-') + '/1/');
         }
     };
 }

package/lib/v1/urls.mjs

@@ -13,7 +13,14 @@ export class UrlFormatter {
      * @returns {URL}
      */
     addSlashToUrl(url) {
-        url.pathname += url.pathname.endsWith('/') ? '' : '/';
+        if (!url) {
+            return new URL(this.siteUrl);
+        }
+
+        url.pathname += url.pathname.endsWith('/')
+            ? ''
+            : '/';
+
         return url;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-accelerator-utils",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Astro utilities for Astro Accelerator.",
   "main": "index.mjs",
   "type": "module",

package/lib/urls.d.mts

@@ -1,17 +0,0 @@
-/**
- * @typedef { import("../types/Site") } Site
- */
-/**
- * Ensures trailing slash is used
- * @param {URL} url
- * @returns {URL}
- */
-export function addSlashToUrl(url: URL): URL;
-/**
- * Ensures trailing slash is used
- * @param {string | null} address
- * @param {Site} site
- * @returns {string}
- */
-export function addSlashToAddress(address: string | null, site: Site): string;
-export type Site = typeof import("../types/Site");

package/lib/urls.mjs

@@ -1,34 +0,0 @@
-/**
- * @typedef { import("../types/Site") } Site
- */
-
-/**
- * Ensures trailing slash is used
- * @param {URL} url 
- * @returns {URL}
- */
-export function addSlashToUrl(url) {
-  url.pathname += url.pathname.endsWith('/') ? '' : '/';
-  return url;
-}
-
-/**
- * Ensures trailing slash is used
- * @param {string | null} address 
- * @param {Site} site 
- * @returns {string}
- */
-export function addSlashToAddress(address, site) {
-  if (!address) {
-    // Handle null or empty addresses
-    address = '/';
-  }
-
-  if (address.indexOf('//') > -1) {
-    // Don't mess with absolute addresses
-    return address;
-  }
-
-  const url = addSlashToUrl(new URL(address, site.url));
-  return url.pathname + url.search;
-}