vona-module-a-orm 5.1.24 → 5.1.26
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/model/metadata/generate.ts +5 -11
- package/dist/index.js +43 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/bean.model/bean.model_cache.d.ts +3 -0
- package/dist/lib/bean.model/bean.model_cache.d.ts.map +1 -1
- package/dist/lib/bean.model/bean.model_crud_inner.d.ts.map +1 -1
- package/dist/lib/dto/dtoGet.d.ts.map +1 -1
- package/dist-cli/model/metadata/generate.js +5 -13
- package/package.json +2 -2
- package/src/lib/bean.model/bean.model_cache.ts +52 -0
- package/src/lib/bean.model/bean.model_crud_inner.ts +3 -0
- package/src/lib/bean.model/bean.model_utils.ts +1 -1
- package/src/lib/dto/dtoGet.ts +4 -10
|
@@ -32,6 +32,9 @@ export declare class BeanModelCache<TRecord extends {} = {}> extends BeanModelCr
|
|
|
32
32
|
private __select_raw;
|
|
33
33
|
private __select_cache;
|
|
34
34
|
get<T extends IModelGetOptions<TRecord>>(where: TypeModelWhere<TRecord>, options?: T): Promise<Partial<TRecord> | undefined>;
|
|
35
|
+
getForUpdate<T extends IModelGetOptions<TRecord>>(where: TypeModelWhere<TRecord>, options?: T): Promise<any | undefined>;
|
|
36
|
+
getByIdForUpdate<T extends IModelGetOptions<TRecord>>(id: TableIdentity, options?: T): Promise<any | undefined>;
|
|
37
|
+
private __getForUpdate_raw;
|
|
35
38
|
private __get_raw;
|
|
36
39
|
update<T extends IModelUpdateOptions<TRecord>>(data: Partial<TRecord>, options?: T): Promise<Partial<TRecord>>;
|
|
37
40
|
updateBulk<T extends IModelUpdateOptions<TRecord>>(items: Partial<TRecord>[], options?: T): Promise<Partial<TRecord>[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_cache.d.ts","sourceRoot":"","sources":["../../../src/lib/bean.model/bean.model_cache.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bean.model_cache.d.ts","sourceRoot":"","sources":["../../../src/lib/bean.model/bean.model_cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_crud_inner.d.ts","sourceRoot":"","sources":["../../../src/lib/bean.model/bean.model_crud_inner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EACzB,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,qBAAa,kBAAkB,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAC;cAChE,KAAK,CACnB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,EAAE,CAAC;cAML,cAAc,CAC5B,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC;cA8BnB,OAAO,CAAC,CAAC,SAAS,kBAAkB,CAAC,OAAO,CAAC,EAC3D,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B,EACpC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,GAC9C,OAAO,CAAC,OAAO,EAAE,CAAC;IAoBrB,SAAS,CAAC,mBAAmB,CAAC,CAAC,SAAS,yBAAyB,CAAC,OAAO,CAAC,EACxE,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B;cA4BtB,IAAI,CAClB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAgBf,MAAM,CACpB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACnC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAoBd,UAAU,CACxB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,EACvC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,CAAC;cAqBF,WAAW,CACzB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,EAC5C,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;cAmDf,OAAO,CACrB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"bean.model_crud_inner.d.ts","sourceRoot":"","sources":["../../../src/lib/bean.model/bean.model_crud_inner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EACzB,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,qBAAa,kBAAkB,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAC;cAChE,KAAK,CACnB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,EAAE,CAAC;cAML,cAAc,CAC5B,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC;cA8BnB,OAAO,CAAC,CAAC,SAAS,kBAAkB,CAAC,OAAO,CAAC,EAC3D,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B,EACpC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,GAC9C,OAAO,CAAC,OAAO,EAAE,CAAC;IAoBrB,SAAS,CAAC,mBAAmB,CAAC,CAAC,SAAS,yBAAyB,CAAC,OAAO,CAAC,EACxE,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B;cA4BtB,IAAI,CAClB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAgBf,MAAM,CACpB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACnC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAoBd,UAAU,CACxB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,EACvC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,CAAC;cAqBF,WAAW,CACzB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,EAC5C,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;cAmDf,OAAO,CACrB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;cAwCZ,OAAO,CACrB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC;CAsBjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dtoGet.d.ts","sourceRoot":"","sources":["../../../src/lib/dto/dtoGet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAc1C,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAA0B,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAYtE,wBAAgB,MAAM,CACpB,SAAS,SAAS,aAAa,GAAG,MAAM,iBAAiB,EACzD,CAAC,SAAS,aAAa,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,SAAS,EAE1D,SAAS,EAAE,SAAS,SAAS,aAAa,GACtC,CAAC,MAAM,aAAa,CAAC,SAAS,CAAC,CAAC,GAAG,aAAa,CAAC,SAAS,CAAC,GAC3D,SAAS,EACb,MAAM,CAAC,EAAE,CAAC,GACT,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"dtoGet.d.ts","sourceRoot":"","sources":["../../../src/lib/dto/dtoGet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAc1C,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAA0B,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAYtE,wBAAgB,MAAM,CACpB,SAAS,SAAS,aAAa,GAAG,MAAM,iBAAiB,EACzD,CAAC,SAAS,aAAa,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,SAAS,EAE1D,SAAS,EAAE,SAAS,SAAS,aAAa,GACtC,CAAC,MAAM,aAAa,CAAC,SAAS,CAAC,CAAC,GAAG,aAAa,CAAC,SAAS,CAAC,GAC3D,SAAS,EACb,MAAM,CAAC,EAAE,CAAC,GACT,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAI/C;AAgBD,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,EAAE,EAAE,MAAM,SAAS,aAAa,EAChF,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,EACjC,WAAW,EAAE,aAAa,CAAC,OAAO,CAAC,EACnC,cAAc,CAAC,EAAE,4BAA4B,EAC7C,kBAAkB,CAAC,EAAE,iBAAiB,QAQvC"}
|
|
@@ -28,6 +28,8 @@ export default async function (options) {
|
|
|
28
28
|
[SymbolKeyEntityMeta]: ${entityMetaName};
|
|
29
29
|
[SymbolKeyModelOptions]: ${opionsName};
|
|
30
30
|
get<T extends IModelGetOptions<${entityName},${className}>>(where: TypeModelWhere<${entityName}>, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
|
|
31
|
+
getForUpdate<T extends IModelGetOptions<${entityName},${className}>>(where: TypeModelWhere<${entityName}>, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
|
|
32
|
+
getByIdForUpdate<T extends IModelGetOptions<${entityName},${className}>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
|
|
31
33
|
mget<T extends IModelGetOptions<${entityName},${className}>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T>[]>;
|
|
32
34
|
selectAndCount<T extends IModelSelectParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<${entityName}, ${className}, T>>;
|
|
33
35
|
select<T extends IModelSelectParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<${entityName}, ${className}, T>[]>;
|
|
@@ -241,21 +243,11 @@ function __parseRelation_options(node) {
|
|
|
241
243
|
aggrs = options?.aggrs;
|
|
242
244
|
}
|
|
243
245
|
// columns
|
|
244
|
-
if (!options?.columns) {
|
|
245
|
-
|
|
246
|
-
columns = 'undefined';
|
|
247
|
-
}
|
|
248
|
-
else {
|
|
249
|
-
columns = 'undefined'; // '\'*\'';
|
|
250
|
-
}
|
|
246
|
+
if (!options?.columns || options.columns.includes('*')) {
|
|
247
|
+
columns = "'*'";
|
|
251
248
|
}
|
|
252
249
|
else {
|
|
253
|
-
|
|
254
|
-
columns = "'*'";
|
|
255
|
-
}
|
|
256
|
-
else {
|
|
257
|
-
columns = __joinColumnsType(options?.columns, false);
|
|
258
|
-
}
|
|
250
|
+
columns = __joinColumnsType(options.columns, false);
|
|
259
251
|
}
|
|
260
252
|
return { autoload, columns, groups, aggrs };
|
|
261
253
|
}
|
package/package.json
CHANGED
|
@@ -465,6 +465,58 @@ export class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TReco
|
|
|
465
465
|
return item;
|
|
466
466
|
}
|
|
467
467
|
|
|
468
|
+
async getForUpdate<T extends IModelGetOptions<TRecord>>(
|
|
469
|
+
where: TypeModelWhere<TRecord>,
|
|
470
|
+
options?: T,
|
|
471
|
+
): Promise<any | undefined> {
|
|
472
|
+
if (!this.db.inTransaction) {
|
|
473
|
+
throw new Error('model error: getForUpdate requires an active transaction');
|
|
474
|
+
}
|
|
475
|
+
const optionsLock = Object.assign({}, options, {
|
|
476
|
+
disableCacheEntity: true,
|
|
477
|
+
disableCacheQuery: true,
|
|
478
|
+
});
|
|
479
|
+
const relations = this.relations.handleRelationsCollection(optionsLock);
|
|
480
|
+
const [options2, refKeys] = this.relations.prepareColumnsByRelations(relations, optionsLock);
|
|
481
|
+
let item = await this.__getForUpdate_raw(undefined, where, options2);
|
|
482
|
+
if (!item) return item;
|
|
483
|
+
item = await this.relations.handleRelationsOne(
|
|
484
|
+
relations,
|
|
485
|
+
item,
|
|
486
|
+
optionsLock as any,
|
|
487
|
+
optionsLock,
|
|
488
|
+
);
|
|
489
|
+
if (refKeys) {
|
|
490
|
+
for (const refKey of refKeys) {
|
|
491
|
+
delete item![refKey];
|
|
492
|
+
}
|
|
493
|
+
}
|
|
494
|
+
return item;
|
|
495
|
+
}
|
|
496
|
+
|
|
497
|
+
async getByIdForUpdate<T extends IModelGetOptions<TRecord>>(
|
|
498
|
+
id: TableIdentity,
|
|
499
|
+
options?: T,
|
|
500
|
+
): Promise<any | undefined> {
|
|
501
|
+
return await this.getForUpdate({ id } as TypeModelWhere<TRecord>, options);
|
|
502
|
+
}
|
|
503
|
+
|
|
504
|
+
private async __getForUpdate_raw(
|
|
505
|
+
table: keyof ITableRecord | undefined,
|
|
506
|
+
where: TypeModelWhere<TRecord>,
|
|
507
|
+
options?: IModelGetOptions<TRecord>,
|
|
508
|
+
): Promise<TRecord | undefined> {
|
|
509
|
+
table = table || this.getTable(where);
|
|
510
|
+
if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
|
|
511
|
+
const params: IModelSelectParams<TRecord> = { where, limit: 1 };
|
|
512
|
+
if (options?.columns) {
|
|
513
|
+
params.columns = options.columns as any;
|
|
514
|
+
}
|
|
515
|
+
const builder = this._select_buildParams(table, params as any, options).forUpdate();
|
|
516
|
+
const items = await super._select(table, params, options, builder);
|
|
517
|
+
return items[0];
|
|
518
|
+
}
|
|
519
|
+
|
|
468
520
|
private async __get_raw(
|
|
469
521
|
table: keyof ITableRecord | undefined,
|
|
470
522
|
where: TypeModelWhere<TRecord>,
|
|
@@ -253,6 +253,9 @@ export class BeanModelCrudInner<TRecord extends {}> extends BeanModelView<TRecor
|
|
|
253
253
|
if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
|
|
254
254
|
// data
|
|
255
255
|
[data] = await this.prepareData(table, data);
|
|
256
|
+
for (const key in data) {
|
|
257
|
+
if (data[key] === undefined) data[key] = null as never;
|
|
258
|
+
}
|
|
256
259
|
// where
|
|
257
260
|
const where = Object.assign({}, options?.where);
|
|
258
261
|
// id
|
|
@@ -49,7 +49,7 @@ export class BeanModelUtils<TRecord extends {}> extends BeanModelMeta<TRecord> {
|
|
|
49
49
|
if (Object.prototype.hasOwnProperty.call(item, columnName)) {
|
|
50
50
|
let value = item[columnName];
|
|
51
51
|
dataOriginal[columnName] = value;
|
|
52
|
-
if (column.type === 'json' && value
|
|
52
|
+
if (column.type === 'json' && !isNil(value)) {
|
|
53
53
|
value = JSON.stringify(value);
|
|
54
54
|
}
|
|
55
55
|
data[columnName] = value;
|
package/src/lib/dto/dtoGet.ts
CHANGED
|
@@ -38,18 +38,12 @@ export function DtoGet<
|
|
|
38
38
|
: ModelLike,
|
|
39
39
|
params?: T,
|
|
40
40
|
): Constructable<TypeDtoGetResult<ModelLike, T>> {
|
|
41
|
-
return _DtoGet_raw(modelLike, params)
|
|
41
|
+
return _DtoGet_raw(modelLike as any, params as any) as Constructable<
|
|
42
|
+
TypeDtoGetResult<ModelLike, T>
|
|
43
|
+
>;
|
|
42
44
|
}
|
|
43
45
|
|
|
44
|
-
function _DtoGet_raw<
|
|
45
|
-
ModelLike extends BeanModelMeta | keyof IModelClassRecord,
|
|
46
|
-
T extends IDtoGetParams<ModelLike> | undefined = undefined,
|
|
47
|
-
>(
|
|
48
|
-
modelLike: ModelLike extends BeanModelMeta
|
|
49
|
-
? (() => Constructable<ModelLike>) | Constructable<ModelLike>
|
|
50
|
-
: ModelLike,
|
|
51
|
-
params?: T,
|
|
52
|
-
): Constructable<TypeDtoGetResult<ModelLike, T>> {
|
|
46
|
+
function _DtoGet_raw(modelLike: any, params?: any): Constructable<any> {
|
|
53
47
|
// model
|
|
54
48
|
const modelClass = prepareClassModel(modelLike);
|
|
55
49
|
// entity
|