@shuo-li/i18n 1.0.3 → 1.0.5

package/dist/{cacheEvents-CDBRPnHU.d.cts → cacheEvents-CSwgzbob.d.cts}

@@ -23,7 +23,7 @@ interface SSEConfig {
     transformMessage?: (raw: unknown) => SSEMessage;
 }
 interface I18nInitOptions {
-    language: string;
+    langCode: string;
     version?: number | string;
     languages?: string[];
     modules?: string[];
@@ -32,7 +32,7 @@ interface I18nInitOptions {
     apiContext: {
         baseURL: string;
         getHeaders: () => Record<string, string>;
-        isLoggedIn: () => boolean;
+        isLoggedIn: boolean;
         unloginPull?: UnloginPullConfig;
         pull?: PullConfig;
         sseSync?: SSESyncConfig;
@@ -88,19 +88,10 @@ interface WorkerTask {
     /** 经 buildParams 映射后的实际请求参数；未提供时 Worker 使用内部字段名 */
     params?: Record<string, unknown>;
 }
-interface WorkerModuleLoadedMessage {
-    type: 'moduleLoaded';
-    storeName: string;
-    langCode: string;
-    moduleCode: string;
-    version: number;
-}
-interface WorkerDataReadyMessage {
-    type: 'dataReady';
-    storeName: string;
-    storeIndex: number;
-    record: ResourceRecord;
+interface WorkerRawDataMessage {
+    type: 'rawData';
     task: WorkerTask;
+    raw: unknown;
 }
 interface WorkerModuleErrorMessage {
     type: 'moduleError';
@@ -115,7 +106,7 @@ interface WorkerErrorMessage {
     type: 'error';
     message?: string;
 }
-type WorkerOutMessage = WorkerModuleLoadedMessage | WorkerDataReadyMessage | WorkerModuleErrorMessage | WorkerDoneMessage | WorkerErrorMessage;
+type WorkerOutMessage = WorkerRawDataMessage | WorkerModuleErrorMessage | WorkerDoneMessage | WorkerErrorMessage;
 interface WorkerLike {
     postMessage(data: unknown): void;
     onMessage(handler: (data: WorkerOutMessage) => void): void;

package/dist/{cacheEvents-CDBRPnHU.d.ts → cacheEvents-CSwgzbob.d.ts}

@@ -23,7 +23,7 @@ interface SSEConfig {
     transformMessage?: (raw: unknown) => SSEMessage;
 }
 interface I18nInitOptions {
-    language: string;
+    langCode: string;
     version?: number | string;
     languages?: string[];
     modules?: string[];
@@ -32,7 +32,7 @@ interface I18nInitOptions {
     apiContext: {
         baseURL: string;
         getHeaders: () => Record<string, string>;
-        isLoggedIn: () => boolean;
+        isLoggedIn: boolean;
         unloginPull?: UnloginPullConfig;
         pull?: PullConfig;
         sseSync?: SSESyncConfig;
@@ -88,19 +88,10 @@ interface WorkerTask {
     /** 经 buildParams 映射后的实际请求参数；未提供时 Worker 使用内部字段名 */
     params?: Record<string, unknown>;
 }
-interface WorkerModuleLoadedMessage {
-    type: 'moduleLoaded';
-    storeName: string;
-    langCode: string;
-    moduleCode: string;
-    version: number;
-}
-interface WorkerDataReadyMessage {
-    type: 'dataReady';
-    storeName: string;
-    storeIndex: number;
-    record: ResourceRecord;
+interface WorkerRawDataMessage {
+    type: 'rawData';
     task: WorkerTask;
+    raw: unknown;
 }
 interface WorkerModuleErrorMessage {
     type: 'moduleError';
@@ -115,7 +106,7 @@ interface WorkerErrorMessage {
     type: 'error';
     message?: string;
 }
-type WorkerOutMessage = WorkerModuleLoadedMessage | WorkerDataReadyMessage | WorkerModuleErrorMessage | WorkerDoneMessage | WorkerErrorMessage;
+type WorkerOutMessage = WorkerRawDataMessage | WorkerModuleErrorMessage | WorkerDoneMessage | WorkerErrorMessage;
 interface WorkerLike {
     postMessage(data: unknown): void;
     onMessage(handler: (data: WorkerOutMessage) => void): void;

package/dist/{chunk-K5VX3COH.cjs → chunk-JPKSBSEO.cjs}

@@ -119,6 +119,56 @@ var SSEClient = class {
   }
 };
 
+// src/core/worker-manager.ts
+var WorkerManager = class {
+  constructor() {
+    this.worker = null;
+    this.pendingCallbacks = /* @__PURE__ */ new Set();
+    this.finalized = false;
+  }
+  start(createWorker, payload, callbacks) {
+    this.terminate();
+    this.finalized = false;
+    this.pendingCallbacks = /* @__PURE__ */ new Set();
+    if (payload.tasks.length === 0) {
+      callbacks.onDone();
+      return;
+    }
+    const worker = createWorker();
+    this.worker = worker;
+    worker.onMessage((msg) => {
+      if (msg.type === "rawData") {
+        const p = callbacks.onRawData(msg.task, msg.raw).catch(() => {
+        });
+        this.pendingCallbacks.add(p);
+        p.finally(() => this.pendingCallbacks.delete(p));
+      } else if (msg.type === "moduleError") {
+        _optionalChain([callbacks, 'access', _7 => _7.onModuleError, 'optionalCall', _8 => _8(msg)]);
+      } else if (msg.type === "done" || msg.type === "error") {
+        if (msg.type === "error") _optionalChain([callbacks, 'access', _9 => _9.onError, 'optionalCall', _10 => _10()]);
+        this.finalize(callbacks);
+      }
+    });
+    worker.postMessage({ type: "start", payload });
+  }
+  terminate() {
+    _optionalChain([this, 'access', _11 => _11.worker, 'optionalAccess', _12 => _12.terminate, 'call', _13 => _13()]);
+    this.worker = null;
+  }
+  isRunning() {
+    return this.worker !== null;
+  }
+  finalize(callbacks) {
+    if (this.finalized) return;
+    this.finalized = true;
+    const pending = [...this.pendingCallbacks];
+    Promise.allSettled(pending).then(() => {
+      this.terminate();
+      callbacks.onDone();
+    });
+  }
+};
+
 // src/core/utils.ts
 function buildKey(moduleCode, langCode, store) {
   return store.cacheGroupKey ? `${moduleCode}_${langCode}_${store.cacheGroupKey}` : `${moduleCode}_${langCode}`;
@@ -162,10 +212,10 @@ function parseI18nValues(values) {
 }
 function toDefaultParams(p) {
   const result = {};
-  if (_optionalChain([p, 'optionalAccess', _7 => _7.storeName])) result["storeName"] = p.storeName;
-  if (_optionalChain([p, 'optionalAccess', _8 => _8.langCode])) result["langCode"] = p.langCode;
-  if (_optionalChain([p, 'optionalAccess', _9 => _9.moduleCode])) result["moduleCode"] = p.moduleCode;
-  if (_optionalChain([p, 'optionalAccess', _10 => _10.version]) != null) result["version"] = String(p.version);
+  if (_optionalChain([p, 'optionalAccess', _14 => _14.storeName])) result["storeName"] = p.storeName;
+  if (_optionalChain([p, 'optionalAccess', _15 => _15.langCode])) result["langCode"] = p.langCode;
+  if (_optionalChain([p, 'optionalAccess', _16 => _16.moduleCode])) result["moduleCode"] = p.moduleCode;
+  if (_optionalChain([p, 'optionalAccess', _17 => _17.version]) != null) result["version"] = String(p.version);
   return result;
 }
 function toQueryString(params) {
@@ -174,89 +224,7 @@ function toQueryString(params) {
   ).toString();
 }
 
-// src/core/worker-manager.ts
-var WorkerManager = class {
-  constructor() {
-    this.worker = null;
-    this.pendingCallbacks = /* @__PURE__ */ new Set();
-    this.finalized = false;
-  }
-  start(createWorker, payload, callbacks, storage) {
-    this.terminate();
-    this.finalized = false;
-    this.pendingCallbacks = /* @__PURE__ */ new Set();
-    if (payload.tasks.length === 0) {
-      callbacks.onDone();
-      return;
-    }
-    const worker = createWorker();
-    this.worker = worker;
-    worker.onMessage((msg) => {
-      if (msg.type === "moduleLoaded") {
-        const m = msg;
-        const p = callbacks.onModuleLoaded({
-          storeName: m.storeName,
-          langCode: m.langCode,
-          moduleCode: m.moduleCode,
-          version: m.version
-        });
-        this.pendingCallbacks.add(p);
-        p.finally(() => this.pendingCallbacks.delete(p));
-      } else if (msg.type === "dataReady") {
-        if (!storage) return;
-        const p = (async () => {
-          const existing = await storage.getRecord(msg.storeName, msg.record.key);
-          if (existing && msg.record.version <= existing.version) return;
-          let resources;
-          if (msg.storeIndex === 0) {
-            resources = deepMerge(
-              _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _11 => _11.resources]), () => ( {})),
-              msg.record.resources
-            );
-          } else {
-            resources = { ..._nullishCoalesce(_optionalChain([existing, 'optionalAccess', _12 => _12.resources]), () => ( {})), ...msg.record.resources };
-          }
-          const mergedRecord = { ...msg.record, resources };
-          await storage.putRecord(msg.storeName, mergedRecord);
-          await callbacks.onModuleLoaded({
-            storeName: msg.task.storeName,
-            langCode: mergedRecord.langCode,
-            moduleCode: mergedRecord.moduleCode,
-            version: mergedRecord.version
-          });
-        })().catch(() => {
-        });
-        this.pendingCallbacks.add(p);
-        p.finally(() => this.pendingCallbacks.delete(p));
-      } else if (msg.type === "moduleError") {
-        _optionalChain([callbacks, 'access', _13 => _13.onModuleError, 'optionalCall', _14 => _14(msg)]);
-      } else if (msg.type === "done" || msg.type === "error") {
-        if (msg.type === "error") _optionalChain([callbacks, 'access', _15 => _15.onError, 'optionalCall', _16 => _16()]);
-        this.finalize(callbacks);
-      }
-    });
-    worker.postMessage({ type: "start", payload });
-  }
-  terminate() {
-    _optionalChain([this, 'access', _17 => _17.worker, 'optionalAccess', _18 => _18.terminate, 'call', _19 => _19()]);
-    this.worker = null;
-  }
-  isRunning() {
-    return this.worker !== null;
-  }
-  finalize(callbacks) {
-    if (this.finalized) return;
-    this.finalized = true;
-    const pending = [...this.pendingCallbacks];
-    Promise.allSettled(pending).then(() => {
-      this.terminate();
-      callbacks.onDone();
-    });
-  }
-};
-
 // src/core/manager.ts
-var DB_NAME = "i18n_cache";
 var PRIORITY_MODULES = ["ENUMS", "CUSTOMER"];
 var currentLang = "zh_CN";
 var currentSig = null;
@@ -301,7 +269,7 @@ async function initI18n(options) {
   currentSig = sig;
   initOptions = options;
   const p = _initI18n(options).then(() => {
-    if (!options.apiContext.isLoggedIn()) {
+    if (!options.apiContext.isLoggedIn) {
       currentPromise = null;
     }
   }).catch((err) => {
@@ -345,7 +313,7 @@ async function getResource(moduleCode, langCode) {
     const result = results[i];
     if (result.status === "rejected") continue;
     const record = result.value;
-    if (!_optionalChain([record, 'optionalAccess', _20 => _20.resources])) continue;
+    if (!_optionalChain([record, 'optionalAccess', _18 => _18.resources])) continue;
     merged = i === 0 ? deepMerge(merged, record.resources) : deepMerge(merged, flatToNested(record.resources));
   }
   return merged;
@@ -362,11 +330,11 @@ async function getAllRecordsByModule(moduleCode) {
 async function _initI18n(options) {
   const { storage } = managerOptions;
   const { apiContext } = options;
-  currentLang = options.language;
+  currentLang = options.langCode;
   resolvedStores = options.stores;
-  resolvedLanguages = _nullishCoalesce(options.languages, () => ( [options.language]));
+  resolvedLanguages = _nullishCoalesce(options.languages, () => ( [options.langCode]));
   resolvedModules = _nullishCoalesce(options.modules, () => ( []));
-  await storage.ensureSchemaVersion(resolvedStores);
+  await storage.ensureStores(resolvedStores);
   await checkCacheVersion(storage, options);
   for (const lang of resolvedLanguages) {
     for (const m of resolvedModules) {
@@ -375,7 +343,7 @@ async function _initI18n(options) {
   }
   await injectCurrentLanguageModules(currentLang);
   await _i18next2.default.changeLanguage(currentLang);
-  if (!apiContext.isLoggedIn()) {
+  if (!apiContext.isLoggedIn) {
     if (!unloginPullStarted && apiContext.unloginPull) {
       unloginPullStarted = true;
       await doUnloginPull(storage, options);
@@ -394,41 +362,55 @@ async function _initI18n(options) {
     startSSE(options);
   }
 }
+var CACHE_VERSION_KEY = "__meta__:cache_version";
 async function checkCacheVersion(storage, options) {
   if (options.version == null) return;
+  const baseStoreName = resolvedStores[0].name;
   const current = String(options.version);
-  const stored = await storage.getMeta("cache_version");
+  const record = await storage.getRecord(baseStoreName, CACHE_VERSION_KEY).catch(() => void 0);
+  const stored = _optionalChain([record, 'optionalAccess', _19 => _19.resources, 'optionalAccess', _20 => _20["value"]]);
   if (stored === current) return;
   for (const store of options.stores) {
     await storage.clearStore(store.name);
   }
-  await storage.setMeta("cache_version", current);
+  await storage.putRecord(baseStoreName, {
+    key: CACHE_VERSION_KEY,
+    moduleCode: "__meta__",
+    langCode: "__meta__",
+    version: 0,
+    resources: { value: current }
+  });
 }
 async function doUnloginPull(storage, options) {
   const { apiContext } = options;
   if (!apiContext.unloginPull) return;
   const baseStore = resolvedStores[0];
+  let blocks;
   try {
-    const blocks = await doFetch(apiContext.unloginPull, options);
-    for (const block of blocks) {
-      for (const mod of _nullishCoalesce(block.modules, () => ( []))) {
-        const key = buildKey(mod.moduleCode, block.langCode, baseStore);
-        const existing = await storage.getRecord(baseStore.name, key);
-        const parsed = parseI18nValues(_nullishCoalesce(mod.i18nValues, () => ( [])));
-        const resources = deepMerge(
-          _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _21 => _21.resources]), () => ( {})),
-          flatToNested(parsed)
-        );
-        await storage.putRecord(baseStore.name, {
-          key,
-          moduleCode: mod.moduleCode,
-          langCode: block.langCode,
-          version: _nullishCoalesce(mod.version, () => ( 0)),
-          resources
-        });
-      }
-    }
+    blocks = await doFetch(apiContext.unloginPull, options);
   } catch (e4) {
+    await injectCurrentLanguageModules(currentLang);
+    await _i18next2.default.changeLanguage(currentLang);
+    emitI18nResourcesUpdated();
+    return;
+  }
+  for (const block of blocks) {
+    for (const mod of _nullishCoalesce(block.modules, () => ( []))) {
+      const key = buildKey(mod.moduleCode, block.langCode, baseStore);
+      const existing = await storage.getRecord(baseStore.name, key);
+      const parsed = parseI18nValues(_nullishCoalesce(mod.i18nValues, () => ( [])));
+      const resources = deepMerge(
+        _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _21 => _21.resources]), () => ( {})),
+        flatToNested(parsed)
+      );
+      await storage.putRecord(baseStore.name, {
+        key,
+        moduleCode: mod.moduleCode,
+        langCode: block.langCode,
+        version: _nullishCoalesce(mod.version, () => ( 0)),
+        resources
+      });
+    }
   }
   await injectCurrentLanguageModules(currentLang);
   await _i18next2.default.changeLanguage(currentLang);
@@ -455,7 +437,7 @@ async function startWorkerFull(options) {
 function runWorker(options, tasks, pull) {
   return new Promise((resolve, reject) => {
     const { apiContext } = options;
-    const workerWritesDB = _nullishCoalesce(managerOptions.workerWritesDB, () => ( false));
+    const storage = managerOptions.storage;
     workerManager.start(
       managerOptions.createWorker,
       {
@@ -463,20 +445,45 @@ function runWorker(options, tasks, pull) {
         headers: apiContext.getHeaders(),
         pullPath: pull.path,
         pullMethod: _nullishCoalesce(pull.method, () => ( "GET")),
-        stores: resolvedStores,
-        tasks,
-        dbName: DB_NAME
+        tasks
       },
       {
-        onModuleLoaded: async (data) => {
-          await onModuleLoaded(data);
+        onRawData: async (task, raw) => {
+          const blocks = pull.transform ? pull.transform(raw) : raw;
+          const store = resolvedStores.find((s) => s.name === task.storeName);
+          if (!store) return;
+          const storeIndex = resolvedStores.indexOf(store);
+          for (const block of blocks) {
+            for (const mod of _nullishCoalesce(block.modules, () => ( []))) {
+              const key = buildKey(mod.moduleCode, block.langCode, store);
+              const existing = await storage.getRecord(store.name, key);
+              if (existing && mod.version <= existing.version) continue;
+              const parsed = parseI18nValues(_nullishCoalesce(mod.i18nValues, () => ( [])));
+              const resources = storeIndex === 0 ? deepMerge(
+                _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _22 => _22.resources]), () => ( {})),
+                flatToNested(parsed)
+              ) : { ..._nullishCoalesce(_optionalChain([existing, 'optionalAccess', _23 => _23.resources]), () => ( {})), ...parsed };
+              await storage.putRecord(store.name, {
+                key,
+                moduleCode: mod.moduleCode,
+                langCode: block.langCode,
+                version: mod.version,
+                resources
+              });
+              await onModuleLoaded({
+                storeName: task.storeName,
+                langCode: block.langCode,
+                moduleCode: mod.moduleCode,
+                version: mod.version
+              });
+            }
+          }
         },
         onModuleError: (_data) => {
         },
         onDone: resolve,
         onError: () => reject(new Error("[i18n] Worker fatal error"))
-      },
-      workerWritesDB ? void 0 : managerOptions.storage
+      }
     );
   });
 }
@@ -493,7 +500,7 @@ async function injectFromDB(moduleCode, langCode) {
     const store = resolvedStores[i];
     const key = buildKey(moduleCode, langCode, store);
     const record = await storage.getRecord(store.name, key);
-    if (!_optionalChain([record, 'optionalAccess', _22 => _22.resources])) continue;
+    if (!_optionalChain([record, 'optionalAccess', _24 => _24.resources])) continue;
     if (i === 0) {
       _i18next2.default.addResourceBundle(langCode, moduleCode, record.resources, true, true);
     } else {
@@ -515,7 +522,7 @@ function startSSE(options) {
   if (!apiContext.sse) return;
   sseClient.start(
     (raw) => {
-      const msg = _optionalChain([apiContext, 'access', _23 => _23.sse, 'optionalAccess', _24 => _24.transformMessage]) ? apiContext.sse.transformMessage(raw) : raw;
+      const msg = _optionalChain([apiContext, 'access', _25 => _25.sse, 'optionalAccess', _26 => _26.transformMessage]) ? apiContext.sse.transformMessage(raw) : raw;
       void handleSSEMessage(msg, options);
     },
     {
@@ -600,16 +607,16 @@ async function pullAndStore(task, fromVersion, options) {
       const storeIndex = resolvedStores.indexOf(store);
       const key = buildKey(mod.moduleCode, block.langCode, store);
       const existing = await storage.getRecord(store.name, key);
-      if (mod.version <= (_nullishCoalesce(_optionalChain([existing, 'optionalAccess', _25 => _25.version]), () => ( 0)))) continue;
+      if (mod.version <= (_nullishCoalesce(_optionalChain([existing, 'optionalAccess', _27 => _27.version]), () => ( 0)))) continue;
       let resources;
       const parsed = parseI18nValues(_nullishCoalesce(mod.i18nValues, () => ( [])));
       if (storeIndex === 0) {
         resources = deepMerge(
-          _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _26 => _26.resources]), () => ( {})),
+          _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _28 => _28.resources]), () => ( {})),
           flatToNested(parsed)
         );
       } else {
-        resources = { ..._nullishCoalesce(_optionalChain([existing, 'optionalAccess', _27 => _27.resources]), () => ( {})), ...parsed };
+        resources = { ..._nullishCoalesce(_optionalChain([existing, 'optionalAccess', _29 => _29.resources]), () => ( {})), ...parsed };
       }
       const version = Math.max(mod.version, task.targetVersion);
       await storage.putRecord(store.name, {
@@ -645,7 +652,7 @@ async function doFetch(config, options, internalParams) {
 }
 function buildSig(options) {
   const cgKeys = options.stores.map((s) => _nullishCoalesce(s.cacheGroupKey, () => ( ""))).join(",");
-  return [options.apiContext.baseURL, options.language, cgKeys].join("|");
+  return [options.apiContext.baseURL, options.langCode, cgKeys].join("|");
 }
 function sortedModules() {
   const priority = PRIORITY_MODULES.filter((m) => resolvedModules.includes(m));
@@ -653,13 +660,13 @@ function sortedModules() {
   return [...priority, ...rest];
 }
 function getStaticLocale(moduleCode, langCode) {
-  return _nullishCoalesce(_optionalChain([initOptions, 'optionalAccess', _28 => _28.staticLocales, 'optionalAccess', _29 => _29[langCode], 'optionalAccess', _30 => _30[moduleCode]]), () => ( {}));
+  return _nullishCoalesce(_optionalChain([initOptions, 'optionalAccess', _30 => _30.staticLocales, 'optionalAccess', _31 => _31[langCode], 'optionalAccess', _32 => _32[moduleCode]]), () => ( {}));
 }
 async function getStoredVersion(store, moduleCode, langCode) {
   const storage = managerOptions.storage;
   const key = buildKey(moduleCode, langCode, store);
   const record = await storage.getRecord(store.name, key);
-  return _nullishCoalesce(_optionalChain([record, 'optionalAccess', _31 => _31.version]), () => ( 0));
+  return _nullishCoalesce(_optionalChain([record, 'optionalAccess', _33 => _33.version]), () => ( 0));
 }