@sheet-i18n/react-client 1.6.0-canary.8 → 1.6.0

package/dist/index.d.mts

@@ -1,37 +1,34 @@
 import { I18nStore } from '@sheet-i18n/react-core';
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ObserverManager } from '@sheet-i18n/shared-utils';
-import * as react from 'react';
-
-type IntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> = {
-    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>;
-    currentLocale?: TSupportedLocales[number];
-    children: React.ReactNode;
-};
-declare function IntlProvider<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false>({ i18nStore, currentLocale, children, }: IntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>): react_jsx_runtime.JSX.Element;
+import { MessageDescriptor, IntlShape } from 'react-intl';
+import * as react_jsx_runtime from 'react/jsx-runtime';
 
-interface Message {
-}
-type MessageIds = Message extends {
-    ids: infer T;
-} ? T extends string ? T : string : string;
-interface MessageDescriptor {
-    id?: MessageIds;
-    description?: string | object;
-    defaultMessage?: any[];
+interface IStorageService<V extends string> {
+    getItem(key: string): V;
+    setItem(key: string, value: V): boolean;
+    removeItem(key: string): boolean;
+    clear(): boolean;
 }
-type PrimitiveType = string | number | boolean | null | undefined | Date;
-type FormatXMLElementFn<T, R = string | T | (string | T)[]> = (parts: Array<string | T>) => R;
-interface ParserOptions {
-    ignoreTag?: boolean;
-    requiresOtherClause?: boolean;
-    shouldParseSkeletons?: boolean;
-    captureLocation?: boolean;
+/**
+ * locale storage manager
+ * implements ILocaleStorageManager (injected StorageService)
+ */
+interface ILocaleStorageManager<TSupportedLocales extends readonly string[]> {
+    getLocale(): TSupportedLocales[number];
+    setLocale(locale: TSupportedLocales[number]): void;
 }
-interface Options extends ParserOptions {
+declare class LocaleStorageManager<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> implements ILocaleStorageManager<TSupportedLocales> {
+    private readonly storageService;
+    private readonly i18nStore;
+    private readonly localeStorageKey;
+    observerManager: ObserverManager<TSupportedLocales[number]>;
+    constructor(storageService: IStorageService<TSupportedLocales[number]>, i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, localeStorageKey?: string);
+    private initializeCurrentLocale;
+    getLocale: () => TSupportedLocales[number];
+    setLocale: (locale: TSupportedLocales[number]) => void;
 }
-type $T<T extends unknown = unknown> = (this: void, descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | T | FormatXMLElementFn<T>>, opts?: Options) => string | T | (T | string)[];
-type UseIntlParams<D = MessageDescriptor> = Parameters<$T> extends [D, ...infer R] ? [...R, Omit<D, 'id'>] : never;
+
+type UseIntlParams<D = MessageDescriptor> = Parameters<IntlShape['$t']> extends [D, ...infer R] ? [...R, Omit<D, 'id'>] : never;
 type ExtendedUseIntlParams<D = MessageDescriptor> = UseIntlParams<D> extends [infer A, infer B, ...infer Rest] ? A extends Record<string, infer V> ? [Record<string, V | React.ReactNode>, B, ...Rest] : [A, B, ...Rest] : UseIntlParams<D>;
 type $TParams = Partial<ExtendedUseIntlParams>;
 /**
@@ -54,48 +51,29 @@ type RuleKey = string;
 type RuleFn<TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, TTypeSafe extends TypeSafe, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues = any> = (values: TValues, currentLocaleSet: ReturnType<TI18nStore['getCurrentLocaleSet']>) => TMessageId;
 type Rules<TSupportedLocales extends SupportedLocales = SupportedLocales, TLocaleSet extends LocaleSet = LocaleSet, TTypeSafe extends TypeSafe = TypeSafe, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe> = I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe> = SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe> = SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>> = Record<RuleKey, RuleFn<TSupportedLocales, TLocaleSet, TI18nStore, TTypeSafe, TSheetTitle, TMessageId>>;
 
-type UseTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Partial<Record<TSupportedLocales[number], Record<string, any>>>>, TTypeSafe extends boolean, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TRules extends Rules> = {
+type GetTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>> = {
     t: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: TMessageId, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? TMessageId : any;
 } & {
     t: {
         dynamic: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: string, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? string : any;
-        rule: <TRuleKey extends keyof TRules, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>>(ruleKey: TRuleKey, values?: Parameters<TRules[TRuleKey]>[0]) => TTypeSafe extends true ? TMessageId : any;
+        promise: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: TMessageId, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? Promise<TMessageId> : any;
     };
 };
 
-type GetTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>> = {
+type UseTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Partial<Record<TSupportedLocales[number], Record<string, any>>>>, TTypeSafe extends boolean, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TRules extends Rules> = {
     t: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: TMessageId, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? TMessageId : any;
 } & {
     t: {
         dynamic: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: string, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? string : any;
-        promise: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: TMessageId, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? Promise<TMessageId> : any;
+        rule: <TRuleKey extends keyof TRules, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>>(ruleKey: TRuleKey, values?: Parameters<TRules[TRuleKey]>[0]) => TTypeSafe extends true ? TMessageId : any;
     };
 };
 
-interface IStorageService<V extends string> {
-    getItem(key: string): V;
-    setItem(key: string, value: V): boolean;
-    removeItem(key: string): boolean;
-    clear(): boolean;
-}
-/**
- * locale storage manager
- * implements ILocaleStorageManager (injected StorageService)
- */
-interface ILocaleStorageManager<TSupportedLocales extends readonly string[]> {
-    getLocale(): TSupportedLocales[number];
-    setLocale(locale: TSupportedLocales[number]): void;
-}
-declare class LocaleStorageManager<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> implements ILocaleStorageManager<TSupportedLocales> {
-    private readonly storageService;
-    private readonly i18nStore;
-    private readonly localeStorageKey;
-    observerManager: ObserverManager<TSupportedLocales[number]>;
-    constructor(storageService: IStorageService<TSupportedLocales[number]>, i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, localeStorageKey?: string);
-    private initializeCurrentLocale;
-    getLocale: () => TSupportedLocales[number];
-    setLocale: (locale: TSupportedLocales[number]) => void;
-}
+type IntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> = {
+    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>;
+    currentLocale?: TSupportedLocales[number];
+    children: React.ReactNode;
+};
 
 declare function useLocaleStorage<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false>(localeStorageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>): {
     locale: TSupportedLocales[number] | undefined;
@@ -107,20 +85,21 @@ interface StorageBasedIntlProviderProps<TSupportedLocales extends readonly strin
     fallbackUI?: React.ReactNode;
     children: React.ReactNode;
 }
-declare function StorageBasedIntlProvider<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false>({ i18nStore, storageManager, fallbackUI, children, }: StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>): string | number | bigint | boolean | Iterable<react.ReactNode> | Promise<string | number | bigint | boolean | react.ReactPortal | react.ReactElement<unknown, string | react.JSXElementConstructor<any>> | Iterable<react.ReactNode> | null | undefined> | react_jsx_runtime.JSX.Element | null;
 
 interface Plugins<TRules extends Rules> {
     rules?: TRules;
 }
-type CreateI18nContextReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TRules extends Rules, TTypeSafe extends boolean = false> = {
-    IntlProvider: (props: IntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>) => ReturnType<typeof IntlProvider<TSupportedLocales, TLocaleSet, TTypeSafe>>;
-    StorageBasedIntlProvider: (props: StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>) => ReturnType<typeof StorageBasedIntlProvider<TSupportedLocales, TLocaleSet, TTypeSafe>>;
+declare function createI18nContext<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TRules extends Rules, TTypeSafe extends boolean = false>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, plugins?: Plugins<TRules>): {
+    IntlProvider: ({ currentLocale, children, }: Omit<IntlProviderProps<TSupportedLocales, TLocaleSet>, "currentLocale" | "i18nStore"> & {
+        currentLocale?: string;
+        children?: React.ReactNode;
+    }) => react_jsx_runtime.JSX.Element;
+    StorageBasedIntlProvider: ({ storageManager, children, }: Omit<StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>, "i18nStore">) => react_jsx_runtime.JSX.Element;
     useTranslation: <TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>>(sheetTitle: TSheetTitle) => UseTranslationReturn<TSupportedLocales, TLocaleSet, TTypeSafe, TSheetTitle, TRules>;
     getTranslation: <TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>>(sheetTitle: TSheetTitle) => GetTranslationReturn<TSupportedLocales, TLocaleSet, TTypeSafe, TSheetTitle>;
     getLocaleStorageManager: (storageService?: IStorageService<string>) => LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>;
     useLocaleStorage: typeof useLocaleStorage;
 };
-declare function createI18nContext<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TRules extends Rules, TTypeSafe extends boolean = false>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, plugins?: Plugins<TRules>): CreateI18nContextReturn<TSupportedLocales, TLocaleSet, TRules, TTypeSafe>;
 
 declare class RuleService<TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TTypeSafe extends TypeSafe, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>> {
     private readonly i18nStore;
@@ -129,4 +108,4 @@ declare class RuleService<TSupportedLocales extends SupportedLocales, TLocaleSet
 }
 declare const ruleFactory: <TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TTypeSafe extends TypeSafe>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>) => RuleService<TSupportedLocales, TLocaleSet, TTypeSafe, SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, SafeMessageId<TSupportedLocales, TLocaleSet, SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TTypeSafe>>;
 
-export { type IStorageService as Storage, createI18nContext, ruleFactory };
+export { type GetTranslationReturn as GetTranslation, LocaleStorageManager, type IStorageService as Storage, type StorageBasedIntlProviderProps, type UseTranslationReturn as UseTranslation, createI18nContext, ruleFactory };

package/dist/index.d.ts

@@ -1,37 +1,34 @@
 import { I18nStore } from '@sheet-i18n/react-core';
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ObserverManager } from '@sheet-i18n/shared-utils';
-import * as react from 'react';
-
-type IntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> = {
-    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>;
-    currentLocale?: TSupportedLocales[number];
-    children: React.ReactNode;
-};
-declare function IntlProvider<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false>({ i18nStore, currentLocale, children, }: IntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>): react_jsx_runtime.JSX.Element;
+import { MessageDescriptor, IntlShape } from 'react-intl';
+import * as react_jsx_runtime from 'react/jsx-runtime';
 
-interface Message {
-}
-type MessageIds = Message extends {
-    ids: infer T;
-} ? T extends string ? T : string : string;
-interface MessageDescriptor {
-    id?: MessageIds;
-    description?: string | object;
-    defaultMessage?: any[];
+interface IStorageService<V extends string> {
+    getItem(key: string): V;
+    setItem(key: string, value: V): boolean;
+    removeItem(key: string): boolean;
+    clear(): boolean;
 }
-type PrimitiveType = string | number | boolean | null | undefined | Date;
-type FormatXMLElementFn<T, R = string | T | (string | T)[]> = (parts: Array<string | T>) => R;
-interface ParserOptions {
-    ignoreTag?: boolean;
-    requiresOtherClause?: boolean;
-    shouldParseSkeletons?: boolean;
-    captureLocation?: boolean;
+/**
+ * locale storage manager
+ * implements ILocaleStorageManager (injected StorageService)
+ */
+interface ILocaleStorageManager<TSupportedLocales extends readonly string[]> {
+    getLocale(): TSupportedLocales[number];
+    setLocale(locale: TSupportedLocales[number]): void;
 }
-interface Options extends ParserOptions {
+declare class LocaleStorageManager<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> implements ILocaleStorageManager<TSupportedLocales> {
+    private readonly storageService;
+    private readonly i18nStore;
+    private readonly localeStorageKey;
+    observerManager: ObserverManager<TSupportedLocales[number]>;
+    constructor(storageService: IStorageService<TSupportedLocales[number]>, i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, localeStorageKey?: string);
+    private initializeCurrentLocale;
+    getLocale: () => TSupportedLocales[number];
+    setLocale: (locale: TSupportedLocales[number]) => void;
 }
-type $T<T extends unknown = unknown> = (this: void, descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | T | FormatXMLElementFn<T>>, opts?: Options) => string | T | (T | string)[];
-type UseIntlParams<D = MessageDescriptor> = Parameters<$T> extends [D, ...infer R] ? [...R, Omit<D, 'id'>] : never;
+
+type UseIntlParams<D = MessageDescriptor> = Parameters<IntlShape['$t']> extends [D, ...infer R] ? [...R, Omit<D, 'id'>] : never;
 type ExtendedUseIntlParams<D = MessageDescriptor> = UseIntlParams<D> extends [infer A, infer B, ...infer Rest] ? A extends Record<string, infer V> ? [Record<string, V | React.ReactNode>, B, ...Rest] : [A, B, ...Rest] : UseIntlParams<D>;
 type $TParams = Partial<ExtendedUseIntlParams>;
 /**
@@ -54,48 +51,29 @@ type RuleKey = string;
 type RuleFn<TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, TTypeSafe extends TypeSafe, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues = any> = (values: TValues, currentLocaleSet: ReturnType<TI18nStore['getCurrentLocaleSet']>) => TMessageId;
 type Rules<TSupportedLocales extends SupportedLocales = SupportedLocales, TLocaleSet extends LocaleSet = LocaleSet, TTypeSafe extends TypeSafe = TypeSafe, TI18nStore extends I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe> = I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe> = SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe> = SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>> = Record<RuleKey, RuleFn<TSupportedLocales, TLocaleSet, TI18nStore, TTypeSafe, TSheetTitle, TMessageId>>;
 
-type UseTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Partial<Record<TSupportedLocales[number], Record<string, any>>>>, TTypeSafe extends boolean, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TRules extends Rules> = {
+type GetTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>> = {
     t: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: TMessageId, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? TMessageId : any;
 } & {
     t: {
         dynamic: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: string, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? string : any;
-        rule: <TRuleKey extends keyof TRules, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>>(ruleKey: TRuleKey, values?: Parameters<TRules[TRuleKey]>[0]) => TTypeSafe extends true ? TMessageId : any;
+        promise: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: TMessageId, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? Promise<TMessageId> : any;
     };
 };
 
-type GetTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>> = {
+type UseTranslationReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Partial<Record<TSupportedLocales[number], Record<string, any>>>>, TTypeSafe extends boolean, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TRules extends Rules> = {
     t: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: TMessageId, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? TMessageId : any;
 } & {
     t: {
         dynamic: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: string, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? string : any;
-        promise: <TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>, TValues extends $TParams[0], TOpts extends $TParams[1], TDescriptor extends $TParams[2]>(id: TMessageId, values?: TValues, opts?: TOpts, _descriptor?: TDescriptor) => TTypeSafe extends true ? Promise<TMessageId> : any;
+        rule: <TRuleKey extends keyof TRules, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>>(ruleKey: TRuleKey, values?: Parameters<TRules[TRuleKey]>[0]) => TTypeSafe extends true ? TMessageId : any;
     };
 };
 
-interface IStorageService<V extends string> {
-    getItem(key: string): V;
-    setItem(key: string, value: V): boolean;
-    removeItem(key: string): boolean;
-    clear(): boolean;
-}
-/**
- * locale storage manager
- * implements ILocaleStorageManager (injected StorageService)
- */
-interface ILocaleStorageManager<TSupportedLocales extends readonly string[]> {
-    getLocale(): TSupportedLocales[number];
-    setLocale(locale: TSupportedLocales[number]): void;
-}
-declare class LocaleStorageManager<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> implements ILocaleStorageManager<TSupportedLocales> {
-    private readonly storageService;
-    private readonly i18nStore;
-    private readonly localeStorageKey;
-    observerManager: ObserverManager<TSupportedLocales[number]>;
-    constructor(storageService: IStorageService<TSupportedLocales[number]>, i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, localeStorageKey?: string);
-    private initializeCurrentLocale;
-    getLocale: () => TSupportedLocales[number];
-    setLocale: (locale: TSupportedLocales[number]) => void;
-}
+type IntlProviderProps<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false> = {
+    i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>;
+    currentLocale?: TSupportedLocales[number];
+    children: React.ReactNode;
+};
 
 declare function useLocaleStorage<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false>(localeStorageManager: LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>): {
     locale: TSupportedLocales[number] | undefined;
@@ -107,20 +85,21 @@ interface StorageBasedIntlProviderProps<TSupportedLocales extends readonly strin
     fallbackUI?: React.ReactNode;
     children: React.ReactNode;
 }
-declare function StorageBasedIntlProvider<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TTypeSafe extends boolean = false>({ i18nStore, storageManager, fallbackUI, children, }: StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>): string | number | bigint | boolean | Iterable<react.ReactNode> | Promise<string | number | bigint | boolean | react.ReactPortal | react.ReactElement<unknown, string | react.JSXElementConstructor<any>> | Iterable<react.ReactNode> | null | undefined> | react_jsx_runtime.JSX.Element | null;
 
 interface Plugins<TRules extends Rules> {
     rules?: TRules;
 }
-type CreateI18nContextReturn<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TRules extends Rules, TTypeSafe extends boolean = false> = {
-    IntlProvider: (props: IntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>) => ReturnType<typeof IntlProvider<TSupportedLocales, TLocaleSet, TTypeSafe>>;
-    StorageBasedIntlProvider: (props: StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>) => ReturnType<typeof StorageBasedIntlProvider<TSupportedLocales, TLocaleSet, TTypeSafe>>;
+declare function createI18nContext<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TRules extends Rules, TTypeSafe extends boolean = false>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, plugins?: Plugins<TRules>): {
+    IntlProvider: ({ currentLocale, children, }: Omit<IntlProviderProps<TSupportedLocales, TLocaleSet>, "currentLocale" | "i18nStore"> & {
+        currentLocale?: string;
+        children?: React.ReactNode;
+    }) => react_jsx_runtime.JSX.Element;
+    StorageBasedIntlProvider: ({ storageManager, children, }: Omit<StorageBasedIntlProviderProps<TSupportedLocales, TLocaleSet, TTypeSafe>, "i18nStore">) => react_jsx_runtime.JSX.Element;
     useTranslation: <TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>>(sheetTitle: TSheetTitle) => UseTranslationReturn<TSupportedLocales, TLocaleSet, TTypeSafe, TSheetTitle, TRules>;
     getTranslation: <TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>>(sheetTitle: TSheetTitle) => GetTranslationReturn<TSupportedLocales, TLocaleSet, TTypeSafe, TSheetTitle>;
     getLocaleStorageManager: (storageService?: IStorageService<string>) => LocaleStorageManager<TSupportedLocales, TLocaleSet, TTypeSafe>;
     useLocaleStorage: typeof useLocaleStorage;
 };
-declare function createI18nContext<TSupportedLocales extends readonly string[], TLocaleSet extends Partial<Record<TSupportedLocales[number], Record<string, any>>>, TRules extends Rules, TTypeSafe extends boolean = false>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>, plugins?: Plugins<TRules>): CreateI18nContextReturn<TSupportedLocales, TLocaleSet, TRules, TTypeSafe>;
 
 declare class RuleService<TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TTypeSafe extends TypeSafe, TSheetTitle extends SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TMessageId extends SafeMessageId<TSupportedLocales, TLocaleSet, TSheetTitle, TTypeSafe>> {
     private readonly i18nStore;
@@ -129,4 +108,4 @@ declare class RuleService<TSupportedLocales extends SupportedLocales, TLocaleSet
 }
 declare const ruleFactory: <TSupportedLocales extends SupportedLocales, TLocaleSet extends LocaleSet, TTypeSafe extends TypeSafe>(i18nStore: I18nStore<TSupportedLocales, TLocaleSet, TTypeSafe>) => RuleService<TSupportedLocales, TLocaleSet, TTypeSafe, SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, SafeMessageId<TSupportedLocales, TLocaleSet, SafeSheetTitle<TSupportedLocales, TLocaleSet, TTypeSafe>, TTypeSafe>>;
 
-export { type IStorageService as Storage, createI18nContext, ruleFactory };
+export { type GetTranslationReturn as GetTranslation, LocaleStorageManager, type IStorageService as Storage, type StorageBasedIntlProviderProps, type UseTranslationReturn as UseTranslation, createI18nContext, ruleFactory };

package/dist/index.js

@@ -38,6 +38,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  LocaleStorageManager: () => LocaleStorageManager,
   createI18nContext: () => createI18nContext,
   ruleFactory: () => ruleFactory
 });
@@ -287,33 +288,39 @@ function getTranslation({
   sheetTitle,
   i18nStore
 }) {
-  const intlInstance = intlInstanceCache.getCachedIntlInstance(
-    sheetTitle,
-    i18nStore,
-    "server"
-  );
-  const translationService = new TranslationService(intlInstance);
   const t = (id, values, opts, _descriptor) => {
+    const intlInstance = intlInstanceCache.getCachedIntlInstance(
+      sheetTitle,
+      i18nStore,
+      "server"
+    );
+    const translationService = new TranslationService(intlInstance);
     return translationService.translate(id, values, opts, _descriptor);
   };
   t.dynamic = (id, values, opts, _descriptor) => {
+    const intlInstance = intlInstanceCache.getCachedIntlInstance(
+      sheetTitle,
+      i18nStore,
+      "server"
+    );
+    const translationService = new TranslationService(intlInstance);
     return translationService.translate(id, values, opts, _descriptor);
   };
   t.promise = (id, values, opts, _descriptor) => {
     const intlInitPromise = new Promise((resolve) => {
       setTimeout(() => {
-        const intlInstance2 = intlInstanceCache.getCachedIntlInstance(
+        const intlInstance = intlInstanceCache.getCachedIntlInstance(
           sheetTitle,
           i18nStore,
           "server"
         );
-        resolve(intlInstance2);
+        resolve(intlInstance);
       }, 1);
     });
     return new Promise((resolve) => {
-      intlInitPromise.then((intlInstance2) => {
-        const translationService2 = new TranslationService(intlInstance2);
-        resolve(translationService2.translate(id, values, opts, _descriptor));
+      intlInitPromise.then((intlInstance) => {
+        const translationService = new TranslationService(intlInstance);
+        resolve(translationService.translate(id, values, opts, _descriptor));
       });
     });
   };
@@ -562,6 +569,7 @@ var ruleFactory = (i18nStore) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  LocaleStorageManager,
   createI18nContext,
   ruleFactory
 });

package/dist/index.mjs

@@ -263,33 +263,39 @@ function getTranslation({
   sheetTitle,
   i18nStore
 }) {
-  const intlInstance = intlInstanceCache.getCachedIntlInstance(
-    sheetTitle,
-    i18nStore,
-    "server"
-  );
-  const translationService = new TranslationService(intlInstance);
   const t = (id, values, opts, _descriptor) => {
+    const intlInstance = intlInstanceCache.getCachedIntlInstance(
+      sheetTitle,
+      i18nStore,
+      "server"
+    );
+    const translationService = new TranslationService(intlInstance);
     return translationService.translate(id, values, opts, _descriptor);
   };
   t.dynamic = (id, values, opts, _descriptor) => {
+    const intlInstance = intlInstanceCache.getCachedIntlInstance(
+      sheetTitle,
+      i18nStore,
+      "server"
+    );
+    const translationService = new TranslationService(intlInstance);
     return translationService.translate(id, values, opts, _descriptor);
   };
   t.promise = (id, values, opts, _descriptor) => {
     const intlInitPromise = new Promise((resolve) => {
       setTimeout(() => {
-        const intlInstance2 = intlInstanceCache.getCachedIntlInstance(
+        const intlInstance = intlInstanceCache.getCachedIntlInstance(
           sheetTitle,
           i18nStore,
           "server"
         );
-        resolve(intlInstance2);
+        resolve(intlInstance);
       }, 1);
     });
     return new Promise((resolve) => {
-      intlInitPromise.then((intlInstance2) => {
-        const translationService2 = new TranslationService(intlInstance2);
-        resolve(translationService2.translate(id, values, opts, _descriptor));
+      intlInitPromise.then((intlInstance) => {
+        const translationService = new TranslationService(intlInstance);
+        resolve(translationService.translate(id, values, opts, _descriptor));
       });
     });
   };
@@ -537,6 +543,7 @@ var ruleFactory = (i18nStore) => {
   return new RuleService(i18nStore);
 };
 export {
+  LocaleStorageManager,
   createI18nContext,
   ruleFactory
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheet-i18n/react-client",
-  "version": "1.6.0-canary.8",
+  "version": "1.6.0",
   "description": "a client package for react modules used by sheet-i18n",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -25,9 +25,9 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@sheet-i18n/errors": "1.8.1",
     "@sheet-i18n/shared-utils": "1.8.2",
-    "@sheet-i18n/react-core": "1.6.0-canary.8"
+    "@sheet-i18n/errors": "1.8.1",
+    "@sheet-i18n/react-core": "1.6.0"
   },
   "devDependencies": {
     "@types/react": "^19.0.2",