@shuo-li/i18n 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/{chunk-2GMRPNQB.js → chunk-BE3XDO7H.js} +20 -16
  2. package/dist/{chunk-EYLGQY2X.cjs → chunk-VKQL65NM.cjs} +20 -16
  3. package/dist/index.cjs +3 -3
  4. package/dist/index.js +1 -1
  5. package/dist/mp/index.cjs +3 -3
  6. package/dist/mp/index.js +1 -1
  7. package/dist/native/index.cjs +3 -3
  8. package/dist/native/index.js +1 -1
  9. package/package.json +1 -1
package/dist/{chunk-2GMRPNQB.js → chunk-BE3XDO7H.js} RENAMED
@@ -123,9 +123,6 @@ var SSEClient = class {
123
123
  function buildKey(moduleCode, langCode, store) {
124
124
  return store.cacheGroupKey ? `${moduleCode}_${langCode}_${store.cacheGroupKey}` : `${moduleCode}_${langCode}`;
125
125
  }
126
- function buildUnloginKey(langCode) {
127
- return `UNLOGIN_${langCode}`;
128
- }
129
126
  function flatToNested(flat) {
130
127
  const result = {};
131
128
  for (const [key, value] of Object.entries(flat)) {
@@ -303,12 +300,17 @@ async function initI18n(options) {
303
300
  if (currentPromise) closeSSE();
304
301
  currentSig = sig;
305
302
  initOptions = options;
306
- currentPromise = _initI18n(options).catch((err) => {
303
+ const p = _initI18n(options).then(() => {
304
+ if (!options.apiContext.isLoggedIn()) {
305
+ currentPromise = null;
306
+ }
307
+ }).catch((err) => {
307
308
  currentSig = null;
308
309
  currentPromise = null;
309
310
  throw err;
310
311
  });
311
- return currentPromise;
312
+ currentPromise = p;
313
+ return p;
312
314
  }
313
315
  async function ensureModules(moduleCodes) {
314
316
  const toLoad = moduleCodes.filter((m) => {
@@ -404,28 +406,30 @@ async function checkCacheVersion(storage, options) {
404
406
  async function doUnloginPull(storage, options) {
405
407
  const { apiContext } = options;
406
408
  if (!apiContext.unloginPull) return;
407
- const unloginStoreName = resolvedStores[0].name;
409
+ const baseStore = resolvedStores[0];
408
410
  try {
409
411
  const blocks = await doFetch(apiContext.unloginPull, options);
410
412
  for (const block of blocks) {
411
413
  for (const mod of block.modules ?? []) {
412
- if (mod.moduleCode !== "UNLOGIN") continue;
413
- await storage.putRecord(unloginStoreName, {
414
- key: buildUnloginKey(block.langCode),
415
- moduleCode: "UNLOGIN",
414
+ const key = buildKey(mod.moduleCode, block.langCode, baseStore);
415
+ const existing = await storage.getRecord(baseStore.name, key);
416
+ const parsed = parseI18nValues(mod.i18nValues ?? []);
417
+ const resources = deepMerge(
418
+ existing?.resources ?? {},
419
+ flatToNested(parsed)
420
+ );
421
+ await storage.putRecord(baseStore.name, {
422
+ key,
423
+ moduleCode: mod.moduleCode,
416
424
  langCode: block.langCode,
417
425
  version: mod.version ?? 0,
418
- resources: flatToNested(parseI18nValues(mod.i18nValues ?? []))
426
+ resources
419
427
  });
420
428
  }
421
429
  }
422
430
  } catch {
423
431
  }
424
- i18n.addResourceBundle(currentLang, "UNLOGIN", getStaticLocale("UNLOGIN", currentLang), true, false);
425
- const dbUnlogin = await storage.getRecord(unloginStoreName, buildUnloginKey(currentLang));
426
- if (dbUnlogin?.resources) {
427
- i18n.addResourceBundle(currentLang, "UNLOGIN", dbUnlogin.resources, true, true);
428
- }
432
+ await injectCurrentLanguageModules(currentLang);
429
433
  await i18n.changeLanguage(currentLang);
430
434
  emitI18nResourcesUpdated();
431
435
  }
package/dist/{chunk-EYLGQY2X.cjs → chunk-VKQL65NM.cjs} RENAMED
@@ -123,9 +123,6 @@ var SSEClient = class {
123
123
  function buildKey(moduleCode, langCode, store) {
124
124
  return store.cacheGroupKey ? `${moduleCode}_${langCode}_${store.cacheGroupKey}` : `${moduleCode}_${langCode}`;
125
125
  }
126
- function buildUnloginKey(langCode) {
127
- return `UNLOGIN_${langCode}`;
128
- }
129
126
  function flatToNested(flat) {
130
127
  const result = {};
131
128
  for (const [key, value] of Object.entries(flat)) {
@@ -303,12 +300,17 @@ async function initI18n(options) {
303
300
  if (currentPromise) closeSSE();
304
301
  currentSig = sig;
305
302
  initOptions = options;
306
- currentPromise = _initI18n(options).catch((err) => {
303
+ const p = _initI18n(options).then(() => {
304
+ if (!options.apiContext.isLoggedIn()) {
305
+ currentPromise = null;
306
+ }
307
+ }).catch((err) => {
307
308
  currentSig = null;
308
309
  currentPromise = null;
309
310
  throw err;
310
311
  });
311
- return currentPromise;
312
+ currentPromise = p;
313
+ return p;
312
314
  }
313
315
  async function ensureModules(moduleCodes) {
314
316
  const toLoad = moduleCodes.filter((m) => {
@@ -404,28 +406,30 @@ async function checkCacheVersion(storage, options) {
404
406
  async function doUnloginPull(storage, options) {
405
407
  const { apiContext } = options;
406
408
  if (!apiContext.unloginPull) return;
407
- const unloginStoreName = resolvedStores[0].name;
409
+ const baseStore = resolvedStores[0];
408
410
  try {
409
411
  const blocks = await doFetch(apiContext.unloginPull, options);
410
412
  for (const block of blocks) {
411
413
  for (const mod of _nullishCoalesce(block.modules, () => ( []))) {
412
- if (mod.moduleCode !== "UNLOGIN") continue;
413
- await storage.putRecord(unloginStoreName, {
414
- key: buildUnloginKey(block.langCode),
415
- moduleCode: "UNLOGIN",
414
+ const key = buildKey(mod.moduleCode, block.langCode, baseStore);
415
+ const existing = await storage.getRecord(baseStore.name, key);
416
+ const parsed = parseI18nValues(_nullishCoalesce(mod.i18nValues, () => ( [])));
417
+ const resources = deepMerge(
418
+ _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _21 => _21.resources]), () => ( {})),
419
+ flatToNested(parsed)
420
+ );
421
+ await storage.putRecord(baseStore.name, {
422
+ key,
423
+ moduleCode: mod.moduleCode,
416
424
  langCode: block.langCode,
417
425
  version: _nullishCoalesce(mod.version, () => ( 0)),
418
- resources: flatToNested(parseI18nValues(_nullishCoalesce(mod.i18nValues, () => ( []))))
426
+ resources
419
427
  });
420
428
  }
421
429
  }
422
430
  } catch (e4) {
423
431
  }
424
- _i18next2.default.addResourceBundle(currentLang, "UNLOGIN", getStaticLocale("UNLOGIN", currentLang), true, false);
425
- const dbUnlogin = await storage.getRecord(unloginStoreName, buildUnloginKey(currentLang));
426
- if (_optionalChain([dbUnlogin, 'optionalAccess', _21 => _21.resources])) {
427
- _i18next2.default.addResourceBundle(currentLang, "UNLOGIN", dbUnlogin.resources, true, true);
428
- }
432
+ await injectCurrentLanguageModules(currentLang);
429
433
  await _i18next2.default.changeLanguage(currentLang);
430
434
  emitI18nResourcesUpdated();
431
435
  }
package/dist/index.cjs CHANGED
@@ -7,7 +7,7 @@ var _chunkAJJKJPNBcjs = require('./chunk-AJJKJPNB.cjs');
7
7
 
8
8
 
9
9
 
10
- var _chunkEYLGQY2Xcjs = require('./chunk-EYLGQY2X.cjs');
10
+ var _chunkVKQL65NMcjs = require('./chunk-VKQL65NM.cjs');
11
11
 
12
12
  // src/index.ts
13
13
  var _i18next = require('i18next'); var _i18next2 = _interopRequireDefault(_i18next);
@@ -203,7 +203,7 @@ if (!_i18next2.default.isInitialized) {
203
203
  }
204
204
  });
205
205
  }
206
- var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkEYLGQY2Xcjs.createI18nManager.call(void 0, {
206
+ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkVKQL65NMcjs.createI18nManager.call(void 0, {
207
207
  storage: new IndexedDBAdapter(),
208
208
  workerWritesDB: true,
209
209
  createWorker: () => new (0, _chunkAJJKJPNBcjs.WebWorkerAdapter)(
@@ -220,4 +220,4 @@ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } =
220
220
 
221
221
 
222
222
 
223
- exports.I18N_RESOURCES_UPDATED_EVENT = _chunkEYLGQY2Xcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkEYLGQY2Xcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n; exports.useDict = _chunkAJJKJPNBcjs.useDict; exports.useTranslation = _chunkAJJKJPNBcjs.useTranslation;
223
+ exports.I18N_RESOURCES_UPDATED_EVENT = _chunkVKQL65NMcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkVKQL65NMcjs.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 CHANGED
@@ -7,7 +7,7 @@ import {
7
7
  I18N_RESOURCES_UPDATED_EVENT,
8
8
  createI18nManager,
9
9
  emitI18nResourcesUpdated
10
- } from "./chunk-2GMRPNQB.js";
10
+ } from "./chunk-BE3XDO7H.js";
11
11
 
12
12
  // src/index.ts
13
13
  import i18n from "i18next";
package/dist/mp/index.cjs CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
 
4
4
 
5
- var _chunkEYLGQY2Xcjs = require('../chunk-EYLGQY2X.cjs');
5
+ var _chunkVKQL65NMcjs = require('../chunk-VKQL65NM.cjs');
6
6
 
7
7
  // src/storage/wx-sqlite.ts
8
8
  var DB_NAME = "i18n_cache";
@@ -215,7 +215,7 @@ function wxFetch(input, init) {
215
215
  }
216
216
 
217
217
  // src/mp/index.ts
218
- var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkEYLGQY2Xcjs.createI18nManager.call(void 0, {
218
+ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkVKQL65NMcjs.createI18nManager.call(void 0, {
219
219
  storage: new WxSQLiteAdapter(),
220
220
  createWorker: () => new WxWorkerAdapter(wx.createWorker("workers/preload-worker-mp.js")),
221
221
  fetchFn: wxFetch
@@ -228,4 +228,4 @@ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } =
228
228
 
229
229
 
230
230
 
231
- exports.I18N_RESOURCES_UPDATED_EVENT = _chunkEYLGQY2Xcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkEYLGQY2Xcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n;
231
+ exports.I18N_RESOURCES_UPDATED_EVENT = _chunkVKQL65NMcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkVKQL65NMcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n;
package/dist/mp/index.js CHANGED
@@ -2,7 +2,7 @@ import {
2
2
  I18N_RESOURCES_UPDATED_EVENT,
3
3
  createI18nManager,
4
4
  emitI18nResourcesUpdated
5
- } from "../chunk-2GMRPNQB.js";
5
+ } from "../chunk-BE3XDO7H.js";
6
6
 
7
7
  // src/storage/wx-sqlite.ts
8
8
  var DB_NAME = "i18n_cache";
package/dist/native/index.cjs CHANGED
@@ -7,7 +7,7 @@ var _chunkAJJKJPNBcjs = require('../chunk-AJJKJPNB.cjs');
7
7
 
8
8
 
9
9
 
10
- var _chunkEYLGQY2Xcjs = require('../chunk-EYLGQY2X.cjs');
10
+ var _chunkVKQL65NMcjs = require('../chunk-VKQL65NM.cjs');
11
11
 
12
12
  // src/native/index.ts
13
13
  var _i18next = require('i18next'); var _i18next2 = _interopRequireDefault(_i18next);
@@ -155,7 +155,7 @@ if (!_i18next2.default.isInitialized) {
155
155
  }
156
156
  });
157
157
  }
158
- var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkEYLGQY2Xcjs.createI18nManager.call(void 0, {
158
+ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } = _chunkVKQL65NMcjs.createI18nManager.call(void 0, {
159
159
  storage: new SQLiteAdapter(),
160
160
  // Hermes Worker（RN 0.71+），API 与 Web Worker 一致
161
161
  createWorker: () => new (0, _chunkAJJKJPNBcjs.WebWorkerAdapter)(
@@ -172,4 +172,4 @@ var { initI18n, closeSSE, ensureModules, getResource, getAllRecordsByModule } =
172
172
 
173
173
 
174
174
 
175
- exports.I18N_RESOURCES_UPDATED_EVENT = _chunkEYLGQY2Xcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkEYLGQY2Xcjs.emitI18nResourcesUpdated; exports.ensureModules = ensureModules; exports.getAllRecordsByModule = getAllRecordsByModule; exports.getResource = getResource; exports.initI18n = initI18n; exports.useDict = _chunkAJJKJPNBcjs.useDict; exports.useTranslation = _chunkAJJKJPNBcjs.useTranslation;
175
+ exports.I18N_RESOURCES_UPDATED_EVENT = _chunkVKQL65NMcjs.I18N_RESOURCES_UPDATED_EVENT; exports.closeSSE = closeSSE; exports.emitI18nResourcesUpdated = _chunkVKQL65NMcjs.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 CHANGED
@@ -7,7 +7,7 @@ import {
7
7
  I18N_RESOURCES_UPDATED_EVENT,
8
8
  createI18nManager,
9
9
  emitI18nResourcesUpdated
10
- } from "../chunk-2GMRPNQB.js";
10
+ } from "../chunk-BE3XDO7H.js";
11
11
 
12
12
  // src/native/index.ts
13
13
  import i18n from "i18next";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shuo-li/i18n",
3
- "version": "1.0.1",
3
+ "version": "1.0.2",
4
4
  "description": "Cross-platform i18n library for Web, React Native and WeChat MiniProgram",
5
5
  "type": "module",
6
6
  "main": "./dist/index.cjs",