vona-module-a-orm 5.1.8 → 5.1.12
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/LICENSE +1 -1
- package/cli/databaseDialect/boilerplate/{{sceneName}}.{{beanName}}.ts_ +2 -2
- package/dist/.metadata/index.d.ts +3 -2
- package/dist/.metadata/index.d.ts.map +1 -1
- package/dist/bean/bean.database.d.ts +2 -2
- package/dist/bean/bean.database.d.ts.map +1 -1
- package/dist/bean/bean.model.d.ts +1 -1
- package/dist/bean/bean.model.d.ts.map +1 -1
- package/dist/common/buildWhere.d.ts.map +1 -1
- package/dist/common/utils.d.ts +1 -1
- package/dist/common/utils.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1396 -1394
- package/dist/index.js.map +1 -1
- package/dist/lib/bean.model/bean.model_cache.d.ts.map +1 -0
- package/dist/lib/bean.model/bean.model_crud.d.ts.map +1 -0
- package/dist/lib/bean.model/bean.model_crud_inner.d.ts.map +1 -0
- package/dist/lib/bean.model/bean.model_crud_table.d.ts.map +1 -0
- package/dist/lib/bean.model/bean.model_knex.d.ts.map +1 -0
- package/dist/{bean → lib}/bean.model/bean.model_meta.d.ts +2 -2
- package/dist/lib/bean.model/bean.model_meta.d.ts.map +1 -0
- package/dist/lib/bean.model/bean.model_utils.d.ts.map +1 -0
- package/dist/lib/bean.model/bean.model_view.d.ts.map +1 -0
- package/dist/lib/bean.modelBase.d.ts.map +1 -0
- package/dist/lib/dto/dtoAggregate.d.ts +1 -1
- package/dist/lib/dto/dtoAggregate.d.ts.map +1 -1
- package/dist/lib/dto/dtoCreate.d.ts +1 -1
- package/dist/lib/dto/dtoCreate.d.ts.map +1 -1
- package/dist/lib/dto/dtoGet.d.ts +1 -1
- package/dist/lib/dto/dtoGet.d.ts.map +1 -1
- package/dist/lib/dto/dtoGroup.d.ts +1 -1
- package/dist/lib/dto/dtoGroup.d.ts.map +1 -1
- package/dist/lib/dto/dtoMutate.d.ts +1 -1
- package/dist/lib/dto/dtoMutate.d.ts.map +1 -1
- package/dist/lib/dto/dtoSelectAndCount.d.ts +1 -1
- package/dist/lib/dto/dtoSelectAndCount.d.ts.map +1 -1
- package/dist/lib/dto/dtoUpdate.d.ts +1 -1
- package/dist/lib/dto/dtoUpdate.d.ts.map +1 -1
- package/dist/lib/index.d.ts +1 -0
- package/dist/lib/index.d.ts.map +1 -1
- package/dist/lib/modelCacheBase.d.ts +3 -3
- package/dist/lib/modelCacheBase.d.ts.map +1 -1
- package/dist/lib/relations.d.ts +1 -1
- package/dist/lib/relations.d.ts.map +1 -1
- package/dist/lib/relationsDynamic.d.ts +1 -1
- package/dist/lib/relationsDynamic.d.ts.map +1 -1
- package/dist/lib/relationsMutate.d.ts +1 -1
- package/dist/lib/relationsMutate.d.ts.map +1 -1
- package/dist/lib/relationsStatic.d.ts +1 -1
- package/dist/lib/relationsStatic.d.ts.map +1 -1
- package/dist/service/cacheEntity_.d.ts +1 -1
- package/dist/service/cacheEntity_.d.ts.map +1 -1
- package/dist/service/cacheQuery_.d.ts +1 -1
- package/dist/service/cacheQuery_.d.ts.map +1 -1
- package/dist/service/database.d.ts +2 -2
- package/dist/service/database.d.ts.map +1 -1
- package/dist/{bean/bean.databaseDialectBase.d.ts → service/databaseDialectBase_.d.ts} +2 -2
- package/dist/service/databaseDialectBase_.d.ts.map +1 -0
- package/dist/service/db_.d.ts +2 -2
- package/dist/service/db_.d.ts.map +1 -1
- package/dist/service/relations_.d.ts +1 -1
- package/dist/service/relations_.d.ts.map +1 -1
- package/dist/types/database.d.ts +0 -4
- package/dist/types/database.d.ts.map +1 -1
- package/dist/types/dto/dtoGet.d.ts +1 -1
- package/dist/types/dto/dtoGet.d.ts.map +1 -1
- package/dist/types/dto/dtoMutate.d.ts +1 -1
- package/dist/types/dto/dtoMutate.d.ts.map +1 -1
- package/dist/types/dto/dtoSelectAndCount.d.ts +1 -1
- package/dist/types/dto/dtoSelectAndCount.d.ts.map +1 -1
- package/dist/types/model.d.ts +1 -1
- package/dist/types/model.d.ts.map +1 -1
- package/dist/types/modelAggr.d.ts +1 -1
- package/dist/types/modelAggr.d.ts.map +1 -1
- package/dist/types/modelCount.d.ts +1 -1
- package/dist/types/modelCount.d.ts.map +1 -1
- package/dist/types/modelGeneral.d.ts +1 -1
- package/dist/types/modelGeneral.d.ts.map +1 -1
- package/dist/types/modelGroup.d.ts +1 -1
- package/dist/types/modelGroup.d.ts.map +1 -1
- package/dist/types/modelIncrement.d.ts +1 -1
- package/dist/types/modelIncrement.d.ts.map +1 -1
- package/dist/types/modelWhere.d.ts +3 -3
- package/dist/types/modelWhere.d.ts.map +1 -1
- package/dist/types/relations.d.ts +1 -1
- package/dist/types/relations.d.ts.map +1 -1
- package/dist/types/relationsColumns.d.ts +1 -1
- package/dist/types/relationsColumns.d.ts.map +1 -1
- package/dist/types/relationsDef.d.ts +1 -1
- package/dist/types/relationsDef.d.ts.map +1 -1
- package/dist/types/relationsDefDynamic.d.ts +1 -1
- package/dist/types/relationsDefDynamic.d.ts.map +1 -1
- package/dist/types/relationsDefMutate.d.ts +1 -1
- package/dist/types/relationsDefMutate.d.ts.map +1 -1
- package/dist/types/relationsMutate.d.ts +1 -1
- package/dist/types/relationsMutate.d.ts.map +1 -1
- package/dist/types/relationsTables.d.ts +1 -1
- package/dist/types/relationsTables.d.ts.map +1 -1
- package/package.json +11 -8
- package/src/.metadata/index.ts +4 -3
- package/src/bean/bean.database.ts +3 -3
- package/src/bean/bean.model.ts +1 -1
- package/src/bean/schedule.softDeletionPrune.ts +1 -1
- package/src/common/buildWhere.ts +8 -9
- package/src/common/utils.ts +1 -1
- package/src/index.ts +1 -1
- package/src/{bean → lib}/bean.model/bean.model_cache.ts +15 -9
- package/src/{bean → lib}/bean.model/bean.model_meta.ts +1 -1
- package/src/{bean → lib}/bean.modelBase.ts +0 -5
- package/src/lib/dto/dtoAggregate.ts +1 -1
- package/src/lib/dto/dtoCreate.ts +1 -1
- package/src/lib/dto/dtoGet.ts +1 -1
- package/src/lib/dto/dtoGroup.ts +1 -1
- package/src/lib/dto/dtoMutate.ts +1 -1
- package/src/lib/dto/dtoSelectAndCount.ts +1 -1
- package/src/lib/dto/dtoUpdate.ts +1 -1
- package/src/lib/index.ts +1 -0
- package/src/lib/modelCacheBase.ts +3 -3
- package/src/lib/relations.ts +1 -1
- package/src/lib/relationsDynamic.ts +1 -1
- package/src/lib/relationsMutate.ts +1 -1
- package/src/lib/relationsStatic.ts +1 -1
- package/src/service/cacheEntity_.ts +1 -1
- package/src/service/cacheQuery_.ts +1 -1
- package/src/service/database.ts +2 -2
- package/src/{bean/bean.databaseDialectBase.ts → service/databaseDialectBase_.ts} +38 -41
- package/src/service/db_.ts +2 -2
- package/src/service/relations_.ts +3 -3
- package/src/types/database.ts +0 -5
- package/src/types/dto/dtoGet.ts +1 -1
- package/src/types/dto/dtoMutate.ts +1 -1
- package/src/types/dto/dtoSelectAndCount.ts +1 -1
- package/src/types/model.ts +1 -1
- package/src/types/modelAggr.ts +1 -1
- package/src/types/modelCount.ts +1 -1
- package/src/types/modelGeneral.ts +1 -1
- package/src/types/modelGroup.ts +1 -1
- package/src/types/modelIncrement.ts +1 -1
- package/src/types/modelWhere.ts +2 -2
- package/src/types/relations.ts +1 -1
- package/src/types/relationsColumns.ts +1 -1
- package/src/types/relationsDef.ts +1 -1
- package/src/types/relationsDefDynamic.ts +1 -1
- package/src/types/relationsDefMutate.ts +1 -1
- package/src/types/relationsMutate.ts +1 -1
- package/src/types/relationsTables.ts +1 -1
- package/dist/bean/bean.databaseDialectBase.d.ts.map +0 -1
- package/dist/bean/bean.model/bean.model_cache.d.ts.map +0 -1
- package/dist/bean/bean.model/bean.model_crud.d.ts.map +0 -1
- package/dist/bean/bean.model/bean.model_crud_inner.d.ts.map +0 -1
- package/dist/bean/bean.model/bean.model_crud_table.d.ts.map +0 -1
- package/dist/bean/bean.model/bean.model_knex.d.ts.map +0 -1
- package/dist/bean/bean.model/bean.model_meta.d.ts.map +0 -1
- package/dist/bean/bean.model/bean.model_utils.d.ts.map +0 -1
- package/dist/bean/bean.model/bean.model_view.d.ts.map +0 -1
- package/dist/bean/bean.modelBase.d.ts.map +0 -1
- /package/dist/{bean → lib}/bean.model/bean.model_cache.d.ts +0 -0
- /package/dist/{bean → lib}/bean.model/bean.model_crud.d.ts +0 -0
- /package/dist/{bean → lib}/bean.model/bean.model_crud_inner.d.ts +0 -0
- /package/dist/{bean → lib}/bean.model/bean.model_crud_table.d.ts +0 -0
- /package/dist/{bean → lib}/bean.model/bean.model_knex.d.ts +0 -0
- /package/dist/{bean → lib}/bean.model/bean.model_utils.d.ts +0 -0
- /package/dist/{bean → lib}/bean.model/bean.model_view.d.ts +0 -0
- /package/dist/{bean → lib}/bean.modelBase.d.ts +0 -0
- /package/src/{bean → lib}/bean.model/bean.model_crud.ts +0 -0
- /package/src/{bean → lib}/bean.model/bean.model_crud_inner.ts +0 -0
- /package/src/{bean → lib}/bean.model/bean.model_crud_table.ts +0 -0
- /package/src/{bean → lib}/bean.model/bean.model_knex.ts +0 -0
- /package/src/{bean → lib}/bean.model/bean.model_utils.ts +0 -0
- /package/src/{bean → lib}/bean.model/bean.model_view.ts +0 -0
|
@@ -5,6 +5,7 @@ import { parseFirstWord, toLowerCaseFirstChar } from '@cabloy/word-utils';
|
|
|
5
5
|
import BigNumber from 'bignumber.js';
|
|
6
6
|
import { cast, deepExtend, disposeInstance } from 'vona';
|
|
7
7
|
|
|
8
|
+
import type { TypeQueueDoubleDeleteJobData } from '../../bean/queue.doubleDelete.ts';
|
|
8
9
|
import type { ServiceDb } from '../../service/db_.ts';
|
|
9
10
|
import type {
|
|
10
11
|
IDatabaseClientRecord,
|
|
@@ -31,7 +32,6 @@ import type {
|
|
|
31
32
|
TypeModelsClassLikeGeneral,
|
|
32
33
|
TypeModelWhere,
|
|
33
34
|
} from '../../types/index.ts';
|
|
34
|
-
import type { TypeQueueDoubleDeleteJobData } from '../queue.doubleDelete.ts';
|
|
35
35
|
|
|
36
36
|
import { getTargetColumnName } from '../../common/utils.ts';
|
|
37
37
|
import { getCacheModelsClear } from '../../lib/const.ts';
|
|
@@ -860,7 +860,7 @@ export class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TReco
|
|
|
860
860
|
if (!fieldName) throw new Error(`invalid magic method: ${prop}`);
|
|
861
861
|
return (fieldValue: any, data: any, options?: any) => {
|
|
862
862
|
const where = __combineMagicWhere(fieldName, op!, fieldValue);
|
|
863
|
-
if (fieldName === 'id') {
|
|
863
|
+
if (fieldName === 'id' && where.id !== null) {
|
|
864
864
|
data = Object.assign({}, data, where);
|
|
865
865
|
} else {
|
|
866
866
|
options = deepExtend({}, options, { where });
|
|
@@ -879,15 +879,21 @@ export class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TReco
|
|
|
879
879
|
}
|
|
880
880
|
|
|
881
881
|
function __combineMagicWhere(fieldName: string, op: string, fieldValue?: any) {
|
|
882
|
+
if (fieldValue === undefined) {
|
|
883
|
+
if (op === 'eq') {
|
|
884
|
+
return {
|
|
885
|
+
[fieldName]: null,
|
|
886
|
+
};
|
|
887
|
+
}
|
|
888
|
+
throw new Error(`should specify the value for magic method: ${fieldName}/${op}`);
|
|
889
|
+
}
|
|
882
890
|
return {
|
|
883
891
|
[fieldName]:
|
|
884
|
-
|
|
885
|
-
?
|
|
886
|
-
:
|
|
887
|
-
|
|
888
|
-
|
|
889
|
-
[`_${op}_`]: fieldValue,
|
|
890
|
-
},
|
|
892
|
+
op === 'eq'
|
|
893
|
+
? fieldValue
|
|
894
|
+
: {
|
|
895
|
+
[`_${op}_`]: fieldValue,
|
|
896
|
+
},
|
|
891
897
|
};
|
|
892
898
|
}
|
|
893
899
|
|
|
@@ -15,7 +15,7 @@ import type {
|
|
|
15
15
|
TypeModelOptionsTable,
|
|
16
16
|
TypeModelRelationOptionsMetaClient,
|
|
17
17
|
} from '../../types/index.ts';
|
|
18
|
-
import type { BeanModel } from '
|
|
18
|
+
import type { BeanModel } from '../../bean/bean.model.ts';
|
|
19
19
|
|
|
20
20
|
import { getTableOrTableAlias, prepareClassModel } from '../../common/utils.ts';
|
|
21
21
|
import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from '../../types/index.ts';
|
|
@@ -4,7 +4,7 @@ import { ensureArray } from '@cabloy/utils';
|
|
|
4
4
|
import { Api, v } from 'vona-module-a-openapiutils';
|
|
5
5
|
import z from 'zod';
|
|
6
6
|
|
|
7
|
-
import type { BeanModelMeta } from '
|
|
7
|
+
import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
|
|
8
8
|
import type { TypeDtoAggrResult } from '../../types/dto/dtoAggregate.ts';
|
|
9
9
|
import type { TypeModelSelectAggrParamsAggrs } from '../../types/modelAggr.ts';
|
|
10
10
|
import type { IModelClassRecord } from '../../types/onion/model.ts';
|
package/src/lib/dto/dtoCreate.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Constructable } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelMeta } from '
|
|
3
|
+
import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
|
|
4
4
|
import type { IDtoMutateParams, TypeDtoMutateResult } from '../../types/dto/dtoMutate.ts';
|
|
5
5
|
import type { IModelClassRecord } from '../../types/onion/model.ts';
|
|
6
6
|
|
package/src/lib/dto/dtoGet.ts
CHANGED
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
} from 'vona-module-a-openapiutils';
|
|
13
13
|
import z from 'zod';
|
|
14
14
|
|
|
15
|
-
import type { BeanModelMeta } from '
|
|
15
|
+
import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
|
|
16
16
|
import type { IDtoGetParams, TypeDtoGetResult } from '../../types/dto/dtoGet.ts';
|
|
17
17
|
import type { TypeDtoMutateType } from '../../types/dto/dtoMutate.ts';
|
|
18
18
|
import type { IModelRelationIncludeWrapper } from '../../types/model.ts';
|
package/src/lib/dto/dtoGroup.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
|
|
|
3
3
|
import { ensureArray } from '@cabloy/utils';
|
|
4
4
|
import { PickClassInner } from 'vona';
|
|
5
5
|
|
|
6
|
-
import type { BeanModelMeta } from '
|
|
6
|
+
import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
|
|
7
7
|
import type { TypeDtoGroupResult } from '../../types/dto/dtoGroup.ts';
|
|
8
8
|
import type { TypeModelSelectAggrParamsAggrs } from '../../types/modelAggr.ts';
|
|
9
9
|
import type { TypeModelColumnsStrict } from '../../types/modelWhere.ts';
|
package/src/lib/dto/dtoMutate.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
|
|
|
3
3
|
import { mutate } from 'mutate-on-copy';
|
|
4
4
|
import { $Class } from 'vona';
|
|
5
5
|
|
|
6
|
-
import type { BeanModelMeta } from '
|
|
6
|
+
import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
|
|
7
7
|
import type {
|
|
8
8
|
IDtoMutateParams,
|
|
9
9
|
TypeDtoMutateResult,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Constructable } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelMeta } from '
|
|
3
|
+
import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
|
|
4
4
|
import type { IDtoGetParams } from '../../types/dto/dtoGet.ts';
|
|
5
5
|
import type { TypeDtoSelectAndCountResult } from '../../types/dto/dtoSelectAndCount.ts';
|
|
6
6
|
import type { IModelClassRecord } from '../../types/onion/model.ts';
|
package/src/lib/dto/dtoUpdate.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Constructable } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelMeta } from '
|
|
3
|
+
import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
|
|
4
4
|
import type { IDtoMutateParams, TypeDtoMutateResult } from '../../types/dto/dtoMutate.ts';
|
|
5
5
|
import type { IModelClassRecord } from '../../types/onion/model.ts';
|
|
6
6
|
|
package/src/lib/index.ts
CHANGED
|
@@ -3,6 +3,7 @@ export * from './databaseDialect.ts';
|
|
|
3
3
|
export * from './dto/index.ts';
|
|
4
4
|
export * from './entity.ts';
|
|
5
5
|
export * from './model.ts';
|
|
6
|
+
export * from './bean.modelBase.ts';
|
|
6
7
|
export * from './relations.ts';
|
|
7
8
|
export * from './relationsDynamic.ts';
|
|
8
9
|
export * from './relationsMutate.ts';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ServiceSummerCacheBase, IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
|
|
2
2
|
|
|
3
3
|
import { BeanBase, deepExtend } from 'vona';
|
|
4
4
|
|
|
5
|
-
import type { BeanModelCache } from '
|
|
5
|
+
import type { BeanModelCache } from './bean.model/bean.model_cache.ts';
|
|
6
6
|
import type { TypeModelCacheType } from '../types/model.ts';
|
|
7
7
|
import type { ITableRecord } from '../types/onion/table.ts';
|
|
8
8
|
|
|
@@ -25,7 +25,7 @@ export class ModelCacheBase extends BeanBase {
|
|
|
25
25
|
return this.$scope.orm;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
public getInstance(table: keyof ITableRecord):
|
|
28
|
+
public getInstance(table: keyof ITableRecord): ServiceSummerCacheBase {
|
|
29
29
|
if (this.options === false) throw new Error('cache disabled');
|
|
30
30
|
const beanFullName = this._model.$beanFullName;
|
|
31
31
|
const cacheName = this.getName(table);
|
package/src/lib/relations.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BeanModelMeta } from '
|
|
1
|
+
import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
|
|
2
2
|
import type { TypeModelsClassLikeGeneral } from '../types/relations.ts';
|
|
3
3
|
import type {
|
|
4
4
|
IModelRelationOptionsManyDynamic,
|
|
@@ -2,7 +2,7 @@ import type { TableIdentity } from 'table-identity';
|
|
|
2
2
|
|
|
3
3
|
import { Service } from 'vona-module-a-bean';
|
|
4
4
|
|
|
5
|
-
import type { BeanModelCache } from '../
|
|
5
|
+
import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
|
|
6
6
|
import type { ITableRecord } from '../types/onion/table.ts';
|
|
7
7
|
|
|
8
8
|
import { ModelCacheBase } from '../lib/modelCacheBase.ts';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Service } from 'vona-module-a-bean';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelCache } from '../
|
|
3
|
+
import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
|
|
4
4
|
import type { ITableRecord } from '../types/onion/table.ts';
|
|
5
5
|
|
|
6
6
|
import { ModelCacheBase } from '../lib/modelCacheBase.ts';
|
package/src/service/database.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { isNil } from '@cabloy/utils';
|
|
|
2
2
|
import { appResource, BeanBase, deepExtend } from 'vona';
|
|
3
3
|
import { Service } from 'vona-module-a-bean';
|
|
4
4
|
|
|
5
|
-
import type {
|
|
5
|
+
import type { ServiceDatabaseDialectBase } from './databaseDialectBase_.ts';
|
|
6
6
|
import type { ConfigDatabaseClient } from '../types/config.ts';
|
|
7
7
|
import type {
|
|
8
8
|
IDatabaseClientDialectRecord,
|
|
@@ -61,7 +61,7 @@ export class ServiceDatabase extends BeanBase {
|
|
|
61
61
|
|
|
62
62
|
prepareClientNameSelector(
|
|
63
63
|
dbInfo: IDbInfo,
|
|
64
|
-
dialect:
|
|
64
|
+
dialect: ServiceDatabaseDialectBase | keyof IDatabaseClientDialectRecord,
|
|
65
65
|
) {
|
|
66
66
|
const dialect2 = typeof dialect === 'string' ? this.bean.database.getDialect(dialect) : dialect;
|
|
67
67
|
if (!dialect2.capabilities.level) return dbInfo.clientName;
|
|
@@ -3,7 +3,7 @@ import type { TableIdentity } from 'table-identity';
|
|
|
3
3
|
|
|
4
4
|
import { isNil, safeBoolean } from '@cabloy/utils';
|
|
5
5
|
import { BeanBase, Virtual } from 'vona';
|
|
6
|
-
import {
|
|
6
|
+
import { Service } from 'vona-module-a-bean';
|
|
7
7
|
|
|
8
8
|
import type { ITableColumn } from '../types/columns.ts';
|
|
9
9
|
import type { ConfigDatabaseClient } from '../types/config.ts';
|
|
@@ -14,9 +14,22 @@ import type {
|
|
|
14
14
|
TypeDatabaseDialectTableColumnsFn,
|
|
15
15
|
} from '../types/dialect.ts';
|
|
16
16
|
|
|
17
|
-
|
|
17
|
+
const BOOLEAN_COLUMN_TYPES = ['bit', 'bool', 'boolean'];
|
|
18
|
+
const NUMBER_COLUMN_TYPES = ['int'];
|
|
19
|
+
const TIMESTAMP_COLUMN_TYPE_PREFIXES = ['timestamp'];
|
|
20
|
+
const FLOAT_COLUMN_TYPE_PREFIXES = ['float', 'double'];
|
|
21
|
+
const INTEGER_COLUMN_TYPE_PREFIXES = [
|
|
22
|
+
'tinyint',
|
|
23
|
+
'smallint',
|
|
24
|
+
'mediumint',
|
|
25
|
+
'bigint',
|
|
26
|
+
'numeric',
|
|
27
|
+
'integer',
|
|
28
|
+
];
|
|
29
|
+
|
|
30
|
+
@Service()
|
|
18
31
|
@Virtual()
|
|
19
|
-
export class
|
|
32
|
+
export class ServiceDatabaseDialectBase extends BeanBase {
|
|
20
33
|
protected _capabilities?: IDatabaseDialectCapabilities;
|
|
21
34
|
protected _configBase?: Partial<ConfigDatabaseClient>;
|
|
22
35
|
|
|
@@ -75,11 +88,8 @@ export class BeanDatabaseDialectBase extends BeanBase {
|
|
|
75
88
|
}
|
|
76
89
|
|
|
77
90
|
coerceColumn(column: Knex.ColumnInfo): ITableColumn {
|
|
78
|
-
// result
|
|
79
91
|
const result = { type: column.type } as ITableColumn;
|
|
80
|
-
// coerce
|
|
81
92
|
result.default = this._coerceColumnValue(column.type, column.defaultValue);
|
|
82
|
-
// ok
|
|
83
93
|
return result;
|
|
84
94
|
}
|
|
85
95
|
|
|
@@ -111,22 +121,22 @@ export class BeanDatabaseDialectBase extends BeanBase {
|
|
|
111
121
|
datas: any[],
|
|
112
122
|
): Promise<[TableIdentity[], Knex.QueryBuilder]> {
|
|
113
123
|
if (datas.length === 0) return [[], builder];
|
|
114
|
-
if (isNil(datas[0].id)) {
|
|
115
|
-
let builderFirst: Knex.QueryBuilder | undefined = undefined;
|
|
116
|
-
const ids: TableIdentity[] = [];
|
|
117
|
-
for (const data of datas) {
|
|
118
|
-
const builder2 = builder.clone();
|
|
119
|
-
builder2.insert(data);
|
|
120
|
-
const items = await builder2;
|
|
121
|
-
ids.push(items[0]);
|
|
122
|
-
if (!builderFirst) builderFirst = builder2;
|
|
123
|
-
}
|
|
124
|
-
return [ids, builderFirst ?? builder];
|
|
125
|
-
} else {
|
|
124
|
+
if (!isNil(datas[0].id)) {
|
|
126
125
|
builder.insert(datas);
|
|
127
126
|
await builder;
|
|
128
127
|
return [datas.map(item => item.id), builder];
|
|
129
128
|
}
|
|
129
|
+
|
|
130
|
+
let builderFirst: Knex.QueryBuilder | undefined = undefined;
|
|
131
|
+
const ids: TableIdentity[] = [];
|
|
132
|
+
for (const data of datas) {
|
|
133
|
+
const builder2 = builder.clone();
|
|
134
|
+
builder2.insert(data);
|
|
135
|
+
const items = await builder2;
|
|
136
|
+
ids.push(items[0]);
|
|
137
|
+
if (!builderFirst) builderFirst = builder2;
|
|
138
|
+
}
|
|
139
|
+
return [ids, builderFirst ?? builder];
|
|
130
140
|
}
|
|
131
141
|
|
|
132
142
|
protected async insertAsPg(
|
|
@@ -134,41 +144,28 @@ export class BeanDatabaseDialectBase extends BeanBase {
|
|
|
134
144
|
datas: any[],
|
|
135
145
|
): Promise<[TableIdentity[], Knex.QueryBuilder]> {
|
|
136
146
|
if (datas.length === 0) return [[], builder];
|
|
137
|
-
if (isNil(datas[0].id)) {
|
|
138
|
-
builder.insert(datas).returning('id');
|
|
139
|
-
const items = await builder;
|
|
140
|
-
return [items.map(item => item.id), builder];
|
|
141
|
-
} else {
|
|
147
|
+
if (!isNil(datas[0].id)) {
|
|
142
148
|
builder.insert(datas);
|
|
143
149
|
await builder;
|
|
144
150
|
return [datas.map(item => item.id), builder];
|
|
145
151
|
}
|
|
152
|
+
|
|
153
|
+
builder.insert(datas).returning('id');
|
|
154
|
+
const items = await builder;
|
|
155
|
+
return [items.map(item => item.id), builder];
|
|
146
156
|
}
|
|
147
157
|
|
|
148
158
|
protected _coerceColumnValue(type: string, value) {
|
|
149
|
-
// null
|
|
150
159
|
if (isNil(value)) return undefined;
|
|
151
|
-
|
|
152
|
-
if (
|
|
153
|
-
if (
|
|
154
|
-
if (this._columnTypePrefixes(type, ['timestamp']) && value === 'CURRENT_TIMESTAMP')
|
|
160
|
+
if (BOOLEAN_COLUMN_TYPES.includes(type)) return safeBoolean(value);
|
|
161
|
+
if (NUMBER_COLUMN_TYPES.includes(type)) return this._safeNumber(value);
|
|
162
|
+
if (this._columnTypePrefixes(type, TIMESTAMP_COLUMN_TYPE_PREFIXES) && value === 'CURRENT_TIMESTAMP') {
|
|
155
163
|
return undefined; // new Date();
|
|
156
|
-
if (this._columnTypePrefixes(type, ['float', 'double'])) return this._safeNumber(value);
|
|
157
|
-
if (
|
|
158
|
-
this._columnTypePrefixes(type, [
|
|
159
|
-
'tinyint',
|
|
160
|
-
'smallint',
|
|
161
|
-
'mediumint',
|
|
162
|
-
'bigint',
|
|
163
|
-
'numeric',
|
|
164
|
-
'integer',
|
|
165
|
-
])
|
|
166
|
-
) {
|
|
167
|
-
return this._safeNumber(value);
|
|
168
164
|
}
|
|
165
|
+
if (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
|
|
166
|
+
if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
|
|
169
167
|
// pg: NULL::character varying
|
|
170
168
|
if (value.indexOf('NULL::') === 0) return undefined;
|
|
171
|
-
// others
|
|
172
169
|
return value;
|
|
173
170
|
}
|
|
174
171
|
|
package/src/service/db_.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { FunctionAny } from 'vona';
|
|
|
3
3
|
import { BeanBase } from 'vona';
|
|
4
4
|
import { Service } from 'vona-module-a-bean';
|
|
5
5
|
|
|
6
|
-
import type {
|
|
6
|
+
import type { ServiceDatabaseDialectBase } from './databaseDialectBase_.ts';
|
|
7
7
|
import type { IDatabaseClientDialectRecord, IDbInfo } from '../types/database.ts';
|
|
8
8
|
import type { ITransactionConsistencyCommitOptions } from '../types/transaction.ts';
|
|
9
9
|
import type { ServiceDatabaseClient } from './databaseClient_.ts';
|
|
@@ -63,7 +63,7 @@ export class ServiceDb extends BeanBase {
|
|
|
63
63
|
return this.client.clientConfig.client;
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
-
get dialect():
|
|
66
|
+
get dialect(): ServiceDatabaseDialectBase {
|
|
67
67
|
return this.bean.database.getDialect(this.dialectName);
|
|
68
68
|
}
|
|
69
69
|
|
|
@@ -4,9 +4,9 @@ import { isNil } from '@cabloy/utils';
|
|
|
4
4
|
import { BeanBase, cast, deepExtend } from 'vona';
|
|
5
5
|
import { Service } from 'vona-module-a-bean';
|
|
6
6
|
|
|
7
|
-
import type { BeanModelCache } from '../
|
|
8
|
-
import type { BeanModelCrud } from '../
|
|
9
|
-
import type { BeanModelMeta } from '../
|
|
7
|
+
import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
|
|
8
|
+
import type { BeanModelCrud } from '../lib/bean.model/bean.model_crud.ts';
|
|
9
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
10
10
|
import type { IModelMethodOptions, IModelRelationIncludeWrapper } from '../types/model.ts';
|
|
11
11
|
import type { IModelClassRecord } from '../types/onion/model.ts';
|
|
12
12
|
import type { TypeModelClassLike } from '../types/relations.ts';
|
package/src/types/database.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { FunctionAny } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModel } from '../bean/bean.model.ts';
|
|
4
3
|
import type { ServiceDb } from '../service/db_.ts';
|
|
5
4
|
import type { ConfigDatabase } from './config.ts';
|
|
6
5
|
|
|
@@ -28,10 +27,6 @@ export interface IDatabaseSwitchOptions {
|
|
|
28
27
|
}
|
|
29
28
|
|
|
30
29
|
declare module 'vona' {
|
|
31
|
-
export interface IBeanRecordGlobal {
|
|
32
|
-
model: BeanModel;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
30
|
export interface VonaConfig {
|
|
36
31
|
database: ConfigDatabase;
|
|
37
32
|
}
|
package/src/types/dto/dtoGet.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BeanModelMeta } from '../../
|
|
1
|
+
import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
|
|
2
2
|
import type { IModelRelationIncludeWrapper } from '../model.ts';
|
|
3
3
|
import type { TypeModelColumns } from '../modelWhere.ts';
|
|
4
4
|
import type { IModelClassRecord } from '../onion/model.ts';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { TableIdentity } from 'table-identity';
|
|
2
2
|
import type { OmitNever, TypeOmitStringUnion } from 'vona';
|
|
3
3
|
|
|
4
|
-
import type { BeanModelMeta } from '../../
|
|
4
|
+
import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
|
|
5
5
|
import type { IModelRelationIncludeWrapper } from '../model.ts';
|
|
6
6
|
import type { TypeModelColumnsStrict } from '../modelWhere.ts';
|
|
7
7
|
import type { IDecoratorModelOptions, IModelClassRecord } from '../onion/model.ts';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BeanModelMeta } from '../../
|
|
1
|
+
import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
|
|
2
2
|
import type { IModelClassRecord } from '../onion/model.ts';
|
|
3
3
|
import type { TypeDtoGetResult } from './dtoGet.ts';
|
|
4
4
|
|
package/src/types/model.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Knex } from 'knex';
|
|
2
2
|
import type { TSummerCacheActionOptions } from 'vona-module-a-summer';
|
|
3
3
|
|
|
4
|
-
import type { BeanModelMeta } from '../
|
|
4
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
5
5
|
import type {
|
|
6
6
|
TypeModelColumn,
|
|
7
7
|
TypeModelColumns,
|
package/src/types/modelAggr.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { OmitNever } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelMeta } from '../
|
|
3
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
4
4
|
import type { IModelSelectParamsJoin } from './model.ts';
|
|
5
5
|
import type { TypeModelColumns, TypeModelWhere } from './modelWhere.ts';
|
|
6
6
|
import type { TypeModelsClassLikeGeneral } from './relations.ts';
|
package/src/types/modelCount.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BeanModelMeta } from '../
|
|
1
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
2
2
|
import type { IModelSelectParamsJoin } from './model.ts';
|
|
3
3
|
import type { TypeModelColumn, TypeModelWhere } from './modelWhere.ts';
|
|
4
4
|
import type { TypeModelsClassLikeGeneral } from './relations.ts';
|
package/src/types/modelGroup.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BeanModelMeta } from '../
|
|
1
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
2
2
|
import type { IModelSelectParamsJoin, IModelSelectParamsOrder } from './model.ts';
|
|
3
3
|
import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
|
|
4
4
|
import type { TypeModelColumnsStrict, TypeModelWhere } from './modelWhere.ts';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { OmitNever } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelMeta } from '../
|
|
3
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
4
4
|
import type { IModelSelectParamsJoin } from './model.ts';
|
|
5
5
|
import type { TypeModelWhere } from './modelWhere.ts';
|
|
6
6
|
import type { TypeModelsClassLikeGeneral } from './relations.ts';
|
package/src/types/modelWhere.ts
CHANGED
|
@@ -33,7 +33,7 @@ export const OpNormal = {
|
|
|
33
33
|
ref: '_ref_',
|
|
34
34
|
} as const;
|
|
35
35
|
export const Op = {
|
|
36
|
-
|
|
36
|
+
omit: undefined,
|
|
37
37
|
...OpJoint,
|
|
38
38
|
...OpNormal,
|
|
39
39
|
} as const;
|
|
@@ -57,7 +57,7 @@ export type TypeModelColumnValue<TRecord, Column> =
|
|
|
57
57
|
| Column
|
|
58
58
|
| Column[]
|
|
59
59
|
| null
|
|
60
|
-
|
|
|
60
|
+
| typeof Op.omit;
|
|
61
61
|
|
|
62
62
|
export type TypeModelWhere<TRecord, Columns extends {} | undefined = undefined> = Columns extends {}
|
|
63
63
|
? TypeModelWhereInner<Columns>
|
package/src/types/relations.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Constructable, OmitNever } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelMeta } from '../
|
|
3
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
4
4
|
import type { TypeDepthPrev, TypeDepthPrevMax } from './depth.ts';
|
|
5
5
|
import type { IDecoratorModelOptions, IModelClassRecord } from './onion/model.ts';
|
|
6
6
|
import type {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { TypeConfirmArray, TypeRecordValues } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelMeta } from '../
|
|
3
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
4
4
|
import type { IDecoratorModelOptions } from './onion/model.ts';
|
|
5
5
|
import type {
|
|
6
6
|
TypeModelOfModelLike,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BeanModelMeta } from '../
|
|
1
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
2
2
|
import type { ServiceDb } from '../service/db_.ts';
|
|
3
3
|
import type { IDatabaseClientRecord } from './database.ts';
|
|
4
4
|
import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BeanModelMeta } from '../
|
|
1
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
2
2
|
import type { IModelRelationIncludeWrapper } from './model.ts';
|
|
3
3
|
import type { IModelRelationOptionsMetaWrapper } from './relationsDef.ts';
|
|
4
4
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { TableIdentity } from 'table-identity';
|
|
2
2
|
import type { OmitNever } from 'vona';
|
|
3
3
|
|
|
4
|
-
import type { BeanModelMeta } from '../
|
|
4
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
5
5
|
import type { IDecoratorModelOptions } from './onion/model.ts';
|
|
6
6
|
import type {
|
|
7
7
|
TypeUtilGetModelOptions,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { TypeConfirmArray, TypeRecordValues } from 'vona';
|
|
2
2
|
|
|
3
|
-
import type { BeanModelMeta } from '../
|
|
3
|
+
import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
|
|
4
4
|
import type { IDecoratorModelOptions } from './onion/model.ts';
|
|
5
5
|
import type {
|
|
6
6
|
TypeModelOfModelLike,
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bean.databaseDialectBase.d.ts","sourceRoot":"","sources":["../../src/bean/bean.databaseDialectBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,EAAE,QAAQ,EAAW,MAAM,MAAM,CAAC;AAGzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,uBAAuB,EACvB,iCAAiC,EAClC,MAAM,qBAAqB,CAAC;AAE7B,qBAEa,uBAAwB,SAAQ,QAAQ;IACnD,SAAS,CAAC,aAAa,CAAC,EAAE,4BAA4B,CAAC;IACvD,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEtD,IAAI,YAAY,iCAGf;IAED,IAAI,UAAU,8CAEb;IAEK,cAAc,CAClB,cAAc,EAAE,IAAI,CAAC,aAAa,EAClC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,EAAE,CAAC;IAIjC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1F,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItF,YAAY,CAChB,cAAc,EAAE,IAAI,CAAC,aAAa,EAClC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAI/B,MAAM,CACV,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,MAAM,EAAE,GAAG,EAAE,GACZ,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAI1C,MAAM,CACV,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,KAAK,EAAE,GAAG,EAAE,EACZ,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,GAAG,EAAE,CAAC;IAIjB,KAAK,CAAC,OAAO,KAAA;IAIP,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvF,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,GAAG,YAAY;cASnC,eAAe,CAC7B,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,KAAK,EAAE,GAAG,EAAE,EACZ,EAAE,EAAE,iCAAiC,GACpC,OAAO,CAAC,GAAG,EAAE,CAAC;cAmBD,aAAa,CAC3B,OAAO,EAAE,IAAI,CAAC,YAAY,EAC1B,KAAK,EAAE,GAAG,EAAE,GACX,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;cAoBhC,UAAU,CACxB,OAAO,EAAE,IAAI,CAAC,YAAY,EAC1B,KAAK,EAAE,GAAG,EAAE,GACX,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAahD,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,KAAA;IA4BhD,SAAS,CAAC,WAAW,CAAC,KAAK,KAAA;IAK3B,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;CAG/D"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_cache.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_crud.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_crud.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,EAClB,0BAA0B,EAC1B,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,qBAAa,aAAa,CAAC,OAAO,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,kBAAkB,CAAC,OAAO,CAAC;IAC/E,IAAI,CACR,GAAG,EAAE,aAAa,EAAE,EACpB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IAIxB,MAAM,CACV,MAAM,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,EACpC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IAIxB,GAAG,CACP,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAIlC,KAAK,CACT,MAAM,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACnC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIxB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvF,UAAU,CACd,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EACxB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,EAAE,CAAC;IAIf,MAAM,CACV,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAItB,MAAM,CACV,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC;CAGjB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_crud_inner.d.ts","sourceRoot":"","sources":["../../../src/bean/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;cAqCZ,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 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_crud_table.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_crud_table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,qBAAa,kBAAkB,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,kBAAkB,CAAC,OAAO,CAAC;IAC/E,IAAI,CACR,KAAK,EAAE,MAAM,YAAY,EACzB,GAAG,EAAE,aAAa,EAAE,EACpB,OAAO,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,GACnE,OAAO,CAAC,OAAO,EAAE,CAAC;IAIf,MAAM,CACV,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,EAC9D,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,EAAE,CAAC;IAIf,GAAG,CACP,KAAK,EAAE,MAAM,YAAY,EACzB,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,GACnE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAIzB,KAAK,CACT,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACnC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIxB,MAAM,CACV,KAAK,EAAE,MAAM,YAAY,EACzB,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EACvB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,CAAC;IAIb,UAAU,CACd,KAAK,EAAE,MAAM,YAAY,EACzB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EACxB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,EAAE,CAAC;IAIf,MAAM,CACV,KAAK,EAAE,MAAM,YAAY,EACzB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAItB,MAAM,CACV,KAAK,EAAE,MAAM,YAAY,EACzB,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC;CAGjB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bean.model_knex.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_knex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,0BAA0B,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAErF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,qBAAa,aAAa,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAC;IAC5E,IAAI,MAAM,IAAI,IAAI,CAAC,aAAa,CAE/B;IAED,OAAO,CAAC,QAAQ,SAAS,EAAE,GAAG,OAAO,EAAE,QAAQ,GAAG,QAAQ,EACxD,KAAK,CAAC,EAAE,IAAI,CAAC,eAAe,GAC3B,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAS1C,aAAa,CAAC,QAAQ,SAAS,EAAE,GAAG,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAC9D,OAAO,CAAC,EAAE,0BAA0B,GACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAC1C,aAAa,CAAC,QAAQ,SAAS,EAAE,GAAG,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAC9D,KAAK,EAAE,MAAM,YAAY,EACzB,OAAO,CAAC,EAAE,0BAA0B,GACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAoBpC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAChE,KAAK,CACT,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,SAAS,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,SAAS,GACpD,OAAO,CAAC,OAAO,EAAE,CAAC;IAQf,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAC7E,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,SAAS,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,SAAS,GACpD,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;CAMhC"}
|