@bleedingdev/modern-js-plugin-i18n 3.5.0-ultramodern.4 → 3.5.0-ultramodern.41

package/dist/types/shared/localisedUrls/types.d.ts

@@ -0,0 +1,14 @@
+export type LocalisedRoute = {
+    type: 'nested' | 'page';
+    path?: string;
+    id?: string;
+    children?: LocalisedRoute[];
+    [key: string]: any;
+};
+export type LocalisedUrlPathMap = Record<string, string>;
+export type LocalisedUrlsMap = Record<string, LocalisedUrlPathMap>;
+export type LocalisedUrlsOption = boolean | LocalisedUrlsMap;
+export interface ResolvedLocalisedUrlsConfig {
+    enabled: boolean;
+    map: LocalisedUrlsMap;
+}

package/dist/types/shared/localisedUrls.d.ts

@@ -1,36 +1,2 @@
-import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
-export type LocalisedUrlPathMap = Record<string, string>;
-export type LocalisedUrlsMap = Record<string, LocalisedUrlPathMap>;
-export type LocalisedUrlsOption = boolean | LocalisedUrlsMap;
-export interface ResolvedLocalisedUrlsConfig {
-    enabled: boolean;
-    map: LocalisedUrlsMap;
-}
-export declare const normalisePathPattern: (path: string) => string;
-/**
- * Normalise a concrete request pathname: slash cleanup only. Unlike
- * {@link normalisePathPattern} it must not rewrite literal `[x]` segments to
- * `:x` params — pathnames are values, not patterns.
- */
-export declare const normalisePathname: (pathname: string) => string;
-/**
- * Localised URLs are strictly opt-in: only an explicit, non-empty map enables
- * route expansion and validation. `true`, `false`, an empty map and absence
- * all resolve to disabled, so upstream-style configs (`localePathRedirect` +
- * `languages` without a map) keep plain locale-prefix behavior instead of
- * failing the build for every route missing from a map they never wrote.
- */
-export declare const resolveLocalisedUrlsConfig: (option: LocalisedUrlsOption | undefined) => ResolvedLocalisedUrlsConfig;
-export declare const validateLocalisedUrls: (routes: (NestedRouteForCli | PageRoute)[], languages: string[], localisedUrls: LocalisedUrlsMap) => void;
-export declare const applyLocalisedUrlsToRoutes: (routes: (NestedRouteForCli | PageRoute)[], languages: string[], localisedUrls: LocalisedUrlsMap) => (NestedRouteForCli | PageRoute)[];
-export declare const matchPathPattern: (pathname: string, pattern: string) => Record<string, string> | null;
-export declare const buildPathFromPattern: (pattern: string, params: Record<string, string>) => string;
-export declare const resolveLocalisedPath: (pathname: string, targetLanguage: string, languages: string[], localisedUrls: LocalisedUrlsMap) => string;
-/**
- * Reverse-map a language-specific pathname (without language prefix) back to
- * the canonical, language-agnostic path: localized slug patterns are matched
- * against every language variant and rebuilt from the canonical map key.
- */
-export declare const resolveCanonicalLocalisedPath: (pathname: string, languages: string[], localisedUrls: LocalisedUrlsMap) => string;
-export declare const localiseTargetPathname: (pathname: string, language: string, languages: string[], localisedUrls?: LocalisedUrlsOption) => string;
-export declare const canonicalTargetPathname: (pathname: string, languages: string[], localisedUrls?: LocalisedUrlsOption) => string;
+export type { LocaleRedirectSkipRule, LocalisedRoute, LocalisedUrlPathMap, LocalisedUrlsMap, LocalisedUrlsOption, ResolvedLocalisedUrlsConfig, } from './localisedUrls/index';
+export { applyLocalisedUrlsToRoutes, buildPathFromPattern, canonicalTargetPathname, DEFAULT_LOCALE_REDIRECT_SKIP_RULES, isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, matchPathPattern, normalisePathname, normalisePathPattern, resolveCanonicalLocalisedPath, resolveLocalisedPath, resolveLocalisedUrlsConfig, shouldSkipLocaleRedirect, stripLanguagePrefix, validateLocalisedUrls, } from './localisedUrls/index';

package/dist/types/shared/utils.d.ts

@@ -1,5 +1,3 @@
 import type { BaseBackendOptions, BaseLocaleDetectionOptions } from './type';
-export declare function getEntryConfig<T extends Record<string, any>>(entryName: string, config: T, entryKey: string): T | undefined;
-export declare function removeEntryConfigKey<T extends Record<string, any>>(config: T, entryKey: string): Omit<T, typeof entryKey>;
 export declare function getLocaleDetectionOptions(entryName: string, localeDetection: BaseLocaleDetectionOptions): BaseLocaleDetectionOptions;
 export declare function getBackendOptions(entryName: string, backend: BaseBackendOptions): BaseBackendOptions;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0-ultramodern.4",
+  "version": "3.5.0-ultramodern.41",
   "engines": {
     "node": ">=20"
   },
@@ -97,19 +97,18 @@
     "i18next-fs-backend": "^2.6.6",
     "i18next-http-backend": "^4.0.0",
     "i18next-http-middleware": "^3.9.7",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.4",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.4",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.5.0-ultramodern.4",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.4",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.4",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.4"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.41",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.41",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.41",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.41",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.5.0-ultramodern.41"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.5.0-ultramodern.4",
+    "@modern-js/runtime": "3.5.0-ultramodern.41",
     "i18next": ">=26.3.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "react-i18next": "^17.0.8"
+    "react-i18next": "^17.0.9"
   },
   "peerDependenciesMeta": {
     "i18next": {
@@ -120,17 +119,16 @@
     }
   },
   "devDependencies": {
-    "@rslib/core": "0.23.1",
-    "@types/node": "^26.0.1",
-    "@typescript/native-preview": "7.0.0-dev.20260628.1",
-    "i18next": "26.3.3",
+    "@rslib/core": "0.23.2",
+    "@types/node": "^26.1.1",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "i18next": "26.3.6",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "react-i18next": "17.0.8",
-    "ts-node": "^10.9.2",
-    "typescript": "^6.0.3",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.4",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.4"
+    "react-i18next": "17.0.9",
+    "typescript": "^7.0.2",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.41",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.41"
   },
   "sideEffects": false,
   "publishConfig": {

package/rstest.config.mts

@@ -29,6 +29,7 @@ export default {
       include: [
         'tests/i18nUtils.test.ts',
         'tests/localisedUrls.test.ts',
+        'tests/localisedUrlRewriteMatrix.fork.test.ts',
         'tests/linkTypes.test.ts',
         'tests/backendDefaults.test.ts',
         'tests/reactI18nextRuntimeBoundary.test.ts',

package/src/cli/index.ts

@@ -1,3 +1,5 @@
+import fs from 'node:fs';
+import path from 'node:path';
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import { getPublicDirRoutePrefixes } from '@modern-js/server-core';
 import type {
@@ -5,8 +7,6 @@ import type {
   NestedRouteForCli,
   PageRoute,
 } from '@modern-js/types';
-import fs from 'fs';
-import path from 'path';
 import {
   applyLocalisedUrlsToRoutes,
   resolveLocalisedUrlsConfig,
@@ -126,9 +126,10 @@ export const i18nPlugin = (
         backend: backendOptions,
         ...extendedConfig,
       };
+      const { reactI18next } = extendedConfig as { reactI18next?: boolean };
       const runtimePluginPath =
         customPlugin?.runtime?.path ||
-        (config.reactI18next === false
+        (reactI18next === false
           ? `@${metaName}/plugin-i18n/runtime/no-react-i18next`
           : `@${metaName}/plugin-i18n/runtime`);
 
@@ -173,7 +174,7 @@ export const i18nPlugin = (
           routes as (NestedRouteForCli | PageRoute)[],
           languages,
           localisedUrlsConfig.map,
-        ),
+        ) as (NestedRouteForCli | PageRoute)[],
       };
     });
 

package/src/cli/locales.ts

@@ -1,10 +1,10 @@
+import fs from 'node:fs';
+import path from 'node:path';
 import {
   getPublicDirRoutePrefixes,
   normalizePublicDir,
   normalizePublicDirPath,
 } from '@modern-js/server-core';
-import fs from 'fs';
-import path from 'path';
 import type { BackendOptions } from '../shared/type';
 
 interface NormalizedConfigForLocales {
@@ -13,7 +13,7 @@ interface NormalizedConfigForLocales {
   };
 }
 
-export interface DetectedLocalesDirectory {
+interface DetectedLocalesDirectory {
   loadPath: string;
   addPath: string;
   serverLoadPath: string;

package/src/runtime/Link.tsx

@@ -6,96 +6,22 @@ import type {
   ValidateLinkTo,
 } from './canonicalRoutes';
 import { useModernI18n } from './context';
+import {
+  interpolateRouteParams,
+  type LinkParams,
+  mergeClassNames,
+  normalizeSearch,
+  splitActiveProps,
+  warnOnce,
+} from './linkHelpers';
 import { canonicalPath, type LocalizedPathsConfig } from './localizedPaths';
 import { useI18nRouterAdapter } from './routerAdapter';
 import { buildLocalizedUrl, splitUrlTarget } from './utils';
 
-const EXTERNAL_TARGET_RE = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
-
-const warnedTargets = new Set<string>();
-
-const warnOnce = (key: string, message: string) => {
-  if (process.env.NODE_ENV !== 'development' || warnedTargets.has(key)) {
-    return;
-  }
-  warnedTargets.add(key);
-  console.warn(message);
-};
-
-export type LinkParams = Record<string, string | number | undefined>;
-
-/**
- * Interpolate `$param`, `:param`, optional (`{-$param}` / `:param?`) and splat
- * (`$` / `*`) segments with concrete values before localization, so
- * pattern-mapped slugs localize correctly.
- */
-export const interpolateRouteParams = (
-  pathname: string,
-  params?: LinkParams,
-): string => {
-  if (!/[$:*{]/.test(pathname)) {
-    return pathname;
-  }
-
-  const resolveParam = (name: string): string | undefined => {
-    const value = params?.[name];
-    return value === undefined ? undefined : String(value);
-  };
-
-  const segments = pathname
-    .split('/')
-    .map(segment => {
-      if (!segment) {
-        return segment;
-      }
-
-      if (segment.startsWith('{-$') && segment.endsWith('}')) {
-        const value = resolveParam(segment.slice(3, -1));
-        return value === undefined ? null : encodeURIComponent(value);
-      }
-
-      if (segment === '$' || segment === '*') {
-        const value = resolveParam('_splat') ?? resolveParam('*');
-        return value === undefined
-          ? null
-          : value.split('/').map(encodeURIComponent).join('/');
-      }
-
-      if (segment.startsWith('$')) {
-        const value = resolveParam(segment.slice(1));
-        if (value === undefined) {
-          warnOnce(
-            `missing-param:${pathname}:${segment}`,
-            `[plugin-i18n] <Link to="${pathname}"> is missing required param "${segment.slice(1)}".`,
-          );
-          return segment;
-        }
-        return encodeURIComponent(value);
-      }
-
-      if (segment.startsWith(':')) {
-        const optional = segment.endsWith('?');
-        const name = segment.slice(1, optional ? -1 : undefined);
-        const value = resolveParam(name);
-        if (value === undefined) {
-          if (optional) {
-            return null;
-          }
-          warnOnce(
-            `missing-param:${pathname}:${segment}`,
-            `[plugin-i18n] <Link to="${pathname}"> is missing required param "${name}".`,
-          );
-          return segment;
-        }
-        return encodeURIComponent(value);
-      }
+export type { LinkParams };
+export { interpolateRouteParams };
 
-      return segment;
-    })
-    .filter(segment => segment !== null);
-
-  return segments.join('/') || '/';
-};
+const EXTERNAL_TARGET_RE = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
 
 export interface LinkActiveOptions {
   /**
@@ -142,59 +68,6 @@ export type LinkProps<TTo extends string = string> = LinkBaseProps & {
 } & ValidateLinkTo<TTo> &
   LinkParamsProp<LinkTargetPathname<TTo>>;
 
-const normalizeSearch = (
-  search: string | Record<string, unknown> | undefined,
-  searchFromTo: string,
-): {
-  searchString: string;
-  searchObject: Record<string, string> | undefined;
-} => {
-  if (search && typeof search === 'object') {
-    const entries = Object.entries(search).filter(
-      ([, value]) => value !== undefined && value !== null,
-    );
-    const searchObject = Object.fromEntries(
-      entries.map(([key, value]) => [key, String(value)]),
-    );
-    const params = new URLSearchParams(searchObject);
-    const serialized = params.toString();
-    return {
-      searchString: serialized ? `?${serialized}` : '',
-      searchObject,
-    };
-  }
-
-  const raw = typeof search === 'string' && search ? search : searchFromTo;
-  if (!raw) {
-    return { searchString: '', searchObject: undefined };
-  }
-
-  const searchString = raw.startsWith('?') ? raw : `?${raw}`;
-  const searchObject: Record<string, string> = {};
-  new URLSearchParams(searchString).forEach((value, key) => {
-    searchObject[key] = value;
-  });
-
-  return { searchString, searchObject };
-};
-
-const splitActiveProps = (
-  active: boolean,
-  activeProps?: LinkBaseProps['activeProps'],
-) => {
-  if (!active || !activeProps) {
-    return {};
-  }
-  return activeProps;
-};
-
-const mergeClassNames = (...values: Array<unknown>): string | undefined => {
-  const classNames = values.filter(
-    (value): value is string => typeof value === 'string' && value.length > 0,
-  );
-  return classNames.length > 0 ? classNames.join(' ') : undefined;
-};
-
 /**
  * The standard UltraModern link: a vanilla link in every respect except that
  * it localizes canonical, language-agnostic paths automatically.