intor-translator 1.0.15 → 1.1.0

package/dist/index.js

@@ -1,116 +1,29 @@
-// src/cache/cache.ts
-var Cache = class {
-  constructor(maxSize = 100, ttl = 1e3 * 60 * 5) {
-    this.cache = /* @__PURE__ */ new Map();
-    this.maxSize = maxSize;
-    this.ttl = ttl;
-  }
-  // Clean up expired cache entries
-  cleanUp() {
-    const now = Date.now();
-    this.cache.forEach((entry, key) => {
-      if (now - entry.timestamp > this.ttl) {
-        this.cache.delete(key);
-      }
-    });
-  }
-  // Get cache data
-  get(key) {
-    this.cleanUp();
-    const entry = this.cache.get(key);
-    if (entry) {
-      entry.timestamp = Date.now();
-      return entry.value;
-    }
-    return void 0;
-  }
-  // Set cache data
-  set(key, value) {
-    this.cleanUp();
-    if (this.cache.size >= this.maxSize) {
-      const oldestKey = this.cache.keys().next().value;
-      if (oldestKey) this.cache.delete(oldestKey);
-    }
-    this.cache.set(key, { value, timestamp: Date.now() });
-  }
-  // Check if a key exists in the cache
-  has(key) {
-    this.cleanUp();
-    return this.cache.has(key);
-  }
-  // Clear all cache
-  clear() {
-    this.cache.clear();
-  }
-};
-
-// src/cache/message-key-cache.ts
-var MESSAGE_KEY_CACHE_MAX_SIZE = 100;
-var MESSAGE_KEY_CACHE_EXPIRES_TIME = 1e3 * 60 * 5;
-var messageKeyCache;
-var getMessageKeyCache = () => {
-  if (typeof window !== "undefined" && !messageKeyCache) {
-    messageKeyCache = new Cache(
-      MESSAGE_KEY_CACHE_MAX_SIZE,
-      MESSAGE_KEY_CACHE_EXPIRES_TIME
-    );
-  }
-  return messageKeyCache;
-};
-var clearMessageKeyCache = () => {
-  if (messageKeyCache) {
-    messageKeyCache.clear();
-    messageKeyCache = void 0;
-  }
-};
-
-// src/utils/get-value-by-key.ts
-var getValueByKey = (locale, messages, key, useCache = true) => {
-  const cache = getMessageKeyCache();
-  useCache = Boolean(useCache && cache);
-  const cacheKey = `${key}`;
-  const currentLocale = cache?.get("locale");
-  if (currentLocale !== locale) {
-    cache?.clear();
-    cache?.set("locale", locale);
-  }
-  if (useCache && cache?.has(cacheKey)) {
-    return cache?.get(cacheKey);
-  }
-  const value = key.split(".").reduce((acc, key2) => {
-    if (acc && typeof acc === "object" && key2 in acc) {
-      return acc[key2];
-    }
-    return void 0;
-  }, messages);
-  if (useCache && value !== void 0) {
-    cache?.set(cacheKey, value);
-  }
-  return value;
-};
-
 // src/utils/find-message-in-locales.ts
 var findMessageInLocales = ({
   messages,
-  localesToTry,
+  candidateLocales,
   key
 }) => {
-  for (const loc of localesToTry) {
-    const localeMessages = messages[loc];
-    if (!localeMessages) {
-      continue;
-    }
-    const candidate = getValueByKey(loc, localeMessages, key);
-    if (typeof candidate === "string") {
-      return candidate;
+  for (const locale of candidateLocales) {
+    const localeMessages = messages[locale];
+    if (!localeMessages) continue;
+    let candidate = localeMessages;
+    const keys = key.split(".");
+    for (const k of keys) {
+      if (candidate && typeof candidate === "object" && k in candidate) {
+        candidate = candidate[k];
+      } else {
+        candidate = void 0;
+        break;
+      }
     }
+    if (typeof candidate === "string") return candidate;
   }
-  return void 0;
 };
 
-// src/utils/resolve-locales-to-try.ts
-var resolveLocalesToTry = (locale, fallbackLocales) => {
-  const fallbacks = fallbackLocales?.[locale] || [];
+// src/utils/resolve-candidate-locales.ts
+var resolveCandidateLocales = (locale, fallbackLocalesMap) => {
+  const fallbacks = fallbackLocalesMap?.[locale] || [];
   const filteredFallbacks = fallbacks.filter((l) => l !== locale);
   return [locale, ...filteredFallbacks];
 };
@@ -127,11 +40,9 @@ var hasKey = ({
   if (!messages) {
     throw new Error("[intor-translator] 'messages' is required");
   }
-  if (!locale) {
-    throw new Error("[intor-translator] 'locale' is required");
-  }
-  const localesToTry = resolveLocalesToTry(targetLocale || locale);
-  return findMessageInLocales({ messages, localesToTry, key }) ? true : false;
+  const candidateLocales = resolveCandidateLocales(targetLocale || locale);
+  const message = findMessageInLocales({ messages, candidateLocales, key });
+  return !!message;
 };
 
 // src/utils/replace-values.ts
@@ -139,7 +50,7 @@ var replaceValues = (message, params) => {
   if (!params || typeof params !== "object" || Object.keys(params).length === 0) {
     return message;
   }
-  const replaced = message.replace(/{([^}]+)}/g, (match, key) => {
+  const replaced = message.replaceAll(/{([^}]+)}/g, (match, key) => {
     const keys = key.split(".");
     let value = params;
     for (const k of keys) {
@@ -164,85 +75,61 @@ var translate = ({
 }) => {
   const messages = messagesRef.current;
   const locale = localeRef.current;
+  const isLoading = isLoadingRef.current;
   if (!messages) {
     throw new Error("[intor-translator] 'messages' is required");
   }
-  if (!locale) {
-    throw new Error("[intor-translator] 'locale' is required");
-  }
-  const isLoading = isLoadingRef.current;
-  const {
-    fallbackLocales,
-    loadingMessage,
-    placeholder,
-    handlers = {}
-  } = translateConfig;
-  const { formatMessage, onLoading, onMissing } = handlers;
-  const localesToTry = resolveLocalesToTry(locale, fallbackLocales);
-  const message = findMessageInLocales({ messages, localesToTry, key });
-  if (isLoading) {
-    if (onLoading) {
-      return onLoading({
-        key,
-        locale,
-        replacements
-      });
-    }
-    if (loadingMessage) {
-      return loadingMessage;
-    }
-  }
-  if (message === void 0 || message === null) {
-    if (onMissing) {
-      return onMissing({ key, locale, replacements });
-    }
-    if (placeholder !== void 0 && placeholder !== null) {
-      return placeholder;
-    }
+  const { fallbackLocales, loadingMessage, placeholder, handlers } = translateConfig;
+  const { formatHandler, loadingHandler, missingHandler } = handlers || {};
+  const candidateLocales = resolveCandidateLocales(locale, fallbackLocales);
+  const message = findMessageInLocales({ messages, candidateLocales, key });
+  if (isLoading && (loadingHandler || loadingMessage)) {
+    if (loadingHandler)
+      return loadingHandler({ key, locale, replacements });
+    if (loadingMessage) return loadingMessage;
+  }
+  if (message === void 0) {
+    if (missingHandler)
+      return missingHandler({ key, locale, replacements });
+    if (placeholder) return placeholder;
     return key;
   }
-  if (formatMessage) {
-    return formatMessage({ message, key, locale, replacements });
-  } else {
-    return replacements ? replaceValues(message, replacements) : message;
+  if (formatHandler) {
+    return formatHandler({ message, key, locale, replacements });
   }
+  return replacements ? replaceValues(message, replacements) : message;
 };
 
 // src/translators/base-translator/base-translator.ts
 var BaseTranslator = class {
   constructor(options) {
+    /** Current messages for translation, updatable at runtime */
     this.messagesRef = { current: void 0 };
-    /** Check if a key exists in the specified locale or current locale. */
-    this.hasKey = (key, targetLocale) => {
-      return hasKey({
-        messagesRef: this.messagesRef,
-        localeRef: this.localeRef,
-        key,
-        targetLocale
-      });
-    };
     this.messagesRef = { current: options.messages };
     this.localeRef = { current: options.locale };
   }
-  /** Get all message data. */
+  /** Get messages. */
   get messages() {
     return this.messagesRef.current;
   }
+  /** Get the current active locale. */
+  get locale() {
+    return this.localeRef.current;
+  }
   /**
    * Replace messages with new ones.
    *
-   * Note: This allows runtime setting of messages even if M is inferred as `never` (uninitialized).
-   * Type cast is used to bypass TypeScript restrictions on dynamic messages.
+   * - Note: This allows runtime setting of messages even if `M` is inferred as `never`.
+   * The type cast bypasses TypeScript restrictions on dynamic messages.
    */
   setMessages(messages) {
     this.messagesRef.current = messages;
-    clearMessageKeyCache();
   }
-  /** Get the current active locale. */
-  get locale() {
-    return this.localeRef.current;
-  }
-  /** Change the active locale. */
+  /**
+   * Set the active locale.
+   *
+   * - Note: Unlike `setMessages`, the locale structure cannot be changed at runtime.
+   */
   setLocale(newLocale) {
     this.localeRef.current = newLocale;
   }
@@ -251,8 +138,17 @@ var BaseTranslator = class {
 // src/translators/core-translator/core-translator.ts
 var CoreTranslator = class extends BaseTranslator {
   constructor(options) {
-    super(options);
+    super({ locale: options.locale, messages: options.messages });
     this.isLoadingRef = { current: false };
+    /** Check if a key exists in the specified locale or current locale. */
+    this.hasKey = (key, targetLocale) => {
+      return hasKey({
+        messagesRef: this.messagesRef,
+        localeRef: this.localeRef,
+        key,
+        targetLocale
+      });
+    };
     this.t = (key, replacements) => {
       return translate({
         messagesRef: this.messagesRef,
@@ -277,12 +173,8 @@ var CoreTranslator = class extends BaseTranslator {
 
 // src/utils/get-full-key.ts
 var getFullKey = (preKey = "", key = "") => {
-  if (!preKey) {
-    return key;
-  }
-  if (!key) {
-    return preKey;
-  }
+  if (!preKey) return key;
+  if (!key) return preKey;
   return `${preKey}.${key}`;
 };
 
@@ -317,4 +209,4 @@ var ScopeTranslator = class extends CoreTranslator {
   }
 };
 
-export { ScopeTranslator as Translator };
+export { ScopeTranslator, ScopeTranslator as Translator };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor-translator",
-  "version": "1.0.15",
+  "version": "1.1.0",
   "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",
@@ -51,42 +51,47 @@
   "type": "module",
   "scripts": {
     "build": "tsup",
+    "prepublishOnly": "yarn build",
+    "test": "vitest",
+    "type": "tsc --noEmit",
     "lint": "eslint",
-    "type-check": "tsc --noEmit",
-    "test": "jest",
-    "test:coverage": "jest --coverage && open coverage/lcov-report/index.html",
-    "prepublishOnly": "yarn build"
-  },
-  "sideEffects": false,
-  "engines": {
-    "node": ">=16.0.0"
+    "lint:debug": "eslint --debug",
+    "knip": "knip --config .config/knip.config.ts"
   },
+  "dependencies": {},
   "devDependencies": {
-    "@eslint/js": "^9.27.0",
+    "@eslint/eslintrc": "^3.3.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
-    "@types/jest": "^29.5.14",
+    "@types/node": "^24.10.1",
     "@types/react": "^19.1.4",
     "@types/react-dom": "^19.1.5",
-    "eslint": "^9.27.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-prettier": "^5.4.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
+    "@vitest/coverage-v8": "4.0.9",
+    "eslint": "^9.39.1",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-unicorn": "^62.0.0",
+    "eslint-plugin-unused-imports": "^4.3.0",
     "globals": "^16.1.0",
     "intl-messageformat": "^10.7.16",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
+    "knip": "^5.69.1",
     "next": "^15.3.2",
     "prettier": "^3.5.3",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "ts-jest": "^29.3.2",
     "ts-node": "^10.9.2",
+    "tsd": "^0.33.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1"
+    "typescript-eslint": "^8.46.4",
+    "vitest": "^4.0.9"
+  },
+  "sideEffects": false,
+  "engines": {
+    "node": ">=16.0.0"
   }
 }