cabloy 5.1.152 → 5.1.154

package/vona/src/suite/a-home/modules/home-base/src/.metadata/index.ts

@@ -1,76 +1,6 @@
 // eslint-disable
 import type { TypeSymbolKeyFieldsMore } from 'vona-module-a-orm';
 import type { TypeEntityOptionsFields,TypeControllerOptionsActions } from 'vona-module-a-openapi';
-/** service: begin */
-export * from '../service/menu.ts';
-export * from '../service/permission.ts';
-export * from '../service/siteCatalog.ts';
-
-import 'vona-module-a-bean';
-declare module 'vona-module-a-bean' {
-
-    export interface IServiceRecord {
-      'home-base:menu': never;
-'home-base:permission': never;
-'home-base:siteCatalog': never;
-    }
-
-
-}
-declare module 'vona-module-home-base' {
-
-        export interface ServiceMenu {
-          /** @internal */
-          get scope(): ScopeModuleHomeBase;
-        }
-
-          export interface ServiceMenu {
-            get $beanFullName(): 'home-base.service.menu';
-            get $onionName(): 'home-base:menu';
-          }
-
-        export interface ServicePermission {
-          /** @internal */
-          get scope(): ScopeModuleHomeBase;
-        }
-
-          export interface ServicePermission {
-            get $beanFullName(): 'home-base.service.permission';
-            get $onionName(): 'home-base:permission';
-          }
-
-        export interface ServiceSiteCatalog {
-          /** @internal */
-          get scope(): ScopeModuleHomeBase;
-        }
-
-          export interface ServiceSiteCatalog {
-            get $beanFullName(): 'home-base.service.siteCatalog';
-            get $onionName(): 'home-base:siteCatalog';
-          }
-}
-/** service: end */
-/** service: begin */
-import type { ServiceMenu } from '../service/menu.ts';
-import type { ServicePermission } from '../service/permission.ts';
-import type { ServiceSiteCatalog } from '../service/siteCatalog.ts';
-export interface IModuleService {
-  'menu': ServiceMenu;
-'permission': ServicePermission;
-'siteCatalog': ServiceSiteCatalog;
-}
-/** service: end */
-/** service: begin */
-
-import 'vona';
-declare module 'vona' {
-  export interface IBeanRecordGeneral {
-    'home-base.service.menu': ServiceMenu;
-'home-base.service.permission': ServicePermission;
-'home-base.service.siteCatalog': ServiceSiteCatalog;
-  }
-}
-/** service: end */
 /** dto: begin */
 export * from '../dto/siteCatalogSelectRes.ts';
 export * from '../dto/siteCatalogSelectResItem.ts';
@@ -195,11 +125,84 @@ import 'vona-module-a-openapi';
   }
 
 /** controller: end */
+/** service: begin */
+export * from '../service/menu.ts';
+export * from '../service/permission.ts';
+export * from '../service/siteCatalog.ts';
+
+import 'vona-module-a-bean';
+declare module 'vona-module-a-bean' {
+
+    export interface IServiceRecord {
+      'home-base:menu': never;
+'home-base:permission': never;
+'home-base:siteCatalog': never;
+    }
+
+
+}
+declare module 'vona-module-home-base' {
+
+        export interface ServiceMenu {
+          /** @internal */
+          get scope(): ScopeModuleHomeBase;
+        }
+
+          export interface ServiceMenu {
+            get $beanFullName(): 'home-base.service.menu';
+            get $onionName(): 'home-base:menu';
+          }
+
+        export interface ServicePermission {
+          /** @internal */
+          get scope(): ScopeModuleHomeBase;
+        }
+
+          export interface ServicePermission {
+            get $beanFullName(): 'home-base.service.permission';
+            get $onionName(): 'home-base:permission';
+          }
+
+        export interface ServiceSiteCatalog {
+          /** @internal */
+          get scope(): ScopeModuleHomeBase;
+        }
+
+          export interface ServiceSiteCatalog {
+            get $beanFullName(): 'home-base.service.siteCatalog';
+            get $onionName(): 'home-base:siteCatalog';
+          }
+}
+/** service: end */
+/** service: begin */
+import type { ServiceMenu } from '../service/menu.ts';
+import type { ServicePermission } from '../service/permission.ts';
+import type { ServiceSiteCatalog } from '../service/siteCatalog.ts';
+export interface IModuleService {
+  'menu': ServiceMenu;
+'permission': ServicePermission;
+'siteCatalog': ServiceSiteCatalog;
+}
+/** service: end */
+/** service: begin */
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGeneral {
+    'home-base.service.menu': ServiceMenu;
+'home-base.service.permission': ServicePermission;
+'home-base.service.siteCatalog': ServiceSiteCatalog;
+  }
+}
+/** service: end */
+/** locale: begin */
+import { locales } from './locales.ts';
+/** locale: end */
 /** main: begin */
 export * from '../main.ts';
 /** main: end */
 /** scope: begin */
-import { BeanScopeBase, type BeanScopeUtil } from 'vona';
+import { BeanScopeBase, type BeanScopeUtil, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
 import { Scope } from 'vona-module-a-bean';
 
 @Scope()
@@ -207,6 +210,7 @@ export class ScopeModuleHomeBase extends BeanScopeBase {}
 
 export interface ScopeModuleHomeBase {
   util: BeanScopeUtil;
+locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
 service: IModuleService;
 }
 
@@ -222,7 +226,9 @@ declare module 'vona' {
 
 
 
-
+  export interface IBeanScopeLocale {
+    'home-base': (typeof locales)[TypeLocaleBase];
+  }
 
 
 }

package/vona/src/suite/a-home/modules/home-base/src/.metadata/locales.ts

@@ -0,0 +1,18 @@
+import type { TypeLocaleBase } from 'vona';
+
+import { $makeLocaleMagic } from 'vona';
+
+import locale_en_us from '../config/locale/en-us.ts';
+import locale_zh_cn from '../config/locale/zh-cn.ts';
+
+export const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn,
+};
+
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(
+  key: K,
+  ...args: any[]
+): any {
+  return $makeLocaleMagic(`home-base::${key}`, ...args);
+}

package/vona/src/suite/a-home/modules/home-base/src/config/locale/en-us.ts

@@ -0,0 +1,3 @@
+export default {
+  SiteAll: 'All Sites',
+};

package/vona/src/suite/a-home/modules/home-base/src/config/locale/zh-cn.ts

@@ -0,0 +1,3 @@
+export default {
+  SiteAll: '全部站点',
+};

package/vona/src/suite/a-home/modules/home-base/src/index.ts

@@ -1 +1,2 @@
+export * from './.metadata/locales.ts';
 export * from './.metadata/index.ts';

package/vona/src/suite/a-home/modules/home-base/src/service/siteCatalog.ts

@@ -2,22 +2,29 @@ import type { IDecoratorSsrSiteOptions } from 'vona-module-a-ssr';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
+import { roleSiteIdAll } from 'vona-module-a-openapiutils';
 
 import type { DtoSiteCatalogSelectRes } from '../dto/siteCatalogSelectRes.ts';
 
 @Service()
 export class ServiceSiteCatalog extends BeanBase {
   async select(): Promise<DtoSiteCatalogSelectRes> {
-    const list = this.app
-      .scope('a-ssr')
-      .service.ssr.getSitesEnabled()
-      .map(site => {
-        const options = site.beanOptions.options as IDecoratorSsrSiteOptions;
-        return {
-          siteId: String(options.siteId),
-          title: this.app.meta.text.locale(this.ctx.locale, options.title),
-        };
-      });
+    const list = [
+      {
+        siteId: roleSiteIdAll,
+        title: this.scope.locale.SiteAll(),
+      },
+      ...this.app
+        .scope('a-ssr')
+        .service.ssr.getSitesEnabled()
+        .map(site => {
+          const options = site.beanOptions.options as IDecoratorSsrSiteOptions;
+          return {
+            siteId: String(options.siteId),
+            title: this.app.meta.text.locale(this.ctx.locale, options.title),
+          };
+        }),
+    ];
     return {
       list,
       total: String(list.length),

package/vona/src/suite/a-home/modules/home-user/src/bean/meta.version.ts

@@ -21,6 +21,10 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
         table.string(entityRole.title, 255).comment(entityRole.$comment.title);
         table.json(entityRole.titleLocales).comment(entityRole.$comment.titleLocales);
         table.json(entityRole.siteIds).comment(entityRole.$comment.siteIds);
+        table
+          .boolean(entityRole.builtin)
+          .defaultTo(entityRole.$default.builtin)
+          .comment(entityRole.$comment.builtin);
       });
       // homeUser
       const entityUser = this.scope.entity.user;
@@ -62,6 +66,7 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
           title: role.title,
           titleLocales: role.titleLocales ?? {},
           siteIds: role.siteIds,
+          builtin: role.builtin,
         });
       }
       // user: admin

package/vona/src/suite/a-home/modules/home-user/src/config/config.ts

@@ -1,5 +1,7 @@
 import type { VonaApplication } from 'vona';
 
+import { roleSiteIdAll } from 'vona-module-a-openapiutils';
+
 import { builtinRoles } from './roles.ts';
 
 export { builtinRoles } from './roles.ts';
@@ -14,13 +16,42 @@ export interface IHomeUserConfig {
   builtinRoles: typeof builtinRoles;
 }
 
-export function config(_app: VonaApplication): IHomeUserConfig {
+export function config(app: VonaApplication): IHomeUserConfig {
+  const { env } = app.meta;
   return {
     passwordDefault: {
-      admin: '123456',
+      admin: env.HOME_USER_PASSWORD_DEFAULT_ADMIN || '123456',
+    },
+    disableBootstrapSystemAdmin: env.HOME_USER_DISABLE_BOOTSTRAP_SYSTEM_ADMIN === 'true',
+    disableUserAdmin: env.HOME_USER_DISABLE_USER_ADMIN === 'true',
+    builtinRoles: {
+      ...builtinRoles,
+      registeredUser: {
+        ...builtinRoles.registeredUser,
+        siteIds: parseBuiltinRoleSiteIds(
+          env.HOME_USER_BUILTIN_ROLE_REGISTERED_USER_SITE_IDS,
+          'HOME_USER_BUILTIN_ROLE_REGISTERED_USER_SITE_IDS',
+        ),
+      },
+      systemAdmin: {
+        ...builtinRoles.systemAdmin,
+        siteIds: parseBuiltinRoleSiteIds(
+          env.HOME_USER_BUILTIN_ROLE_SYSTEM_ADMIN_SITE_IDS,
+          'HOME_USER_BUILTIN_ROLE_SYSTEM_ADMIN_SITE_IDS',
+        ),
+      },
     },
-    disableBootstrapSystemAdmin: false,
-    disableUserAdmin: false,
-    builtinRoles,
   };
 }
+
+function parseBuiltinRoleSiteIds(value: string | undefined, variableName: string): string[] {
+  const siteIds = value
+    ?.split(',')
+    .map(siteId => siteId.trim())
+    .filter(Boolean) ?? [roleSiteIdAll];
+  if (siteIds.length === 0) return [roleSiteIdAll];
+  if (siteIds.includes(roleSiteIdAll) && siteIds.length !== 1) {
+    throw new Error(`${variableName} must contain only "${roleSiteIdAll}" or concrete site IDs`);
+  }
+  return siteIds;
+}

package/vona/src/suite/a-home/modules/home-user/src/config/roles.ts

@@ -1,24 +1,29 @@
 import type { LocalizedTextMap } from 'vona-module-a-user';
 
+import { roleSiteIdAll } from 'vona-module-a-openapiutils';
+
 export interface IRoleConfig {
   title: string;
   titleLocales?: LocalizedTextMap;
   siteIds: string[];
+  builtin: boolean;
 }
 
 export const builtinRoles: Record<string, IRoleConfig> = {
   registeredUser: {
     title: 'Registered User',
+    builtin: true,
     titleLocales: {
       'zh-cn': '注册用户',
     },
-    siteIds: ['web'],
+    siteIds: [roleSiteIdAll],
   },
   systemAdmin: {
     title: 'System Administrator',
+    builtin: true,
     titleLocales: {
       'zh-cn': '系统管理员',
     },
-    siteIds: ['web', 'admin'],
+    siteIds: [roleSiteIdAll],
   },
 };

package/vona/src/suite/a-home/modules/home-user/src/entity/role.ts

@@ -23,4 +23,7 @@ export class EntityRole extends EntityBase implements IRole {
 
   @Api.field(v.array(z.string()))
   siteIds: string[];
+
+  @Api.field(v.default(false))
+  builtin: boolean;
 }

package/vona/src/suite/a-home/modules/home-user/src/types/env.ts

@@ -0,0 +1,11 @@
+declare module 'vona' {
+  export interface VonaConfigEnv {
+    HOME_USER_PASSWORD_DEFAULT_ADMIN: string | undefined;
+    HOME_USER_DISABLE_BOOTSTRAP_SYSTEM_ADMIN: string | undefined;
+    HOME_USER_DISABLE_USER_ADMIN: string | undefined;
+    HOME_USER_BUILTIN_ROLE_REGISTERED_USER_SITE_IDS: string | undefined;
+    HOME_USER_BUILTIN_ROLE_SYSTEM_ADMIN_SITE_IDS: string | undefined;
+  }
+}
+
+export {};

package/vona/src/suite/a-home/modules/home-user/src/types/index.ts

@@ -1,4 +1,5 @@
 export * from './auth.ts';
+export * from './env.ts';
 export * from './jwt.ts';
 export * from './passport.ts';
 export * from './role.ts';

package/vona/src/suite/a-home/modules/home-user/test/config.test.ts

@@ -0,0 +1,65 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+
+import { config } from '../src/config/config.ts';
+import { builtinRoles } from '../src/config/roles.ts';
+
+function createConfig(env: Record<string, string | undefined>) {
+  return config({ meta: { env } } as never);
+}
+
+describe('config.test.ts', () => {
+  it('uses environment overrides and defaults without mutating static role definitions', () => {
+    const configured = createConfig({
+      HOME_USER_PASSWORD_DEFAULT_ADMIN: 'strong-admin-password',
+      HOME_USER_DISABLE_BOOTSTRAP_SYSTEM_ADMIN: 'true',
+      HOME_USER_DISABLE_USER_ADMIN: 'true',
+      HOME_USER_BUILTIN_ROLE_REGISTERED_USER_SITE_IDS: 'web',
+      HOME_USER_BUILTIN_ROLE_SYSTEM_ADMIN_SITE_IDS: 'web,admin',
+    });
+    assert.equal(configured.passwordDefault.admin, 'strong-admin-password');
+    assert.equal(configured.disableBootstrapSystemAdmin, true);
+    assert.equal(configured.disableUserAdmin, true);
+    assert.deepEqual(configured.builtinRoles.registeredUser.siteIds, ['web']);
+    assert.deepEqual(configured.builtinRoles.systemAdmin.siteIds, ['web', 'admin']);
+    assert.deepEqual(builtinRoles.registeredUser.siteIds, ['*']);
+    assert.deepEqual(builtinRoles.systemAdmin.siteIds, ['*']);
+
+    const defaults = createConfig({
+      HOME_USER_PASSWORD_DEFAULT_ADMIN: '',
+      HOME_USER_DISABLE_BOOTSTRAP_SYSTEM_ADMIN: 'false',
+      HOME_USER_DISABLE_USER_ADMIN: 'invalid',
+    });
+    assert.equal(defaults.passwordDefault.admin, '123456');
+    assert.equal(defaults.disableBootstrapSystemAdmin, false);
+    assert.equal(defaults.disableUserAdmin, false);
+    assert.deepEqual(defaults.builtinRoles.registeredUser.siteIds, ['*']);
+    assert.deepEqual(defaults.builtinRoles.systemAdmin.siteIds, ['*']);
+  });
+
+  it('parses comma-delimited role site IDs and falls back for blank values', () => {
+    const configured = createConfig({
+      HOME_USER_BUILTIN_ROLE_REGISTERED_USER_SITE_IDS: ' web, admin, , store ',
+      HOME_USER_BUILTIN_ROLE_SYSTEM_ADMIN_SITE_IDS: ' , ',
+    });
+    assert.deepEqual(configured.builtinRoles.registeredUser.siteIds, ['web', 'admin', 'store']);
+    assert.deepEqual(configured.builtinRoles.systemAdmin.siteIds, ['*']);
+  });
+
+  it('rejects non-exclusive wildcard role site IDs', () => {
+    assert.throws(
+      () =>
+        createConfig({
+          HOME_USER_BUILTIN_ROLE_REGISTERED_USER_SITE_IDS: '*,web',
+        }),
+      /HOME_USER_BUILTIN_ROLE_REGISTERED_USER_SITE_IDS/,
+    );
+    assert.throws(
+      () =>
+        createConfig({
+          HOME_USER_BUILTIN_ROLE_SYSTEM_ADMIN_SITE_IDS: 'web,*',
+        }),
+      /HOME_USER_BUILTIN_ROLE_SYSTEM_ADMIN_SITE_IDS/,
+    );
+  });
+});

package/vona/src/suite/a-home/modules/home-user/test/role.test.ts

@@ -9,13 +9,17 @@ describe('role.test.ts', () => {
       const roleRegisteredUser = await scope.model.role.getByName('registeredUser');
       assert.equal(roleRegisteredUser?.title, 'Registered User');
       assert.deepEqual(roleRegisteredUser?.titleLocales, { 'zh-cn': '注册用户' });
-      assert.ok(roleRegisteredUser?.siteIds.includes('web'));
+      assert.deepEqual(
+        roleRegisteredUser?.siteIds,
+        scope.config.builtinRoles.registeredUser.siteIds,
+      );
+      assert.equal(roleRegisteredUser?.builtin, true);
 
       const roleSystemAdmin = await scope.model.role.getByName('systemAdmin');
       assert.equal(roleSystemAdmin?.title, 'System Administrator');
       assert.deepEqual(roleSystemAdmin?.titleLocales, { 'zh-cn': '系统管理员' });
-      assert.ok(roleSystemAdmin?.siteIds.includes('web'));
-      assert.ok(roleSystemAdmin?.siteIds.includes('admin'));
+      assert.deepEqual(roleSystemAdmin?.siteIds, scope.config.builtinRoles.systemAdmin.siteIds);
+      assert.equal(roleSystemAdmin?.builtin, true);
 
       await app.bean.passport.signinMock();
       const passport = await app.bean.executor.performAction('get', '/home/user/passport/current');
@@ -24,13 +28,17 @@ describe('role.test.ts', () => {
       );
       assert.equal(passportRegisteredUser?.title, 'Registered User');
       assert.deepEqual(passportRegisteredUser?.titleLocales, { 'zh-cn': '注册用户' });
-      assert.ok(passportRegisteredUser?.siteIds.includes('web'));
+      assert.deepEqual(
+        passportRegisteredUser?.siteIds,
+        scope.config.builtinRoles.registeredUser.siteIds,
+      );
+      assert.equal(passportRegisteredUser?.builtin, true);
 
       const passportSystemAdmin = passport.roles.find((role: any) => role.name === 'systemAdmin');
       assert.equal(passportSystemAdmin?.title, 'System Administrator');
       assert.deepEqual(passportSystemAdmin?.titleLocales, { 'zh-cn': '系统管理员' });
-      assert.ok(passportSystemAdmin?.siteIds.includes('web'));
-      assert.ok(passportSystemAdmin?.siteIds.includes('admin'));
+      assert.deepEqual(passportSystemAdmin?.siteIds, scope.config.builtinRoles.systemAdmin.siteIds);
+      assert.equal(passportSystemAdmin?.builtin, true);
     });
   });
 });

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-rbac",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.30",
+  "version": "5.1.31",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/.metadata/index.ts

@@ -162,6 +162,7 @@ declare module 'vona' {
 }
 /** service: end */
 /** event: begin */
+export * from '../bean/event.resolveMenuVisibility.ts';
 export * from '../bean/event.retrieveMenus.ts';
 export * from '../bean/event.retrieveMenusSite.ts';
 
@@ -172,6 +173,16 @@ declare module 'vona' {
 }
 declare module 'vona-module-a-ssr' {
 
+        export interface EventResolveMenuVisibility {
+          /** @internal */
+          get scope(): ScopeModuleASsr;
+        }
+
+          export interface EventResolveMenuVisibility {
+            get $beanFullName(): 'a-ssr.event.resolveMenuVisibility';
+            get $onionName(): 'a-ssr:resolveMenuVisibility';
+          }
+
         export interface EventRetrieveMenus {
           /** @internal */
           get scope(): ScopeModuleASsr;
@@ -194,20 +205,24 @@ declare module 'vona-module-a-ssr' {
 }
 /** event: end */
 /** event: begin */
+import type { EventResolveMenuVisibility } from '../bean/event.resolveMenuVisibility.ts';
 import type { EventRetrieveMenus } from '../bean/event.retrieveMenus.ts';
 import type { EventRetrieveMenusSite } from '../bean/event.retrieveMenusSite.ts';
 export interface IModuleEvent {
-  'retrieveMenus': EventRetrieveMenus;
+  'resolveMenuVisibility': EventResolveMenuVisibility;
+'retrieveMenus': EventRetrieveMenus;
 'retrieveMenusSite': EventRetrieveMenusSite;
 }
 /** event: end */
 /** event: begin */
+import type { TypeEventResolveMenuVisibilityData, TypeEventResolveMenuVisibilityResult } from '../bean/event.resolveMenuVisibility.ts';
 import type { TypeEventRetrieveMenusData, TypeEventRetrieveMenusResult } from '../bean/event.retrieveMenus.ts';
 import type { TypeEventRetrieveMenusSiteData, TypeEventRetrieveMenusSiteResult } from '../bean/event.retrieveMenusSite.ts';
 import type { EventOn } from 'vona-module-a-event';
 declare module 'vona-module-a-event' {
   export interface IEventRecord {
-    'a-ssr:retrieveMenus': EventOn<TypeEventRetrieveMenusData, TypeEventRetrieveMenusResult>;
+    'a-ssr:resolveMenuVisibility': EventOn<TypeEventResolveMenuVisibilityData, TypeEventResolveMenuVisibilityResult>;
+'a-ssr:retrieveMenus': EventOn<TypeEventRetrieveMenusData, TypeEventRetrieveMenusResult>;
 'a-ssr:retrieveMenusSite': EventOn<TypeEventRetrieveMenusSiteData, TypeEventRetrieveMenusSiteResult>;
   }
 }

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/bean/event.resolveMenuVisibility.ts

@@ -0,0 +1,19 @@
+import type { TableIdentity } from 'table-identity';
+
+import { BeanEventBase, Event } from 'vona-module-a-event';
+
+import type { ISsrMenuItemPrepared } from '../types/ssrMenu.ts';
+
+export interface TypeEventResolveMenuVisibilityData {
+  ssrSiteName: string;
+  menus: ISsrMenuItemPrepared[];
+  currentRoleIds: TableIdentity[];
+}
+
+export type TypeEventResolveMenuVisibilityResult = ISsrMenuItemPrepared[];
+
+@Event()
+export class EventResolveMenuVisibility extends BeanEventBase<
+  TypeEventResolveMenuVisibilityData,
+  TypeEventResolveMenuVisibilityResult
+> {}