vome-core 0.0.8 → 0.0.9

package/dist/index.js

@@ -121,7 +121,7 @@ class BaseController {
 // package.json
 var package_default = {
   name: "vome-core",
-  version: "0.0.8",
+  version: "0.0.9",
   description: "Vome framework \u2014 shared + Bun/Elysia server + Vue admin",
   license: "MIT",
   type: "module",

package/dist/server/index.js

@@ -3083,7 +3083,7 @@ function defineAuthMacro(name, resolve) {
 // package.json
 var package_default = {
   name: "vome-core",
-  version: "0.0.8",
+  version: "0.0.9",
   description: "Vome framework \u2014 shared + Bun/Elysia server + Vue admin",
   license: "MIT",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vome-core",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Vome framework — shared + Bun/Elysia server + Vue admin",
   "license": "MIT",
   "type": "module",

package/src/admin/service/index.ts

@@ -3,7 +3,13 @@ import { BaseService } from './base'
 
 const SIDE_ID = 'admin'
 
-/** 标准 CRUD 之外的常用接口（EPS 未就绪时也可用） */
+/**
+ * 每次发版递增。globalThis 单例若跨 HMR/旧包残留，靠此戳强制换新根对象并重建。
+ * 根因：旧 singleton 只有 CRUD、无 tree/roleMap，且 plugin-info 错名导致 base.plugin 缺失。
+ */
+const SERVICE_BUILD = 9
+
+/** 标准 CRUD 之外的常用接口（不依赖 EPS 是否已返回） */
 const FALLBACK_EXTRA_APIS: Record<
   string,
   Array<{ method: string; path: string; perms?: string[] }>
@@ -52,7 +58,6 @@ const FALLBACK_EXTRA_APIS: Record<
   ],
 }
 
-/** EPS 不可用时仍保证业务页链式可调 */
 const FALLBACK_PREFIXES = [
   '/admin/base/menu',
   '/admin/base/user',
@@ -82,7 +87,6 @@ function isValidName(name: string) {
   return Boolean(name) && !['{', '}', ':'].some((c) => name.includes(c))
 }
 
-/** 无 EPS perms 时生成权限码 */
 function resolvePermCode(prefix: string, action: string) {
   const parts = prefix.replace(/^\//, '').split('/').filter(Boolean)
   const module = parts[1] || parts[0] || 'base'
@@ -99,10 +103,13 @@ function resolvePermCode(prefix: string, action: string) {
   return `${module}:${resource}:${action}`
 }
 
-function getMethodKeys(leaf: Record<string, unknown>) {
-  return Object.keys(leaf).filter(
-    (k) => !['namespace', 'permission', '_permission', 'request', 'search'].includes(k),
-  )
+function prefixToParts(prefix: string) {
+  const raw = prefix.replace(/^\//, '')
+  return raw
+    .replace(new RegExp(`^${SIDE_ID}/?`), '')
+    .split('/')
+    .filter(Boolean)
+    .map(toCamel)
 }
 
 function bindCrud(leaf: ServiceLeaf, base: BaseService) {
@@ -132,14 +139,6 @@ function bindApis(leaf: ServiceLeaf, base: BaseService, apis: EpsApiItem[]) {
     const name = methodName(api.path)
     if (!isValidName(name) || /[-:]/g.test(name)) continue
     const method = (api.method || 'get').toLowerCase()
-    // 已有同名方法则保留（避免 fallback 覆盖 EPS 绑定）
-    if (typeof (leaf as Record<string, unknown>)[name] === 'function') {
-      if (!leaf.permission[name]) {
-        leaf.permission[name] =
-          api.perms?.[0] || resolvePermCode(`/${leaf.namespace}`, name)
-      }
-      continue
-    }
     ;(leaf as Record<string, unknown>)[name] = function (
       this: BaseService,
       data?: unknown,
@@ -155,40 +154,46 @@ function bindApis(leaf: ServiceLeaf, base: BaseService, apis: EpsApiItem[]) {
   }
 }
 
-function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
-  const base = new BaseService(namespace)
-  const leaf = base as unknown as ServiceLeaf
-  leaf.namespace = namespace.replace(/^\//, '')
+/** 原地重挂方法，保持叶子对象引用不变（避免页面 const log = service.base.log 失效） */
+function remountLeaf(leaf: ServiceLeaf, namespace: string, apis: EpsApiItem[]) {
+  const ns = namespace.replace(/^\//, '')
+  const base = new BaseService(ns)
+  leaf.namespace = ns
   leaf.permission = {}
-  leaf._permission = {}
+  leaf._permission = leaf._permission || {}
+
+  // 清掉旧方法再绑，避免残留错误实现
+  for (const key of Object.keys(leaf as object)) {
+    if (
+      key === 'namespace' ||
+      key === 'permission' ||
+      key === '_permission' ||
+      key === 'search'
+    ) {
+      continue
+    }
+    delete (leaf as Record<string, unknown>)[key]
+  }
 
   bindCrud(leaf, base)
   bindApis(leaf, base, apis)
 
-  for (const name of getMethodKeys(leaf as unknown as Record<string, unknown>)) {
-    if (!leaf.permission[name]) {
-      leaf.permission[name] = resolvePermCode(`/${leaf.namespace}`, name)
-    }
+  for (const name of Object.keys(leaf.permission)) {
+    if (leaf._permission[name] == null) leaf._permission[name] = false
   }
-
   return leaf
 }
 
-/** 合并到已有叶子：补方法，不抹掉已有自定义 API */
-function mergeLeaf(existing: ServiceLeaf, namespace: string, apis: EpsApiItem[]) {
-  const base = new BaseService(namespace)
-  // 确保 CRUD 在实例上（兼容旧 fallback）
-  bindCrud(existing, base)
-  bindApis(existing, base, apis)
-  existing.namespace = namespace.replace(/^\//, '')
-  existing.permission ||= {}
-  existing._permission ||= {}
-  for (const name of getMethodKeys(existing as unknown as Record<string, unknown>)) {
-    if (!existing.permission[name]) {
-      existing.permission[name] = resolvePermCode(`/${existing.namespace}`, name)
-    }
-  }
-  return existing
+function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
+  const ns = namespace.replace(/^\//, '')
+  const base = new BaseService(ns)
+  const leaf = base as unknown as ServiceLeaf
+  leaf.namespace = ns
+  leaf.permission = {}
+  leaf._permission = {}
+  bindCrud(leaf, base)
+  bindApis(leaf, base, apis)
+  return leaf
 }
 
 function attachLeaf(
@@ -197,12 +202,7 @@ function attachLeaf(
   apis: EpsApiItem[] = [],
 ) {
   const raw = prefix.replace(/^\//, '')
-  const arr = raw
-    .replace(new RegExp(`^${SIDE_ID}/?`), '')
-    .split('/')
-    .filter(Boolean)
-    .map(toCamel)
-
+  const arr = prefixToParts(prefix)
   if (!arr.length) return undefined
 
   let node: Record<string, unknown> = tree as unknown as Record<string, unknown>
@@ -210,13 +210,18 @@ function attachLeaf(
     const key = arr[i]!
     const isLast = i === arr.length - 1
     if (!isLast) {
-      if (!node[key] || typeof node[key] !== 'object') node[key] = {}
+      const cur = node[key] as ServiceLeaf | Record<string, unknown> | undefined
+      // 中间节点若被误建成叶子，换成容器（否则 dict/info 挂不上）
+      if (!cur || typeof cur !== 'object' || 'namespace' in cur) {
+        node[key] = {}
+      }
       node = node[key] as Record<string, unknown>
       continue
     }
+
     const existing = node[key] as ServiceLeaf | undefined
-    if (existing?.namespace) {
-      return mergeLeaf(existing, raw, apis)
+    if (existing && typeof existing === 'object' && existing.namespace) {
+      return remountLeaf(existing, raw, apis)
     }
     const leaf = createLeaf(raw, apis)
     node[key] = leaf
@@ -245,27 +250,62 @@ function buildFromEps(map: EpsModuleMap) {
   }
 }
 
+function extraApisOf(prefix: string): EpsApiItem[] {
+  return (FALLBACK_EXTRA_APIS[prefix] || []).map(
+    (a) =>
+      ({
+        method: a.method,
+        path: a.path,
+        perms: a.perms,
+      }) as EpsApiItem,
+  )
+}
+
+/**
+ * 用 fallback 补全：已有叶子则合并补方法（不整棵删，避免打断引用）。
+ * 对 fallback 前缀：若 EPS 已挂过，只补缺失的 extra；attachLeaf/remount 会重绑整叶。
+ */
 function buildFallback() {
   for (const prefix of FALLBACK_PREFIXES) {
-    const extra = FALLBACK_EXTRA_APIS[prefix] || []
-    const apis = extra.map(
-      (a) =>
-        ({
-          method: a.method,
-          path: a.path,
-          perms: a.perms,
-        }) as EpsApiItem,
-    )
-    attachLeaf(service, prefix, apis)
+    const parts = prefixToParts(prefix)
+    let node: Record<string, unknown> = service as unknown as Record<string, unknown>
+    let missing = false
+    for (let i = 0; i < parts.length; i++) {
+      const key = parts[i]!
+      if (!node[key]) {
+        missing = true
+        break
+      }
+      if (i < parts.length - 1) {
+        node = node[key] as Record<string, unknown>
+      }
+    }
+    const leaf = missing
+      ? undefined
+      : (node[parts[parts.length - 1]!] as ServiceLeaf | undefined)
+
+    if (leaf?.namespace) {
+      // 只补 extra 里还没有的方法，保留 EPS 已绑方法
+      const extras = extraApisOf(prefix).filter((api) => {
+        const name = methodName(api.path)
+        return typeof (leaf as Record<string, unknown>)[name] !== 'function'
+      })
+      if (extras.length) {
+        const base = new BaseService(leaf.namespace)
+        bindApis(leaf, base, extras)
+      }
+      continue
+    }
+    attachLeaf(service, prefix, extraApisOf(prefix))
   }
 }
 
 type ServiceRoot = Eps.Service & { request: BaseService['request'] }
 
-/**
- * 全局单例：npm 包经多路径解析时避免出现两份 service（一份有 tree、一份没有）。
- */
-const g = globalThis as typeof globalThis & { __vome_admin_service__?: ServiceRoot }
+const g = globalThis as typeof globalThis & {
+  __vome_admin_service__?: ServiceRoot
+  __vome_admin_service_build__?: number
+}
 
 function createServiceRoot(): ServiceRoot {
   const root = new BaseService()
@@ -274,14 +314,23 @@ function createServiceRoot(): ServiceRoot {
   } as ServiceRoot
 }
 
+function getOrCreateRoot(): ServiceRoot {
+  if (
+    !g.__vome_admin_service__ ||
+    g.__vome_admin_service_build__ !== SERVICE_BUILD
+  ) {
+    g.__vome_admin_service__ = createServiceRoot()
+    g.__vome_admin_service_build__ = SERVICE_BUILD
+  }
+  return g.__vome_admin_service__
+}
+
 /** 全局链式 service（service.base.user.page()） */
-export const service: ServiceRoot =
-  g.__vome_admin_service__ ?? (g.__vome_admin_service__ = createServiceRoot())
+export const service: ServiceRoot = getOrCreateRoot()
 
-// 同步兜底（含 tree / menus 等），页面 import 时即可调用
 buildFallback()
 
-/** 从 EPS 构建/刷新 service 树；失败时用兜底 prefix + 自定义 API */
+/** 从 EPS 构建/刷新；再 fallback 补自定义方法 */
 export async function createEps(force = false) {
   try {
     const map = (await loadEps(force)) || {}
@@ -301,7 +350,6 @@ if (import.meta.hot) {
   })
 }
 
-/** 登录后写入 _permission，供 CRUD / 按钮显隐 */
 export function setServicePerms(perms: string[], isSuper = false) {
   const list = perms || []
 
@@ -335,7 +383,6 @@ export function setServicePerms(perms: string[], isSuper = false) {
   deep(service)
 }
 
-/** 解析 service.base.user 或 'base.user' */
 export function resolveService(path: string): ServiceLeaf | undefined {
   const parts = path.replace(/^\//, '').split('.').filter(Boolean)
   let cur: unknown = service
@@ -349,24 +396,12 @@ export function resolveService(path: string): ServiceLeaf | undefined {
   return undefined
 }
 
-/** 按 prefix 取或创建 service 叶子 */
 export function serviceOf(prefix: string): ServiceLeaf {
   const raw = prefix.replace(/\/$/, '')
-  const path = raw
-    .replace(/^\//, '')
-    .replace(new RegExp(`^${SIDE_ID}/?`), '')
-    .split('/')
-    .filter(Boolean)
-    .map(toCamel)
-    .join('.')
+  const path = prefixToParts(raw).join('.')
   const hit = resolveService(path)
   if (hit) return hit
-  const extra = FALLBACK_EXTRA_APIS[raw.startsWith('/') ? raw : `/${raw}`] || []
-  return attachLeaf(
-    service,
-    raw,
-    extra.map((a) => ({ method: a.method, path: a.path, perms: a.perms }) as EpsApiItem),
-  ) as ServiceLeaf
+  return attachLeaf(service, raw, extraApisOf(raw.startsWith('/') ? raw : `/${raw}`)) as ServiceLeaf
 }
 
 /** @deprecated 请用 service.base.xxx */