vona-cli-set-api 1.0.273 → 1.0.275

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

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.157"
+    "vona": "^5.0.159"
   },
   "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.8",
+  "version": "5.0.10",
   "title": "home-user",
   "vonaModule": {
     "fileVersion": 1,

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

@@ -144,7 +144,7 @@ import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'von
 declare module 'vona-module-home-user' {
   export interface IModelOptionsUser {
         relations: {
-          roles: IModelRelationBelongsToMany<ModelRoleUser, ModelRole, false, 'id'|'name',undefined,undefined,undefined>;
+          roles: IModelRelationBelongsToMany<ModelRoleUser, ModelRole, false, undefined,undefined,undefined,undefined>;
         };
       }
   export interface ModelRole {

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

@@ -16,7 +16,7 @@ export class EventListenerEmailConfirmCallback
       return this.scope.locale.ConfirmationEmailExpired();
     }
     // activate
-    const user = await this.bean.user.findOne({ id: data.userId });
+    const user = await this.bean.user.findOneById(data.userId);
     await this.bean.user.activate(user!);
     // ok
     return this.scope.locale.ConfirmationEmailSucceeded();

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

@@ -22,7 +22,7 @@ export class EntityUser extends EntityBase {
   mobile?: string;
 
   @Api.field(v.title($locale('UserActivated')), v.default(false))
-  activated: boolean;
+  activated?: boolean;
 
   @Api.field(v.title($locale('UserLocale')), z.string().optional())
   locale?: keyof ILocaleInfos | undefined;

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

@@ -9,7 +9,7 @@ export interface IModelOptionsUser extends IDecoratorModelOptions<EntityUser> {}
 @Model<IModelOptionsUser>({
   entity: EntityUser,
   relations: {
-    roles: $relation.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId', { columns: ['id', 'name'] }),
+    roles: $relation.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId'),
   },
 })
 export class ModelUser extends BeanModelBase<EntityUser> {

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

@@ -23,7 +23,7 @@ export class ServicePassportAdapter extends BeanBase implements IPassportAdapter
   }
 
   async deserialize(payloadData: IPayloadData): Promise<IPassport | undefined> {
-    const user = await this.bean.user.findOne({ id: payloadData.userId });
+    const user = await this.bean.user.findOneById(payloadData.userId);
     if (!user) return;
     const auth = await this.bean.auth.findOne({ id: payloadData.authId });
     if (!auth) return;

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

@@ -1,19 +1,20 @@
 import type { TableIdentity } from 'table-identity';
-import type { IRoleAdapter, IRoleBase } from 'vona-module-a-user';
+import type { IRoleAdapter } from 'vona-module-a-user';
+import type { EntityRole } from 'vona-module-test-vona';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 @Service()
 export class ServiceRoleAdapter extends BeanBase implements IRoleAdapter {
-  async findOneByName(name: string): Promise<IRoleBase | undefined> {
+  async findOneByName(name: string): Promise<EntityRole | undefined> {
     return await this.scope.model.role.getByNameEqI(name);
   }
 
-  async findOne(role: Partial<IRoleBase>): Promise<IRoleBase | undefined> {
+  async findOne(role: Partial<EntityRole>): Promise<EntityRole | undefined> {
     return await this.scope.model.role.get(role);
   }
 
-  async findAllByUserId(userId: TableIdentity): Promise<IRoleBase[] | undefined> {
+  async findAllByUserId(userId: TableIdentity): Promise<EntityRole[] | 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,40 +1,41 @@
 import type { TableIdentity } from 'table-identity';
 import type { IAuthUserProfile, IUserAdapter, IUserBase } from 'vona-module-a-user';
+import type { EntityUser } from '../entity/user.ts';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 @Service()
 export class ServiceUserAdapter extends BeanBase implements IUserAdapter {
-  async create(user: Partial<IUserBase>): Promise<IUserBase> {
+  async create(user: Partial<EntityUser>): Promise<EntityUser> {
     return await this.scope.model.user.insert(user);
   }
 
-  async userOfProfile(profile: IAuthUserProfile): Promise<IUserBase> {
+  async userOfProfile(profile: IAuthUserProfile): Promise<Partial<EntityUser>> {
     return {
       name: profile.username!,
       email: profile.emails?.[0].value,
       avatar: profile.photos?.[0].value,
       locale: profile.locale || this.ctx.locale,
-    } as IUserBase;
+    };
   }
 
-  async createAnonymous(): Promise<IUserBase> {
-    return { id: -1, anonymous: true, name: 'anonymous', avatar: undefined, locale: undefined } as IUserBase;
+  async createAnonymous(): Promise<Partial<IUserBase>> {
+    return { id: -1, anonymous: true, name: 'anonymous' };
   }
 
-  async findOneByName(name: string): Promise<IUserBase | undefined> {
+  async findOneByName(name: string): Promise<EntityUser | undefined> {
     return await this.scope.model.user.getByNameEqI(name);
   }
 
-  async findOne(user: Partial<IUserBase>): Promise<IUserBase | undefined> {
+  async findOne(user: Partial<EntityUser>): Promise<EntityUser | undefined> {
     return await this.scope.model.user.get(user);
   }
 
-  async update(user: Partial<IUserBase>): Promise<void> {
+  async update(user: Partial<EntityUser>): Promise<void> {
     await this.scope.model.user.update(user);
   }
 
-  async remove(user: Partial<IUserBase>): Promise<void> {
+  async remove(user: Partial<EntityUser>): Promise<void> {
     await this.scope.model.user.delete(user);
   }
 

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.9",
+  "version": "5.0.11",
   "title": "a-home",
   "description": "",
   "author": "zhennann",

package/package.json

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