@bleedingdev/modern-js-i18n-runtime-extensions 3.9.0-ultramodern.11 → 3.9.0-ultramodern.13

package/dist/esm-node/router-navigation/adapter.mjs

@@ -1,192 +1,50 @@
 import "node:module";
-import { Fragment, jsx } from "react/jsx-runtime";
-import { RuntimeContext, isBrowser } from "@modern-js/runtime";
+import { jsx } from "react/jsx-runtime";
+import { RuntimeContext } from "@modern-js/runtime";
 import { InternalRuntimeContext } from "@modern-js/runtime/context";
 import { getRouterRuntimeState, subscribeRouterRuntimeState } from "@modern-js/runtime-extensions/router-state";
 import { useCallback, useContext, useSyncExternalStore } from "react";
-const normalizeUrlPart = (value, prefix)=>{
-    if ('string' != typeof value || !value) return '';
-    return value.startsWith(prefix) ? value : `${prefix}${value}`;
-};
-const normalizeLocation = (location)=>{
-    if (!location || 'object' != typeof location) return null;
-    const locationValue = location;
-    if ('string' != typeof locationValue.pathname) return null;
-    return {
-        pathname: locationValue.pathname,
-        search: normalizeUrlPart('string' == typeof locationValue.search ? locationValue.search : locationValue.searchStr, '?'),
-        hash: normalizeUrlPart(locationValue.hash, '#')
-    };
-};
-const getWindowLocation = ()=>{
-    if (!isBrowser()) return null;
-    return {
-        pathname: window.location.pathname,
-        search: window.location.search,
-        hash: window.location.hash
-    };
-};
-const getRouterFramework = (runtimeContext, internalContext, inReactRouter)=>{
-    const framework = getRouterRuntimeState(internalContext)?.framework || getRouterRuntimeState(runtimeContext)?.framework;
-    if (framework) return framework;
-    if (internalContext.router?.useRouter || runtimeContext.router?.useRouter) return 'tanstack';
-    if (internalContext.router?.useLocation || internalContext.router?.useHref || runtimeContext.router?.useLocation || runtimeContext.router?.useHref) return 'react-router';
-    if (inReactRouter) return 'react-router';
-};
-const getRouterInstance = (internalContext, contextRouter)=>{
-    if (contextRouter) return contextRouter;
-    const router = getRouterRuntimeState(internalContext)?.instance;
-    if (!router || 'object' != typeof router) return null;
-    return router;
-};
-const getRouterStateLocation = (internalContext, contextRouter)=>{
-    const router = getRouterInstance(internalContext, contextRouter);
-    return normalizeLocation(router?.stores?.location?.get?.()) || normalizeLocation(router?.state?.location);
-};
-const getRouterParams = (internalContext, contextRouter)=>{
-    const router = getRouterInstance(internalContext, contextRouter);
-    const matches = router?.stores?.matches?.get?.() || router?.state?.matches;
-    if (!Array.isArray(matches)) return {};
-    return matches.reduce((params, match)=>{
-        if (match?.params) Object.assign(params, match.params);
-        return params;
-    }, {});
-};
-const getRouterSnapshot = (internalContext, contextRouter)=>{
-    const location = getRouterStateLocation(internalContext, contextRouter);
-    const params = getRouterParams(internalContext, contextRouter);
-    return JSON.stringify([
-        location?.pathname ?? '',
-        location?.search ?? '',
-        location?.hash ?? '',
-        Object.entries(params).sort(([left], [right])=>left.localeCompare(right))
-    ]);
-};
+const subscribeNone = ()=>()=>{};
+const getEmptySnapshot = ()=>null;
 const createI18nRouterNavigation = ({ I18nNavigationProvider, useNativeI18nRouterAdapter })=>{
+    const NavigationProvider = I18nNavigationProvider;
     const useIntegratedRouterAdapter = ()=>{
         const runtimeContext = useContext(RuntimeContext);
         const internalContext = useContext(InternalRuntimeContext);
-        const routerApi = internalContext.router || runtimeContext.router;
         const native = useNativeI18nRouterAdapter();
-        const inReactRouter = native.hasRouter;
-        const reactRouterNavigate = native.navigate;
-        const reactRouterLocation = inReactRouter ? native.location : null;
-        const reactRouterParams = native.params;
-        const framework = getRouterFramework(runtimeContext, internalContext, inReactRouter);
-        const contextUseRouter = inReactRouter || 'tanstack' !== framework ? void 0 : internalContext.router?.useRouter || runtimeContext.router?.useRouter;
-        const contextRouter = contextUseRouter ? contextUseRouter({
-            warn: false
-        }) : null;
-        const slotRouter = getRouterInstance(internalContext, contextRouter);
-        const drivableSlotRouter = ('tanstack' === framework || 'react-router' === framework) && 'function' == typeof slotRouter?.navigate;
-        const hasRouter = Boolean(reactRouterNavigate) || drivableSlotRouter;
-        const subscribeToRouter = useCallback((update)=>{
-            const unsubscribers = [];
-            const unsubscribeFromSlot = subscribeRouterRuntimeState(internalContext, update);
-            if ('function' == typeof unsubscribeFromSlot) unsubscribers.push(unsubscribeFromSlot);
-            const router = getRouterInstance(internalContext, contextRouter);
-            if (!router) return ()=>{
-                for (const unsubscribe of unsubscribers)unsubscribe();
-            };
-            if ('react-router' === framework && !inReactRouter && 'function' == typeof router.subscribe) {
-                const subscribe = router.subscribe;
-                const unsubscribe = subscribe.call(router, update);
-                if ('function' == typeof unsubscribe) unsubscribers.push(unsubscribe);
-            }
-            if ('tanstack' === framework && 'function' == typeof router.stores?.location?.subscribe) {
-                const unsubscribe = router.stores.location.subscribe(update);
-                if ('function' == typeof unsubscribe) unsubscribers.push(unsubscribe);
-            }
-            if ('tanstack' === framework && 'function' == typeof router.subscribe) {
-                const subscribe = router.subscribe;
-                for (const eventType of [
-                    'onBeforeNavigate',
-                    'onBeforeLoad'
-                ]){
-                    const unsubscribe = subscribe.call(router, eventType, update);
-                    if ('function' == typeof unsubscribe) unsubscribers.push(unsubscribe);
-                }
-            }
+        const getCapability = useCallback(()=>getRouterRuntimeState(internalContext)?.navigation ?? getRouterRuntimeState(runtimeContext)?.navigation, [
+            internalContext,
+            runtimeContext
+        ]);
+        const subscribeCapability = useCallback((update)=>{
+            const stopInternal = subscribeRouterRuntimeState(internalContext, update);
+            const stopPublic = internalContext === runtimeContext ? void 0 : subscribeRouterRuntimeState(runtimeContext, update);
             return ()=>{
-                for (const unsubscribe of unsubscribers)unsubscribe();
+                stopInternal();
+                stopPublic?.();
             };
         }, [
-            contextRouter,
-            framework,
-            inReactRouter,
-            internalContext
-        ]);
-        const getSnapshot = useCallback(()=>getRouterSnapshot(internalContext, contextRouter), [
-            contextRouter,
-            internalContext
-        ]);
-        useSyncExternalStore(subscribeToRouter, getSnapshot, getSnapshot);
-        const navigate = useCallback((href, options)=>{
-            const router = getRouterInstance(internalContext, contextRouter);
-            const activeFramework = getRouterFramework(runtimeContext, internalContext, inReactRouter);
-            if ('tanstack' === activeFramework) {
-                if ('function' == typeof router?.navigate) return router.navigate({
-                    to: href,
-                    replace: options?.replace,
-                    ...options?.state === void 0 ? {} : {
-                        state: options.state
-                    }
-                });
-                throw new Error('TanStack router instance is not available.');
-            }
-            if (reactRouterNavigate) return reactRouterNavigate(href, options);
-            if ('react-router' === activeFramework) {
-                if ('function' == typeof router?.navigate) return router.navigate(href, options);
-                throw new Error('React Router instance is not available.');
-            }
-        }, [
-            contextRouter,
             internalContext,
-            inReactRouter,
-            reactRouterNavigate,
             runtimeContext
         ]);
-        const location = (reactRouterLocation ? normalizeLocation(reactRouterLocation) : getRouterStateLocation(internalContext, contextRouter)) || getWindowLocation();
-        const params = inReactRouter ? reactRouterParams : getRouterParams(internalContext, contextRouter);
-        const Link = 'tanstack' === framework ? internalContext.router?.Link || runtimeContext.router?.Link || null : 'react-router' === framework || inReactRouter ? routerApi?.Link ?? null : null;
-        return {
-            framework,
-            hasRouter,
-            location,
-            navigate: hasRouter ? navigate : null,
-            Link,
-            params,
-            ...'tanstack' === framework ? {
-                createLinkProps: createTanstackLinkProps
-            } : {}
-        };
-    };
-    const createTanstackLinkProps = (target)=>{
-        const preload = void 0 !== target.preload ? target.preload : 'none' === target.prefetch ? false : target.prefetch;
+        const capability = useSyncExternalStore(subscribeCapability, getCapability, getCapability);
+        const snapshot = useSyncExternalStore(capability?.subscribe ?? subscribeNone, capability?.getSnapshot ?? getEmptySnapshot, capability?.getSnapshot ?? getEmptySnapshot);
+        if (native.hasRouter || !capability || !snapshot) return native;
+        const internalState = getRouterRuntimeState(internalContext);
         return {
-            to: target.pathname,
-            ...target.search ? {
-                search: target.search
-            } : {},
-            ...target.hash ? {
-                hash: target.hash
-            } : {},
-            ...void 0 === target.hashScrollIntoView ? {} : {
-                hashScrollIntoView: target.hashScrollIntoView
-            },
-            ...void 0 === preload ? {} : {
-                preload
-            }
+            framework: internalState?.navigation === capability ? internalState.framework : getRouterRuntimeState(runtimeContext)?.framework,
+            hasRouter: true,
+            ...snapshot,
+            navigate: capability.navigate,
+            Link: capability.Link,
+            createLinkProps: capability.createLinkProps
         };
     };
     const I18nRouterNavigationProvider = ({ children })=>{
         const value = useIntegratedRouterAdapter();
         const native = useNativeI18nRouterAdapter();
-        if (!value.hasRouter || native.hasRouter) return /*#__PURE__*/ jsx(Fragment, {
-            children: children
-        });
-        return /*#__PURE__*/ jsx(I18nNavigationProvider, {
-            value: value,
+        return /*#__PURE__*/ jsx(NavigationProvider, {
+            value: value.hasRouter && !native.hasRouter ? value : null,
             children: children
         });
     };

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
+export * from '@modern-js/runtime-extensions/localised-urls';
 export * from './language-sync/controller.js';
 export * from './language-sync/react.js';
 export * from './localeRedirectPolicy.js';
-export * from './localisedUrls/index.js';

package/dist/types/localeRedirectPolicy.d.ts

@@ -1,4 +1,4 @@
-import type { LocalisedUrlsOption } from './localisedUrls/index.js';
+import type { LocalisedUrlsOption } from '@modern-js/runtime-extensions/localised-urls';
 interface LocaleRedirectRequest {
     url: string;
     header: () => {

package/dist/types/paths.d.ts

@@ -1,4 +1,4 @@
-import { type LocalisedUrlsOption } from './localisedUrls/index.js';
+import { type LocalisedUrlsOption } from '@modern-js/runtime-extensions/localised-urls';
 export interface LocalizedPathsConfig {
     languages: string[];
     localisedUrls?: LocalisedUrlsOption;

package/dist/types/router-navigation/adapter.d.ts

@@ -1,70 +1,22 @@
+import { type RouterLinkTarget, type RouterNavigationCapability, type RouterNavigationSnapshot } from '@modern-js/runtime-extensions/router-state';
 import type React from 'react';
-/**
- * Fork-owned: the selected-router navigation adapter.
- *
- * `useNativeI18nRouterAdapter` only knows react-router's own hooks, so a bare
- * `appTools() + i18nPlugin()` app running the TanStack router would fall back
- * to plain `<a>` links and a non-reactive `window.location`. That breaks
- * language-invariant active state and, worse, leaves the i18n language stuck
- * after a client-side navigation to a localized URL.
- *
- * The subsystem lives in this fork-owned package rather than inside
- * upstream-owned `@modern-js/plugin-i18n`: that package only wires it in
- * through its existing `NavigationProvider` extension point, so the upstream
- * package keeps a seam instead of gaining a fork subsystem. The primitives the
- * adapter composes with - the navigation context provider, the native
- * react-router adapter and the adapter shape - are injected by that seam, so
- * nothing here imports `@modern-js/plugin-i18n` and no dependency cycle is
- * created.
- *
- * The adapter reads the actual selected router out of the fork-owned router
- * runtime-state slot, so it serves both routers without either plugin having
- * to know about i18n.
- */
-/** The primitives the host plugin injects; see `createI18nRouterNavigation`. */
 export interface I18nRouterNavigationDependencies<Adapter extends I18nRouterAdapterShape> {
     I18nNavigationProvider: React.ComponentType<React.PropsWithChildren<{
         value: Adapter;
     }>>;
     useNativeI18nRouterAdapter: () => Adapter;
 }
-export interface I18nRouterLinkTarget {
-    pathname: string;
-    href: string;
-    search?: Record<string, unknown>;
-    hash?: string;
-    hashScrollIntoView?: boolean | ScrollIntoViewOptions;
-    prefetch?: 'intent' | 'render' | 'viewport' | 'none';
-    preload?: unknown;
-}
+export type I18nRouterLinkTarget = RouterLinkTarget;
 export interface I18nRouterAdapterShape {
     framework?: string;
     hasRouter: boolean;
-    location: {
-        pathname: string;
-        search: string;
-        hash: string;
-    } | null;
-    navigate: ((href: string, options?: {
-        replace?: boolean;
-        state?: unknown;
-    }) => void | Promise<void>) | null;
-    Link: React.ComponentType<{
-        to: string;
-        children?: React.ReactNode;
-        [key: string]: unknown;
-    }> | null;
+    location: RouterNavigationSnapshot['location'] | null;
+    navigate: RouterNavigationCapability['navigate'] | null;
+    Link: RouterNavigationCapability['Link'] | null;
     params: Record<string, string>;
-    createLinkProps?: (target: I18nRouterLinkTarget) => {
-        to: string;
-        [key: string]: unknown;
-    };
+    createLinkProps?: RouterNavigationCapability['createLinkProps'];
 }
-/**
- * Build the selected-router navigation hook and provider from the host
- * plugin's own primitives. Injecting them is what keeps this fork-owned
- * subsystem free of any import edge back into the plugin that installs it.
- */
+/** The router provider owns navigation; this seam only observes its capability. */
 export declare const createI18nRouterNavigation: <Adapter extends I18nRouterAdapterShape>({ I18nNavigationProvider, useNativeI18nRouterAdapter, }: I18nRouterNavigationDependencies<Adapter>) => {
     useIntegratedRouterAdapter: () => Adapter;
     I18nRouterNavigationProvider: ({ children, }: React.PropsWithChildren) => React.JSX.Element;

package/package.json

@@ -17,7 +17,7 @@
     "modern.js",
     "i18n"
   ],
-  "version": "3.9.0-ultramodern.11",
+  "version": "3.9.0-ultramodern.13",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.mjs",
@@ -66,22 +66,22 @@
     "node": ">=26.7.0"
   },
   "dependencies": {
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.11",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.11",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.13",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.13",
     "i18next-browser-languagedetector": "^8.2.1"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.9.0-ultramodern.11",
+    "@modern-js/runtime": "3.9.0-ultramodern.13",
     "react": "^19.2.8"
   },
   "devDependencies": {
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.11",
-    "@rslib/core": "1.0.0",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.13",
+    "@rslib/core": "1.0.2",
     "@scripts/rstest-config": "2.66.0",
-    "@types/node": "^26.4.1",
+    "@types/node": "^26.6.2",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8"
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -1,4 +1,4 @@
+export * from '@modern-js/runtime-extensions/localised-urls';
 export * from './language-sync/controller';
 export * from './language-sync/react';
 export * from './localeRedirectPolicy';
-export * from './localisedUrls/index';

package/src/localeRedirectPolicy.ts

@@ -1,11 +1,11 @@
-import type { LocalisedUrlsOption } from './localisedUrls/index';
+import type { LocalisedUrlsOption } from '@modern-js/runtime-extensions/localised-urls';
 import {
   isDefaultLocaleRedirectSkipPath,
   localiseTargetPathname,
   matchesPathPrefix,
   shouldSkipLocaleRedirect,
   stripLanguagePrefix,
-} from './localisedUrls/index';
+} from '@modern-js/runtime-extensions/localised-urls';
 
 interface LocaleRedirectRequest {
   url: string;

package/src/paths.ts

@@ -1,9 +1,9 @@
-import { splitUrlTarget } from '@modern-js/runtime-utils/url';
 import {
   canonicalTargetPathname,
   type LocalisedUrlsOption,
   localiseTargetPathname,
-} from './localisedUrls';
+} from '@modern-js/runtime-extensions/localised-urls';
+import { splitUrlTarget } from '@modern-js/runtime-utils/url';
 
 export interface LocalizedPathsConfig {
   languages: string[];