vome-core 0.0.84 → 0.0.86

package/dist/client/eps.d.ts

@@ -1,6 +1,8 @@
-import type { EpsEntity, EpsModuleMap } from '../../typings/admin/comm/eps';
+import type { EpsEntity, EpsModuleMap, EpsPayload } from '../../typings/admin/comm/eps';
 export type EpsSide = 'admin' | 'app';
-/** 拉取 EPS；公开接口建议 request 侧 toast:false */
+/** 兼容旧版纯 modules map 与新版 { modules, dict } */
+export declare function parseEpsPayload(input: unknown): EpsPayload;
+/** 拉取 EPS；公开接口建议 request 侧 toast:false；顺带灌入字典本地缓存 */
 export declare function loadEps(force?: boolean, side?: EpsSide): Promise<EpsModuleMap>;
 export declare function loadAllEps(force?: boolean): Promise<{
     admin: EpsModuleMap;

package/dist/client/eps.js

@@ -1,4 +1,5 @@
 import { getClientRequest } from "./configure";
+import { clearDictCache, hydrateDictFromEps } from "./dict";
 const EPS_URL = {
   admin: "/admin/base/open/eps",
   app: "/app/base/open/eps"
@@ -7,11 +8,37 @@ const cache = {
   admin: null,
   app: null
 };
+function isEpsPayload(input) {
+  return Boolean(input && typeof input === "object" && "modules" in input && input.modules && typeof input.modules === "object");
+}
+export function parseEpsPayload(input) {
+  if (!input || typeof input !== "object") {
+    return { modules: {}, dict: {} };
+  }
+  const m = input;
+  if ("code" in m && "data" in m && m.data && typeof m.data === "object" && !Array.isArray(m.data)) {
+    return parseEpsPayload(m.data);
+  }
+  if (isEpsPayload(input)) {
+    return {
+      modules: input.modules || {},
+      dict: input.dict && typeof input.dict === "object" ? input.dict : {}
+    };
+  }
+  return { modules: input, dict: {} };
+}
 export async function loadEps(force = false, side = "admin") {
   if (cache[side] && !force)
     return cache[side];
   const request = getClientRequest();
-  cache[side] = await request(EPS_URL[side], { toast: false }) || {};
+  const raw = await request(EPS_URL[side], {
+    toast: false
+  });
+  const payload = parseEpsPayload(raw);
+  cache[side] = payload.modules || {};
+  if (payload.dict && Object.keys(payload.dict).length) {
+    hydrateDictFromEps(payload.dict);
+  }
   return cache[side];
 }
 export async function loadAllEps(force = false) {
@@ -39,4 +66,5 @@ export function clearEpsCache(side) {
   }
   cache.admin = null;
   cache.app = null;
+  clearDictCache();
 }

package/dist/client/index.d.ts

@@ -1,5 +1,6 @@
 export { configureClient, getClientRequest, type ClientHooks, type ClientRequestFn, } from './configure';
-export { loadEps, loadAllEps, getEps, findEpsEntity, clearEpsCache, type EpsSide, } from './eps';
+export { loadEps, loadAllEps, getEps, findEpsEntity, clearEpsCache, parseEpsPayload, type EpsSide, } from './eps';
+export { getDict, getDictMap, getDictOptions, hydrateDictFromEps, replaceDictTrees, clearDictCache, type EpsDictNode, type EpsDictMap, type EpsDictRow, } from './dict';
 export { BaseService } from './base';
 export { service, getService, createEps, bindEpsHotReload, setServicePerms, resolveService, serviceOf, type CreateEpsOptions, type ServiceLeaf, type ServiceTree, } from './service';
 export { createLocaleStore, type I18nLangItem, type LocalePersist, type LocalePackApi, type CreateLocaleStoreOptions, } from './locale-store';

package/dist/client/index.js

@@ -7,8 +7,17 @@ export {
   loadAllEps,
   getEps,
   findEpsEntity,
-  clearEpsCache
+  clearEpsCache,
+  parseEpsPayload
 } from "./eps";
+export {
+  getDict,
+  getDictMap,
+  getDictOptions,
+  hydrateDictFromEps,
+  replaceDictTrees,
+  clearDictCache
+} from "./dict";
 export { BaseService } from "./base";
 export {
   service,

package/dist/client/service.js

@@ -1,5 +1,5 @@
 import { BaseService } from "./base";
-import { loadEps } from "./eps";
+import { loadEps, parseEpsPayload } from "./eps";
 function toCamel(str) {
   return str.replace(/([^-])(?:-+([^-]))/g, (_m, a, b) => a + String(b).toUpperCase());
 }
@@ -120,13 +120,7 @@ function buildFromEps(map, side, root) {
   }
 }
 function normalizeEpsMap(input) {
-  if (!input || typeof input !== "object")
-    return {};
-  const m = input;
-  if ("code" in m && "data" in m && m.data && typeof m.data === "object" && !Array.isArray(m.data)) {
-    return m.data;
-  }
-  return input;
+  return parseEpsPayload(input).modules;
 }
 function countPrefixedEntities(map) {
   return Object.values(map).flat().filter((e) => e && typeof e === "object" && Boolean(e.prefix)).length;

package/dist/client/vite-plugin-eps.js

@@ -140,9 +140,13 @@ async function fetchEps(apiUrl) {
   try {
     const res = await fetch(apiUrl, { signal: AbortSignal.timeout(5000) });
     const json = await res.json();
-    if (json?.code === 1000 && json.data && Object.keys(json.data).length) {
-      return json.data;
+    if (json?.code !== 1000 || !json.data || typeof json.data !== "object") {
+      return null;
     }
+    const data = json.data;
+    const modules = "modules" in data && data.modules && typeof data.modules === "object" ? data.modules : data;
+    if (modules && Object.keys(modules).length)
+      return modules;
   } catch {}
   return null;
 }