site-config-stack 0.8.11 → 0.8.13

package/dist/index.cjs

@@ -67,17 +67,26 @@ function normalizeSiteConfig(config) {
     config.url = ufo.withHttps(config.url);
   return config;
 }
-function resolveSitePath(path, options) {
+function resolveSitePath(pathOrUrl, options) {
+  let path = pathOrUrl;
+  if (ufo.hasProtocol(pathOrUrl, { strict: false, acceptRelative: true })) {
+    const parsed = ufo.parseURL(pathOrUrl);
+    path = parsed.pathname;
+  }
+  if (!options.withBase && path.startsWith(`/${options.base}`)) {
+    path = path.slice(options.base.length + 1);
+  }
   const origin = options.absolute ? options.siteUrl : "";
-  const baseWithOrigin = options.withBase ? ufo.joinURL(origin || "/", options.base) : origin;
-  const resolvedUrl = ufo.joinURL(baseWithOrigin, path);
-  return fixSlashes(options.trailingSlash, resolvedUrl);
+  const baseWithOrigin = options.withBase ? ufo.withBase(options.base, origin || "/") : origin;
+  const resolvedUrl = ufo.withBase(path, baseWithOrigin);
+  return path === "/" ? ufo.withTrailingSlash(resolvedUrl) : fixSlashes(options.trailingSlash, resolvedUrl);
 }
-function fixSlashes(trailingSlash, path) {
-  const isFileUrl = path.includes(".");
+function fixSlashes(trailingSlash, pathOrUrl) {
+  const parsed = ufo.parseURL(pathOrUrl);
+  const isFileUrl = parsed.pathname.includes(".");
   if (isFileUrl)
-    return path;
-  return trailingSlash ? ufo.withTrailingSlash(path) : ufo.withoutTrailingSlash(path);
+    return pathOrUrl;
+  return trailingSlash ? ufo.withTrailingSlash(pathOrUrl) : ufo.withoutTrailingSlash(pathOrUrl);
 }
 
 exports.createSiteConfigStack = createSiteConfigStack;

package/dist/index.d.ts

@@ -73,13 +73,13 @@ declare const envSiteConfig: SiteConfigInput;
 declare function createSiteConfigStack(): SiteConfigStack;
 
 declare function normalizeSiteConfig(config: SiteConfig): SiteConfig;
-declare function resolveSitePath(path: string, options: {
+declare function resolveSitePath(pathOrUrl: string, options: {
     siteUrl: string;
     trailingSlash: boolean;
     base: string;
     absolute?: boolean;
     withBase?: boolean;
 }): string;
-declare function fixSlashes(trailingSlash: boolean, path: string): string;
+declare function fixSlashes(trailingSlash: boolean, pathOrUrl: string): string;
 
 export { SiteConfig, SiteConfigInput, SiteConfigStack, createSiteConfigStack, envSiteConfig, fixSlashes, normalizeSiteConfig, resolveSitePath };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { hasProtocol, withHttps, joinURL, withTrailingSlash, withoutTrailingSlash } from 'ufo';
+import { hasProtocol, withHttps, parseURL, withBase, withTrailingSlash, withoutTrailingSlash } from 'ufo';
 
 const processShim = typeof process !== "undefined" ? process : {};
 const envShim = processShim.env || {};
@@ -65,17 +65,26 @@ function normalizeSiteConfig(config) {
     config.url = withHttps(config.url);
   return config;
 }
-function resolveSitePath(path, options) {
+function resolveSitePath(pathOrUrl, options) {
+  let path = pathOrUrl;
+  if (hasProtocol(pathOrUrl, { strict: false, acceptRelative: true })) {
+    const parsed = parseURL(pathOrUrl);
+    path = parsed.pathname;
+  }
+  if (!options.withBase && path.startsWith(`/${options.base}`)) {
+    path = path.slice(options.base.length + 1);
+  }
   const origin = options.absolute ? options.siteUrl : "";
-  const baseWithOrigin = options.withBase ? joinURL(origin || "/", options.base) : origin;
-  const resolvedUrl = joinURL(baseWithOrigin, path);
-  return fixSlashes(options.trailingSlash, resolvedUrl);
+  const baseWithOrigin = options.withBase ? withBase(options.base, origin || "/") : origin;
+  const resolvedUrl = withBase(path, baseWithOrigin);
+  return path === "/" ? withTrailingSlash(resolvedUrl) : fixSlashes(options.trailingSlash, resolvedUrl);
 }
-function fixSlashes(trailingSlash, path) {
-  const isFileUrl = path.includes(".");
+function fixSlashes(trailingSlash, pathOrUrl) {
+  const parsed = parseURL(pathOrUrl);
+  const isFileUrl = parsed.pathname.includes(".");
   if (isFileUrl)
-    return path;
-  return trailingSlash ? withTrailingSlash(path) : withoutTrailingSlash(path);
+    return pathOrUrl;
+  return trailingSlash ? withTrailingSlash(pathOrUrl) : withoutTrailingSlash(pathOrUrl);
 }
 
 export { createSiteConfigStack, envSiteConfig, fixSlashes, normalizeSiteConfig, resolveSitePath };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-config-stack",
   "type": "module",
-  "version": "0.8.11",
+  "version": "0.8.13",
   "description": "Shared site configuration  utilities.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",