intor 2.5.0 → 2.6.0

package/dist/express/src/routing/locale/get-locale-from-pathname.js

@@ -3,44 +3,18 @@ import 'logry';
 import 'p-limit';
 import 'intor-translator';
 
-/**
- * Get locale from pathname.
- *
- * Extracts the first pathname segment (after basePath) as a locale
- * if it exactly matches one of the supported locales.
- *
- * @example
- * ```ts
- * getLocaleFromPathname(config, "/en/about")
- * // => "en"
- * getLocaleFromPathname(config, "/zh-TW")
- * // => "zh-TW"
- * getLocaleFromPathname(config, "/about")
- * // => undefined
- *
- * // config.routing.basePath: "/app"
- * getLocaleFromPathname(config, "/app/en/dashboard")
- * // => "en"
- * ```
- */
 function getLocaleFromPathname(pathname, config) {
-    const { routing, supportedLocales } = config;
-    const { basePath } = routing;
-    // 1. Normalize pathname
-    const normalizedPathname = normalizePathname(pathname);
-    // 2. Strip basePath
-    let prefixedPathname = normalizedPathname;
-    if (basePath && normalizedPathname === basePath) {
-        prefixedPathname = "/";
-    }
-    else if (basePath && normalizedPathname.startsWith(basePath + "/")) {
-        prefixedPathname = normalizedPathname.slice(basePath.length);
-    }
-    // 3. Detect locale segment
-    const firstSegment = prefixedPathname.split("/").find(Boolean);
-    return firstSegment && supportedLocales.includes(firstSegment)
-        ? firstSegment
-        : undefined;
+  const { routing, supportedLocales } = config;
+  const { basePath } = routing;
+  const normalizedPathname = normalizePathname(pathname);
+  let prefixedPathname = normalizedPathname;
+  if (basePath && normalizedPathname === basePath) {
+    prefixedPathname = "/";
+  } else if (basePath && normalizedPathname.startsWith(basePath + "/")) {
+    prefixedPathname = normalizedPathname.slice(basePath.length);
+  }
+  const firstSegment = prefixedPathname.split("/").find(Boolean);
+  return firstSegment && supportedLocales.includes(firstSegment) ? firstSegment : void 0;
 }
 
 export { getLocaleFromPathname };

package/dist/express/src/routing/locale/get-locale-from-query.js

@@ -1,21 +1,6 @@
-/**
- * Get locale candidate from URL query parameters.
- *
- * Extracts the value of the configured query key, without
- * validation or normalization.
- *
- * @example
- * ```ts
- * getLocaleFromQuery({ locale: "en" }, "locale")
- * // => "en"
- *
- * getLocaleFromQuery({}, "locale")
- * // => undefined
- */
 function getLocaleFromQuery(query, queryKey) {
-    if (!query)
-        return;
-    return query[queryKey];
+  if (!query) return;
+  return query[queryKey];
 }
 
 export { getLocaleFromQuery };

package/dist/express/src/routing/pathname/canonicalize-pathname.js

@@ -4,75 +4,33 @@ import 'logry';
 import 'p-limit';
 import 'intor-translator';
 
-/**
- * Returns the internal canonical pathname.
- *
- * Canonical representation is the locale-neutral and deployment-neutral
- * internal routing form used for identity and routing computation.
- *
- * Guarantees:
- * - Pathname is normalized
- * - Deployment prefix (`basePath`) is removed
- * - Leading locale segment or `{locale}` placeholder is removed
- * - Only the first path segment is evaluated for locale stripping
- * - Result always starts with "/"
- * - Root is represented as "/"
- *
- * Accepts `{locale}` as a locale placeholder segment.
- *
- * @example
- * ```ts
- * // config.supportedLocales: ["en"]
- * // config.routing.basePath: "/app"
- * // config.routing.prefix: "all"
- * canonicalizePathname("/app/en/about", config);
- * // => "/about"
- *```
- */
 function canonicalizePathname(rawPathname, config) {
-    const { routing, supportedLocales } = config;
-    const normalizedPathname = normalizePathname(rawPathname);
-    // ---------------------------------------------------------------------------
-    // Strip basePath (deployment prefix)
-    // ---------------------------------------------------------------------------
-    const basePath = routing.basePath === "/" ? "" : routing.basePath;
-    let path = normalizedPathname;
-    if (basePath) {
-        if (path === basePath) {
-            path = "/";
-        }
-        else if (path.startsWith(basePath + "/")) {
-            path = path.slice(basePath.length);
-        }
+  const { routing, supportedLocales } = config;
+  const normalizedPathname = normalizePathname(rawPathname);
+  const basePath = routing.basePath === "/" ? "" : routing.basePath;
+  let path = normalizedPathname;
+  if (basePath) {
+    if (path === basePath) {
+      path = "/";
+    } else if (path.startsWith(basePath + "/")) {
+      path = path.slice(basePath.length);
     }
-    // ---------------------------------------------------------------------------
-    // Detect first segment (allocation-minimized)
-    // ---------------------------------------------------------------------------
-    if (path === "/")
-        return "/";
-    const segmentStart = 1; // skip leading "/"
-    const nextSlash = path.indexOf("/", segmentStart);
-    const firstSegment = nextSlash === -1
-        ? path.slice(segmentStart)
-        : path.slice(segmentStart, nextSlash);
-    // ---------------------------------------------------------------------------
-    // Determine if first segment is locale representation
-    // ---------------------------------------------------------------------------
-    let localeLength;
-    if (firstSegment === LOCALE_PLACEHOLDER) {
-        localeLength = firstSegment.length;
-    }
-    else if (supportedLocales.includes(firstSegment)) {
-        localeLength = firstSegment.length;
-    }
-    // ---------------------------------------------------------------------------
-    // Strip locale segment (if any)
-    // ---------------------------------------------------------------------------
-    if (localeLength !== undefined) {
-        const stripped = path.slice(localeLength + 1);
-        return stripped || "/";
-    }
-    return path;
+  }
+  if (path === "/") return "/";
+  const segmentStart = 1;
+  const nextSlash = path.indexOf("/", segmentStart);
+  const firstSegment = nextSlash === -1 ? path.slice(segmentStart) : path.slice(segmentStart, nextSlash);
+  let localeLength;
+  if (firstSegment === LOCALE_PLACEHOLDER) {
+    localeLength = firstSegment.length;
+  } else if (supportedLocales.includes(firstSegment)) {
+    localeLength = firstSegment.length;
+  }
+  if (localeLength !== void 0) {
+    const stripped = path.slice(localeLength + 1);
+    return stripped || "/";
+  }
+  return path;
 }
 
 export { canonicalizePathname };

package/dist/express/src/routing/pathname/localize-pathname.js

@@ -2,37 +2,19 @@ import { canonicalizePathname } from './canonicalize-pathname.js';
 import { materializePathname } from './materialize-pathname.js';
 import { standardizePathname } from './standardize-pathname.js';
 
-/**
- * Localizes a pathname by composing canonicalization,
- * standardization, and locale prefix strategies.
- *
- * @example
- * ```ts
- * // config.supportedLocales: ["en-US"]
- * // config.routing.basePath: "/app"
- * // config.routing.prefix: "all"
- * localizePathname("/app/en-US/about", config, "en-US");
- * // => {
- * //   pathname: '/app/en-US/about'
- * //   canonicalPathname: '/about',
- * //   templatedPathname: '/app/{locale}/about',
- * // }
- * ```
- *
- * @public
- */
 const localizePathname = (rawPathname, config, locale) => {
-    // 1. Canonicalize: normalize and remove routing-specific prefixes
-    const canonicalPathname = canonicalizePathname(rawPathname, config);
-    // 2. Standardize: convert to internal pathname shape with locale placeholder
-    const standardizedPathname = standardizePathname(canonicalPathname, config);
-    // 3. Materialize: apply routing rules to produce the final pathname
-    const materializedPathname = materializePathname(standardizedPathname, config, locale);
-    return {
-        canonicalPathname,
-        templatedPathname: standardizedPathname,
-        pathname: materializedPathname,
-    };
+  const canonicalPathname = canonicalizePathname(rawPathname, config);
+  const standardizedPathname = standardizePathname(canonicalPathname, config);
+  const materializedPathname = materializePathname(
+    standardizedPathname,
+    config,
+    locale
+  );
+  return {
+    canonicalPathname,
+    templatedPathname: standardizedPathname,
+    pathname: materializedPathname
+  };
 };
 
 export { localizePathname };

package/dist/express/src/routing/pathname/materialize-pathname.js

@@ -3,51 +3,16 @@ import 'logry';
 import 'p-limit';
 import 'intor-translator';
 
-/**
- * Materializes a standardized pathname into a concrete, locale-aware URL.
- *
- * This function resolves the `{locale}` placeholder according to the
- * configured `localePrefix` strategy and produces the final pathname.
- *
- * Behavior:
- * - "all": always injects the locale segment
- * - "except-default": injects the locale unless it equals `defaultLocale`
- * - "none": removes the locale placeholder entirely
- *
- * Invariants:
- * - `standardizedPathname` must be produced by `standardizePathname`
- * - The pathname must contain exactly one `{locale}` placeholder
- * - The placeholder must appear as the first path segment
- *
- * This function performs structural transformation only.
- * It does not normalize or sanitize the resulting pathname.
- *
- * @example
- * ```ts
- * // config.routing.localePrefix: "all"
- * materializePathname("/app/{locale}/about", config, "en");
- * // => /app/en/about
- *
- * // config.routing.localePrefix: "none"
- * materializePathname("/app/{locale}/about", config, "en");
- * // => /app/about
- * ```
- */
 const materializePathname = (standardizedPathname, config, locale) => {
-    const { localePrefix } = config.routing;
-    const removeLocale = () => {
-        const result = standardizedPathname.replace(`/${LOCALE_PLACEHOLDER}`, "");
-        return result === "" ? "/" : result;
-    };
-    const injectLocale = () => standardizedPathname.replace(LOCALE_PLACEHOLDER, locale);
-    // localePrefix: "none"
-    if (localePrefix === "none")
-        return removeLocale();
-    // localePrefix: "all"
-    if (localePrefix === "all")
-        return injectLocale();
-    // localePrefix: "except-default"
-    return locale === config.defaultLocale ? removeLocale() : injectLocale();
+  const { localePrefix } = config.routing;
+  const removeLocale = () => {
+    const result = standardizedPathname.replace(`/${LOCALE_PLACEHOLDER}`, "");
+    return result === "" ? "/" : result;
+  };
+  const injectLocale = () => standardizedPathname.replace(LOCALE_PLACEHOLDER, locale);
+  if (localePrefix === "none") return removeLocale();
+  if (localePrefix === "all") return injectLocale();
+  return locale === config.defaultLocale ? removeLocale() : injectLocale();
 };
 
 export { materializePathname };

package/dist/express/src/routing/pathname/standardize-pathname.js

@@ -3,37 +3,13 @@ import 'logry';
 import 'p-limit';
 import 'intor-translator';
 
-/**
- * Standardizes a canonical pathname into an internal routing template.
- *
- * Standardized representation:
- * - Prepends the deployment prefix (`basePath`) if defined
- * - Injects the `{locale}` placeholder as the first path segment
- * - Preserves the canonical pathname structure
- *
- * Input must be a canonical pathname.
- *
- * Output is an internal routing template and
- * is not a locale-resolved URL.
- *
- * @example
- * ```ts
- * // config.routing.basePath: "/app",
- * standardizePathname("/about", config);
- * // => "/app/{locale}/about"
- * ```
- */
 const standardizePathname = (canonicalPathname, config) => {
-    const { routing } = config;
-    const basePath = routing.basePath && routing.basePath !== "/" ? routing.basePath : "";
-    if (canonicalPathname === "/") {
-        return basePath
-            ? `${basePath}/${LOCALE_PLACEHOLDER}`
-            : `/${LOCALE_PLACEHOLDER}`;
-    }
-    return basePath
-        ? `${basePath}/${LOCALE_PLACEHOLDER}${canonicalPathname}`
-        : `/${LOCALE_PLACEHOLDER}${canonicalPathname}`;
+  const { routing } = config;
+  const basePath = routing.basePath && routing.basePath !== "/" ? routing.basePath : "";
+  if (canonicalPathname === "/") {
+    return basePath ? `${basePath}/${LOCALE_PLACEHOLDER}` : `/${LOCALE_PLACEHOLDER}`;
+  }
+  return basePath ? `${basePath}/${LOCALE_PLACEHOLDER}${canonicalPathname}` : `/${LOCALE_PLACEHOLDER}${canonicalPathname}`;
 };
 
 export { standardizePathname };

package/dist/fastify/src/adapters/fastify/create-intor-handler.js

@@ -7,54 +7,42 @@ import 'intor-translator';
 import { resolveInbound } from '../../routing/inbound/resolve-inbound.js';
 import { getLocaleFromAcceptLanguage } from '../../routing/locale/get-locale-from-accept-language.js';
 
-/**
- * Resolves locale-aware routing for the current execution context.
- *
- * - Binds resolved routing state to the request.
- * - Optionally binds convenience routing shortcuts for downstream consumption.
- *
- * @public
- */
 function createIntorHandler(config, options) {
-    return async function intorHandler(request) {
-        // Locale from Accept-Language header
-        const acceptLanguage = request.headers["accept-language"];
-        const localeFromAcceptLanguage = getLocaleFromAcceptLanguage(acceptLanguage, config.supportedLocales);
-        // ----------------------------------------------------------
-        // Resolve inbound routing decision (pure computation)
-        // ----------------------------------------------------------
-        const cookie = parseCookieHeader(request.headers.cookie)[config.cookie.name];
-        const rawPathname = new URL(request.raw.url ?? "/", "http://localhost")
-            .pathname;
-        const { locale, localeSource, pathname } = resolveInbound(config, rawPathname, {
-            host: request.hostname,
-            query: normalizeQuery(request.query),
-            ...(cookie !== undefined ? { cookie } : {}),
-            ...(localeFromAcceptLanguage !== undefined
-                ? { detected: localeFromAcceptLanguage }
-                : {}),
-        });
-        // --------------------------------------------------
-        // Bind inbound routing context
-        // --------------------------------------------------
-        request.intor = { locale, localeSource, pathname };
-        const { loader, handlers, hooks, readers } = options ?? {};
-        const { hasKey, t, tRich } = await getTranslator(config, {
-            locale,
-            ...(loader !== undefined ? { loader } : {}),
-            ...(readers !== undefined ? { readers } : {}),
-            allowCacheWrite: true,
-            ...(handlers !== undefined ? { handlers } : {}),
-            ...(hooks !== undefined ? { hooks } : {}),
-        });
-        // DX shortcuts (enabled by default)
-        if (options?.shortcuts !== false) {
-            request.locale = locale;
-            request.hasKey = hasKey;
-            request.t = t;
-            request.tRich = tRich;
-        }
-    };
+  return async function intorHandler(request) {
+    const acceptLanguage = request.headers["accept-language"];
+    const localeFromAcceptLanguage = getLocaleFromAcceptLanguage(
+      acceptLanguage,
+      config.supportedLocales
+    );
+    const cookie = parseCookieHeader(request.headers.cookie)[config.cookie.name];
+    const rawPathname = new URL(request.raw.url ?? "/", "http://localhost").pathname;
+    const { locale, localeSource, pathname } = resolveInbound(
+      config,
+      rawPathname,
+      {
+        host: request.hostname,
+        query: normalizeQuery(request.query),
+        ...cookie !== void 0 ? { cookie } : {},
+        ...localeFromAcceptLanguage !== void 0 ? { detected: localeFromAcceptLanguage } : {}
+      }
+    );
+    request.intor = { locale, localeSource, pathname };
+    const { loader, handlers, hooks, readers } = options ?? {};
+    const { hasKey, t, tRich } = await getTranslator(config, {
+      locale,
+      ...loader !== void 0 ? { loader } : {},
+      ...readers !== void 0 ? { readers } : {},
+      allowCacheWrite: true,
+      ...handlers !== void 0 ? { handlers } : {},
+      ...hooks !== void 0 ? { hooks } : {}
+    });
+    if (options?.shortcuts !== false) {
+      request.locale = locale;
+      request.hasKey = hasKey;
+      request.t = t;
+      request.tRich = tRich;
+    }
+  };
 }
 
 export { createIntorHandler };

package/dist/fastify/src/adapters/fastify/get-translator.js

@@ -1,15 +1,8 @@
 import { getTranslator as getTranslator$1 } from 'intor/server';
 
-/**
- * Get a server-side translator for the current execution context.
- *
- * - Automatically resolves the locale from the framework context.
- *
- * @public
- */
 async function getTranslator(config, request, params) {
-    const locale = request.intor?.locale ?? config.defaultLocale;
-    return getTranslator$1(config, { locale, ...(params ?? {}) });
+  const locale = request.intor?.locale ?? config.defaultLocale;
+  return getTranslator$1(config, { locale, ...params ?? {} });
 }
 
 export { getTranslator };

package/dist/fastify/src/adapters/fastify/intor-fastify-plugin.js

@@ -1,49 +1,40 @@
 import fp from 'fastify-plugin';
 import { createIntorHandler } from './create-intor-handler.js';
 
-/** Internal helpers */
 function decorateRequest(fastify, key) {
-    if (fastify.hasRequestDecorator?.(key))
-        return;
-    fastify.decorateRequest(key, null);
+  if (fastify.hasRequestDecorator?.(key)) return;
+  fastify.decorateRequest(key, null);
 }
-/**
- * Internal plugin implementation
- */
 const intorFastifyPluginImpl = (fastify, options, done) => {
-    const { config, loader, readers, handlers, hooks, shortcuts = true, } = options;
-    // --------------------------------------------------
-    // Declare request structure (once per instance)
-    // --------------------------------------------------
-    decorateRequest(fastify, "intor");
-    if (shortcuts) {
-        decorateRequest(fastify, "locale");
-        decorateRequest(fastify, "hasKey");
-        decorateRequest(fastify, "t");
-        decorateRequest(fastify, "tRich");
-    }
-    // --------------------------------------------------
-    // Bind inbound handler
-    // --------------------------------------------------
-    fastify.addHook("onRequest", createIntorHandler(config, {
-        ...(loader !== undefined ? { loader } : {}),
-        ...(readers !== undefined ? { readers } : {}),
-        ...(handlers !== undefined ? { handlers } : {}),
-        ...(hooks !== undefined ? { hooks } : {}),
-        shortcuts,
-    }));
-    done();
+  const {
+    config,
+    loader,
+    readers,
+    handlers,
+    hooks,
+    shortcuts = true
+  } = options;
+  decorateRequest(fastify, "intor");
+  if (shortcuts) {
+    decorateRequest(fastify, "locale");
+    decorateRequest(fastify, "hasKey");
+    decorateRequest(fastify, "t");
+    decorateRequest(fastify, "tRich");
+  }
+  fastify.addHook(
+    "onRequest",
+    createIntorHandler(config, {
+      ...loader !== void 0 ? { loader } : {},
+      ...readers !== void 0 ? { readers } : {},
+      ...handlers !== void 0 ? { handlers } : {},
+      ...hooks !== void 0 ? { hooks } : {},
+      shortcuts
+    })
+  );
+  done();
 };
-/**
- * Fastify plugin for Intor.
- *
- * Registers inbound routing resolution and binds
- * locale-aware translation helpers to each request.
- *
- * @public
- */
 const intorFastifyPlugin = fp(intorFastifyPluginImpl, {
-    name: "@intor/fastify",
+  name: "@intor/fastify"
 });
 
 export { intorFastifyPlugin };

package/dist/fastify/src/core/constants/locale-placeholder.js

@@ -1,4 +1,3 @@
-// Default locale placeholder
 const LOCALE_PLACEHOLDER = "{locale}";
 
 export { LOCALE_PLACEHOLDER };

package/dist/fastify/src/core/locale/canonicalize-locale.js

@@ -1,23 +1,12 @@
-/**
- * Canonicalizes a BCP 47 locale string.
- *
- * - Uses `Intl.getCanonicalLocales` when available.
- * - Returns the original input if `Intl` is unavailable.
- * - Returns `undefined` for invalid locale input.
- *
- * This function performs normalization only.
- * It does not perform matching or fallback.
- */
 function canonicalizeLocale(input) {
-    try {
-        if (typeof Intl === "undefined" || !Intl.getCanonicalLocales) {
-            return input;
-        }
-        return Intl.getCanonicalLocales(input)[0];
-    }
-    catch {
-        return;
+  try {
+    if (typeof Intl === "undefined" || !Intl.getCanonicalLocales) {
+      return input;
     }
+    return Intl.getCanonicalLocales(input)[0];
+  } catch {
+    return;
+  }
 }
 
 export { canonicalizeLocale };

package/dist/fastify/src/core/locale/match-locale.js

@@ -1,61 +1,35 @@
 import { canonicalizeLocale } from './canonicalize-locale.js';
 import { parseLocale } from './parse-locale.js';
 
-/**
- * Matches a locale candidate against a list of supported locales.
- *
- * Resolution order:
- * 1. Exact canonical match
- * 2. Same language + same script
- * 3. Same language only (only if candidate has no script)
- *
- * Returns one of the original `supportedLocales` values if matched.
- * Returns `undefined` if no match is found.
- *
- * Notes:
- * - Matching is deterministic and order-sensitive.
- * - Does not perform automatic fallback to a default locale.
- *   Consumers are responsible for applying fallback logic.
- * - If the candidate includes a script subtag, language-only fallback is skipped.
- *
- * @public
- */
 function matchLocale(locale, supportedLocales = []) {
-    if (!locale || supportedLocales.length === 0)
-        return;
-    const canonicalCandidate = canonicalizeLocale(locale);
-    if (!canonicalCandidate)
-        return;
-    const candidateParts = parseLocale(canonicalCandidate);
-    const supportedCanonical = supportedLocales.flatMap((original) => {
-        const canonical = canonicalizeLocale(original);
-        if (!canonical)
-            return [];
-        return [{ original, canonical, parts: parseLocale(canonical) }];
-    });
-    // 1. Exact match
-    for (const s of supportedCanonical) {
-        if (s.canonical === canonicalCandidate) {
-            return s.original;
-        }
-    }
-    // 2. Same language + same script
-    if (candidateParts.script) {
-        for (const s of supportedCanonical) {
-            if (s.parts.language === candidateParts.language &&
-                s.parts.script === candidateParts.script) {
-                return s.original;
-            }
-        }
-        return;
+  if (!locale || supportedLocales.length === 0) return;
+  const canonicalCandidate = canonicalizeLocale(locale);
+  if (!canonicalCandidate) return;
+  const candidateParts = parseLocale(canonicalCandidate);
+  const supportedCanonical = supportedLocales.flatMap((original) => {
+    const canonical = canonicalizeLocale(original);
+    if (!canonical) return [];
+    return [{ original, canonical, parts: parseLocale(canonical) }];
+  });
+  for (const s of supportedCanonical) {
+    if (s.canonical === canonicalCandidate) {
+      return s.original;
     }
-    // 3. Same language only
+  }
+  if (candidateParts.script) {
     for (const s of supportedCanonical) {
-        if (s.parts.language === candidateParts.language) {
-            return s.original;
-        }
+      if (s.parts.language === candidateParts.language && s.parts.script === candidateParts.script) {
+        return s.original;
+      }
     }
     return;
+  }
+  for (const s of supportedCanonical) {
+    if (s.parts.language === candidateParts.language) {
+      return s.original;
+    }
+  }
+  return;
 }
 
 export { matchLocale };