vona-cli-set-api 1.0.72 → 1.0.74

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

@@ -1,16 +1,16 @@
 import type { BeanScopeUtil, TypeModuleConfig } from 'vona';
 import type { IDecoratorModelOptions } from 'vona-module-a-database';
+import type { IMetaOptionsIndex } from 'vona-module-a-index';
 import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 import type { TypeEntityOptionsFields } from 'vona-module-a-openapi';
 import type { config } from '../config/config.ts';
-
 import type { IControllerOptionsPassport } from '../controller/passport.ts';
 /** controller: end */
 /** controller: begin */
 // @ts-ignore ignore
 import type { ControllerPassport } from '../controller/passport.ts';
-
 import type { IDtoOptionsAuth } from '../dto/auth.ts';
+
 /** dto: end */
 /** dto: begin */
 import type { DtoAuth } from '../dto/auth.ts';
@@ -18,20 +18,27 @@ import type { IDtoOptionsPassport } from '../dto/passport.ts';
 import type { DtoPassport } from '../dto/passport.ts';
 import type { IDtoOptionsPassportJwt } from '../dto/passportJwt.ts';
 import type { DtoPassportJwt } from '../dto/passportJwt.ts';
-import type { IEntityOptionsUser } from '../entity/user.ts';
+import type { IEntityOptionsRole } from '../entity/role.ts';
 /** entity: end */
 /** entity: begin */
+import type { EntityRole } from '../entity/role.ts';
+import type { IEntityOptionsUser } from '../entity/user.ts';
 import type { EntityUser } from '../entity/user.ts';
-
+import type { IEntityOptionsUserRole } from '../entity/userRole.ts';
+import type { EntityUserRole } from '../entity/userRole.ts';
 /** model: end */
 /** model: begin */
+import type { ModelRole } from '../model/role.ts';
 import type { ModelUser } from '../model/user.ts';
+
+import type { ModelUserRole } from '../model/userRole.ts';
 /** service: end */
 /** service: begin */
 import type { ServiceAuthInnerAdapter } from '../service/authInnerAdapter.ts';
 import type { ServiceAuthTokenAdapter } from '../service/authTokenAdapter.ts';
 import type { ServicePassportAdapter } from '../service/passportAdapter.ts';
 import type { ServiceRedisToken } from '../service/redisToken.ts';
+import type { ServiceRoleInnerAdapter } from '../service/roleInnerAdapter.ts';
 import type { ServiceUserInnerAdapter } from '../service/userInnerAdapter.ts';
 /** config: end */
 /** scope: begin */
@@ -50,11 +57,17 @@ import 'vona';
 import 'vona';
 /** model: end */
 /** meta: begin */
+export * from '../bean/meta.index.ts';
 export * from '../bean/meta.version.ts';
+/** controller: end */
+/** config: begin */
+export * from '../config/config.ts';
 declare module 'vona-module-a-database' {
 
   export interface IEntityRecord {
+    'home-user:role': IEntityOptionsRole;
     'home-user:user': IEntityOptionsUser;
+    'home-user:userRole': IEntityOptionsUserRole;
   }
 
 }
@@ -62,63 +75,110 @@ declare module 'vona-module-home-user' {
 
 }
 export interface IModuleEntity {
+  role: EntityRole;
   user: EntityUser;
+  userRole: EntityUserRole;
 }
 /** entity: end */
 /** entity: begin */
 declare module 'vona-module-home-user' {
 
+  export interface EntityRole {
+    get $table(): 'homeRole';
+    $column: <K extends keyof Omit<EntityRole, '$column' | '$columns' | '$table'>>(column: K) => K;
+    $columns: <K extends keyof Omit<EntityRole, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
+  }
+
   export interface EntityUser {
+    get $table(): 'homeUser';
     $column: <K extends keyof Omit<EntityUser, '$column' | '$columns' | '$table'>>(column: K) => K;
     $columns: <K extends keyof Omit<EntityUser, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
   }
 
+  export interface EntityUserRole {
+    get $table(): 'homeUserRole';
+    $column: <K extends keyof Omit<EntityUserRole, '$column' | '$columns' | '$table'>>(column: K) => K;
+    $columns: <K extends keyof Omit<EntityUserRole, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
+  }
+
+  export interface IEntityOptionsRole {
+    fields?: TypeEntityOptionsFields<EntityRole, IEntityOptionsRole['fieldsMore']>;
+  }
+
   export interface IEntityOptionsUser {
     fields?: TypeEntityOptionsFields<EntityUser, IEntityOptionsUser['fieldsMore']>;
   }
+
+  export interface IEntityOptionsUserRole {
+    fields?: TypeEntityOptionsFields<EntityUserRole, IEntityOptionsUserRole['fieldsMore']>;
+  }
 }
-/** controller: end */
-/** config: begin */
-export * from '../config/config.ts';
+/** service: end */
+/** controller: begin */
+export * from '../controller/passport.ts';
+/** meta: end */
+/** dto: begin */
+export * from '../dto/auth.ts';
+export * from '../dto/passport.ts';
 declare module 'vona-module-a-database' {
 
   export interface IModelRecord {
+    'home-user:role': IDecoratorModelOptions;
     'home-user:user': IDecoratorModelOptions;
+    'home-user:userRole': IDecoratorModelOptions;
   }
 
 }
 declare module 'vona-module-home-user' {
 
+  export interface ModelRole {
+    /** @internal */
+    get scope(): ScopeModuleHomeUser;
+  }
+
   export interface ModelUser {
     /** @internal */
     get scope(): ScopeModuleHomeUser;
   }
+
+  export interface ModelUserRole {
+    /** @internal */
+    get scope(): ScopeModuleHomeUser;
+  }
 }
 export interface IModuleModel {
+  role: ModelRole;
   user: ModelUser;
+  userRole: ModelUserRole;
 }
-/** service: end */
-/** controller: begin */
-export * from '../controller/passport.ts';
+export * from '../dto/passportJwt.ts';
+/** entity: begin */
+export * from '../entity/role.ts';
 declare module 'vona' {
 
   export interface IMetaRecord {
+    'home-user:index': IMetaOptionsIndex;
     'home-user:version': never;
   }
 
 }
 declare module 'vona-module-home-user' {
 
+  export interface MetaIndex {
+    /** @internal */
+    get scope(): ScopeModuleHomeUser;
+  }
+
   export interface MetaVersion {
     /** @internal */
     get scope(): ScopeModuleHomeUser;
   }
 }
-/** meta: end */
-/** dto: begin */
-export * from '../dto/auth.ts';
-export * from '../dto/passport.ts';
-export * from '../dto/passportJwt.ts';
+export * from '../entity/user.ts';
+export * from '../entity/userRole.ts';
+/** entity: end */
+/** model: begin */
+export * from '../model/role.ts';
 declare module 'vona-module-a-web' {
 
   export interface IDtoRecord {
@@ -145,16 +205,14 @@ declare module 'vona-module-home-user' {
     fields?: TypeEntityOptionsFields<DtoPassportJwt, IDtoOptionsPassportJwt['fieldsMore']>;
   }
 }
-/** entity: begin */
-export * from '../entity/user.ts';
-/** entity: end */
-/** model: begin */
 export * from '../model/user.ts';
+export * from '../model/userRole.ts';
 /** dto: end */
 /** service: begin */
 export * from '../service/authInnerAdapter.ts';
 export * from '../service/authTokenAdapter.ts';
 export * from '../service/passportAdapter.ts';
+export * from '../service/redisToken.ts';
 declare module 'vona-module-a-web' {
 
   export interface IServiceRecord {
@@ -162,6 +220,7 @@ declare module 'vona-module-a-web' {
     'home-user:authTokenAdapter': never;
     'home-user:passportAdapter': never;
     'home-user:redisToken': never;
+    'home-user:roleInnerAdapter': never;
     'home-user:userInnerAdapter': never;
   }
 
@@ -188,6 +247,11 @@ declare module 'vona-module-home-user' {
     get scope(): ScopeModuleHomeUser;
   }
 
+  export interface ServiceRoleInnerAdapter {
+    /** @internal */
+    get scope(): ScopeModuleHomeUser;
+  }
+
   export interface ServiceUserInnerAdapter {
     /** @internal */
     get scope(): ScopeModuleHomeUser;
@@ -198,6 +262,7 @@ export interface IModuleService {
   authTokenAdapter: ServiceAuthTokenAdapter;
   passportAdapter: ServicePassportAdapter;
   redisToken: ServiceRedisToken;
+  roleInnerAdapter: ServiceRoleInnerAdapter;
   userInnerAdapter: ServiceUserInnerAdapter;
 }
 declare module 'vona' {
@@ -206,10 +271,11 @@ declare module 'vona' {
     'home-user.service.authTokenAdapter': ServiceAuthTokenAdapter;
     'home-user.service.passportAdapter': ServicePassportAdapter;
     'home-user.service.redisToken': ServiceRedisToken;
+    'home-user.service.roleInnerAdapter': ServiceRoleInnerAdapter;
     'home-user.service.userInnerAdapter': ServiceUserInnerAdapter;
   }
 }
-export * from '../service/redisToken.ts';
+export * from '../service/roleInnerAdapter.ts';
 declare module 'vona-module-a-web' {
 
   export interface IControllerRecord {

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

@@ -0,0 +1,16 @@
+import type { IMetaOptionsIndex } from 'vona-module-a-index';
+import { BeanBase } from 'vona';
+import { $tableColumns } from 'vona-module-a-database';
+import { Meta } from 'vona-module-a-meta';
+import { EntityRole } from '../entity/role.ts';
+import { EntityUser } from '../entity/user.ts';
+import { EntityUserRole } from '../entity/userRole.ts';
+
+@Meta<IMetaOptionsIndex>({
+  indexes: {
+    ...$tableColumns(() => EntityUser, entity => entity.name),
+    ...$tableColumns(() => EntityRole, entity => entity.name),
+    ...$tableColumns(() => EntityUserRole, entity => [entity.userId, entity.roleId]),
+  },
+})
+export class MetaIndex extends BeanBase {}

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

@@ -6,6 +6,12 @@ import { Meta } from 'vona-module-a-meta';
 export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVersionInit {
   async update(options: IMetaVersionUpdateOptions) {
     if (options.version === 1) {
+      // homeRole
+      const entityRole = this.scope.entity.role;
+      await this.bean.model.createTable(entityRole.$table, table => {
+        table.basicFields();
+        table.string(entityRole.$column('name'), 255);
+      });
       // homeUser
       const entityUser = this.scope.entity.user;
       await this.bean.model.createTable(entityUser.$table, table => {
@@ -14,17 +20,33 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
         table.string(entityUser.$column('avatar'), 255);
         table.string(entityUser.$column('locale'), 255);
       });
+      // homeUserRole
+      const entityUserRole = this.scope.entity.userRole;
+      await this.bean.model.createTable(entityUserRole.$table, table => {
+        table.basicFields();
+        table.tableIdentity('userId');
+        table.tableIdentity('roleId');
+      });
     }
   }
 
   async init(options: IMetaVersionInitOptions) {
     if (options.version === 1) {
-      // admin
-      await this.scope.model.user.insert({
+      // role: admin
+      const roleAdmin = await this.scope.model.role.insert({
+        name: 'admin',
+      });
+      // user: admin
+      const userAdmin = await this.scope.model.user.insert({
         name: 'admin',
         avatar: ':emoji:flower',
         locale: undefined,
       });
+      // userRole: admin
+      await this.scope.model.userRole.insert({
+        userId: userAdmin.id,
+        roleId: roleAdmin.id,
+      });
     }
   }
 }

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

@@ -1,6 +1,7 @@
 import type { IAuthenticateOptions, IAuthProviderRecord } from 'vona-module-a-auth';
 import type { IJwtToken } from 'vona-module-a-jwt';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+import type { EntityRole } from '../entity/role.ts';
 import type { EntityUser } from '../entity/user.ts';
 import { BeanBase } from 'vona';
 import { DtoAuthSimple } from 'vona-module-a-authsimple';
@@ -111,6 +112,7 @@ export class ControllerPassport extends BeanBase {
     return {
       user: passport.user as EntityUser,
       auth: { id: passport.auth!.id },
+      roles: passport.roles as EntityRole[],
     };
   }
 }

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

@@ -1,6 +1,7 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapi';
 import { Dto } from 'vona-module-a-web';
+import { EntityRole } from 'vona-module-home-user';
 import { EntityUser } from '../entity/user.ts';
 import { DtoAuth } from './auth.ts';
 
@@ -13,4 +14,7 @@ export class DtoPassport {
 
   @Api.field()
   auth: DtoAuth;
+
+  @Api.field(v.array(EntityRole))
+  roles: EntityRole[];
 }

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

@@ -0,0 +1,11 @@
+import type { IDecoratorEntityOptions } from 'vona-module-a-database';
+import { Entity, EntityBase } from 'vona-module-a-database';
+import { Api } from 'vona-module-a-openapi';
+
+export interface IEntityOptionsRole extends IDecoratorEntityOptions {}
+
+@Entity<IEntityOptionsRole>('homeRole')
+export class EntityRole extends EntityBase {
+  @Api.field()
+  name: string;
+}

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

@@ -0,0 +1,14 @@
+import type { IDecoratorEntityOptions, TableIdentity } from 'vona-module-a-database';
+import { Entity, EntityBase } from 'vona-module-a-database';
+import { Api, v } from 'vona-module-a-openapi';
+
+export interface IEntityOptionsUserRole extends IDecoratorEntityOptions {}
+
+@Entity<IEntityOptionsUserRole>('homeUserRole')
+export class EntityUserRole extends EntityBase {
+  @Api.field(v.tableIdentity())
+  userId: TableIdentity;
+
+  @Api.field(v.tableIdentity())
+  roleId: TableIdentity;
+}

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

@@ -1,2 +1,3 @@
 export * from './authAdapter.ts';
+export * from './roleAdapter.ts';
 export * from './userAdapter.ts';

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

@@ -0,0 +1,15 @@
+import type { TableIdentity } from 'vona-module-a-database';
+import type { IRoleBase } from 'vona-module-a-user';
+import type { IRole } from '../types/role.ts';
+import { cast } from 'vona';
+import { setRoleAdapter } from 'vona-module-a-user';
+
+setRoleAdapter({ getRoleId, getRoleName });
+
+function getRoleId(role: IRoleBase): TableIdentity {
+  return cast<IRole>(role).id;
+}
+
+function getRoleName(role: IRoleBase): string {
+  return cast<IRole>(role).name;
+}

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

@@ -0,0 +1,5 @@
+import { BeanModelBase, Model } from 'vona-module-a-database';
+import { EntityRole } from '../entity/role.ts';
+
+@Model({ entity: EntityRole })
+export class ModelRole extends BeanModelBase<EntityRole> {}

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

@@ -0,0 +1,5 @@
+import { BeanModelBase, Model } from 'vona-module-a-database';
+import { EntityUserRole } from '../entity/userRole.ts';
+
+@Model({ entity: EntityUserRole })
+export class ModelUserRole extends BeanModelBase<EntityUserRole> {}

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

@@ -5,10 +5,10 @@ import { Service } from 'vona-module-a-web';
 
 @Service()
 export class ServiceAuthInnerAdapter extends BeanBase implements IAuthInnerAdapter {
-  async get(auth: Partial<IAuth>): Promise<IAuthBase | undefined> {
+  async findOne(auth: Partial<IAuth>): Promise<IAuthBase | undefined> {
     const beanFullName = beanFullNameFromOnionName(this.scope.config.adapter.authInner, 'service');
     const beanAuth = this.bean._getBean<IAuthInnerAdapter>(beanFullName as never);
-    if (beanAuth) return await beanAuth.get(auth);
+    if (beanAuth) return await beanAuth.findOne(auth);
     return auth as unknown as IAuthBase | undefined;
   }
 }

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

@@ -21,10 +21,11 @@ export class ServicePassportAdapter extends BeanBase implements IPassportAdapter
   }
 
   async deserialize(payloadData: IPayloadData): Promise<IPassportBase | undefined> {
-    const user = await this.bean.userInner.get({ id: payloadData.userId });
+    const user = await this.bean.userInner.findOne({ id: payloadData.userId });
     if (!user) return;
-    const auth = await this.bean.authInner.get({ id: payloadData.authId });
+    const auth = await this.bean.authInner.findOne({ id: payloadData.authId });
     if (!auth) return;
-    return { user, auth };
+    const roles = await this.bean.roleInner.findAllByUserId(payloadData.userId);
+    return { user, auth, roles };
   }
 }

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

@@ -0,0 +1,21 @@
+import type { TableIdentity } from 'table-identity';
+import type { IRoleBase, IRoleInnerAdapter } from 'vona-module-a-user';
+import type { IRole } from '../types/role.ts';
+import { BeanBase } from 'vona';
+import { Service } from 'vona-module-a-web';
+
+@Service()
+export class ServiceRoleInnerAdapter extends BeanBase implements IRoleInnerAdapter {
+  async findOneByName(name: string): Promise<IRoleBase | undefined> {
+    return await this.findOne({ name });
+  }
+
+  async findOne(role: Partial<IRole>): Promise<IRoleBase | undefined> {
+    return await this.scope.model.role.get(role);
+  }
+
+  async findAllByUserId(userId: TableIdentity): Promise<IRoleBase[]> {
+    const userRoles = await this.scope.model.userRole.select({ where: { userId } });
+    return await this.scope.model.role.select({ where: { id: userRoles.map(item => item.roleId) } });
+  }
+}

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

@@ -17,11 +17,11 @@ export class ServiceUserInnerAdapter extends BeanBase implements IUserInnerAdapt
     return { id: -1, name: 'anonymous', avatar: undefined, locale: undefined } as IUserBase;
   }
 
-  async getByName(name: string): Promise<IUserBase | undefined> {
-    return await this.get({ name });
+  async findOneByName(name: string): Promise<IUserBase | undefined> {
+    return await this.findOne({ name });
   }
 
-  async get(user: Partial<IUser>): Promise<IUserBase | undefined> {
+  async findOne(user: Partial<IUser>): Promise<IUserBase | undefined> {
     return await this.scope.model.user.get(user);
   }
 
@@ -29,7 +29,7 @@ export class ServiceUserInnerAdapter extends BeanBase implements IUserInnerAdapt
     await this.scope.model.user.update(user);
   }
 
-  async delete(user: Partial<IUser>): 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/index.ts

@@ -1,3 +1,4 @@
 export * from './auth.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/role.ts

@@ -0,0 +1,5 @@
+import type { IRoleBase } from 'vona-module-a-user';
+
+export interface IRole extends IRoleBase {
+  name: string;
+}

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

@@ -2,7 +2,13 @@
   "extends": "../../tsconfig.base",
   "compilerOptions": {
     "rootDir": "src",
+    "declaration": true,
+    "emitDeclarationOnly": true,
     "outDir": "dist"
   },
-  "include": ["src", "src/.metadata/*.ts", "src/**/*.json"]
+  "include": [
+    "src",
+    "src/.metadata/*.ts",
+    "src/**/*.json"
+  ]
 }