site-config-stack 1.6.7 → 2.0.0

package/dist/index.cjs

@@ -1,7 +1,44 @@
 'use strict';
 
+const vue = require('vue');
 const ufo = require('ufo');
 
+function normalizeSiteConfig(config) {
+  if (typeof config.indexable !== "undefined")
+    config.indexable = String(config.indexable) !== "false";
+  if (typeof config.trailingSlash !== "undefined" && !config.trailingSlash)
+    config.trailingSlash = String(config.trailingSlash) !== "false";
+  if (config.url && !ufo.hasProtocol(config.url, { acceptRelative: true, strict: false }))
+    config.url = ufo.withHttps(config.url);
+  const keys = Object.keys(config).sort((a, b) => a.localeCompare(b));
+  const newConfig = {};
+  for (const k of keys)
+    newConfig[k] = config[k];
+  return newConfig;
+}
+function validateSiteConfigStack(stack) {
+  const resolved = normalizeSiteConfig(stack.get({
+    // we need the context
+    debug: true
+  }));
+  const errors = [];
+  if (resolved.url) {
+    const val = resolved.url;
+    const context = resolved._context?.url || "unknown";
+    const url = ufo.parseURL(val);
+    if (!url.host)
+      errors.push(`url "${val}" from ${context} is not absolute`);
+    else if (url.pathname && url.pathname !== "/")
+      errors.push(`url "${val}" from ${context} should not contain a path`);
+    else if (url.hash)
+      errors.push(`url "${val}" from ${context} should not contain a hash`);
+    else if (Object.keys(ufo.getQuery(val)).length > 0)
+      errors.push(`url "${val}" from ${context} should not contain a query`);
+    else if (url.host === "localhost")
+      errors.push(`url "${val}" from ${context} should not be localhost`);
+  }
+  return errors;
+}
 function createSiteConfigStack(options) {
   const debug = options?.debug || false;
   const stack = [];
@@ -32,13 +69,13 @@ function createSiteConfigStack(options) {
         const key = k;
         const val = stack[o][k];
         if (!k.startsWith("_")) {
-          siteConfig[k] = val;
+          siteConfig[k] = options2?.resolveRefs ? vue.toValue(val) : val;
           if (options2?.debug)
             siteConfig._context[key] = stack[o]._context?.[key] || stack[o]._context || "anonymous";
         }
       }
     }
-    return normalizeSiteConfig(siteConfig);
+    return options2?.skipNormalize ? siteConfig : normalizeSiteConfig(siteConfig);
   }
   return {
     stack,
@@ -47,44 +84,14 @@ function createSiteConfigStack(options) {
   };
 }
 
-function normalizeSiteConfig(config) {
-  if (typeof config.indexable !== "undefined")
-    config.indexable = String(config.indexable) !== "false";
-  if (typeof config.trailingSlash !== "undefined")
-    config.trailingSlash = String(config.trailingSlash) !== "false";
-  if (config.url && !ufo.hasProtocol(config.url, { acceptRelative: true, strict: false }))
-    config.url = ufo.withHttps(config.url);
-  const keys = Object.keys(config).sort((a, b) => a.localeCompare(b));
-  const newConfig = {};
-  for (const k of keys)
-    newConfig[k] = config[k];
-  return newConfig;
-}
-function resolveSitePath(pathOrUrl, options) {
-  let path = pathOrUrl;
-  if (ufo.hasProtocol(pathOrUrl, { strict: false, acceptRelative: true })) {
-    const parsed = ufo.parseURL(pathOrUrl);
-    path = parsed.pathname;
-  }
-  const base = ufo.withLeadingSlash(options.base || "/");
-  if (base !== "/" && path.startsWith(base)) {
-    path = path.slice(base.length);
-  }
-  const origin = options.absolute ? options.siteUrl : "";
-  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 fixSlashes(trailingSlash, pathOrUrl) {
-  const $url = ufo.parseURL(pathOrUrl);
-  const isFileUrl = $url.pathname.includes(".");
-  if (isFileUrl)
-    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 || ""}`;
+function envSiteConfig(env) {
+  return Object.fromEntries(Object.entries(env).filter(([k]) => k.startsWith("NUXT_SITE_") || k.startsWith("NUXT_PUBLIC_SITE_")).map(([k, v]) => [
+    k.replace(/^NUXT_(PUBLIC_)?SITE_/, "").split("_").map((s, i) => i === 0 ? s.toLowerCase() : s[0].toUpperCase() + s.slice(1).toLowerCase()).join(""),
+    v
+  ]));
 }
 
 exports.createSiteConfigStack = createSiteConfigStack;
-exports.fixSlashes = fixSlashes;
+exports.envSiteConfig = envSiteConfig;
 exports.normalizeSiteConfig = normalizeSiteConfig;
-exports.resolveSitePath = resolveSitePath;
+exports.validateSiteConfigStack = validateSiteConfigStack;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { ComputedRef, Ref } from 'vue';
 
-interface SiteConfig {
+interface SiteConfigResolved {
     /**
      * The canonical Site URL.
      *
@@ -19,91 +19,62 @@ interface SiteConfig {
      *
      * Used by: nuxt-schema-org, nuxt-seo-kit
      */
-    name: string;
+    name?: string;
     /**
      * Whether the site is indexable by search engines.
+     *
+     * @deprecated we should only rely on `env`
      */
-    indexable: boolean;
+    indexable?: boolean;
     /**
      * The environment of the site. Comparable to `process.env.NODE_ENV`.
      */
-    env: 'production' | 'staging' | 'development' | string;
+    env?: 'production' | 'staging' | 'development' | 'preview' | 'uat' | string;
     /**
      * Whether the site uses trailing slash.
      */
-    trailingSlash: boolean;
-    /**
-     * Current locale, set with `@nuxt/i18n`.
-     *
-     * Falls back to the defaultLocale.
-     */
-    currentLocale?: string;
-    /**
-     * The default locale of the site.
-     */
-    defaultLocale: string;
-    /**
-     * The description of the site.
-     *
-     * @default `process.env.NUXT_PUBLIC_SITE_DESCRIPTION`
-     *
-     * Used by: nuxt-schema-org, nuxt-seo-kit
-     */
-    description?: string;
+    trailingSlash?: boolean;
     /**
-     * Configure the identity of the site.
-     */
-    identity?: {
-        /**
-         * Use Organization for when the site is a company, business, etc.
-         * Use Person for when the site is a personal blog, portfolio, etc.
-         */
-        type: 'Organization' | 'Person';
-    };
-    /**
-     * Twitter (X) profile ID.
-     *
-     * Used for Schema.org sameAs and `<meta profile>`.
-     *
-     * @example `@harlan_zw`
+     * The mapping of the context of each site config value being set.
      */
-    twitter?: string;
+    _context?: Record<string, string>;
     /**
-     * The mapping of the context of each site config value being set.
+     * Support any keys as site config.
      */
-    _context: Partial<Record<Exclude<keyof SiteConfig, '_meta'>, string>>;
-    [key: (string & Record<never, never>)]: any;
+    [key: string]: any;
 }
+/**
+ * @deprecated use SiteConfigResolved
+ */
+type SiteConfig = SiteConfigResolved;
 type MaybeComputedRef<T> = T | (() => T) | ComputedRef<T> | Ref<T>;
 type MaybeComputedRefEntries<T> = {
     [key in keyof T]?: MaybeComputedRef<T[key]>;
 };
-type SiteConfigInput = Omit<MaybeComputedRefEntries<Partial<SiteConfig>>, '_context' | 'indexable'> & {
+type SiteConfigInput = Omit<MaybeComputedRefEntries<Partial<SiteConfigResolved>>, '_context' | 'indexable'> & {
     _context?: string;
     _priority?: number;
     indexable?: MaybeComputedRef<string | boolean>;
 };
 interface GetSiteConfigOptions {
     debug?: boolean;
+    skipNormalize?: boolean;
+    resolveRefs?: boolean;
 }
 interface SiteConfigStack {
     stack: Partial<SiteConfigInput>[];
     push: (config: SiteConfigInput) => void;
-    get: (options?: GetSiteConfigOptions) => SiteConfig;
+    get: (options?: GetSiteConfigOptions) => SiteConfigResolved;
 }
 
+declare function normalizeSiteConfig(config: SiteConfigResolved): SiteConfigResolved;
+declare function validateSiteConfigStack(stack: SiteConfigStack): string[];
 declare function createSiteConfigStack(options?: {
     debug: boolean;
 }): SiteConfigStack;
 
-declare function normalizeSiteConfig(config: SiteConfig): SiteConfig;
-declare function resolveSitePath(pathOrUrl: string, options: {
-    siteUrl: string;
-    trailingSlash: boolean;
-    base?: string;
-    absolute?: boolean;
-    withBase?: boolean;
-}): string;
-declare function fixSlashes(trailingSlash: boolean, pathOrUrl: string): string;
+declare function envSiteConfig(env: Record<string, any>): {
+    [k: string]: any;
+};
 
-export { type GetSiteConfigOptions, type MaybeComputedRef, type MaybeComputedRefEntries, type SiteConfig, type SiteConfigInput, type SiteConfigStack, createSiteConfigStack, fixSlashes, normalizeSiteConfig, resolveSitePath };
+export { type GetSiteConfigOptions, type MaybeComputedRef, type MaybeComputedRefEntries, type SiteConfig, type SiteConfigInput, type SiteConfigResolved, type SiteConfigStack, createSiteConfigStack, envSiteConfig, normalizeSiteConfig, validateSiteConfigStack };

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { ComputedRef, Ref } from 'vue';
 
-interface SiteConfig {
+interface SiteConfigResolved {
     /**
      * The canonical Site URL.
      *
@@ -19,91 +19,62 @@ interface SiteConfig {
      *
      * Used by: nuxt-schema-org, nuxt-seo-kit
      */
-    name: string;
+    name?: string;
     /**
      * Whether the site is indexable by search engines.
+     *
+     * @deprecated we should only rely on `env`
      */
-    indexable: boolean;
+    indexable?: boolean;
     /**
      * The environment of the site. Comparable to `process.env.NODE_ENV`.
      */
-    env: 'production' | 'staging' | 'development' | string;
+    env?: 'production' | 'staging' | 'development' | 'preview' | 'uat' | string;
     /**
      * Whether the site uses trailing slash.
      */
-    trailingSlash: boolean;
-    /**
-     * Current locale, set with `@nuxt/i18n`.
-     *
-     * Falls back to the defaultLocale.
-     */
-    currentLocale?: string;
-    /**
-     * The default locale of the site.
-     */
-    defaultLocale: string;
-    /**
-     * The description of the site.
-     *
-     * @default `process.env.NUXT_PUBLIC_SITE_DESCRIPTION`
-     *
-     * Used by: nuxt-schema-org, nuxt-seo-kit
-     */
-    description?: string;
+    trailingSlash?: boolean;
     /**
-     * Configure the identity of the site.
-     */
-    identity?: {
-        /**
-         * Use Organization for when the site is a company, business, etc.
-         * Use Person for when the site is a personal blog, portfolio, etc.
-         */
-        type: 'Organization' | 'Person';
-    };
-    /**
-     * Twitter (X) profile ID.
-     *
-     * Used for Schema.org sameAs and `<meta profile>`.
-     *
-     * @example `@harlan_zw`
+     * The mapping of the context of each site config value being set.
      */
-    twitter?: string;
+    _context?: Record<string, string>;
     /**
-     * The mapping of the context of each site config value being set.
+     * Support any keys as site config.
      */
-    _context: Partial<Record<Exclude<keyof SiteConfig, '_meta'>, string>>;
-    [key: (string & Record<never, never>)]: any;
+    [key: string]: any;
 }
+/**
+ * @deprecated use SiteConfigResolved
+ */
+type SiteConfig = SiteConfigResolved;
 type MaybeComputedRef<T> = T | (() => T) | ComputedRef<T> | Ref<T>;
 type MaybeComputedRefEntries<T> = {
     [key in keyof T]?: MaybeComputedRef<T[key]>;
 };
-type SiteConfigInput = Omit<MaybeComputedRefEntries<Partial<SiteConfig>>, '_context' | 'indexable'> & {
+type SiteConfigInput = Omit<MaybeComputedRefEntries<Partial<SiteConfigResolved>>, '_context' | 'indexable'> & {
     _context?: string;
     _priority?: number;
     indexable?: MaybeComputedRef<string | boolean>;
 };
 interface GetSiteConfigOptions {
     debug?: boolean;
+    skipNormalize?: boolean;
+    resolveRefs?: boolean;
 }
 interface SiteConfigStack {
     stack: Partial<SiteConfigInput>[];
     push: (config: SiteConfigInput) => void;
-    get: (options?: GetSiteConfigOptions) => SiteConfig;
+    get: (options?: GetSiteConfigOptions) => SiteConfigResolved;
 }
 
+declare function normalizeSiteConfig(config: SiteConfigResolved): SiteConfigResolved;
+declare function validateSiteConfigStack(stack: SiteConfigStack): string[];
 declare function createSiteConfigStack(options?: {
     debug: boolean;
 }): SiteConfigStack;
 
-declare function normalizeSiteConfig(config: SiteConfig): SiteConfig;
-declare function resolveSitePath(pathOrUrl: string, options: {
-    siteUrl: string;
-    trailingSlash: boolean;
-    base?: string;
-    absolute?: boolean;
-    withBase?: boolean;
-}): string;
-declare function fixSlashes(trailingSlash: boolean, pathOrUrl: string): string;
+declare function envSiteConfig(env: Record<string, any>): {
+    [k: string]: any;
+};
 
-export { type GetSiteConfigOptions, type MaybeComputedRef, type MaybeComputedRefEntries, type SiteConfig, type SiteConfigInput, type SiteConfigStack, createSiteConfigStack, fixSlashes, normalizeSiteConfig, resolveSitePath };
+export { type GetSiteConfigOptions, type MaybeComputedRef, type MaybeComputedRefEntries, type SiteConfig, type SiteConfigInput, type SiteConfigResolved, type SiteConfigStack, createSiteConfigStack, envSiteConfig, normalizeSiteConfig, validateSiteConfigStack };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { ComputedRef, Ref } from 'vue';
 
-interface SiteConfig {
+interface SiteConfigResolved {
     /**
      * The canonical Site URL.
      *
@@ -19,91 +19,62 @@ interface SiteConfig {
      *
      * Used by: nuxt-schema-org, nuxt-seo-kit
      */
-    name: string;
+    name?: string;
     /**
      * Whether the site is indexable by search engines.
+     *
+     * @deprecated we should only rely on `env`
      */
-    indexable: boolean;
+    indexable?: boolean;
     /**
      * The environment of the site. Comparable to `process.env.NODE_ENV`.
      */
-    env: 'production' | 'staging' | 'development' | string;
+    env?: 'production' | 'staging' | 'development' | 'preview' | 'uat' | string;
     /**
      * Whether the site uses trailing slash.
      */
-    trailingSlash: boolean;
-    /**
-     * Current locale, set with `@nuxt/i18n`.
-     *
-     * Falls back to the defaultLocale.
-     */
-    currentLocale?: string;
-    /**
-     * The default locale of the site.
-     */
-    defaultLocale: string;
-    /**
-     * The description of the site.
-     *
-     * @default `process.env.NUXT_PUBLIC_SITE_DESCRIPTION`
-     *
-     * Used by: nuxt-schema-org, nuxt-seo-kit
-     */
-    description?: string;
+    trailingSlash?: boolean;
     /**
-     * Configure the identity of the site.
-     */
-    identity?: {
-        /**
-         * Use Organization for when the site is a company, business, etc.
-         * Use Person for when the site is a personal blog, portfolio, etc.
-         */
-        type: 'Organization' | 'Person';
-    };
-    /**
-     * Twitter (X) profile ID.
-     *
-     * Used for Schema.org sameAs and `<meta profile>`.
-     *
-     * @example `@harlan_zw`
+     * The mapping of the context of each site config value being set.
      */
-    twitter?: string;
+    _context?: Record<string, string>;
     /**
-     * The mapping of the context of each site config value being set.
+     * Support any keys as site config.
      */
-    _context: Partial<Record<Exclude<keyof SiteConfig, '_meta'>, string>>;
-    [key: (string & Record<never, never>)]: any;
+    [key: string]: any;
 }
+/**
+ * @deprecated use SiteConfigResolved
+ */
+type SiteConfig = SiteConfigResolved;
 type MaybeComputedRef<T> = T | (() => T) | ComputedRef<T> | Ref<T>;
 type MaybeComputedRefEntries<T> = {
     [key in keyof T]?: MaybeComputedRef<T[key]>;
 };
-type SiteConfigInput = Omit<MaybeComputedRefEntries<Partial<SiteConfig>>, '_context' | 'indexable'> & {
+type SiteConfigInput = Omit<MaybeComputedRefEntries<Partial<SiteConfigResolved>>, '_context' | 'indexable'> & {
     _context?: string;
     _priority?: number;
     indexable?: MaybeComputedRef<string | boolean>;
 };
 interface GetSiteConfigOptions {
     debug?: boolean;
+    skipNormalize?: boolean;
+    resolveRefs?: boolean;
 }
 interface SiteConfigStack {
     stack: Partial<SiteConfigInput>[];
     push: (config: SiteConfigInput) => void;
-    get: (options?: GetSiteConfigOptions) => SiteConfig;
+    get: (options?: GetSiteConfigOptions) => SiteConfigResolved;
 }
 
+declare function normalizeSiteConfig(config: SiteConfigResolved): SiteConfigResolved;
+declare function validateSiteConfigStack(stack: SiteConfigStack): string[];
 declare function createSiteConfigStack(options?: {
     debug: boolean;
 }): SiteConfigStack;
 
-declare function normalizeSiteConfig(config: SiteConfig): SiteConfig;
-declare function resolveSitePath(pathOrUrl: string, options: {
-    siteUrl: string;
-    trailingSlash: boolean;
-    base?: string;
-    absolute?: boolean;
-    withBase?: boolean;
-}): string;
-declare function fixSlashes(trailingSlash: boolean, pathOrUrl: string): string;
+declare function envSiteConfig(env: Record<string, any>): {
+    [k: string]: any;
+};
 
-export { type GetSiteConfigOptions, type MaybeComputedRef, type MaybeComputedRefEntries, type SiteConfig, type SiteConfigInput, type SiteConfigStack, createSiteConfigStack, fixSlashes, normalizeSiteConfig, resolveSitePath };
+export { type GetSiteConfigOptions, type MaybeComputedRef, type MaybeComputedRefEntries, type SiteConfig, type SiteConfigInput, type SiteConfigResolved, type SiteConfigStack, createSiteConfigStack, envSiteConfig, normalizeSiteConfig, validateSiteConfigStack };

package/dist/index.mjs

@@ -1,5 +1,42 @@
-import { hasProtocol, withHttps, parseURL, withLeadingSlash, withBase, withTrailingSlash, withoutTrailingSlash } from 'ufo';
+import { toValue } from 'vue';
+import { hasProtocol, withHttps, parseURL, getQuery } from 'ufo';
 
+function normalizeSiteConfig(config) {
+  if (typeof config.indexable !== "undefined")
+    config.indexable = String(config.indexable) !== "false";
+  if (typeof config.trailingSlash !== "undefined" && !config.trailingSlash)
+    config.trailingSlash = String(config.trailingSlash) !== "false";
+  if (config.url && !hasProtocol(config.url, { acceptRelative: true, strict: false }))
+    config.url = withHttps(config.url);
+  const keys = Object.keys(config).sort((a, b) => a.localeCompare(b));
+  const newConfig = {};
+  for (const k of keys)
+    newConfig[k] = config[k];
+  return newConfig;
+}
+function validateSiteConfigStack(stack) {
+  const resolved = normalizeSiteConfig(stack.get({
+    // we need the context
+    debug: true
+  }));
+  const errors = [];
+  if (resolved.url) {
+    const val = resolved.url;
+    const context = resolved._context?.url || "unknown";
+    const url = parseURL(val);
+    if (!url.host)
+      errors.push(`url "${val}" from ${context} is not absolute`);
+    else if (url.pathname && url.pathname !== "/")
+      errors.push(`url "${val}" from ${context} should not contain a path`);
+    else if (url.hash)
+      errors.push(`url "${val}" from ${context} should not contain a hash`);
+    else if (Object.keys(getQuery(val)).length > 0)
+      errors.push(`url "${val}" from ${context} should not contain a query`);
+    else if (url.host === "localhost")
+      errors.push(`url "${val}" from ${context} should not be localhost`);
+  }
+  return errors;
+}
 function createSiteConfigStack(options) {
   const debug = options?.debug || false;
   const stack = [];
@@ -30,13 +67,13 @@ function createSiteConfigStack(options) {
         const key = k;
         const val = stack[o][k];
         if (!k.startsWith("_")) {
-          siteConfig[k] = val;
+          siteConfig[k] = options2?.resolveRefs ? toValue(val) : val;
           if (options2?.debug)
             siteConfig._context[key] = stack[o]._context?.[key] || stack[o]._context || "anonymous";
         }
       }
     }
-    return normalizeSiteConfig(siteConfig);
+    return options2?.skipNormalize ? siteConfig : normalizeSiteConfig(siteConfig);
   }
   return {
     stack,
@@ -45,41 +82,11 @@ function createSiteConfigStack(options) {
   };
 }
 
-function normalizeSiteConfig(config) {
-  if (typeof config.indexable !== "undefined")
-    config.indexable = String(config.indexable) !== "false";
-  if (typeof config.trailingSlash !== "undefined")
-    config.trailingSlash = String(config.trailingSlash) !== "false";
-  if (config.url && !hasProtocol(config.url, { acceptRelative: true, strict: false }))
-    config.url = withHttps(config.url);
-  const keys = Object.keys(config).sort((a, b) => a.localeCompare(b));
-  const newConfig = {};
-  for (const k of keys)
-    newConfig[k] = config[k];
-  return newConfig;
-}
-function resolveSitePath(pathOrUrl, options) {
-  let path = pathOrUrl;
-  if (hasProtocol(pathOrUrl, { strict: false, acceptRelative: true })) {
-    const parsed = parseURL(pathOrUrl);
-    path = parsed.pathname;
-  }
-  const base = withLeadingSlash(options.base || "/");
-  if (base !== "/" && path.startsWith(base)) {
-    path = path.slice(base.length);
-  }
-  const origin = options.absolute ? options.siteUrl : "";
-  const baseWithOrigin = options.withBase ? withBase(base, origin || "/") : origin;
-  const resolvedUrl = withBase(path, baseWithOrigin);
-  return path === "/" && !options.withBase ? withTrailingSlash(resolvedUrl) : fixSlashes(options.trailingSlash, resolvedUrl);
-}
-function fixSlashes(trailingSlash, pathOrUrl) {
-  const $url = parseURL(pathOrUrl);
-  const isFileUrl = $url.pathname.includes(".");
-  if (isFileUrl)
-    return pathOrUrl;
-  const fixedPath = trailingSlash ? withTrailingSlash($url.pathname) : withoutTrailingSlash($url.pathname);
-  return `${$url.protocol ? `${$url.protocol}//` : ""}${$url.host || ""}${fixedPath}${$url.search || ""}${$url.hash || ""}`;
+function envSiteConfig(env) {
+  return Object.fromEntries(Object.entries(env).filter(([k]) => k.startsWith("NUXT_SITE_") || k.startsWith("NUXT_PUBLIC_SITE_")).map(([k, v]) => [
+    k.replace(/^NUXT_(PUBLIC_)?SITE_/, "").split("_").map((s, i) => i === 0 ? s.toLowerCase() : s[0].toUpperCase() + s.slice(1).toLowerCase()).join(""),
+    v
+  ]));
 }
 
-export { createSiteConfigStack, fixSlashes, normalizeSiteConfig, resolveSitePath };
+export { createSiteConfigStack, envSiteConfig, normalizeSiteConfig, validateSiteConfigStack };

package/dist/urls.cjs

@@ -0,0 +1,30 @@
+'use strict';
+
+const ufo = require('ufo');
+
+function resolveSitePath(pathOrUrl, options) {
+  let path = pathOrUrl;
+  if (ufo.hasProtocol(pathOrUrl, { strict: false, acceptRelative: true })) {
+    const parsed = ufo.parseURL(pathOrUrl);
+    path = parsed.pathname;
+  }
+  const base = ufo.withLeadingSlash(options.base || "/");
+  if (base !== "/" && path.startsWith(base)) {
+    path = path.slice(base.length);
+  }
+  const origin = options.absolute ? options.siteUrl : "";
+  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 fixSlashes(trailingSlash, pathOrUrl) {
+  const $url = ufo.parseURL(pathOrUrl);
+  const isFileUrl = $url.pathname.includes(".");
+  if (isFileUrl)
+    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.resolveSitePath = resolveSitePath;

package/dist/urls.d.cts

@@ -0,0 +1,10 @@
+declare function resolveSitePath(pathOrUrl: string, options: {
+    siteUrl: string;
+    trailingSlash?: boolean;
+    base?: string;
+    absolute?: boolean;
+    withBase?: boolean;
+}): string;
+declare function fixSlashes(trailingSlash: boolean | undefined, pathOrUrl: string): string;
+
+export { fixSlashes, resolveSitePath };

package/dist/urls.d.mts

@@ -0,0 +1,10 @@
+declare function resolveSitePath(pathOrUrl: string, options: {
+    siteUrl: string;
+    trailingSlash?: boolean;
+    base?: string;
+    absolute?: boolean;
+    withBase?: boolean;
+}): string;
+declare function fixSlashes(trailingSlash: boolean | undefined, pathOrUrl: string): string;
+
+export { fixSlashes, resolveSitePath };

package/dist/urls.d.ts

@@ -0,0 +1,10 @@
+declare function resolveSitePath(pathOrUrl: string, options: {
+    siteUrl: string;
+    trailingSlash?: boolean;
+    base?: string;
+    absolute?: boolean;
+    withBase?: boolean;
+}): string;
+declare function fixSlashes(trailingSlash: boolean | undefined, pathOrUrl: string): string;
+
+export { fixSlashes, resolveSitePath };

package/dist/urls.mjs

@@ -0,0 +1,27 @@
+import { hasProtocol, parseURL, withLeadingSlash, withBase, withTrailingSlash, withoutTrailingSlash } from 'ufo';
+
+function resolveSitePath(pathOrUrl, options) {
+  let path = pathOrUrl;
+  if (hasProtocol(pathOrUrl, { strict: false, acceptRelative: true })) {
+    const parsed = parseURL(pathOrUrl);
+    path = parsed.pathname;
+  }
+  const base = withLeadingSlash(options.base || "/");
+  if (base !== "/" && path.startsWith(base)) {
+    path = path.slice(base.length);
+  }
+  const origin = options.absolute ? options.siteUrl : "";
+  const baseWithOrigin = options.withBase ? withBase(base, origin || "/") : origin;
+  const resolvedUrl = withBase(path, baseWithOrigin);
+  return path === "/" && !options.withBase ? withTrailingSlash(resolvedUrl) : fixSlashes(options.trailingSlash, resolvedUrl);
+}
+function fixSlashes(trailingSlash, pathOrUrl) {
+  const $url = parseURL(pathOrUrl);
+  const isFileUrl = $url.pathname.includes(".");
+  if (isFileUrl)
+    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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-config-stack",
   "type": "module",
-  "version": "1.6.7",
+  "version": "2.0.0",
   "description": "Shared site configuration utilities.",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -19,6 +19,16 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
+    },
+    "./urls": {
+      "types": "./dist/urls.d.ts",
+      "import": "./dist/urls.mjs",
+      "require": "./dist/urls.cjs"
+    },
+    "./dist/urls": {
+      "types": "./dist/urls.d.ts",
+      "import": "./dist/urls.mjs",
+      "require": "./dist/urls.cjs"
     }
   },
   "main": "./dist/index.cjs",
@@ -38,6 +48,7 @@
   "scripts": {
     "lint": "eslint . --fix",
     "build": "unbuild",
-    "stub": "unbuild --stub"
+    "stub": "unbuild --stub",
+    "typecheck": "tsc --noEmit"
   }
 }