vona-cli-set-api 1.0.170 → 1.0.174

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

@@ -45,7 +45,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.101"
+    "vona": "^5.0.103"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

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

@@ -1,6 +1,7 @@
 /* eslint-disable */
 import type { TypeEntityMeta,TypeModelsClassLikeGeneral,TypeSymbolKeyFieldsMore,IModelRelationBelongsToMany } from 'vona-module-a-orm';
 import type { TypeEntityOptionsFields,TypeControllerOptionsActions } from 'vona-module-a-openapi';
+import type { TableIdentity } from 'table-identity';
 /** entity: begin */
 export * from '../entity/role.ts';
 export * from '../entity/roleUser.ts';
@@ -135,7 +136,7 @@ declare module 'vona' {
 }
 /** model: end */
 /** model: begin */
-import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TableIdentity, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
+import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-home-user' {
   export interface IModelOptionsUser {
@@ -149,6 +150,7 @@ declare module 'vona-module-home-user' {
       [SymbolKeyModelOptions]: IModelOptionsRole;
       get<T extends IModelGetOptions<EntityRole,ModelRole>>(where: TypeModelWhere<EntityRole>, options?: T): Promise<TypeModelRelationResult<EntityRole, ModelRole, T> | undefined>;
       mget<T extends IModelGetOptions<EntityRole,ModelRole>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityRole, ModelRole, T>[]>;
+      selectAndCount<T extends IModelSelectParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityRole, ModelRole, T>>;
       select<T extends IModelSelectParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityRole, ModelRole, T>[]>;
       insert<T extends IModelInsertOptions<EntityRole,ModelRole>>(data?: TypeModelMutateRelationData<EntityRole,ModelRole, T>, options?: T): Promise<TypeModelMutateRelationData<EntityRole,ModelRole, T, true>>;
       insertBulk<T extends IModelInsertOptions<EntityRole,ModelRole>>(items: TypeModelMutateRelationData<EntityRole,ModelRole, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityRole,ModelRole, T, true>[]>;
@@ -168,6 +170,7 @@ export interface ModelRoleUser {
       [SymbolKeyModelOptions]: IModelOptionsRoleUser;
       get<T extends IModelGetOptions<EntityRoleUser,ModelRoleUser>>(where: TypeModelWhere<EntityRoleUser>, options?: T): Promise<TypeModelRelationResult<EntityRoleUser, ModelRoleUser, T> | undefined>;
       mget<T extends IModelGetOptions<EntityRoleUser,ModelRoleUser>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityRoleUser, ModelRoleUser, T>[]>;
+      selectAndCount<T extends IModelSelectParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityRoleUser, ModelRoleUser, T>>;
       select<T extends IModelSelectParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityRoleUser, ModelRoleUser, T>[]>;
       insert<T extends IModelInsertOptions<EntityRoleUser,ModelRoleUser>>(data?: TypeModelMutateRelationData<EntityRoleUser,ModelRoleUser, T>, options?: T): Promise<TypeModelMutateRelationData<EntityRoleUser,ModelRoleUser, T, true>>;
       insertBulk<T extends IModelInsertOptions<EntityRoleUser,ModelRoleUser>>(items: TypeModelMutateRelationData<EntityRoleUser,ModelRoleUser, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityRoleUser,ModelRoleUser, T, true>[]>;
@@ -187,6 +190,7 @@ export interface ModelUser {
       [SymbolKeyModelOptions]: IModelOptionsUser;
       get<T extends IModelGetOptions<EntityUser,ModelUser>>(where: TypeModelWhere<EntityUser>, options?: T): Promise<TypeModelRelationResult<EntityUser, ModelUser, T> | undefined>;
       mget<T extends IModelGetOptions<EntityUser,ModelUser>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityUser, ModelUser, T>[]>;
+      selectAndCount<T extends IModelSelectParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityUser, ModelUser, T>>;
       select<T extends IModelSelectParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityUser, ModelUser, T>[]>;
       insert<T extends IModelInsertOptions<EntityUser,ModelUser>>(data?: TypeModelMutateRelationData<EntityUser,ModelUser, T>, options?: T): Promise<TypeModelMutateRelationData<EntityUser,ModelUser, T, true>>;
       insertBulk<T extends IModelInsertOptions<EntityUser,ModelUser>>(items: TypeModelMutateRelationData<EntityUser,ModelUser, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityUser,ModelUser, T, true>[]>;
@@ -294,6 +298,31 @@ declare module 'vona' {
   }
 }
 /** service: end */
+/** eventListener: begin */
+export * from '../bean/eventListener.activate.ts';
+
+import { type IDecoratorEventListenerOptions } from 'vona-module-a-event';
+declare module 'vona-module-a-event' {
+  
+    export interface IEventListenerRecord {
+      'home-user:activate': IDecoratorEventListenerOptions;
+    }
+
+  
+}
+declare module 'vona-module-home-user' {
+  
+        export interface EventListenerActivate {
+          /** @internal */
+          get scope(): ScopeModuleHomeUser;
+        }
+
+          export interface EventListenerActivate {
+            get $beanFullName(): 'home-user.eventListener.activate';
+            get $onionName(): 'home-user:activate';
+          } 
+}
+/** eventListener: end */
 /** meta: begin */
 export * from '../bean/meta.index.ts';
 export * from '../bean/meta.version.ts';

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

@@ -0,0 +1,28 @@
+import type { IEventExecute, NextEvent } from 'vona-module-a-event';
+import type { TypeEventActivateData, TypeEventActivateResult } from 'vona-module-a-user';
+import type { IUser } from '../types/user.ts';
+import { BeanBase } from 'vona';
+import { EventListener } from 'vona-module-a-event';
+
+type TypeEventData = TypeEventActivateData;
+type TypeEventResult = TypeEventActivateResult;
+
+@EventListener({ match: 'a-user:activate' })
+export class EventListenerActivate
+  extends BeanBase
+  implements IEventExecute<TypeEventData, TypeEventResult> {
+  async execute(data: TypeEventData, next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
+    const user = data as IUser;
+    if (user.name === 'admin') {
+      // role: admin
+      const roleAdmin = await this.scope.model.role.get({ name: 'admin' });
+      // userRole: admin
+      await this.scope.model.roleUser.insert({
+        userId: user.id,
+        roleId: roleAdmin!.id,
+      });
+    }
+    // next
+    return next();
+  }
+}

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

@@ -1,4 +1,5 @@
 import type { IMetaVersionInit, IMetaVersionInitOptions, IMetaVersionUpdate, IMetaVersionUpdateOptions } from 'vona-module-a-version';
+import type { IUser } from '../types/user.ts';
 import { BeanBase } from 'vona';
 import { Meta } from 'vona-module-a-meta';
 
@@ -20,6 +21,9 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
         table.basicFields();
         table.string(entityUser.name, 255).comment(entityUser.$comment.name);
         table.string(entityUser.avatar, 255).comment(entityUser.$comment.avatar);
+        table.string(entityUser.email, 255).comment(entityUser.$comment.email);
+        table.string(entityUser.mobile, 255).comment(entityUser.$comment.mobile);
+        table.boolean(entityUser.activated).defaultTo(entityUser.$default.activated).comment(entityUser.$comment.activated);
         table.string(entityUser.locale, 255).comment(entityUser.$comment.locale);
       });
       // homeRoleUser
@@ -35,20 +39,15 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
   async init(options: IMetaVersionInitOptions) {
     if (options.version === 1) {
       // role: admin
-      const roleAdmin = await this.scope.model.role.insert({
+      await this.scope.model.role.insert({
         name: 'admin',
       });
       // user: admin
-      const userAdmin = await this.scope.model.user.insert({
+      await this.bean.userInner.register({
         name: 'admin',
         avatar: ':emoji:flower',
         locale: undefined,
-      });
-      // userRole: admin
-      await this.scope.model.roleUser.insert({
-        userId: userAdmin.id,
-        roleId: roleAdmin.id,
-      });
+      } as IUser, true);
     }
   }
 }

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/config/locale/en-us.ts

@@ -4,5 +4,8 @@ export default {
   User: 'User',
   UserName: 'User Name',
   UserAvatar: 'Avatar',
+  UserEmail: 'Email',
+  UserMobile: 'Mobile',
+  UserActivated: 'Activated',
   UserLocale: 'Language',
 };

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/config/locale/zh-cn.ts

@@ -4,5 +4,8 @@ export default {
   User: '用户',
   UserName: '用户名',
   UserAvatar: '头像',
+  UserEmail: '电子邮件',
+  UserMobile: '手机号',
+  UserActivated: '已激活',
   UserLocale: '语言',
 };

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

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
 import type { IAuthBase } from 'vona-module-a-user';
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { Api, v } from 'vona-module-a-openapi';

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

@@ -1,4 +1,5 @@
-import type { IDecoratorEntityOptions, TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import { Api, v } from 'vona-module-a-openapi';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 

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

@@ -15,6 +15,15 @@ export class EntityUser extends EntityBase {
   @Api.field(v.title($locale('UserAvatar')), v.optional())
   avatar?: string;
 
+  @Api.field(v.title($locale('UserEmail')), v.optional())
+  email?: string;
+
+  @Api.field(v.title($locale('UserMobile')), v.optional())
+  mobile?: string;
+
+  @Api.field(v.title($locale('UserActivated')), v.default(false))
+  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/lib/authAdapter.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
 import type { IAuthBase } from 'vona-module-a-user';
 import type { IAuth } from '../types/auth.ts';
 import { cast } from 'vona';

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

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
 import type { IRoleBase } from 'vona-module-a-user';
 import type { IRole } from '../types/role.ts';
 import { cast } from 'vona';

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

@@ -1,11 +1,11 @@
+import type { TableIdentity } from 'table-identity';
 import type { ILocaleInfos } from 'vona';
-import type { TableIdentity } from 'vona-module-a-orm';
 import type { IUserBase } from 'vona-module-a-user';
 import type { IUser } from '../types/user.ts';
 import { cast } from 'vona';
 import { setUserAdapter } from 'vona-module-a-user';
 
-setUserAdapter({ getUserId, getUserName, getUserAvatar, getUserLocale, getUserAnonymous });
+setUserAdapter({ getUserId, getUserName, getUserAvatar, getUserEmail, getUserMobile, getUserActivated, getUserLocale, getUserAnonymous });
 
 function getUserId(user: IUserBase): TableIdentity {
   return cast<IUser>(user).id;
@@ -19,6 +19,18 @@ function getUserAvatar(user: IUserBase): string | undefined {
   return cast<IUser>(user).avatar;
 }
 
+function getUserEmail(user: IUserBase): string | undefined {
+  return cast<IUser>(user).email;
+}
+
+function getUserMobile(user: IUserBase): string | undefined {
+  return cast<IUser>(user).mobile;
+}
+
+function getUserActivated(user: IUserBase): boolean {
+  return cast<IUser>(user).activated;
+}
+
 function getUserLocale(user: IUserBase): keyof ILocaleInfos | undefined {
   return cast<IUser>(user).locale;
 }

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

@@ -1,3 +1,4 @@
+import type { TableIdentity } from 'table-identity';
 import type { IAuthUserProfile, IUserBase, IUserInnerAdapter } from 'vona-module-a-user';
 import type { IUser } from '../types/user.ts';
 import { BeanBase } from 'vona';
@@ -5,16 +6,21 @@ import { Service } from 'vona-module-a-bean';
 
 @Service()
 export class ServiceUserInnerAdapter extends BeanBase implements IUserInnerAdapter {
-  async createByProfile(profile: IAuthUserProfile): Promise<IUserBase> {
-    return await this.scope.model.user.insert({
+  async create(user: Partial<IUser>): Promise<IUserBase> {
+    return await this.scope.model.user.insert(user);
+  }
+
+  async userOfProfile(profile: IAuthUserProfile): Promise<IUserBase> {
+    return {
       name: profile.username!,
+      email: profile.emails?.[0].value,
       avatar: profile.photos?.[0].value,
       locale: undefined,
-    });
+    } as IUser;
   }
 
   async createAnonymous(): Promise<IUserBase> {
-    return { id: -1, name: 'anonymous', avatar: undefined, locale: undefined } as IUserBase;
+    return { id: -1, name: 'anonymous', avatar: undefined, locale: undefined } as IUser;
   }
 
   async findOneByName(name: string): Promise<IUserBase | undefined> {
@@ -32,4 +38,8 @@ export class ServiceUserInnerAdapter extends BeanBase implements IUserInnerAdapt
   async remove(user: Partial<IUser>): Promise<void> {
     await this.scope.model.user.delete(user);
   }
+
+  async setActivated(id: TableIdentity, activated: boolean): Promise<void> {
+    await this.scope.model.user.update({ id, activated });
+  }
 }

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

@@ -1,5 +1,5 @@
 import type { IPayloadDataBase } from 'vona-module-a-jwt';
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
 import type { IPassportBase } from 'vona-module-a-user';
 import type { IAuth } from './auth.ts';
 import type { IUser } from './user.ts';

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

@@ -4,5 +4,8 @@ import type { IUserBase } from 'vona-module-a-user';
 export interface IUser extends IUserBase {
   name: string;
   avatar?: string;
+  email?: string;
+  mobile?: string;
+  activated: boolean;
   locale?: keyof ILocaleInfos | undefined;
 }

package/cli/templates/tools/crud/boilerplate/src/controller/{{resourceName}}.ts_

@@ -1,4 +1,5 @@
-import type { IQueryParams, TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
+import type { IQueryParams } from 'vona-module-a-orm';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 import { BeanBase } from 'vona';

package/cli/templates/tools/crud/boilerplate/src/service/{{resourceName}}.ts_

@@ -1,4 +1,5 @@
-import type { IQueryParams, TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
+import type { IQueryParams } from 'vona-module-a-orm';
 import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.ts';
 import type { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.ts';
 import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.ts';

package/dist/lib/bean/cli.tools.metadata.js

@@ -134,6 +134,7 @@ export class CliToolsMetadata extends BeanCliBase {
     _generatePatch(content) {
         if (!content)
             return content;
+        content = this._generatePatch_resources(content, 'table-identity', ['TableIdentity'], true);
         content = this._generatePatch_resources(content, 'vona-module-a-openapi', ['TypeEntityOptionsFields', 'TypeControllerOptionsActions'], true);
         content = this._generatePatch_resources(content, 'vona-module-a-orm', [
             'TypeEntityMeta',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.170",
+  "version": "1.0.174",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -61,7 +61,7 @@
     "ts-node": "^10.9.2",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.47",
+    "vona-core": "^5.0.48",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },

package/templates/app/app.ejs

@@ -4,18 +4,12 @@ import config from './config.ts';
 import env from './env.ts';
 <%=appMonkey?"import { AppMonkey } from '../src/backend/config/monkey.ts';":''%>
 
-export async function createSingleApp(envRuntime?: NodeJS.ProcessEnv) {
-  const env2 = envRuntime ? Object.assign({}, env, envRuntime) : env;
-  if (envRuntime) {
-    for (const key of Object.keys(envRuntime)) {
-      process.env[key] = envRuntime[key];
-    }
-  }
+export async function createSingleApp() {
   return await createApp({
     modulesMeta: () => import('./modules-meta.ts'),
     locales,
     config,
-    env: env2,
+    env,
     <%=appMonkey?'AppMonkey,':''%>
   });
 }