site-config-stack 3.0.5 → 3.0.7

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Harlan Wilton
+Copyright (c) 2023-Present - Harlan Wilton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-const vue = require('vue');
 const ufo = require('ufo');
+const vue = require('vue');
 
 function normalizeSiteConfig(config) {
   if (typeof config.indexable !== "undefined")

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { toValue } from 'vue';
 import { hasProtocol, withHttps, parseURL, getQuery } from 'ufo';
+import { toValue } from 'vue';
 
 function normalizeSiteConfig(config) {
   if (typeof config.indexable !== "undefined")

package/dist/urls.cjs

@@ -12,19 +12,26 @@ function resolveSitePath(pathOrUrl, options) {
   if (base !== "/" && path.startsWith(base)) {
     path = path.slice(base.length);
   }
-  const origin = options.absolute ? options.siteUrl : "";
+  let origin = ufo.withoutTrailingSlash(options.absolute ? options.siteUrl : "");
+  if (base !== "/" && origin.endsWith(base)) {
+    origin = origin.slice(0, origin.indexOf(base));
+  }
   const baseWithOrigin = options.withBase ? ufo.withBase(base, origin || "/") : origin;
   const resolvedUrl = ufo.withBase(path, baseWithOrigin);
   return path === "/" && !options.withBase ? ufo.withTrailingSlash(resolvedUrl) : fixSlashes(options.trailingSlash, resolvedUrl);
 }
+function isPathFile(path) {
+  const lastSegment = path.split("/").pop();
+  return !!(lastSegment || path).match(/\.[0-9a-z]+$/i)?.[0];
+}
 function fixSlashes(trailingSlash, pathOrUrl) {
   const $url = ufo.parseURL(pathOrUrl);
-  const isFileUrl = $url.pathname.includes(".");
-  if (isFileUrl)
+  if (isPathFile($url.pathname))
     return pathOrUrl;
   const fixedPath = trailingSlash ? ufo.withTrailingSlash($url.pathname) : ufo.withoutTrailingSlash($url.pathname);
   return `${$url.protocol ? `${$url.protocol}//` : ""}${$url.host || ""}${fixedPath}${$url.search || ""}${$url.hash || ""}`;
 }
 
 exports.fixSlashes = fixSlashes;
+exports.isPathFile = isPathFile;
 exports.resolveSitePath = resolveSitePath;

package/dist/urls.d.cts

@@ -5,6 +5,7 @@ declare function resolveSitePath(pathOrUrl: string, options: {
     absolute?: boolean;
     withBase?: boolean;
 }): string;
+declare function isPathFile(path: string): boolean;
 declare function fixSlashes(trailingSlash: boolean | undefined, pathOrUrl: string): string;
 
-export { fixSlashes, resolveSitePath };
+export { fixSlashes, isPathFile, resolveSitePath };

package/dist/urls.d.mts

@@ -5,6 +5,7 @@ declare function resolveSitePath(pathOrUrl: string, options: {
     absolute?: boolean;
     withBase?: boolean;
 }): string;
+declare function isPathFile(path: string): boolean;
 declare function fixSlashes(trailingSlash: boolean | undefined, pathOrUrl: string): string;
 
-export { fixSlashes, resolveSitePath };
+export { fixSlashes, isPathFile, resolveSitePath };

package/dist/urls.d.ts

@@ -5,6 +5,7 @@ declare function resolveSitePath(pathOrUrl: string, options: {
     absolute?: boolean;
     withBase?: boolean;
 }): string;
+declare function isPathFile(path: string): boolean;
 declare function fixSlashes(trailingSlash: boolean | undefined, pathOrUrl: string): string;
 
-export { fixSlashes, resolveSitePath };
+export { fixSlashes, isPathFile, resolveSitePath };

package/dist/urls.mjs

@@ -1,4 +1,4 @@
-import { hasProtocol, parseURL, withLeadingSlash, withBase, withTrailingSlash, withoutTrailingSlash } from 'ufo';
+import { hasProtocol, parseURL, withLeadingSlash, withoutTrailingSlash, withBase, withTrailingSlash } from 'ufo';
 
 function resolveSitePath(pathOrUrl, options) {
   let path = pathOrUrl;
@@ -10,18 +10,24 @@ function resolveSitePath(pathOrUrl, options) {
   if (base !== "/" && path.startsWith(base)) {
     path = path.slice(base.length);
   }
-  const origin = options.absolute ? options.siteUrl : "";
+  let origin = withoutTrailingSlash(options.absolute ? options.siteUrl : "");
+  if (base !== "/" && origin.endsWith(base)) {
+    origin = origin.slice(0, origin.indexOf(base));
+  }
   const baseWithOrigin = options.withBase ? withBase(base, origin || "/") : origin;
   const resolvedUrl = withBase(path, baseWithOrigin);
   return path === "/" && !options.withBase ? withTrailingSlash(resolvedUrl) : fixSlashes(options.trailingSlash, resolvedUrl);
 }
+function isPathFile(path) {
+  const lastSegment = path.split("/").pop();
+  return !!(lastSegment || path).match(/\.[0-9a-z]+$/i)?.[0];
+}
 function fixSlashes(trailingSlash, pathOrUrl) {
   const $url = parseURL(pathOrUrl);
-  const isFileUrl = $url.pathname.includes(".");
-  if (isFileUrl)
+  if (isPathFile($url.pathname))
     return pathOrUrl;
   const fixedPath = trailingSlash ? withTrailingSlash($url.pathname) : withoutTrailingSlash($url.pathname);
   return `${$url.protocol ? `${$url.protocol}//` : ""}${$url.host || ""}${fixedPath}${$url.search || ""}${$url.hash || ""}`;
 }
 
-export { fixSlashes, resolveSitePath };
+export { fixSlashes, isPathFile, resolveSitePath };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-config-stack",
   "type": "module",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "Shared site configuration utilities.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -45,7 +45,7 @@
     "ufo": "^1.5.4"
   },
   "devDependencies": {
-    "vue": "^3.5.12"
+    "vue": "^3.5.13"
   },
   "scripts": {
     "lint": "eslint . --fix",