intor-translator 1.0.7 → 1.0.9

package/dist/index.cjs

@@ -297,29 +297,29 @@ var getFullKey = (preKey = "", key = "") => {
 var ScopeTranslator = class extends CoreTranslator {
   constructor(options) {
     super(options);
-    this.scoped = (preKey) => {
-      return {
-        hasKey: (key, targetLocale) => {
-          const fullKey = getFullKey(preKey, key);
-          return hasKey({
-            messagesRef: this.messagesRef,
-            localeRef: this.localeRef,
-            key: fullKey,
-            targetLocale
-          });
-        },
-        t: (key, replacements) => {
-          const fullKey = getFullKey(preKey, key);
-          return translate({
-            messagesRef: this.messagesRef,
-            localeRef: this.localeRef,
-            isLoadingRef: this.isLoadingRef,
-            translateConfig: this.options,
-            key: fullKey,
-            replacements
-          });
-        }
-      };
+  }
+  scoped(preKey) {
+    return {
+      hasKey: (key, targetLocale) => {
+        const fullKey = getFullKey(preKey, key);
+        return hasKey({
+          messagesRef: this.messagesRef,
+          localeRef: this.localeRef,
+          key: fullKey,
+          targetLocale
+        });
+      },
+      t: (key, replacements) => {
+        const fullKey = getFullKey(preKey, key);
+        return translate({
+          messagesRef: this.messagesRef,
+          localeRef: this.localeRef,
+          isLoadingRef: this.isLoadingRef,
+          translateConfig: this.options,
+          key: fullKey,
+          replacements
+        });
+      }
     };
   }
 };

package/dist/index.d.cts

@@ -161,7 +161,7 @@ type LocaleNamespaceMessages = Record<Locale, NamespaceMessages>;
  * type Result = UnionLocaleMessages<typeof messages>;
  * // Result: { auth: { login: "Login" } } | { auth: { logout: "登出" } }
  */
-type UnionLocaleMessages<M extends LocaleNamespaceMessages> = M[LocaleKey<M>];
+type UnionLocaleMessages<M> = M[LocaleKey<M>];
 
 /**
  * Extracts the locale keys from the messages object as string literals.
@@ -173,7 +173,7 @@ type UnionLocaleMessages<M extends LocaleNamespaceMessages> = M[LocaleKey<M>];
  * }>;
  * // Locales is "en" | "zh-TW"
  */
-type LocaleKey<M extends LocaleNamespaceMessages> = keyof M & string;
+type LocaleKey<M> = keyof M & string;
 /**
  * A map that defines fallback locales for each base locale.
  *
@@ -242,7 +242,7 @@ type LeafKeys<M, D extends number = DefaultDepth> = [D] extends [never] ? never
  * @example
  * UnionLocaleLeafKeys<{ en: { a: { b: "x" } }, zh: { a: { c: "y" } } }> → "a.b" | "a.c"
  */
-type UnionLocaleLeafKeys<M extends LocaleNamespaceMessages, D extends number = DefaultDepth> = UnionLocaleMessages<M> extends NamespaceMessages ? LeafKeys<UnionLocaleMessages<M>, D> : never;
+type UnionLocaleLeafKeys<M, D extends number = DefaultDepth> = UnionLocaleMessages<M> extends NamespaceMessages ? LeafKeys<UnionLocaleMessages<M>, D> : never;
 /**
  * Resolves the type at a dot-separated key in a nested object.
  *
@@ -261,15 +261,13 @@ type ResolvePathType<T, P extends string> = P extends `${infer Head}.${infer Tai
  * };
  * ScopedLeafKeys<Messages, "auth.login"> → "success" | "failed"
  */
-type ScopedLeafKeys<M extends LocaleNamespaceMessages, K extends string, D extends number = DefaultDepth> = UnionLocaleMessages<M> extends infer ResolvedLocaleMessages ? ResolvedLocaleMessages extends object ? LeafKeys<ResolvePathType<ResolvedLocaleMessages, K>, D> : never : never;
+type ScopedLeafKeys<M, K extends string, D extends number = DefaultDepth> = UnionLocaleMessages<M> extends infer ResolvedLocaleMessages ? ResolvedLocaleMessages extends object ? LeafKeys<ResolvePathType<ResolvedLocaleMessages, K>, D> : never : never;
 /**
  * Infer valid key type from locale messages.
  *
  * If `M` is not passed or empty, fallback to `string`.
  */
-type InferTranslatorKey<M extends LocaleNamespaceMessages> = [
-    M
-] extends [never] ? string : UnionLocaleLeafKeys<M>;
+type InferTranslatorKey<M> = M extends LocaleNamespaceMessages ? UnionLocaleLeafKeys<M> : string;
 
 /**
  * A ref object holding all localized messages by locale.
@@ -282,7 +280,7 @@ type InferTranslatorKey<M extends LocaleNamespaceMessages> = [
  *   }
  * };
  */
-type MessagesRef<M extends LocaleNamespaceMessages> = {
+type MessagesRef<M> = {
     current?: Readonly<M>;
 };
 /**
@@ -293,7 +291,7 @@ type MessagesRef<M extends LocaleNamespaceMessages> = {
  *   current: "en"
  * };
  */
-type LocaleRef<M extends LocaleNamespaceMessages> = {
+type LocaleRef<M> = {
     current?: LocaleKey<M>;
 };
 /**
@@ -309,8 +307,8 @@ type IsLoadingRef = {
 };
 
 /** Config options for translation behavior. */
-type TranslateConfig = {
-    fallbackLocales?: FallbackLocalesMap;
+type TranslateConfig<M> = {
+    fallbackLocales?: FallbackLocalesMap<LocaleKey<M>>;
     loadingMessage?: string;
     placeholder?: string;
     handlers?: TranslateHandlers;
@@ -344,12 +342,12 @@ type TranslateContext = {
     replacements?: Replacement | RichReplacement;
 };
 
-interface BaseTranslatorOptions<M extends LocaleNamespaceMessages> {
+interface BaseTranslatorOptions<M> {
     messages?: Readonly<M>;
     locale?: LocaleKey<M>;
 }
 
-declare class BaseTranslator<M extends LocaleNamespaceMessages = never> {
+declare class BaseTranslator<M = unknown> {
     protected messagesRef: MessagesRef<M>;
     protected localeRef: LocaleRef<M>;
     constructor(options?: BaseTranslatorOptions<M>);
@@ -370,10 +368,10 @@ declare class BaseTranslator<M extends LocaleNamespaceMessages = never> {
     hasKey: (key: InferTranslatorKey<M>, targetLocale?: LocaleKey<M>) => boolean;
 }
 
-interface CoreTranslatorOptions<M extends LocaleNamespaceMessages> extends BaseTranslatorOptions<M>, TranslateConfig {
+interface CoreTranslatorOptions<M> extends BaseTranslatorOptions<M>, TranslateConfig<M> {
 }
 
-declare class CoreTranslator<M extends LocaleNamespaceMessages = never> extends BaseTranslator<M> {
+declare class CoreTranslator<M = unknown> extends BaseTranslator<M> {
     protected options: CoreTranslatorOptions<M>;
     protected isLoadingRef: IsLoadingRef;
     constructor(options?: CoreTranslatorOptions<M>);
@@ -384,11 +382,15 @@ declare class CoreTranslator<M extends LocaleNamespaceMessages = never> extends
     t: <Result = string>(key: InferTranslatorKey<M>, replacements?: Replacement | RichReplacement) => Result;
 }
 
-declare class ScopeTranslator<M extends LocaleNamespaceMessages = never> extends CoreTranslator<M> {
+declare class ScopeTranslator<M = unknown> extends CoreTranslator<M> {
     constructor(options?: CoreTranslatorOptions<M>);
-    scoped: <K extends NodeKeys<UnionLocaleMessages<M>> & string, ScopedKeys extends ScopedLeafKeys<M, K> & string>(preKey: K) => {
-        hasKey: (key?: ScopedKeys | undefined, targetLocale?: string) => boolean;
-        t: (key?: ScopedKeys | undefined, replacements?: Replacement | RichReplacement) => string;
+    scoped<K extends NodeKeys<UnionLocaleMessages<M>> & string>(preKey: K): {
+        hasKey: (key?: ScopedLeafKeys<M, K> & string, targetLocale?: LocaleKey<M>) => boolean;
+        t: (key?: ScopedLeafKeys<M, K> & string, replacements?: Replacement | RichReplacement) => string;
+    };
+    scoped(): {
+        hasKey: (key?: InferTranslatorKey<M> & string, targetLocale?: LocaleKey<M>) => boolean;
+        t: (key?: InferTranslatorKey<M> & string, replacements?: Replacement | RichReplacement) => string;
     };
 }
 

package/dist/index.d.ts

@@ -161,7 +161,7 @@ type LocaleNamespaceMessages = Record<Locale, NamespaceMessages>;
  * type Result = UnionLocaleMessages<typeof messages>;
  * // Result: { auth: { login: "Login" } } | { auth: { logout: "登出" } }
  */
-type UnionLocaleMessages<M extends LocaleNamespaceMessages> = M[LocaleKey<M>];
+type UnionLocaleMessages<M> = M[LocaleKey<M>];
 
 /**
  * Extracts the locale keys from the messages object as string literals.
@@ -173,7 +173,7 @@ type UnionLocaleMessages<M extends LocaleNamespaceMessages> = M[LocaleKey<M>];
  * }>;
  * // Locales is "en" | "zh-TW"
  */
-type LocaleKey<M extends LocaleNamespaceMessages> = keyof M & string;
+type LocaleKey<M> = keyof M & string;
 /**
  * A map that defines fallback locales for each base locale.
  *
@@ -242,7 +242,7 @@ type LeafKeys<M, D extends number = DefaultDepth> = [D] extends [never] ? never
  * @example
  * UnionLocaleLeafKeys<{ en: { a: { b: "x" } }, zh: { a: { c: "y" } } }> → "a.b" | "a.c"
  */
-type UnionLocaleLeafKeys<M extends LocaleNamespaceMessages, D extends number = DefaultDepth> = UnionLocaleMessages<M> extends NamespaceMessages ? LeafKeys<UnionLocaleMessages<M>, D> : never;
+type UnionLocaleLeafKeys<M, D extends number = DefaultDepth> = UnionLocaleMessages<M> extends NamespaceMessages ? LeafKeys<UnionLocaleMessages<M>, D> : never;
 /**
  * Resolves the type at a dot-separated key in a nested object.
  *
@@ -261,15 +261,13 @@ type ResolvePathType<T, P extends string> = P extends `${infer Head}.${infer Tai
  * };
  * ScopedLeafKeys<Messages, "auth.login"> → "success" | "failed"
  */
-type ScopedLeafKeys<M extends LocaleNamespaceMessages, K extends string, D extends number = DefaultDepth> = UnionLocaleMessages<M> extends infer ResolvedLocaleMessages ? ResolvedLocaleMessages extends object ? LeafKeys<ResolvePathType<ResolvedLocaleMessages, K>, D> : never : never;
+type ScopedLeafKeys<M, K extends string, D extends number = DefaultDepth> = UnionLocaleMessages<M> extends infer ResolvedLocaleMessages ? ResolvedLocaleMessages extends object ? LeafKeys<ResolvePathType<ResolvedLocaleMessages, K>, D> : never : never;
 /**
  * Infer valid key type from locale messages.
  *
  * If `M` is not passed or empty, fallback to `string`.
  */
-type InferTranslatorKey<M extends LocaleNamespaceMessages> = [
-    M
-] extends [never] ? string : UnionLocaleLeafKeys<M>;
+type InferTranslatorKey<M> = M extends LocaleNamespaceMessages ? UnionLocaleLeafKeys<M> : string;
 
 /**
  * A ref object holding all localized messages by locale.
@@ -282,7 +280,7 @@ type InferTranslatorKey<M extends LocaleNamespaceMessages> = [
  *   }
  * };
  */
-type MessagesRef<M extends LocaleNamespaceMessages> = {
+type MessagesRef<M> = {
     current?: Readonly<M>;
 };
 /**
@@ -293,7 +291,7 @@ type MessagesRef<M extends LocaleNamespaceMessages> = {
  *   current: "en"
  * };
  */
-type LocaleRef<M extends LocaleNamespaceMessages> = {
+type LocaleRef<M> = {
     current?: LocaleKey<M>;
 };
 /**
@@ -309,8 +307,8 @@ type IsLoadingRef = {
 };
 
 /** Config options for translation behavior. */
-type TranslateConfig = {
-    fallbackLocales?: FallbackLocalesMap;
+type TranslateConfig<M> = {
+    fallbackLocales?: FallbackLocalesMap<LocaleKey<M>>;
     loadingMessage?: string;
     placeholder?: string;
     handlers?: TranslateHandlers;
@@ -344,12 +342,12 @@ type TranslateContext = {
     replacements?: Replacement | RichReplacement;
 };
 
-interface BaseTranslatorOptions<M extends LocaleNamespaceMessages> {
+interface BaseTranslatorOptions<M> {
     messages?: Readonly<M>;
     locale?: LocaleKey<M>;
 }
 
-declare class BaseTranslator<M extends LocaleNamespaceMessages = never> {
+declare class BaseTranslator<M = unknown> {
     protected messagesRef: MessagesRef<M>;
     protected localeRef: LocaleRef<M>;
     constructor(options?: BaseTranslatorOptions<M>);
@@ -370,10 +368,10 @@ declare class BaseTranslator<M extends LocaleNamespaceMessages = never> {
     hasKey: (key: InferTranslatorKey<M>, targetLocale?: LocaleKey<M>) => boolean;
 }
 
-interface CoreTranslatorOptions<M extends LocaleNamespaceMessages> extends BaseTranslatorOptions<M>, TranslateConfig {
+interface CoreTranslatorOptions<M> extends BaseTranslatorOptions<M>, TranslateConfig<M> {
 }
 
-declare class CoreTranslator<M extends LocaleNamespaceMessages = never> extends BaseTranslator<M> {
+declare class CoreTranslator<M = unknown> extends BaseTranslator<M> {
     protected options: CoreTranslatorOptions<M>;
     protected isLoadingRef: IsLoadingRef;
     constructor(options?: CoreTranslatorOptions<M>);
@@ -384,11 +382,15 @@ declare class CoreTranslator<M extends LocaleNamespaceMessages = never> extends
     t: <Result = string>(key: InferTranslatorKey<M>, replacements?: Replacement | RichReplacement) => Result;
 }
 
-declare class ScopeTranslator<M extends LocaleNamespaceMessages = never> extends CoreTranslator<M> {
+declare class ScopeTranslator<M = unknown> extends CoreTranslator<M> {
     constructor(options?: CoreTranslatorOptions<M>);
-    scoped: <K extends NodeKeys<UnionLocaleMessages<M>> & string, ScopedKeys extends ScopedLeafKeys<M, K> & string>(preKey: K) => {
-        hasKey: (key?: ScopedKeys | undefined, targetLocale?: string) => boolean;
-        t: (key?: ScopedKeys | undefined, replacements?: Replacement | RichReplacement) => string;
+    scoped<K extends NodeKeys<UnionLocaleMessages<M>> & string>(preKey: K): {
+        hasKey: (key?: ScopedLeafKeys<M, K> & string, targetLocale?: LocaleKey<M>) => boolean;
+        t: (key?: ScopedLeafKeys<M, K> & string, replacements?: Replacement | RichReplacement) => string;
+    };
+    scoped(): {
+        hasKey: (key?: InferTranslatorKey<M> & string, targetLocale?: LocaleKey<M>) => boolean;
+        t: (key?: InferTranslatorKey<M> & string, replacements?: Replacement | RichReplacement) => string;
     };
 }
 

package/dist/index.js

@@ -295,29 +295,29 @@ var getFullKey = (preKey = "", key = "") => {
 var ScopeTranslator = class extends CoreTranslator {
   constructor(options) {
     super(options);
-    this.scoped = (preKey) => {
-      return {
-        hasKey: (key, targetLocale) => {
-          const fullKey = getFullKey(preKey, key);
-          return hasKey({
-            messagesRef: this.messagesRef,
-            localeRef: this.localeRef,
-            key: fullKey,
-            targetLocale
-          });
-        },
-        t: (key, replacements) => {
-          const fullKey = getFullKey(preKey, key);
-          return translate({
-            messagesRef: this.messagesRef,
-            localeRef: this.localeRef,
-            isLoadingRef: this.isLoadingRef,
-            translateConfig: this.options,
-            key: fullKey,
-            replacements
-          });
-        }
-      };
+  }
+  scoped(preKey) {
+    return {
+      hasKey: (key, targetLocale) => {
+        const fullKey = getFullKey(preKey, key);
+        return hasKey({
+          messagesRef: this.messagesRef,
+          localeRef: this.localeRef,
+          key: fullKey,
+          targetLocale
+        });
+      },
+      t: (key, replacements) => {
+        const fullKey = getFullKey(preKey, key);
+        return translate({
+          messagesRef: this.messagesRef,
+          localeRef: this.localeRef,
+          isLoadingRef: this.isLoadingRef,
+          translateConfig: this.options,
+          key: fullKey,
+          replacements
+        });
+      }
     };
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor-translator",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "A type safe translator that knows what to say and how to handle the rest. Supports custom messages, rich replacements, and async loading.",
   "author": "Yiming Liao",
   "license": "MIT",