@shuo-li/i18n 1.0.6 → 1.0.8

package/dist/{chunk-JPKSBSEO.cjs → chunk-2EV6FQIL.cjs}

@@ -231,6 +231,7 @@ var currentSig = null;
 var currentPromise = null;
 var resolvedStores = [];
 var resolvedModules = [];
+var resolvedStaticModules = [];
 var resolvedLanguages = [];
 var unloginPullStarted = false;
 var managerOptions = null;
@@ -259,6 +260,7 @@ function closeSSE() {
   loadedModules.clear();
   loadingModules.clear();
   unloginPullStarted = false;
+  resolvedStaticModules = [];
   currentSig = null;
   currentPromise = null;
 }
@@ -334,11 +336,18 @@ async function _initI18n(options) {
   resolvedStores = options.stores;
   resolvedLanguages = _nullishCoalesce(options.languages, () => ( [options.langCode]));
   resolvedModules = _nullishCoalesce(options.modules, () => ( []));
+  resolvedStaticModules = options.staticLocales ? [...new Set(
+    Object.values(options.staticLocales).flatMap((langModules) => Object.keys(langModules))
+  )] : [];
   await storage.ensureStores(resolvedStores);
   await checkCacheVersion(storage, options);
+  const allKnownModules = sortedModules();
   for (const lang of resolvedLanguages) {
-    for (const m of resolvedModules) {
-      _i18next2.default.addResourceBundle(lang, m, getStaticLocale(m, lang), true, false);
+    for (const m of allKnownModules) {
+      const data = getStaticLocale(m, lang);
+      if (Object.keys(data).length > 0) {
+        _i18next2.default.addResourceBundle(lang, m, data, true, false);
+      }
     }
   }
   await injectCurrentLanguageModules(currentLang);
@@ -655,8 +664,9 @@ function buildSig(options) {
   return [options.apiContext.baseURL, options.langCode, cgKeys].join("|");
 }
 function sortedModules() {
-  const priority = PRIORITY_MODULES.filter((m) => resolvedModules.includes(m));
-  const rest = resolvedModules.filter((m) => !PRIORITY_MODULES.includes(m));
+  const all = [.../* @__PURE__ */ new Set([...resolvedStaticModules, ...resolvedModules])];
+  const priority = PRIORITY_MODULES.filter((m) => all.includes(m));
+  const rest = all.filter((m) => !PRIORITY_MODULES.includes(m));
   return [...priority, ...rest];
 }
 function getStaticLocale(moduleCode, langCode) {

package/dist/{chunk-X6D2MZ7M.js → chunk-5VHZCG34.js}

@@ -231,6 +231,7 @@ var currentSig = null;
 var currentPromise = null;
 var resolvedStores = [];
 var resolvedModules = [];
+var resolvedStaticModules = [];
 var resolvedLanguages = [];
 var unloginPullStarted = false;
 var managerOptions = null;
@@ -259,6 +260,7 @@ function closeSSE() {
   loadedModules.clear();
   loadingModules.clear();
   unloginPullStarted = false;
+  resolvedStaticModules = [];
   currentSig = null;
   currentPromise = null;
 }
@@ -334,11 +336,18 @@ async function _initI18n(options) {
   resolvedStores = options.stores;
   resolvedLanguages = options.languages ?? [options.langCode];
   resolvedModules = options.modules ?? [];
+  resolvedStaticModules = options.staticLocales ? [...new Set(
+    Object.values(options.staticLocales).flatMap((langModules) => Object.keys(langModules))
+  )] : [];
   await storage.ensureStores(resolvedStores);
   await checkCacheVersion(storage, options);
+  const allKnownModules = sortedModules();
   for (const lang of resolvedLanguages) {
-    for (const m of resolvedModules) {
-      i18n.addResourceBundle(lang, m, getStaticLocale(m, lang), true, false);
+    for (const m of allKnownModules) {
+      const data = getStaticLocale(m, lang);
+      if (Object.keys(data).length > 0) {
+        i18n.addResourceBundle(lang, m, data, true, false);
+      }
     }
   }
   await injectCurrentLanguageModules(currentLang);
@@ -655,8 +664,9 @@ function buildSig(options) {
   return [options.apiContext.baseURL, options.langCode, cgKeys].join("|");
 }
 function sortedModules() {
-  const priority = PRIORITY_MODULES.filter((m) => resolvedModules.includes(m));
-  const rest = resolvedModules.filter((m) => !PRIORITY_MODULES.includes(m));
+  const all = [.../* @__PURE__ */ new Set([...resolvedStaticModules, ...resolvedModules])];
+  const priority = PRIORITY_MODULES.filter((m) => all.includes(m));
+  const rest = all.filter((m) => !PRIORITY_MODULES.includes(m));
   return [...priority, ...rest];
 }
 function getStaticLocale(moduleCode, langCode) {

package/dist/index.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 
 
@@ -7,7 +7,7 @@ var _chunkAJJKJPNBcjs = require('./chunk-AJJKJPNB.cjs');
 
 
 
-var _chunkJPKSBSEOcjs = require('./chunk-JPKSBSEO.cjs');
+var _chunk2EV6FQILcjs = require('./chunk-2EV6FQIL.cjs');
 
 // src/index.ts
 var _i18next = require('i18next'); var _i18next2 = _interopRequireDefault(_i18next);
@@ -15,17 +15,17 @@ var _reacti18next = require('react-i18next');
 
 // src/storage/indexeddb.ts
 var DB_NAME = "i18n_cache";
-var SCHEMA_VERSION = 2;
 function resourceStoreName(name) {
   return `i18n_resources_${name}`;
 }
 var dbInstance = null;
 var dbOpenPromise = null;
 var dbStoreNames = [];
-function openDB(storeNames) {
+function openDB(storeNames, version) {
   return new Promise((resolve, reject) => {
-    const request = indexedDB.open(DB_NAME, SCHEMA_VERSION);
-    request.onupgradeneeded = (event) => {
+    const req = version !== void 0 ? indexedDB.open(DB_NAME, version) : indexedDB.open(DB_NAME);
+    req.onupgradeneeded = (event) => {
+      if (version === void 0) return;
       const db = event.target.result;
       for (const name of storeNames) {
         const storeName = resourceStoreName(name);
@@ -36,8 +36,8 @@ function openDB(storeNames) {
         }
       }
     };
-    request.onsuccess = () => {
-      const db = request.result;
+    req.onsuccess = () => {
+      const db = req.result;
       db.onversionchange = () => {
         db.close();
         dbInstance = null;
@@ -47,16 +47,23 @@ function openDB(storeNames) {
         dbInstance = null;
         dbOpenPromise = null;
       };
-      resolve(db);
+      const missing = storeNames.filter((n) => !db.objectStoreNames.contains(resourceStoreName(n)));
+      if (missing.length === 0 || version !== void 0) {
+        resolve(db);
+        return;
+      }
+      const nextVersion = db.version + 1;
+      db.close();
+      openDB(storeNames, nextVersion).then(resolve).catch(reject);
     };
-    request.onerror = () => reject(request.error);
-    request.onblocked = () => reject(new Error("[i18n] IndexedDB open blocked"));
+    req.onerror = () => reject(req.error);
+    req.onblocked = () => reject(new Error("[i18n] IndexedDB open blocked"));
   });
 }
-function getDB(storeNames) {
+function getDB() {
   if (dbInstance) return Promise.resolve(dbInstance);
   if (!dbOpenPromise) {
-    dbOpenPromise = openDB(_nullishCoalesce(storeNames, () => ( dbStoreNames))).then((db) => {
+    dbOpenPromise = openDB(dbStoreNames).then((db) => {
       dbInstance = db;
       dbOpenPromise = null;
       return db;
@@ -83,8 +90,31 @@ async function withRetry(fn) {
 }
 var IndexedDBAdapter = class {
   async ensureStores(stores) {
-    dbStoreNames = stores.map((s) => s.name);
-    await getDB(dbStoreNames);
+    const storeNames = stores.map((s) => s.name);
+    dbStoreNames = storeNames;
+    if (dbInstance) {
+      const allExist = storeNames.every(
+        (n) => dbInstance.objectStoreNames.contains(resourceStoreName(n))
+      );
+      if (allExist) return;
+      const nextVersion = dbInstance.version + 1;
+      dbInstance.close();
+      dbInstance = null;
+      dbOpenPromise = null;
+      dbInstance = await openDB(storeNames, nextVersion);
+      return;
+    }
+    if (!dbOpenPromise) {
+      dbOpenPromise = openDB(storeNames).then((db) => {
+        dbInstance = db;
+        dbOpenPromise = null;
+        return db;
+      }).catch((err) => {
+        dbOpenPromise = null;
+        throw err;
+      });
+    }
+    await dbOpenPromise;
   }
   async getRecord(storeName, key) {
     return withRetry(async () => {
@@ -165,7 +195,7 @@ if (!_i18next2.default.isInitialized) {
     }
   });
 }
-var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkJPKSBSEOcjs.createI18nManager.call(void 0, {
+var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunk2EV6FQILcjs.createI18nManager.call(void 0, {
   storage: new IndexedDBAdapter(),
   createWorker: () => new (0, _chunkAJJKJPNBcjs.WebWorkerAdapter)(
     new Worker(new URL("./workers/preload-worker.js", import.meta.url), { type: "module" })
@@ -181,4 +211,4 @@ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } =
 
 
 
-exports.I18N_RESOURCES_UPDATED_EVENT = _chunkJPKSBSEOcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkJPKSBSEOcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n; exports.useDict = _chunkAJJKJPNBcjs.useDict; exports.useTranslation = _chunkAJJKJPNBcjs.useTranslation;
+exports.I18N_RESOURCES_UPDATED_EVENT = _chunk2EV6FQILcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunk2EV6FQILcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n; exports.useDict = _chunkAJJKJPNBcjs.useDict; exports.useTranslation = _chunkAJJKJPNBcjs.useTranslation;

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   I18N_RESOURCES_UPDATED_EVENT,
   createI18nManager,
   emitI18nResourcesUpdated
-} from "./chunk-X6D2MZ7M.js";
+} from "./chunk-5VHZCG34.js";
 
 // src/index.ts
 import i18n from "i18next";
@@ -15,17 +15,17 @@ import { initReactI18next } from "react-i18next";
 
 // src/storage/indexeddb.ts
 var DB_NAME = "i18n_cache";
-var SCHEMA_VERSION = 2;
 function resourceStoreName(name) {
   return `i18n_resources_${name}`;
 }
 var dbInstance = null;
 var dbOpenPromise = null;
 var dbStoreNames = [];
-function openDB(storeNames) {
+function openDB(storeNames, version) {
   return new Promise((resolve, reject) => {
-    const request = indexedDB.open(DB_NAME, SCHEMA_VERSION);
-    request.onupgradeneeded = (event) => {
+    const req = version !== void 0 ? indexedDB.open(DB_NAME, version) : indexedDB.open(DB_NAME);
+    req.onupgradeneeded = (event) => {
+      if (version === void 0) return;
       const db = event.target.result;
       for (const name of storeNames) {
         const storeName = resourceStoreName(name);
@@ -36,8 +36,8 @@ function openDB(storeNames) {
         }
       }
     };
-    request.onsuccess = () => {
-      const db = request.result;
+    req.onsuccess = () => {
+      const db = req.result;
       db.onversionchange = () => {
         db.close();
         dbInstance = null;
@@ -47,16 +47,23 @@ function openDB(storeNames) {
         dbInstance = null;
         dbOpenPromise = null;
       };
-      resolve(db);
+      const missing = storeNames.filter((n) => !db.objectStoreNames.contains(resourceStoreName(n)));
+      if (missing.length === 0 || version !== void 0) {
+        resolve(db);
+        return;
+      }
+      const nextVersion = db.version + 1;
+      db.close();
+      openDB(storeNames, nextVersion).then(resolve).catch(reject);
     };
-    request.onerror = () => reject(request.error);
-    request.onblocked = () => reject(new Error("[i18n] IndexedDB open blocked"));
+    req.onerror = () => reject(req.error);
+    req.onblocked = () => reject(new Error("[i18n] IndexedDB open blocked"));
   });
 }
-function getDB(storeNames) {
+function getDB() {
   if (dbInstance) return Promise.resolve(dbInstance);
   if (!dbOpenPromise) {
-    dbOpenPromise = openDB(storeNames ?? dbStoreNames).then((db) => {
+    dbOpenPromise = openDB(dbStoreNames).then((db) => {
       dbInstance = db;
       dbOpenPromise = null;
       return db;
@@ -83,8 +90,31 @@ async function withRetry(fn) {
 }
 var IndexedDBAdapter = class {
   async ensureStores(stores) {
-    dbStoreNames = stores.map((s) => s.name);
-    await getDB(dbStoreNames);
+    const storeNames = stores.map((s) => s.name);
+    dbStoreNames = storeNames;
+    if (dbInstance) {
+      const allExist = storeNames.every(
+        (n) => dbInstance.objectStoreNames.contains(resourceStoreName(n))
+      );
+      if (allExist) return;
+      const nextVersion = dbInstance.version + 1;
+      dbInstance.close();
+      dbInstance = null;
+      dbOpenPromise = null;
+      dbInstance = await openDB(storeNames, nextVersion);
+      return;
+    }
+    if (!dbOpenPromise) {
+      dbOpenPromise = openDB(storeNames).then((db) => {
+        dbInstance = db;
+        dbOpenPromise = null;
+        return db;
+      }).catch((err) => {
+        dbOpenPromise = null;
+        throw err;
+      });
+    }
+    await dbOpenPromise;
   }
   async getRecord(storeName, key) {
     return withRetry(async () => {

package/dist/mp/index.cjs

@@ -2,7 +2,7 @@
 
 
 
-var _chunkJPKSBSEOcjs = require('../chunk-JPKSBSEO.cjs');
+var _chunk2EV6FQILcjs = require('../chunk-2EV6FQIL.cjs');
 
 // src/storage/wx-sqlite.ts
 var DB_NAME = "i18n_cache";
@@ -181,7 +181,7 @@ function wxFetch(input, init) {
 }
 
 // src/mp/index.ts
-var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkJPKSBSEOcjs.createI18nManager.call(void 0, {
+var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunk2EV6FQILcjs.createI18nManager.call(void 0, {
   storage: new WxSQLiteAdapter(),
   createWorker: () => new WxWorkerAdapter(wx.createWorker("workers/preload-worker-mp.js")),
   fetchFn: wxFetch
@@ -194,4 +194,4 @@ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } =
 
 
 
-exports.I18N_RESOURCES_UPDATED_EVENT = _chunkJPKSBSEOcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkJPKSBSEOcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n;
+exports.I18N_RESOURCES_UPDATED_EVENT = _chunk2EV6FQILcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunk2EV6FQILcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n;

package/dist/mp/index.js

@@ -2,7 +2,7 @@ import {
   I18N_RESOURCES_UPDATED_EVENT,
   createI18nManager,
   emitI18nResourcesUpdated
-} from "../chunk-X6D2MZ7M.js";
+} from "../chunk-5VHZCG34.js";
 
 // src/storage/wx-sqlite.ts
 var DB_NAME = "i18n_cache";

package/dist/native/index.cjs

@@ -7,7 +7,7 @@ var _chunkAJJKJPNBcjs = require('../chunk-AJJKJPNB.cjs');
 
 
 
-var _chunkJPKSBSEOcjs = require('../chunk-JPKSBSEO.cjs');
+var _chunk2EV6FQILcjs = require('../chunk-2EV6FQIL.cjs');
 
 // src/native/index.ts
 var _i18next = require('i18next'); var _i18next2 = _interopRequireDefault(_i18next);
@@ -121,7 +121,7 @@ if (!_i18next2.default.isInitialized) {
     }
   });
 }
-var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkJPKSBSEOcjs.createI18nManager.call(void 0, {
+var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunk2EV6FQILcjs.createI18nManager.call(void 0, {
   storage: new SQLiteAdapter(),
   // Hermes Worker（RN 0.71+），API 与 Web Worker 一致
   createWorker: () => new (0, _chunkAJJKJPNBcjs.WebWorkerAdapter)(
@@ -138,4 +138,4 @@ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } =
 
 
 
-exports.I18N_RESOURCES_UPDATED_EVENT = _chunkJPKSBSEOcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkJPKSBSEOcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n; exports.useDict = _chunkAJJKJPNBcjs.useDict; exports.useTranslation = _chunkAJJKJPNBcjs.useTranslation;
+exports.I18N_RESOURCES_UPDATED_EVENT = _chunk2EV6FQILcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunk2EV6FQILcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n; exports.useDict = _chunkAJJKJPNBcjs.useDict; exports.useTranslation = _chunkAJJKJPNBcjs.useTranslation;

package/dist/native/index.js

@@ -7,7 +7,7 @@ import {
   I18N_RESOURCES_UPDATED_EVENT,
   createI18nManager,
   emitI18nResourcesUpdated
-} from "../chunk-X6D2MZ7M.js";
+} from "../chunk-5VHZCG34.js";
 
 // src/native/index.ts
 import i18n from "i18next";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuo-li/i18n",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Cross-platform i18n library for Web, React Native and WeChat MiniProgram",
   "type": "module",
   "main": "./dist/index.cjs",