gt-react-native 11.0.0-odysseus.9 → 11.0.0

package/src/hooks/selectors.ts

@@ -3,14 +3,28 @@ import {
   useInternalLocaleSelector,
   useInternalRegionSelector,
 } from '@generaltranslation/react-core/hooks';
-import type { InternalRegionSelectorOptions } from '@generaltranslation/react-core/hooks';
+import type {
+  InternalLocaleSelectorResult,
+  InternalRegionSelectorOptions,
+  InternalRegionSelectorResult,
+} from '@generaltranslation/react-core/hooks';
 
-export function useLocaleSelector(locales?: string[]) {
+// Explicit return types are required: project references make TypeScript try to
+// name the inferred selector types, which otherwise reach into
+// generaltranslation's non-portable bundled declarations (TS2742).
+export function useLocaleSelector(
+  locales?: string[]
+): InternalLocaleSelectorResult & { setLocale: (locale: string) => void } {
   const setLocale = useSetLocale();
   return { setLocale, ...useInternalLocaleSelector(locales) };
 }
 
-export function useRegionSelector(options?: InternalRegionSelectorOptions) {
+export function useRegionSelector(
+  options?: InternalRegionSelectorOptions
+): InternalRegionSelectorResult & {
+  setLocale: (locale: string) => void;
+  setRegion: (region: string | undefined) => void;
+} {
   const setLocale = useSetLocale();
   const setRegion = useSetRegion();
   return { setLocale, setRegion, ...useInternalRegionSelector(options) };

package/src/index.tsx

@@ -19,8 +19,8 @@ export {
   useEnableI18n,
   useFormatLocales,
   useGT,
-  useGTClass,
   useLocale,
+  useLocaleDirection,
   useLocaleProperties,
   useLocales,
   useMessages,
@@ -33,7 +33,6 @@ export {
   useSetEnableI18n,
 } from './hooks/condition-store';
 export { useLocaleSelector, useRegionSelector } from './hooks/selectors';
-export { useLocaleDirection, useVersionId } from './hooks/utils';
 
 // ===== Functions ===== //
 export {
@@ -43,9 +42,13 @@ export {
   decodeVars,
   declareVar,
   derive,
+  getDefaultLocale,
   getFormatLocales,
+  getLocales,
+  resolveCanonicalLocale,
   getReactI18nCache,
   getTranslationsSnapshot,
+  getVersionId,
   gtFallback,
   mFallback,
   msg,

package/src/provider/GTProvider.tsx

@@ -14,7 +14,10 @@ import {
 } from '../utils/getInitialNativeConditions';
 import { resolveLocale } from '../utils/resolveLocale';
 import { loadTranslations, type LocaleTranslations } from './loadTranslations';
-import { NativeGTProvider } from './NativeGTProvider';
+import {
+  NativeGTProvider,
+  type NativeGTProviderProps,
+} from './NativeGTProvider';
 
 export type GTProviderProps = Omit<
   InternalGTProviderProps,
@@ -23,49 +26,37 @@ export type GTProviderProps = Omit<
   Omit<NativeConditionStoreParams, 'locale' | '_reload'> & {
     children?: ReactNode;
     locale?: LocaleCandidates;
-    loadingFallback?: ReactNode;
+    fallback?: ReactNode;
   };
 
-type LoadableGTProviderProps = Omit<GTProviderProps, 'loadingFallback'>;
+type LoadedGTProviderProps = Omit<NativeGTProviderProps, 'translations'>;
 type TranslationSnapshot = Record<Locale, LocaleTranslations>;
 
 export function GTProvider(props: GTProviderProps) {
-  const { loadingFallback, ...providerProps } = props;
-
-  return (
-    <Suspense fallback={loadingFallback ?? <DefaultLoadingFallback />}>
-      <LoadableGTProvider {...providerProps} />
-    </Suspense>
-  );
+  return <LoadableGTProvider {...props} />;
 }
 
 /**
  * This wrapper takes the place of a loader that would be present in
  * SSR style applications.
  */
-function LoadableGTProvider(props: LoadableGTProviderProps) {
-  const {
-    locale,
-    localeStoreKey,
-    region,
-    regionStoreKey,
-    enableI18n,
-    enableI18nStoreKey,
-  } = props;
+function LoadableGTProvider(props: GTProviderProps) {
+  const { fallback, ...providerProps } = props;
+  const renderedFallback = fallback ?? <DefaultLoadingFallback />;
+  const { locale, region, enableI18n } = providerProps;
   // Keep native conditions in React state so condition-store writes trigger rerenders.
   const [nativeConditions, setNativeConditions] =
     useState<NativeConditionStoreState>(() => ({
-      locale: getLocale({ localeStoreKey }),
-      region: getInitialRegion({ region, regionStoreKey }),
-      enableI18n: getInitialEnableI18n({ enableI18n, enableI18nStoreKey }),
+      locale: getLocale(),
+      region: getInitialRegion({ region }),
+      enableI18n: getInitialEnableI18n({ enableI18n }),
     }));
   const activeLocale = resolveLocale(locale ?? nativeConditions.locale);
   const activeRegion = region ?? nativeConditions.region;
   const activeEnableI18n = enableI18n ?? nativeConditions.enableI18n;
-  const localeTranslations = use(loadTranslations(activeLocale));
-  const translations = useMemo<TranslationSnapshot>(
-    () => ({ [activeLocale]: localeTranslations }),
-    [activeLocale, localeTranslations]
+  const fallbackTranslations = useMemo<TranslationSnapshot>(
+    () => ({ [activeLocale]: {} }),
+    [activeLocale]
   );
   const reload = useCallback(
     (state: NativeConditionStoreState) => {
@@ -81,14 +72,45 @@ function LoadableGTProvider(props: LoadableGTProviderProps) {
     [enableI18n, locale, region]
   );
 
+  return (
+    <Suspense
+      fallback={
+        <NativeGTProvider
+          {...providerProps}
+          locale={activeLocale}
+          region={activeRegion}
+          enableI18n={activeEnableI18n}
+          translations={fallbackTranslations}
+          _reload={reload}
+        >
+          {renderedFallback}
+        </NativeGTProvider>
+      }
+    >
+      <LoadedGTProvider
+        {...providerProps}
+        locale={activeLocale}
+        region={activeRegion}
+        enableI18n={activeEnableI18n}
+        _reload={reload}
+      />
+    </Suspense>
+  );
+}
+
+function LoadedGTProvider(props: LoadedGTProviderProps) {
+  const activeLocale = resolveLocale(props.locale);
+  const localeTranslations = use(loadTranslations(activeLocale));
+  const translations = useMemo<TranslationSnapshot>(
+    () => ({ [activeLocale]: localeTranslations }),
+    [activeLocale, localeTranslations]
+  );
+
   return (
     <NativeGTProvider
       {...props}
       locale={activeLocale}
-      region={activeRegion}
-      enableI18n={activeEnableI18n}
       translations={translations}
-      _reload={reload}
     />
   );
 }

package/src/provider/NativeGTProvider.tsx

@@ -19,15 +19,7 @@ export type NativeGTProviderProps = Omit<
 export function NativeGTProvider(props: NativeGTProviderProps) {
   const conditionStore = useMemo(() => {
     return new NativeConditionStore(props);
-  }, [
-    props.locale,
-    props.region,
-    props.enableI18n,
-    props.localeStoreKey,
-    props.regionStoreKey,
-    props.enableI18nStoreKey,
-    props._reload,
-  ]);
+  }, [props.locale, props.region, props.enableI18n, props._reload]);
 
   const i18nStoreRef = useRef<I18nStore | null>(null);
   if (i18nStoreRef.current == null) {

package/src/setup/initializeGT.ts

@@ -1,23 +1,11 @@
-import {
-  initializeI18nConfig,
-  setReactI18nCache,
-} from '@generaltranslation/react-core/pure';
-import { ReactI18nCache } from '@generaltranslation/react-core/pure';
-import type { ReactI18nCacheParams } from '@generaltranslation/react-core/pure';
-import { setupGTServicesEnabled } from 'gt-i18n/internal';
 import type {
-  GTServicesEnabledParams,
   I18nConfigParams,
-} from 'gt-i18n/internal/types';
-
-export type InitializeGTParams = I18nConfigParams &
-  GTServicesEnabledParams &
-  ReactI18nCacheParams;
+  ReactI18nCacheParams,
+} from '@generaltranslation/react-core/pure';
 
-export function initializeGT(config: InitializeGTParams): void {
-  setupGTServicesEnabled(config);
-  initializeI18nConfig(config, 'server-render');
+export type InitializeGTParams = I18nConfigParams & ReactI18nCacheParams;
 
-  const i18nCache = new ReactI18nCache(config);
-  setReactI18nCache(i18nCache);
-}
+// Server-render initialization is identical to react-core's shared implementation
+// (there is no native-specific setup here), so re-export it directly instead of
+// maintaining a byte-for-byte copy.
+export { internalInitializeGTSRA as initializeGT } from '@generaltranslation/react-core/pure';

package/src/utils/getInitialNativeConditions.ts

@@ -1,8 +1,5 @@
 import type { WritableConditionStoreParams } from 'gt-i18n/internal/types';
-import {
-  defaultEnableI18nCookieName as defaultEnableI18nStoreKey,
-  defaultRegionCookieName as defaultRegionStoreKey,
-} from '@generaltranslation/react-core/pure';
+import { getI18nConfig } from '@generaltranslation/react-core/pure';
 import { nativeStoreGet } from './nativeStore';
 
 type InitialRegionParams = Pick<WritableConditionStoreParams, 'region'> & {
@@ -18,7 +15,7 @@ type InitialEnableI18nParams = Pick<
 
 export function getInitialRegion({
   region,
-  regionStoreKey = defaultRegionStoreKey,
+  regionStoreKey = getI18nConfig().getRegionCookieName(),
 }: InitialRegionParams): string | undefined {
   if (region !== undefined) return region;
   return nativeStoreGet(regionStoreKey) || undefined;
@@ -26,7 +23,7 @@ export function getInitialRegion({
 
 export function getInitialEnableI18n({
   enableI18n,
-  enableI18nStoreKey = defaultEnableI18nStoreKey,
+  enableI18nStoreKey = getI18nConfig().getEnableI18nCookieName(),
 }: InitialEnableI18nParams): boolean {
   if (enableI18n !== undefined) return enableI18n;
   const storedEnableI18n = nativeStoreGet(enableI18nStoreKey);

package/src/utils/getLocale.ts

@@ -1,5 +1,5 @@
 import type { LocaleCandidates } from 'gt-i18n/internal/types';
-import { defaultLocaleCookieName as defaultLocaleStoreKey } from '@generaltranslation/react-core/pure';
+import { getI18nConfig } from '@generaltranslation/react-core/pure';
 import { getNativeLocales } from './getNativeLocales';
 import { nativeStoreGet } from './nativeStore';
 import { resolveLocale } from './resolveLocale';
@@ -12,7 +12,7 @@ export type GetLocaleParams = {
  * @internal
  */
 export function getLocale({
-  localeStoreKey = defaultLocaleStoreKey,
+  localeStoreKey = getI18nConfig().getLocaleCookieName(),
 }: GetLocaleParams = {}): string {
   const candidates: string[] = [];
   pushLocaleCandidates(candidates, nativeStoreGet(localeStoreKey));

package/src/utils/nativeStore.ts

@@ -1,5 +1,5 @@
-import { defaultLocaleCookieName as defaultLocaleStoreKey } from '@generaltranslation/react-core/pure';
 import { Platform } from 'react-native';
+import { getI18nConfig } from '@generaltranslation/react-core/pure';
 import { GtReactNative } from '../NativeGtReactNative';
 import { ssrUnsupportedWarning } from '../errors-dir/warnings';
 
@@ -9,13 +9,13 @@ import { ssrUnsupportedWarning } from '../errors-dir/warnings';
  * This reads persisted native storage directly, so it can temporarily be out of
  * sync with React state while a locale change is in progress.
  *
- * If GTProvider uses a custom localeStoreKey, pass that same value as the key.
+ * Defaults to the store key configured through initializeGT().
  *
  * @param key - The key to get the locale from
  * @returns The locale from the native store
  */
 export function getLocaleFromNativeStore(
-  key = defaultLocaleStoreKey
+  key = getI18nConfig().getLocaleCookieName()
 ): string | null {
   return nativeStoreGet(key);
 }

package/src/utils/resolveLocale.ts

@@ -2,9 +2,5 @@ import { getI18nConfig } from 'gt-i18n/internal';
 import type { LocaleCandidates } from 'gt-i18n/internal/types';
 
 export function resolveLocale(candidates?: LocaleCandidates | null): string {
-  const i18nConfig = getI18nConfig();
-  return (
-    i18nConfig.determineLocale(candidates ?? undefined) ||
-    i18nConfig.getDefaultLocale()
-  );
+  return getI18nConfig().resolveSupportedLocale(candidates ?? undefined);
 }

package/dist/commonjs/hooks/utils.js

@@ -1,17 +0,0 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../_virtual/_rolldown/runtime.js");
-let _generaltranslation_react_core_pure = require("@generaltranslation/react-core/pure");
-let _generaltranslation_react_core_hooks = require("@generaltranslation/react-core/hooks");
-//#region src/hooks/utils.ts
-function useLocaleDirection(locale) {
-	const currentLocale = (0, _generaltranslation_react_core_hooks.useLocale)();
-	return (0, _generaltranslation_react_core_hooks.useLocaleDirection)(locale ?? currentLocale);
-}
-function useVersionId() {
-	return (0, _generaltranslation_react_core_pure.getVersionId)();
-}
-//#endregion
-exports.useLocaleDirection = useLocaleDirection;
-exports.useVersionId = useVersionId;
-
-//# sourceMappingURL=utils.js.map

package/dist/commonjs/hooks/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","names":[],"sources":["../../../src/hooks/utils.ts"],"sourcesContent":["import { getVersionId } from '@generaltranslation/react-core/pure';\nimport {\n  useLocale,\n  useLocaleDirection as useCoreLocaleDirection,\n} from '@generaltranslation/react-core/hooks';\n\nexport function useLocaleDirection(locale?: string): 'ltr' | 'rtl' {\n  const currentLocale = useLocale();\n  return useCoreLocaleDirection(locale ?? currentLocale);\n}\n\nexport function useVersionId(): string | undefined {\n  return getVersionId();\n}\n"],"mappings":";;;;;AAMA,SAAgB,mBAAmB,QAAgC;CACjE,MAAM,iBAAA,GAAA,qCAAA,YAA2B;AACjC,SAAA,GAAA,qCAAA,oBAA8B,UAAU,cAAc;;AAGxD,SAAgB,eAAmC;AACjD,SAAA,GAAA,oCAAA,eAAqB"}

package/dist/commonjs/setup/initializeGT.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"initializeGT.js","names":["ReactI18nCache"],"sources":["../../../src/setup/initializeGT.ts"],"sourcesContent":["import {\n  initializeI18nConfig,\n  setReactI18nCache,\n} from '@generaltranslation/react-core/pure';\nimport { ReactI18nCache } from '@generaltranslation/react-core/pure';\nimport type { ReactI18nCacheParams } from '@generaltranslation/react-core/pure';\nimport { setupGTServicesEnabled } from 'gt-i18n/internal';\nimport type {\n  GTServicesEnabledParams,\n  I18nConfigParams,\n} from 'gt-i18n/internal/types';\n\nexport type InitializeGTParams = I18nConfigParams &\n  GTServicesEnabledParams &\n  ReactI18nCacheParams;\n\nexport function initializeGT(config: InitializeGTParams): void {\n  setupGTServicesEnabled(config);\n  initializeI18nConfig(config, 'server-render');\n\n  const i18nCache = new ReactI18nCache(config);\n  setReactI18nCache(i18nCache);\n}\n"],"mappings":";;;;;AAgBA,SAAgB,aAAa,QAAkC;AAC7D,EAAA,GAAA,iBAAA,wBAAuB,OAAO;AAC9B,EAAA,GAAA,oCAAA,sBAAqB,QAAQ,gBAAgB;AAG7C,EAAA,GAAA,oCAAA,mBAAkB,IADIA,oCAAAA,eAAe,OACV,CAAC"}

package/dist/module/hooks/utils.d.ts

@@ -1,3 +0,0 @@
-export declare function useLocaleDirection(locale?: string): 'ltr' | 'rtl';
-export declare function useVersionId(): string | undefined;
-//# sourceMappingURL=utils.d.ts.map

package/dist/module/hooks/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/hooks/utils.ts"],"names":[],"mappings":"AAMA,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAGjE;AAED,wBAAgB,YAAY,IAAI,MAAM,GAAG,SAAS,CAEjD"}

package/dist/module/hooks/utils.js

@@ -1,14 +0,0 @@
-import { getVersionId } from "@generaltranslation/react-core/pure";
-import { useLocale, useLocaleDirection as useLocaleDirection$1 } from "@generaltranslation/react-core/hooks";
-//#region src/hooks/utils.ts
-function useLocaleDirection(locale) {
-	const currentLocale = useLocale();
-	return useLocaleDirection$1(locale ?? currentLocale);
-}
-function useVersionId() {
-	return getVersionId();
-}
-//#endregion
-export { useLocaleDirection, useVersionId };
-
-//# sourceMappingURL=utils.js.map

package/dist/module/hooks/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","names":["useCoreLocaleDirection"],"sources":["../../../src/hooks/utils.ts"],"sourcesContent":["import { getVersionId } from '@generaltranslation/react-core/pure';\nimport {\n  useLocale,\n  useLocaleDirection as useCoreLocaleDirection,\n} from '@generaltranslation/react-core/hooks';\n\nexport function useLocaleDirection(locale?: string): 'ltr' | 'rtl' {\n  const currentLocale = useLocale();\n  return useCoreLocaleDirection(locale ?? currentLocale);\n}\n\nexport function useVersionId(): string | undefined {\n  return getVersionId();\n}\n"],"mappings":";;;AAMA,SAAgB,mBAAmB,QAAgC;CACjE,MAAM,gBAAgB,WAAW;AACjC,QAAOA,qBAAuB,UAAU,cAAc;;AAGxD,SAAgB,eAAmC;AACjD,QAAO,cAAc"}

package/dist/module/setup/initializeGT.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"initializeGT.js","names":[],"sources":["../../../src/setup/initializeGT.ts"],"sourcesContent":["import {\n  initializeI18nConfig,\n  setReactI18nCache,\n} from '@generaltranslation/react-core/pure';\nimport { ReactI18nCache } from '@generaltranslation/react-core/pure';\nimport type { ReactI18nCacheParams } from '@generaltranslation/react-core/pure';\nimport { setupGTServicesEnabled } from 'gt-i18n/internal';\nimport type {\n  GTServicesEnabledParams,\n  I18nConfigParams,\n} from 'gt-i18n/internal/types';\n\nexport type InitializeGTParams = I18nConfigParams &\n  GTServicesEnabledParams &\n  ReactI18nCacheParams;\n\nexport function initializeGT(config: InitializeGTParams): void {\n  setupGTServicesEnabled(config);\n  initializeI18nConfig(config, 'server-render');\n\n  const i18nCache = new ReactI18nCache(config);\n  setReactI18nCache(i18nCache);\n}\n"],"mappings":";;;AAgBA,SAAgB,aAAa,QAAkC;AAC7D,wBAAuB,OAAO;AAC9B,sBAAqB,QAAQ,gBAAgB;AAG7C,mBAAkB,IADI,eAAe,OACV,CAAC"}

package/src/hooks/utils.ts

@@ -1,14 +0,0 @@
-import { getVersionId } from '@generaltranslation/react-core/pure';
-import {
-  useLocale,
-  useLocaleDirection as useCoreLocaleDirection,
-} from '@generaltranslation/react-core/hooks';
-
-export function useLocaleDirection(locale?: string): 'ltr' | 'rtl' {
-  const currentLocale = useLocale();
-  return useCoreLocaleDirection(locale ?? currentLocale);
-}
-
-export function useVersionId(): string | undefined {
-  return getVersionId();
-}