@shuo-li/i18n 1.1.0 → 1.2.0

package/dist/{cacheEvents-DAFvp5or.d.cts → cacheEvents-BwXBBuex.d.cts}

@@ -39,20 +39,22 @@ interface I18nInitOptions {
         sse?: SSEConfig;
     };
 }
+interface I18nValue {
+    termCode?: string;
+    langValue?: string;
+}
 interface PullLangBlock {
     langCode: string;
     modules: Array<{
         moduleCode: string;
         version: number;
-        /** transform 函数返回的最终资源对象，直接写入 DB 和 i18next */
-        resources: Record<string, unknown>;
+        i18nValues: I18nValue[];
     }>;
 }
 interface SSEMessage {
     type: string;
     langCode: string;
     moduleCode: string;
-    /** SSE 消息携带的数据版本号，与本地 version 对比决定是否拉取 */
     version: number;
     storeName: string;
 }
@@ -71,7 +73,6 @@ interface ResourceRecord {
     key: string;
     moduleCode: string;
     langCode: string;
-    /** 当前已存储数据的版本号（对应旧的 toSynTime） */
     version: number;
     resources: Record<string, unknown>;
 }
@@ -81,6 +82,8 @@ interface WorkerTask {
     moduleCode?: string;
     /** 全量拉取时为 0；SSE 增量拉取时为本地已有版本号 */
     version?: number;
+    /** 唯一标识，用于主线程回传 parsedData 时关联任务（Web 模式下必须） */
+    taskId?: number;
     trigger?: 'init-full' | 'sse';
     /** 经 buildParams 映射后的实际请求参数；未提供时 Worker 使用内部字段名 */
     params?: Record<string, unknown>;
@@ -90,6 +93,14 @@ interface WorkerRawDataMessage {
     task: WorkerTask;
     raw: unknown;
 }
+/** Worker 写入一个模块后通知主线程（Web 模式，Worker 写 IDB） */
+interface WorkerModuleLoadedMessage {
+    type: 'moduleLoaded';
+    storeName: string;
+    moduleCode: string;
+    langCode: string;
+    version: number;
+}
 interface WorkerModuleErrorMessage {
     type: 'moduleError';
     storeName: string;
@@ -103,7 +114,7 @@ interface WorkerErrorMessage {
     type: 'error';
     message?: string;
 }
-type WorkerOutMessage = WorkerRawDataMessage | WorkerModuleErrorMessage | WorkerDoneMessage | WorkerErrorMessage;
+type WorkerOutMessage = WorkerRawDataMessage | WorkerModuleLoadedMessage | WorkerModuleErrorMessage | WorkerDoneMessage | WorkerErrorMessage;
 interface WorkerLike {
     postMessage(data: unknown): void;
     onMessage(handler: (data: WorkerOutMessage) => void): void;
@@ -119,4 +130,4 @@ declare function getAllRecordsByModule(moduleCode: string): Promise<ResourceReco
 declare const I18N_RESOURCES_UPDATED_EVENT = "golucky:i18n-resources-updated";
 declare function emitI18nResourcesUpdated(): void;
 
-export { I18N_RESOURCES_UPDATED_EVENT as I, type PullLangBlock as P, type ResourceRecord as R, type SSEMessage as S, type WorkerLike as W, getResource as a, type I18nInitOptions as b, closeSSE as c, type StandardPullParams as d, ensureModules as e, type StoreConfig as f, getAllRecordsByModule as g, emitI18nResourcesUpdated as h, initI18n as i };
+export { I18N_RESOURCES_UPDATED_EVENT as I, type PullLangBlock as P, type ResourceRecord as R, type SSEMessage as S, type WorkerLike as W, getResource as a, type I18nInitOptions as b, closeSSE as c, type StandardPullParams as d, ensureModules as e, type StoreConfig as f, getAllRecordsByModule as g, emitI18nResourcesUpdated as h, initI18n as i, type I18nValue as j };

package/dist/{cacheEvents-DAFvp5or.d.ts → cacheEvents-BwXBBuex.d.ts}

@@ -39,20 +39,22 @@ interface I18nInitOptions {
         sse?: SSEConfig;
     };
 }
+interface I18nValue {
+    termCode?: string;
+    langValue?: string;
+}
 interface PullLangBlock {
     langCode: string;
     modules: Array<{
         moduleCode: string;
         version: number;
-        /** transform 函数返回的最终资源对象，直接写入 DB 和 i18next */
-        resources: Record<string, unknown>;
+        i18nValues: I18nValue[];
     }>;
 }
 interface SSEMessage {
     type: string;
     langCode: string;
     moduleCode: string;
-    /** SSE 消息携带的数据版本号，与本地 version 对比决定是否拉取 */
     version: number;
     storeName: string;
 }
@@ -71,7 +73,6 @@ interface ResourceRecord {
     key: string;
     moduleCode: string;
     langCode: string;
-    /** 当前已存储数据的版本号（对应旧的 toSynTime） */
     version: number;
     resources: Record<string, unknown>;
 }
@@ -81,6 +82,8 @@ interface WorkerTask {
     moduleCode?: string;
     /** 全量拉取时为 0；SSE 增量拉取时为本地已有版本号 */
     version?: number;
+    /** 唯一标识，用于主线程回传 parsedData 时关联任务（Web 模式下必须） */
+    taskId?: number;
     trigger?: 'init-full' | 'sse';
     /** 经 buildParams 映射后的实际请求参数；未提供时 Worker 使用内部字段名 */
     params?: Record<string, unknown>;
@@ -90,6 +93,14 @@ interface WorkerRawDataMessage {
     task: WorkerTask;
     raw: unknown;
 }
+/** Worker 写入一个模块后通知主线程（Web 模式，Worker 写 IDB） */
+interface WorkerModuleLoadedMessage {
+    type: 'moduleLoaded';
+    storeName: string;
+    moduleCode: string;
+    langCode: string;
+    version: number;
+}
 interface WorkerModuleErrorMessage {
     type: 'moduleError';
     storeName: string;
@@ -103,7 +114,7 @@ interface WorkerErrorMessage {
     type: 'error';
     message?: string;
 }
-type WorkerOutMessage = WorkerRawDataMessage | WorkerModuleErrorMessage | WorkerDoneMessage | WorkerErrorMessage;
+type WorkerOutMessage = WorkerRawDataMessage | WorkerModuleLoadedMessage | WorkerModuleErrorMessage | WorkerDoneMessage | WorkerErrorMessage;
 interface WorkerLike {
     postMessage(data: unknown): void;
     onMessage(handler: (data: WorkerOutMessage) => void): void;
@@ -119,4 +130,4 @@ declare function getAllRecordsByModule(moduleCode: string): Promise<ResourceReco
 declare const I18N_RESOURCES_UPDATED_EVENT = "golucky:i18n-resources-updated";
 declare function emitI18nResourcesUpdated(): void;
 
-export { I18N_RESOURCES_UPDATED_EVENT as I, type PullLangBlock as P, type ResourceRecord as R, type SSEMessage as S, type WorkerLike as W, getResource as a, type I18nInitOptions as b, closeSSE as c, type StandardPullParams as d, ensureModules as e, type StoreConfig as f, getAllRecordsByModule as g, emitI18nResourcesUpdated as h, initI18n as i };
+export { I18N_RESOURCES_UPDATED_EVENT as I, type PullLangBlock as P, type ResourceRecord as R, type SSEMessage as S, type WorkerLike as W, getResource as a, type I18nInitOptions as b, closeSSE as c, type StandardPullParams as d, ensureModules as e, type StoreConfig as f, getAllRecordsByModule as g, emitI18nResourcesUpdated as h, initI18n as i, type I18nValue as j };

package/dist/{chunk-LZQP6OHB.js → chunk-FFIQQFC4.js}

@@ -1,3 +1,12 @@
+import {
+  buildKey,
+  deepMerge,
+  flatToNested,
+  parseI18nValues,
+  toDefaultParams,
+  toQueryString
+} from "./chunk-NEXKR7GY.js";
+
 // src/core/cacheEvents.ts
 var I18N_RESOURCES_UPDATED_EVENT = "golucky:i18n-resources-updated";
 function emitI18nResourcesUpdated() {
@@ -5,52 +14,6 @@ function emitI18nResourcesUpdated() {
   window.dispatchEvent(new CustomEvent(I18N_RESOURCES_UPDATED_EVENT));
 }
 
-// src/core/utils.ts
-function buildKey(moduleCode, langCode, store) {
-  return store.cacheGroupKey ? `${moduleCode}_${langCode}_${store.cacheGroupKey}` : `${moduleCode}_${langCode}`;
-}
-function flatToNested(flat) {
-  const result = {};
-  for (const [key, value] of Object.entries(flat)) {
-    const parts = key.split(".");
-    let cur = result;
-    for (let i = 0; i < parts.length - 1; i++) {
-      const part = parts[i];
-      if (typeof cur[part] !== "object" || cur[part] === null) {
-        cur[part] = {};
-      }
-      cur = cur[part];
-    }
-    cur[parts[parts.length - 1]] = value;
-  }
-  return result;
-}
-function deepMerge(target, source) {
-  const result = { ...target };
-  for (const [key, sv] of Object.entries(source)) {
-    const tv = result[key];
-    if (sv !== null && typeof sv === "object" && !Array.isArray(sv) && tv !== null && typeof tv === "object" && !Array.isArray(tv)) {
-      result[key] = deepMerge(tv, sv);
-    } else {
-      result[key] = sv;
-    }
-  }
-  return result;
-}
-function toDefaultParams(p) {
-  const result = {};
-  if (p?.storeName) result["storeName"] = p.storeName;
-  if (p?.langCode) result["langCode"] = p.langCode;
-  if (p?.moduleCode) result["moduleCode"] = p.moduleCode;
-  if (p?.version != null) result["version"] = String(p.version);
-  return result;
-}
-function toQueryString(params) {
-  return new URLSearchParams(
-    Object.entries(params).filter(([, v]) => v != null).map(([k, v]) => [k, String(v)])
-  ).toString();
-}
-
 // src/core/manager.ts
 import i18n from "i18next";
 
@@ -182,12 +145,31 @@ var WorkerManager = class {
     }
     const worker = createWorker();
     this.worker = worker;
+    const workerWritesDB = typeof callbacks.transformRaw === "function";
     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));
+        if (workerWritesDB && callbacks.transformRaw) {
+          let blocks;
+          try {
+            blocks = callbacks.transformRaw(msg.task, msg.raw);
+          } catch (err) {
+            console.error("[i18n] transform failed", msg.task, err);
+            blocks = [];
+          }
+          worker.postMessage({ type: "parsedData", taskId: msg.task.taskId, blocks });
+        } else if (callbacks.onRawData) {
+          const p = callbacks.onRawData(msg.task, msg.raw).catch(() => {
+          });
+          this.pendingCallbacks.add(p);
+          p.finally(() => this.pendingCallbacks.delete(p));
+        }
+      } else if (msg.type === "moduleLoaded") {
+        if (callbacks.onModuleLoaded) {
+          const p = callbacks.onModuleLoaded(msg).catch(() => {
+          });
+          this.pendingCallbacks.add(p);
+          p.finally(() => this.pendingCallbacks.delete(p));
+        }
       } else if (msg.type === "moduleError") {
         callbacks.onModuleError?.(msg);
       } else if (msg.type === "done" || msg.type === "error") {
@@ -227,6 +209,7 @@ var resolvedLanguages = [];
 var unloginPullStarted = false;
 var managerOptions = null;
 var initOptions = null;
+var taskIdCounter = 0;
 var loadedModules = /* @__PURE__ */ new Set();
 var loadingModules = /* @__PURE__ */ new Set();
 var sseClient = new SSEClient();
@@ -363,24 +346,15 @@ 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 record = await storage.getRecord(baseStoreName, CACHE_VERSION_KEY).catch(() => void 0);
-  const stored = record?.resources?.["value"];
+  const stored = await storage.getMeta("cache_version").catch(() => null);
   if (stored === current) return;
   for (const store of options.stores) {
     await storage.clearStore(store.name);
   }
-  await storage.putRecord(baseStoreName, {
-    key: CACHE_VERSION_KEY,
-    moduleCode: "__meta__",
-    langCode: "__meta__",
-    version: 0,
-    resources: { value: current }
-  });
+  await storage.setMeta("cache_version", current);
 }
 async function doUnloginPull(storage, options) {
   const { apiContext } = options;
@@ -398,9 +372,10 @@ async function doUnloginPull(storage, options) {
     for (const mod of block.modules ?? []) {
       const key = buildKey(mod.moduleCode, block.langCode, baseStore);
       const existing = await storage.getRecord(baseStore.name, key);
+      const flat = parseI18nValues(mod.i18nValues);
       const resources = deepMerge(
         existing?.resources ?? {},
-        mod.resources
+        flatToNested(flat)
       );
       await storage.putRecord(baseStore.name, {
         key,
@@ -420,16 +395,13 @@ async function startWorkerFull(options) {
   const pull = apiContext.pull;
   const tasks = [];
   for (const store of resolvedStores) {
-    for (const lang of resolvedLanguages) {
-      for (const module of sortedModules()) {
-        const internal = { storeName: store.name, langCode: lang, moduleCode: module, version: 0 };
-        tasks.push({
-          ...internal,
-          trigger: "init-full",
-          params: pull.buildParams ? pull.buildParams(internal) : void 0
-        });
-      }
-    }
+    const internal = { storeName: store.name };
+    tasks.push({
+      storeName: store.name,
+      taskId: ++taskIdCounter,
+      trigger: "init-full",
+      params: pull.buildParams ? pull.buildParams(internal) : void 0
+    });
   }
   await runWorker(options, tasks, pull);
 }
@@ -437,16 +409,35 @@ function runWorker(options, tasks, pull) {
   return new Promise((resolve, reject) => {
     const { apiContext } = options;
     const storage = managerOptions.storage;
-    workerManager.start(
-      managerOptions.createWorker,
-      {
-        baseURL: apiContext.baseURL,
-        headers: apiContext.getHeaders(),
-        pullPath: pull.path,
-        pullMethod: pull.method ?? "GET",
-        tasks
-      },
-      {
+    const workerWritesDB = managerOptions.workerWritesDB ?? false;
+    const payload = {
+      baseURL: apiContext.baseURL,
+      headers: apiContext.getHeaders(),
+      pullPath: pull.path,
+      pullMethod: pull.method ?? "GET",
+      tasks,
+      ...workerWritesDB ? { storeConfigs: resolvedStores } : {}
+    };
+    if (workerWritesDB) {
+      workerManager.start(managerOptions.createWorker, payload, {
+        transformRaw: (task, raw) => {
+          try {
+            return pull.transform ? pull.transform(raw) : raw;
+          } catch (err) {
+            console.error("[i18n] pull transform \u5931\u8D25", task, err);
+            return [];
+          }
+        },
+        onModuleLoaded: async (info) => {
+          await onModuleLoaded(info);
+        },
+        onModuleError: () => {
+        },
+        onDone: resolve,
+        onError: () => reject(new Error("[i18n] Worker fatal error"))
+      });
+    } else {
+      workerManager.start(managerOptions.createWorker, payload, {
         onRawData: async (task, raw) => {
           let blocks;
           try {
@@ -463,7 +454,8 @@ function runWorker(options, tasks, pull) {
               const key = buildKey(mod.moduleCode, block.langCode, store);
               const existing = await storage.getRecord(store.name, key);
               if (existing && mod.version <= existing.version) continue;
-              const resources = storeIndex === 0 ? deepMerge(existing?.resources ?? {}, mod.resources) : { ...existing?.resources ?? {}, ...mod.resources };
+              const flat = parseI18nValues(mod.i18nValues);
+              const resources = storeIndex === 0 ? deepMerge(existing?.resources ?? {}, flatToNested(flat)) : { ...existing?.resources ?? {}, ...flat };
               await storage.putRecord(store.name, {
                 key,
                 moduleCode: mod.moduleCode,
@@ -473,19 +465,19 @@ function runWorker(options, tasks, pull) {
               });
               await onModuleLoaded({
                 storeName: task.storeName,
-                langCode: block.langCode,
                 moduleCode: mod.moduleCode,
+                langCode: block.langCode,
                 version: mod.version
               });
             }
           }
         },
-        onModuleError: (_data) => {
+        onModuleError: () => {
         },
         onDone: resolve,
         onError: () => reject(new Error("[i18n] Worker fatal error"))
-      }
-    );
+      });
+    }
   });
 }
 async function onModuleLoaded(data) {
@@ -609,7 +601,8 @@ async function pullAndStore(task, fromVersion, options) {
       const key = buildKey(mod.moduleCode, block.langCode, store);
       const existing = await storage.getRecord(store.name, key);
       if (mod.version <= (existing?.version ?? 0)) continue;
-      const resources = storeIndex === 0 ? deepMerge(existing?.resources ?? {}, mod.resources) : { ...existing?.resources ?? {}, ...mod.resources };
+      const flat = parseI18nValues(mod.i18nValues);
+      const resources = storeIndex === 0 ? deepMerge(existing?.resources ?? {}, flatToNested(flat)) : { ...existing?.resources ?? {}, ...flat };
       const version = Math.max(mod.version, task.targetVersion);
       await storage.putRecord(store.name, {
         key,
@@ -665,7 +658,5 @@ async function getStoredVersion(store, moduleCode, langCode) {
 export {
   I18N_RESOURCES_UPDATED_EVENT,
   emitI18nResourcesUpdated,
-  flatToNested,
-  deepMerge,
   createI18nManager
 };

package/dist/chunk-JOUVTRSA.cjs

@@ -0,0 +1,61 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/core/utils.ts
+function buildKey(moduleCode, langCode, store) {
+  return store.cacheGroupKey ? `${moduleCode}_${langCode}_${store.cacheGroupKey}` : `${moduleCode}_${langCode}`;
+}
+function parseI18nValues(values) {
+  const result = {};
+  for (const v of values) {
+    if (v.termCode) result[v.termCode] = _nullishCoalesce(v.langValue, () => ( ""));
+  }
+  return result;
+}
+function flatToNested(flat) {
+  const result = {};
+  for (const [key, value] of Object.entries(flat)) {
+    const parts = key.split(".");
+    let cur = result;
+    for (let i = 0; i < parts.length - 1; i++) {
+      const part = parts[i];
+      if (typeof cur[part] !== "object" || cur[part] === null) {
+        cur[part] = {};
+      }
+      cur = cur[part];
+    }
+    cur[parts[parts.length - 1]] = value;
+  }
+  return result;
+}
+function deepMerge(target, source) {
+  const result = { ...target };
+  for (const [key, sv] of Object.entries(source)) {
+    const tv = result[key];
+    if (sv !== null && typeof sv === "object" && !Array.isArray(sv) && tv !== null && typeof tv === "object" && !Array.isArray(tv)) {
+      result[key] = deepMerge(tv, sv);
+    } else {
+      result[key] = sv;
+    }
+  }
+  return result;
+}
+function toDefaultParams(p) {
+  const result = {};
+  if (_optionalChain([p, 'optionalAccess', _ => _.storeName])) result["storeName"] = p.storeName;
+  if (_optionalChain([p, 'optionalAccess', _2 => _2.langCode])) result["langCode"] = p.langCode;
+  if (_optionalChain([p, 'optionalAccess', _3 => _3.moduleCode])) result["moduleCode"] = p.moduleCode;
+  if (_optionalChain([p, 'optionalAccess', _4 => _4.version]) != null) result["version"] = String(p.version);
+  return result;
+}
+function toQueryString(params) {
+  return new URLSearchParams(
+    Object.entries(params).filter(([, v]) => v != null).map(([k, v]) => [k, String(v)])
+  ).toString();
+}
+
+
+
+
+
+
+
+
+exports.buildKey = buildKey; exports.parseI18nValues = parseI18nValues; exports.flatToNested = flatToNested; exports.deepMerge = deepMerge; exports.toDefaultParams = toDefaultParams; exports.toQueryString = toQueryString;

package/dist/chunk-NEXKR7GY.js

@@ -0,0 +1,61 @@
+// src/core/utils.ts
+function buildKey(moduleCode, langCode, store) {
+  return store.cacheGroupKey ? `${moduleCode}_${langCode}_${store.cacheGroupKey}` : `${moduleCode}_${langCode}`;
+}
+function parseI18nValues(values) {
+  const result = {};
+  for (const v of values) {
+    if (v.termCode) result[v.termCode] = v.langValue ?? "";
+  }
+  return result;
+}
+function flatToNested(flat) {
+  const result = {};
+  for (const [key, value] of Object.entries(flat)) {
+    const parts = key.split(".");
+    let cur = result;
+    for (let i = 0; i < parts.length - 1; i++) {
+      const part = parts[i];
+      if (typeof cur[part] !== "object" || cur[part] === null) {
+        cur[part] = {};
+      }
+      cur = cur[part];
+    }
+    cur[parts[parts.length - 1]] = value;
+  }
+  return result;
+}
+function deepMerge(target, source) {
+  const result = { ...target };
+  for (const [key, sv] of Object.entries(source)) {
+    const tv = result[key];
+    if (sv !== null && typeof sv === "object" && !Array.isArray(sv) && tv !== null && typeof tv === "object" && !Array.isArray(tv)) {
+      result[key] = deepMerge(tv, sv);
+    } else {
+      result[key] = sv;
+    }
+  }
+  return result;
+}
+function toDefaultParams(p) {
+  const result = {};
+  if (p?.storeName) result["storeName"] = p.storeName;
+  if (p?.langCode) result["langCode"] = p.langCode;
+  if (p?.moduleCode) result["moduleCode"] = p.moduleCode;
+  if (p?.version != null) result["version"] = String(p.version);
+  return result;
+}
+function toQueryString(params) {
+  return new URLSearchParams(
+    Object.entries(params).filter(([, v]) => v != null).map(([k, v]) => [k, String(v)])
+  ).toString();
+}
+
+export {
+  buildKey,
+  parseI18nValues,
+  flatToNested,
+  deepMerge,
+  toDefaultParams,
+  toQueryString
+};