vona-cli-set-api 1.0.283 → 1.0.287

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.164"
+    "vona": "^5.0.166"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-user",
   "type": "module",
-  "version": "5.0.11",
+  "version": "5.0.13",
   "title": "home-user",
   "vonaModule": {
     "fileVersion": 1,

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.activate.ts

@@ -1,5 +1,5 @@
 import type { IEventExecute, NextEvent } from 'vona-module-a-event';
-import type { IUserBase, TypeEventActivateData, TypeEventActivateResult } from 'vona-module-a-user';
+import type { IUser, TypeEventActivateData, TypeEventActivateResult } from 'vona-module-a-user';
 import { BeanBase } from 'vona';
 import { EventListener } from 'vona-module-a-event';
 
@@ -11,7 +11,7 @@ export class EventListenerActivate
   extends BeanBase
   implements IEventExecute<TypeEventData, TypeEventResult> {
   async execute(data: TypeEventData, next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
-    const user = data as IUserBase;
+    const user = data as IUser;
     if (user.name === 'admin') {
       // role: admin
       const roleAdmin = await this.scope.model.role.get({ name: 'admin' });

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.register.ts

@@ -1,5 +1,5 @@
 import type { IEventExecute, NextEvent } from 'vona-module-a-event';
-import type { IUserBase, TypeEventRegisterData, TypeEventRegisterResult } from 'vona-module-a-user';
+import type { IUser, TypeEventRegisterData, TypeEventRegisterResult } from 'vona-module-a-user';
 import { BeanBase } from 'vona';
 import { EventListener } from 'vona-module-a-event';
 
@@ -12,7 +12,7 @@ export class EventListenerRegister
   implements IEventExecute<TypeEventData, TypeEventResult> {
   async execute(data: TypeEventData, next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
     // next: registered
-    const user = await next() as IUserBase;
+    const user = await next() as IUser;
     // mail: activate
     if (!data.autoActivate && user.email) {
       await this.bean.mailConfirm.emailConfirm(user);

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/entity/role.ts

@@ -1,4 +1,5 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+import type { IRole } from 'vona-module-a-user';
 import { Api, v } from 'vona-module-a-openapi';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { $locale } from '../.metadata/index.ts';
@@ -6,7 +7,7 @@ import { $locale } from '../.metadata/index.ts';
 export interface IEntityOptionsRole extends IDecoratorEntityOptions {}
 
 @Entity<IEntityOptionsRole>('homeRole', { openapi: { title: $locale('Role') } })
-export class EntityRole extends EntityBase {
+export class EntityRole extends EntityBase implements IRole {
   @Api.field(v.title($locale('RoleName')))
   name: string;
 }

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/entity/user.ts

@@ -1,5 +1,6 @@
 import type { ILocaleInfos } from 'vona';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+import type { IUser } from 'vona-module-a-user';
 import { Api, v } from 'vona-module-a-openapi';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { z } from 'zod';
@@ -8,7 +9,7 @@ import { $locale } from '../.metadata/index.ts';
 export interface IEntityOptionsUser extends IDecoratorEntityOptions {}
 
 @Entity<IEntityOptionsUser>('homeUser', { openapi: { title: $locale('User') } })
-export class EntityUser extends EntityBase {
+export class EntityUser extends EntityBase implements IUser {
   @Api.field(v.title($locale('UserName')))
   name: string;
 

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/passportAdapter.ts

@@ -1,5 +1,5 @@
-import type { IPassportAdapter } from 'vona-module-a-user';
-import type { IPassport, IPayloadData } from '../types/passport.ts';
+import type { IPayloadData } from 'vona-module-a-jwt';
+import type { IPassport, IPassportAdapter } from 'vona-module-a-user';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/roleAdapter.ts

@@ -1,20 +1,19 @@
 import type { TableIdentity } from 'table-identity';
-import type { IRoleAdapter } from 'vona-module-a-user';
-import type { EntityRole } from 'vona-module-test-vona';
+import type { IRole, IRoleAdapter } from 'vona-module-a-user';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 @Service()
 export class ServiceRoleAdapter extends BeanBase implements IRoleAdapter {
-  async findOneByName(name: string): Promise<EntityRole | undefined> {
+  async findOneByName(name: string): Promise<IRole | undefined> {
     return await this.scope.model.role.getByNameEqI(name);
   }
 
-  async findOne(role: Partial<EntityRole>): Promise<EntityRole | undefined> {
+  async findOne(role: Partial<IRole>): Promise<IRole | undefined> {
     return await this.scope.model.role.get(role);
   }
 
-  async findAllByUserId(userId: TableIdentity): Promise<EntityRole[] | undefined> {
+  async findAllByUserId(userId: TableIdentity): Promise<IRole[] | undefined> {
     const user = await this.scope.model.user.get({ id: userId }, { include: { roles: true } });
     return user?.roles;
   }

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/userAdapter.ts

@@ -1,16 +1,15 @@
 import type { TableIdentity } from 'table-identity';
-import type { IAuthUserProfile, IUserAdapter, IUserBase } from 'vona-module-a-user';
-import type { EntityUser } from '../entity/user.ts';
+import type { IAuthUserProfile, IUser, IUserAdapter } from 'vona-module-a-user';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 @Service()
 export class ServiceUserAdapter extends BeanBase implements IUserAdapter {
-  async create(user: Partial<EntityUser>): Promise<EntityUser> {
+  async create(user: Partial<IUser>): Promise<IUser> {
     return await this.scope.model.user.insert(user);
   }
 
-  async userOfProfile(profile: IAuthUserProfile): Promise<Partial<EntityUser>> {
+  async userOfProfile(profile: IAuthUserProfile): Promise<Partial<IUser>> {
     return {
       name: profile.username!,
       email: profile.emails?.[0].value,
@@ -19,23 +18,23 @@ export class ServiceUserAdapter extends BeanBase implements IUserAdapter {
     };
   }
 
-  async createAnonymous(): Promise<Partial<IUserBase>> {
+  async createAnonymous(): Promise<Partial<IUser>> {
     return { id: -1, anonymous: true, name: 'anonymous' };
   }
 
-  async findOneByName(name: string): Promise<EntityUser | undefined> {
+  async findOneByName(name: string): Promise<IUser | undefined> {
     return await this.scope.model.user.getByNameEqI(name);
   }
 
-  async findOne(user: Partial<EntityUser>): Promise<EntityUser | undefined> {
+  async findOne(user: Partial<IUser>): Promise<IUser | undefined> {
     return await this.scope.model.user.get(user);
   }
 
-  async update(user: Partial<EntityUser>): Promise<void> {
+  async update(user: Partial<IUser>): Promise<void> {
     await this.scope.model.user.update(user);
   }
 
-  async remove(user: Partial<EntityUser>): Promise<void> {
+  async remove(user: Partial<IUser>): Promise<void> {
     await this.scope.model.user.delete(user);
   }
 

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/types/auth.ts

@@ -0,0 +1,5 @@
+export interface IAuthCustom {}
+
+declare module 'vona-module-a-user' {
+  export interface IAuth extends IAuthCustom {}
+}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/types/index.ts

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

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/types/jwt.ts

@@ -0,0 +1,11 @@
+import type { TableIdentity } from 'table-identity';
+
+export interface IPayloadDataCustom {
+  userId: TableIdentity;
+  authId: TableIdentity;
+  token?: string;
+}
+
+declare module 'vona-module-a-jwt' {
+  export interface IPayloadData extends IPayloadDataCustom {}
+}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/types/passport.ts

@@ -1,11 +1,5 @@
-import type { TableIdentity } from 'table-identity';
-import type { IPayloadDataBase } from 'vona-module-a-jwt';
-import type { IPassportBase } from 'vona-module-a-user';
+export interface IPassportCustom {}
 
-export interface IPayloadData extends IPayloadDataBase {
-  userId: TableIdentity;
-  authId: TableIdentity;
-  token?: string;
+declare module 'vona-module-a-user' {
+  export interface IPassport extends IPassportCustom {}
 }
-
-export interface IPassport extends IPassportBase {}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/types/role.ts

@@ -0,0 +1,5 @@
+export interface IRoleCustom {}
+
+declare module 'vona-module-a-user' {
+  export interface IRole extends IRoleCustom {}
+}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/types/user.ts

@@ -0,0 +1,5 @@
+export interface IUserCustom {}
+
+declare module 'vona-module-a-user' {
+  export interface IUser extends IUserCustom {}
+}

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-suite-a-home",
   "type": "module",
-  "version": "5.0.12",
+  "version": "5.0.14",
   "title": "a-home",
   "description": "",
   "author": "zhennann",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.283",
+  "version": "1.0.287",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"