vona-cli-set-api 1.0.202 → 1.0.205
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/templates/create/project/basic/boilerplate/package.original.json +1 -1
- package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/.metadata/index.ts +11 -0
- package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/bean/zodRefine.emailUnique.ts +1 -1
- package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/model/user.ts +5 -1
- package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/roleAdapter.ts +1 -1
- package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/userAdapter.ts +1 -1
- package/package.json +2 -2
|
@@ -163,6 +163,11 @@ declare module 'vona-module-home-user' {
|
|
|
163
163
|
count<T extends IModelSelectCountParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<BigNumber | undefined>;
|
|
164
164
|
aggregate<T extends IModelSelectAggrParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
|
|
165
165
|
group<T extends IModelSelectGroupParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<EntityRole, T>[]>;
|
|
166
|
+
getById<T extends IModelGetOptions<EntityRole,ModelRole>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityRole, ModelRole, T> | undefined>;
|
|
167
|
+
getByName<T extends IModelGetOptions<EntityRole,ModelRole>>(name?: string, options?: T): Promise<TypeModelRelationResult<EntityRole, ModelRole, T> | undefined>;
|
|
168
|
+
getByNameEqI<T extends IModelGetOptions<EntityRole,ModelRole>>(name?: string, options?: T): Promise<TypeModelRelationResult<EntityRole, ModelRole, T> | undefined>;
|
|
169
|
+
selectByName<T extends IModelSelectParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(name?: string, params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityRole, ModelRole, T>[]>;
|
|
170
|
+
selectByNameEqI<T extends IModelSelectParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(name?: string, params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityRole, ModelRole, T>[]>;
|
|
166
171
|
}
|
|
167
172
|
export interface ModelRoleUser {
|
|
168
173
|
[SymbolKeyEntity]: EntityRoleUser;
|
|
@@ -183,6 +188,7 @@ export interface ModelRoleUser {
|
|
|
183
188
|
count<T extends IModelSelectCountParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<BigNumber | undefined>;
|
|
184
189
|
aggregate<T extends IModelSelectAggrParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
|
|
185
190
|
group<T extends IModelSelectGroupParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<EntityRoleUser, T>[]>;
|
|
191
|
+
getById<T extends IModelGetOptions<EntityRoleUser,ModelRoleUser>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityRoleUser, ModelRoleUser, T> | undefined>;
|
|
186
192
|
}
|
|
187
193
|
export interface ModelUser {
|
|
188
194
|
[SymbolKeyEntity]: EntityUser;
|
|
@@ -203,6 +209,11 @@ export interface ModelUser {
|
|
|
203
209
|
count<T extends IModelSelectCountParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<BigNumber | undefined>;
|
|
204
210
|
aggregate<T extends IModelSelectAggrParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
|
|
205
211
|
group<T extends IModelSelectGroupParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<EntityUser, T>[]>;
|
|
212
|
+
getById<T extends IModelGetOptions<EntityUser,ModelUser>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityUser, ModelUser, T> | undefined>;
|
|
213
|
+
getByName<T extends IModelGetOptions<EntityUser,ModelUser>>(name?: string, options?: T): Promise<TypeModelRelationResult<EntityUser, ModelUser, T> | undefined>;
|
|
214
|
+
getByNameEqI<T extends IModelGetOptions<EntityUser,ModelUser>>(name?: string, options?: T): Promise<TypeModelRelationResult<EntityUser, ModelUser, T> | undefined>;
|
|
215
|
+
selectByName<T extends IModelSelectParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(name?: string, params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityUser, ModelUser, T>[]>;
|
|
216
|
+
selectByNameEqI<T extends IModelSelectParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(name?: string, params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityUser, ModelUser, T>[]>;
|
|
206
217
|
}
|
|
207
218
|
}
|
|
208
219
|
declare module 'vona-module-a-orm' {
|
|
@@ -9,7 +9,7 @@ export interface IZodRefineOptionsEmailUnique extends IDecoratorZodRefineOptions
|
|
|
9
9
|
@ZodRefine<IZodRefineOptionsEmailUnique>()
|
|
10
10
|
export class ZodRefineEmailUnique extends BeanBase implements IZodRefineExecute<TypeZodRefineEmailUniqueData> {
|
|
11
11
|
async execute(value: TypeZodRefineEmailUniqueData, refinementCtx: TypeRefinementCtx, _options: IZodRefineOptionsEmailUnique) {
|
|
12
|
-
const user = await this.scope.model.user.
|
|
12
|
+
const user = await this.scope.model.user.getByEmailEqI(value);
|
|
13
13
|
if (user) {
|
|
14
14
|
refinementCtx.addIssue({
|
|
15
15
|
code: 'custom',
|
|
@@ -12,4 +12,8 @@ export interface IModelOptionsUser extends IDecoratorModelOptions<EntityUser> {}
|
|
|
12
12
|
roles: $relation.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId', { columns: ['id', 'name'] }),
|
|
13
13
|
},
|
|
14
14
|
})
|
|
15
|
-
export class ModelUser extends BeanModelBase<EntityUser> {
|
|
15
|
+
export class ModelUser extends BeanModelBase<EntityUser> {
|
|
16
|
+
getByEmailEqI(email: string) {
|
|
17
|
+
return this.get({ email: { _eqI_: email } });
|
|
18
|
+
}
|
|
19
|
+
}
|
|
@@ -6,7 +6,7 @@ import { Service } from 'vona-module-a-bean';
|
|
|
6
6
|
@Service()
|
|
7
7
|
export class ServiceRoleAdapter extends BeanBase implements IRoleAdapter {
|
|
8
8
|
async findOneByName(name: string): Promise<IRoleBase | undefined> {
|
|
9
|
-
return await this.scope.model.role.
|
|
9
|
+
return await this.scope.model.role.getByNameEqI(name);
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
async findOne(role: Partial<IRoleBase>): Promise<IRoleBase | undefined> {
|
|
@@ -23,7 +23,7 @@ export class ServiceUserAdapter extends BeanBase implements IUserAdapter {
|
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
async findOneByName(name: string): Promise<IUserBase | undefined> {
|
|
26
|
-
return await this.scope.model.user.
|
|
26
|
+
return await this.scope.model.user.getByNameEqI(name);
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
async findOne(user: Partial<IUserBase>): Promise<IUserBase | undefined> {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vona-cli-set-api",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.205",
|
|
5
5
|
"description": "vona cli-set-api",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"ts-node": "^10.9.2",
|
|
62
62
|
"urllib": "^4.6.11",
|
|
63
63
|
"uuid": "^11.1.0",
|
|
64
|
-
"vona-core": "^5.0.
|
|
64
|
+
"vona-core": "^5.0.56",
|
|
65
65
|
"why-is-node-running": "^3.2.2",
|
|
66
66
|
"yargs-parser": "^21.1.1"
|
|
67
67
|
},
|