@eggjs/dal-decorator 4.0.0-beta.7 → 4.0.0-beta.9
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/dist/decorator/Column.d.ts +2 -6
- package/dist/decorator/Column.js +13 -16
- package/dist/decorator/Dao.d.ts +2 -6
- package/dist/decorator/Dao.js +15 -19
- package/dist/decorator/DataSourceQualifier.d.ts +1 -4
- package/dist/decorator/DataSourceQualifier.js +7 -11
- package/dist/decorator/Table.d.ts +2 -6
- package/dist/decorator/Table.js +18 -20
- package/dist/decorator/TableIndex.d.ts +2 -6
- package/dist/decorator/TableIndex.js +6 -11
- package/dist/decorator/index.d.ts +5 -0
- package/dist/decorator/index.js +6 -7
- package/dist/index.d.ts +5 -16
- package/dist/index.js +6 -21
- package/dist/model/ColumnModel.d.ts +19 -23
- package/dist/model/ColumnModel.js +57 -59
- package/dist/model/IndexModel.d.ts +19 -22
- package/dist/model/IndexModel.js +51 -52
- package/dist/model/TableModel.d.ts +30 -34
- package/dist/model/TableModel.js +111 -114
- package/dist/model/index.d.ts +3 -0
- package/dist/model/index.js +4 -5
- package/dist/type/MySql.d.ts +1 -2
- package/dist/type/MySql.js +2 -0
- package/dist/type/Spatial.d.ts +10 -13
- package/dist/type/Spatial.js +31 -31
- package/dist/type/index.d.ts +2 -0
- package/dist/type/index.js +3 -3
- package/dist/util/ColumnInfoUtil.d.ts +8 -12
- package/dist/util/ColumnInfoUtil.js +19 -21
- package/dist/util/DaoInfoUtil.d.ts +5 -8
- package/dist/util/DaoInfoUtil.js +11 -15
- package/dist/util/IndexInfoUtil.d.ts +4 -8
- package/dist/util/IndexInfoUtil.js +12 -15
- package/dist/util/TableInfoUtil.d.ts +8 -12
- package/dist/util/TableInfoUtil.js +23 -26
- package/dist/util/index.d.ts +4 -0
- package/dist/util/index.js +5 -6
- package/package.json +5 -5
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
import { ColumnParams, ColumnTypeParams } from
|
|
2
|
-
|
|
3
|
-
//#region src/decorator/Column.d.ts
|
|
4
|
-
declare function Column(type: ColumnTypeParams, params?: ColumnParams): (target: any, propertyKey: PropertyKey) => void;
|
|
5
|
-
//#endregion
|
|
6
|
-
export { Column };
|
|
1
|
+
import type { ColumnParams, ColumnTypeParams } from '@eggjs/tegg-types';
|
|
2
|
+
export declare function Column(type: ColumnTypeParams, params?: ColumnParams): (target: any, propertyKey: PropertyKey) => void;
|
package/dist/decorator/Column.js
CHANGED
|
@@ -1,17 +1,14 @@
|
|
|
1
|
-
import
|
|
2
|
-
import "../util/index.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
};
|
|
1
|
+
import assert from 'node:assert';
|
|
2
|
+
import { ColumnInfoUtil } from "../util/index.js";
|
|
3
|
+
export function Column(type, params) {
|
|
4
|
+
return function (target, propertyKey) {
|
|
5
|
+
assert(typeof propertyKey === 'string', `[Column/${target.name}] expect column name be typeof string, but now is ${String(propertyKey)}`);
|
|
6
|
+
const tableClazz = target.constructor;
|
|
7
|
+
const columnName = propertyKey;
|
|
8
|
+
ColumnInfoUtil.addColumnType(tableClazz, columnName, type);
|
|
9
|
+
if (params) {
|
|
10
|
+
ColumnInfoUtil.addColumnInfo(tableClazz, columnName, params);
|
|
11
|
+
}
|
|
12
|
+
};
|
|
14
13
|
}
|
|
15
|
-
|
|
16
|
-
//#endregion
|
|
17
|
-
export { Column };
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29sdW1uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RlY29yYXRvci9Db2x1bW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBSWpDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVsRCxNQUFNLFVBQVUsTUFBTSxDQUFDLElBQXNCLEVBQUUsTUFBcUI7SUFDbEUsT0FBTyxVQUFTLE1BQVcsRUFBRSxXQUF3QjtRQUNuRCxNQUFNLENBQUMsT0FBTyxXQUFXLEtBQUssUUFBUSxFQUNwQyxXQUFXLE1BQU0sQ0FBQyxJQUFJLHFEQUFxRCxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3BHLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxXQUFnQyxDQUFDO1FBQzNELE1BQU0sVUFBVSxHQUFHLFdBQXFCLENBQUM7UUFDekMsY0FBYyxDQUFDLGFBQWEsQ0FBQyxVQUFVLEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzNELElBQUksTUFBTSxFQUFFLENBQUM7WUFDWCxjQUFjLENBQUMsYUFBYSxDQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDL0QsQ0FBQztJQUNILENBQUMsQ0FBQztBQUNKLENBQUMifQ==
|
package/dist/decorator/Dao.d.ts
CHANGED
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
import { EggProtoImplClass } from
|
|
2
|
-
|
|
3
|
-
//#region src/decorator/Dao.d.ts
|
|
4
|
-
declare function Dao(): (constructor: EggProtoImplClass) => void;
|
|
5
|
-
//#endregion
|
|
6
|
-
export { Dao };
|
|
1
|
+
import type { EggProtoImplClass } from '@eggjs/tegg-types';
|
|
2
|
+
export declare function Dao(): (constructor: EggProtoImplClass) => void;
|
package/dist/decorator/Dao.js
CHANGED
|
@@ -1,20 +1,16 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
import { AccessLevel, ObjectInitType } from
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
PrototypeUtil.setFilePath(constructor, StackUtil.getCalleeFromStack(false, 5));
|
|
16
|
-
};
|
|
1
|
+
import { Prototype, PrototypeUtil } from '@eggjs/core-decorator';
|
|
2
|
+
import { StackUtil } from '@eggjs/tegg-common-util';
|
|
3
|
+
import { AccessLevel, ObjectInitType } from '@eggjs/tegg-types';
|
|
4
|
+
import { DaoInfoUtil } from "../util/index.js";
|
|
5
|
+
export function Dao() {
|
|
6
|
+
return function (constructor) {
|
|
7
|
+
DaoInfoUtil.setIsDao(constructor);
|
|
8
|
+
const func = Prototype({
|
|
9
|
+
accessLevel: AccessLevel.PUBLIC,
|
|
10
|
+
initType: ObjectInitType.SINGLETON,
|
|
11
|
+
});
|
|
12
|
+
func(constructor);
|
|
13
|
+
PrototypeUtil.setFilePath(constructor, StackUtil.getCalleeFromStack(false, 5));
|
|
14
|
+
};
|
|
17
15
|
}
|
|
18
|
-
|
|
19
|
-
//#endregion
|
|
20
|
-
export { Dao };
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGFvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RlY29yYXRvci9EYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNqRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDcEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUdoRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0MsTUFBTSxVQUFVLEdBQUc7SUFDakIsT0FBTyxVQUFTLFdBQThCO1FBQzVDLFdBQVcsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDbEMsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDO1lBQ3JCLFdBQVcsRUFBRSxXQUFXLENBQUMsTUFBTTtZQUMvQixRQUFRLEVBQUUsY0FBYyxDQUFDLFNBQVM7U0FDbkMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ2xCLGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVyxFQUFFLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqRixDQUFDLENBQUM7QUFDSixDQUFDIn0=
|
|
@@ -1,4 +1 @@
|
|
|
1
|
-
|
|
2
|
-
declare function DataSourceQualifier(dataSourceName: string): (target: any, propertyKey: PropertyKey, parameterIndex?: number) => void;
|
|
3
|
-
//#endregion
|
|
4
|
-
export { DataSourceQualifier };
|
|
1
|
+
export declare function DataSourceQualifier(dataSourceName: string): (target: any, propertyKey: PropertyKey, parameterIndex?: number) => void;
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
import { DataSourceQualifierAttribute } from
|
|
2
|
-
import { QualifierUtil } from
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
QualifierUtil.addInjectQualifier(target, propertyKey, parameterIndex, DataSourceQualifierAttribute, dataSourceName);
|
|
8
|
-
};
|
|
1
|
+
import { DataSourceQualifierAttribute } from '@eggjs/tegg-types';
|
|
2
|
+
import { QualifierUtil } from '@eggjs/core-decorator';
|
|
3
|
+
export function DataSourceQualifier(dataSourceName) {
|
|
4
|
+
return function (target, propertyKey, parameterIndex) {
|
|
5
|
+
QualifierUtil.addInjectQualifier(target, propertyKey, parameterIndex, DataSourceQualifierAttribute, dataSourceName);
|
|
6
|
+
};
|
|
9
7
|
}
|
|
10
|
-
|
|
11
|
-
//#endregion
|
|
12
|
-
export { DataSourceQualifier };
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YVNvdXJjZVF1YWxpZmllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZWNvcmF0b3IvRGF0YVNvdXJjZVF1YWxpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFdEQsTUFBTSxVQUFVLG1CQUFtQixDQUFDLGNBQXNCO0lBQ3hELE9BQU8sVUFBUyxNQUFXLEVBQUUsV0FBd0IsRUFBRSxjQUF1QjtRQUM1RSxhQUFhLENBQUMsa0JBQWtCLENBQUMsTUFBTSxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsNEJBQTRCLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDdEgsQ0FBQyxDQUFDO0FBQ0osQ0FBQyJ9
|
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
import { EggProtoImplClass, TableParams } from
|
|
2
|
-
|
|
3
|
-
//#region src/decorator/Table.d.ts
|
|
4
|
-
declare function Table(params?: TableParams): (constructor: EggProtoImplClass) => void;
|
|
5
|
-
//#endregion
|
|
6
|
-
export { Table };
|
|
1
|
+
import type { EggProtoImplClass, TableParams } from '@eggjs/tegg-types';
|
|
2
|
+
export declare function Table(params?: TableParams): (constructor: EggProtoImplClass) => void;
|
package/dist/decorator/Table.js
CHANGED
|
@@ -1,21 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
import { AccessLevel, ObjectInitType } from
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
1
|
+
import { Prototype, PrototypeUtil } from '@eggjs/core-decorator';
|
|
2
|
+
import { StackUtil } from '@eggjs/tegg-common-util';
|
|
3
|
+
import { AccessLevel, ObjectInitType } from '@eggjs/tegg-types';
|
|
4
|
+
import { TableInfoUtil } from "../util/index.js";
|
|
5
|
+
export function Table(params) {
|
|
6
|
+
return function (constructor) {
|
|
7
|
+
TableInfoUtil.setIsTable(constructor);
|
|
8
|
+
if (params) {
|
|
9
|
+
TableInfoUtil.setTableParams(constructor, params);
|
|
10
|
+
}
|
|
11
|
+
const func = Prototype({
|
|
12
|
+
accessLevel: AccessLevel.PUBLIC,
|
|
13
|
+
initType: ObjectInitType.ALWAYS_NEW,
|
|
14
|
+
});
|
|
15
|
+
func(constructor);
|
|
16
|
+
PrototypeUtil.setFilePath(constructor, StackUtil.getCalleeFromStack(false, 5));
|
|
17
|
+
};
|
|
18
18
|
}
|
|
19
|
-
|
|
20
|
-
//#endregion
|
|
21
|
-
export { Table };
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFibGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGVjb3JhdG9yL1RhYmxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHaEUsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWpELE1BQU0sVUFBVSxLQUFLLENBQUMsTUFBb0I7SUFDeEMsT0FBTyxVQUFTLFdBQThCO1FBQzVDLGFBQWEsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDdEMsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLGFBQWEsQ0FBQyxjQUFjLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFDRCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUM7WUFDckIsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO1lBQy9CLFFBQVEsRUFBRSxjQUFjLENBQUMsVUFBVTtTQUNwQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDbEIsYUFBYSxDQUFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsU0FBUyxDQUFDLGtCQUFrQixDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pGLENBQUMsQ0FBQztBQUNKLENBQUMifQ==
|
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
import { EggProtoImplClass, IndexParams } from
|
|
2
|
-
|
|
3
|
-
//#region src/decorator/TableIndex.d.ts
|
|
4
|
-
declare function Index(params: IndexParams): (constructor: EggProtoImplClass) => void;
|
|
5
|
-
//#endregion
|
|
6
|
-
export { Index };
|
|
1
|
+
import type { EggProtoImplClass, IndexParams } from '@eggjs/tegg-types';
|
|
2
|
+
export declare function Index(params: IndexParams): (constructor: EggProtoImplClass) => void;
|
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
import { IndexInfoUtil } from "../util/
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
return function(constructor) {
|
|
7
|
-
IndexInfoUtil.addIndex(constructor, params);
|
|
8
|
-
};
|
|
1
|
+
import { IndexInfoUtil } from "../util/index.js";
|
|
2
|
+
export function Index(params) {
|
|
3
|
+
return function (constructor) {
|
|
4
|
+
IndexInfoUtil.addIndex(constructor, params);
|
|
5
|
+
};
|
|
9
6
|
}
|
|
10
|
-
|
|
11
|
-
//#endregion
|
|
12
|
-
export { Index };
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFibGVJbmRleC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZWNvcmF0b3IvVGFibGVJbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFakQsTUFBTSxVQUFVLEtBQUssQ0FBQyxNQUFtQjtJQUN2QyxPQUFPLFVBQVMsV0FBOEI7UUFDNUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDOUMsQ0FBQyxDQUFDO0FBQ0osQ0FBQyJ9
|
package/dist/decorator/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
export { };
|
|
1
|
+
export * from "./Column.js";
|
|
2
|
+
export * from "./Dao.js";
|
|
3
|
+
export * from "./DataSourceQualifier.js";
|
|
4
|
+
export * from "./Table.js";
|
|
5
|
+
export * from "./TableIndex.js";
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGVjb3JhdG9yL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxpQkFBaUIsQ0FBQyJ9
|
package/dist/index.d.ts
CHANGED
|
@@ -1,16 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
import { ColumnModel } from "./model/ColumnModel.js";
|
|
7
|
-
import { IndexKey, IndexModel } from "./model/IndexModel.js";
|
|
8
|
-
import { TableModel } from "./model/TableModel.js";
|
|
9
|
-
import { DeleteResult, InsertResult, UpdateResult } from "./type/MySql.js";
|
|
10
|
-
import { SpatialHelper } from "./type/Spatial.js";
|
|
11
|
-
import { ColumnInfoMap, ColumnInfoUtil, ColumnTypeMap } from "./util/ColumnInfoUtil.js";
|
|
12
|
-
import { DaoInfoUtil } from "./util/DaoInfoUtil.js";
|
|
13
|
-
import { IndexInfoUtil } from "./util/IndexInfoUtil.js";
|
|
14
|
-
import { TABLE_CLAZZ_LIST, TableInfoUtil } from "./util/TableInfoUtil.js";
|
|
15
|
-
export * from "@eggjs/tegg-types/dal";
|
|
16
|
-
export { Column, ColumnInfoMap, ColumnInfoUtil, ColumnModel, ColumnTypeMap, Dao, DaoInfoUtil, DataSourceQualifier, DeleteResult, Index, IndexInfoUtil, IndexKey, IndexModel, InsertResult, SpatialHelper, TABLE_CLAZZ_LIST, Table, TableInfoUtil, TableModel, UpdateResult };
|
|
1
|
+
export * from '@eggjs/tegg-types/dal';
|
|
2
|
+
export * from './decorator/index.ts';
|
|
3
|
+
export * from './model/index.ts';
|
|
4
|
+
export * from './type/index.ts';
|
|
5
|
+
export * from './util/index.ts';
|
package/dist/index.js
CHANGED
|
@@ -1,21 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
import { Dao } from "./decorator/Dao.js";
|
|
8
|
-
import { DataSourceQualifier } from "./decorator/DataSourceQualifier.js";
|
|
9
|
-
import { Table } from "./decorator/Table.js";
|
|
10
|
-
import { Index } from "./decorator/TableIndex.js";
|
|
11
|
-
import "./decorator/index.js";
|
|
12
|
-
import { ColumnModel } from "./model/ColumnModel.js";
|
|
13
|
-
import { IndexModel } from "./model/IndexModel.js";
|
|
14
|
-
import { TableModel } from "./model/TableModel.js";
|
|
15
|
-
import "./model/index.js";
|
|
16
|
-
import { SpatialHelper } from "./type/Spatial.js";
|
|
17
|
-
import "./type/index.js";
|
|
18
|
-
|
|
19
|
-
export * from "@eggjs/tegg-types/dal"
|
|
20
|
-
|
|
21
|
-
export { Column, ColumnInfoUtil, ColumnModel, Dao, DaoInfoUtil, DataSourceQualifier, Index, IndexInfoUtil, IndexModel, SpatialHelper, TABLE_CLAZZ_LIST, Table, TableInfoUtil, TableModel };
|
|
1
|
+
export * from '@eggjs/tegg-types/dal';
|
|
2
|
+
export * from "./decorator/index.js";
|
|
3
|
+
export * from "./model/index.js";
|
|
4
|
+
export * from "./type/index.js";
|
|
5
|
+
export * from "./util/index.js";
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx1QkFBdUIsQ0FBQztBQUV0QyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGlCQUFpQixDQUFDIn0=
|
|
@@ -1,22 +1,5 @@
|
|
|
1
|
-
import { ColumnFormat, ColumnParams, ColumnTypeParams } from
|
|
2
|
-
|
|
3
|
-
//#region src/model/ColumnModel.d.ts
|
|
4
|
-
declare class ColumnModel {
|
|
5
|
-
columnName: string;
|
|
6
|
-
propertyName: string;
|
|
7
|
-
type: ColumnTypeParams;
|
|
8
|
-
canNull: boolean;
|
|
9
|
-
default?: string;
|
|
10
|
-
comment?: string;
|
|
11
|
-
visible?: boolean;
|
|
12
|
-
autoIncrement?: boolean;
|
|
13
|
-
uniqueKey?: boolean;
|
|
14
|
-
primaryKey?: boolean;
|
|
15
|
-
collate?: string;
|
|
16
|
-
columnFormat?: ColumnFormat;
|
|
17
|
-
engineAttribute?: string;
|
|
18
|
-
secondaryEngineAttribute?: string;
|
|
19
|
-
constructor(params: {
|
|
1
|
+
import type { ColumnFormat, ColumnParams, ColumnTypeParams } from '@eggjs/tegg-types';
|
|
2
|
+
export declare class ColumnModel {
|
|
20
3
|
columnName: string;
|
|
21
4
|
propertyName: string;
|
|
22
5
|
type: ColumnTypeParams;
|
|
@@ -31,8 +14,21 @@ declare class ColumnModel {
|
|
|
31
14
|
columnFormat?: ColumnFormat;
|
|
32
15
|
engineAttribute?: string;
|
|
33
16
|
secondaryEngineAttribute?: string;
|
|
34
|
-
|
|
35
|
-
|
|
17
|
+
constructor(params: {
|
|
18
|
+
columnName: string;
|
|
19
|
+
propertyName: string;
|
|
20
|
+
type: ColumnTypeParams;
|
|
21
|
+
canNull: boolean;
|
|
22
|
+
default?: string;
|
|
23
|
+
comment?: string;
|
|
24
|
+
visible?: boolean;
|
|
25
|
+
autoIncrement?: boolean;
|
|
26
|
+
uniqueKey?: boolean;
|
|
27
|
+
primaryKey?: boolean;
|
|
28
|
+
collate?: string;
|
|
29
|
+
columnFormat?: ColumnFormat;
|
|
30
|
+
engineAttribute?: string;
|
|
31
|
+
secondaryEngineAttribute?: string;
|
|
32
|
+
});
|
|
33
|
+
static build(property: string, type: ColumnTypeParams, params?: ColumnParams): ColumnModel;
|
|
36
34
|
}
|
|
37
|
-
//#endregion
|
|
38
|
-
export { ColumnModel };
|
|
@@ -1,59 +1,57 @@
|
|
|
1
|
-
import snakecase from
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
//#endregion
|
|
59
|
-
export { ColumnModel };
|
|
1
|
+
import snakecase from 'lodash.snakecase';
|
|
2
|
+
export class ColumnModel {
|
|
3
|
+
columnName;
|
|
4
|
+
propertyName;
|
|
5
|
+
type;
|
|
6
|
+
canNull;
|
|
7
|
+
default;
|
|
8
|
+
comment;
|
|
9
|
+
visible;
|
|
10
|
+
autoIncrement;
|
|
11
|
+
uniqueKey;
|
|
12
|
+
primaryKey;
|
|
13
|
+
collate;
|
|
14
|
+
columnFormat;
|
|
15
|
+
engineAttribute;
|
|
16
|
+
secondaryEngineAttribute;
|
|
17
|
+
constructor(params) {
|
|
18
|
+
this.columnName = params.columnName;
|
|
19
|
+
this.propertyName = params.propertyName;
|
|
20
|
+
this.type = params.type;
|
|
21
|
+
this.canNull = params.canNull;
|
|
22
|
+
this.default = params.default;
|
|
23
|
+
this.comment = params.comment;
|
|
24
|
+
this.visible = params.visible;
|
|
25
|
+
this.autoIncrement = params.autoIncrement;
|
|
26
|
+
this.uniqueKey = params.uniqueKey;
|
|
27
|
+
this.primaryKey = params.primaryKey;
|
|
28
|
+
this.collate = params.collate;
|
|
29
|
+
this.columnFormat = params.columnFormat;
|
|
30
|
+
this.engineAttribute = params.engineAttribute;
|
|
31
|
+
this.secondaryEngineAttribute = params.secondaryEngineAttribute;
|
|
32
|
+
}
|
|
33
|
+
static build(property, type, params) {
|
|
34
|
+
const columnName = params?.name ?? snakecase(property);
|
|
35
|
+
let canNull = params?.canNull ?? false;
|
|
36
|
+
if (params?.primaryKey) {
|
|
37
|
+
canNull = false;
|
|
38
|
+
}
|
|
39
|
+
return new ColumnModel({
|
|
40
|
+
columnName,
|
|
41
|
+
propertyName: property,
|
|
42
|
+
type,
|
|
43
|
+
canNull,
|
|
44
|
+
default: params?.default,
|
|
45
|
+
comment: params?.comment,
|
|
46
|
+
visible: params?.visible,
|
|
47
|
+
autoIncrement: params?.autoIncrement,
|
|
48
|
+
uniqueKey: params?.uniqueKey,
|
|
49
|
+
primaryKey: params?.primaryKey,
|
|
50
|
+
collate: params?.collate,
|
|
51
|
+
columnFormat: params?.columnFormat,
|
|
52
|
+
engineAttribute: params?.engineAttribute,
|
|
53
|
+
secondaryEngineAttribute: params?.secondaryEngineAttribute,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29sdW1uTW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kZWwvQ29sdW1uTW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxTQUFTLE1BQU0sa0JBQWtCLENBQUM7QUFHekMsTUFBTSxPQUFPLFdBQVc7SUFDdEIsVUFBVSxDQUFTO0lBQ25CLFlBQVksQ0FBUztJQUNyQixJQUFJLENBQW1CO0lBQ3ZCLE9BQU8sQ0FBVTtJQUNqQixPQUFPLENBQVU7SUFDakIsT0FBTyxDQUFVO0lBQ2pCLE9BQU8sQ0FBVztJQUNsQixhQUFhLENBQVc7SUFDeEIsU0FBUyxDQUFXO0lBQ3BCLFVBQVUsQ0FBVztJQUNyQixPQUFPLENBQVU7SUFDakIsWUFBWSxDQUFnQjtJQUM1QixlQUFlLENBQVU7SUFDekIsd0JBQXdCLENBQVU7SUFFbEMsWUFBWSxNQWVYO1FBQ0MsSUFBSSxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDO1FBQ3BDLElBQUksQ0FBQyxZQUFZLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQztRQUN4QyxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUM7UUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDO1FBQzlCLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQztRQUM5QixJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUM7UUFDOUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDO1FBQzlCLElBQUksQ0FBQyxhQUFhLEdBQUcsTUFBTSxDQUFDLGFBQWEsQ0FBQztRQUMxQyxJQUFJLENBQUMsU0FBUyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUM7UUFDbEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDO1FBQ3BDLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQztRQUM5QixJQUFJLENBQUMsWUFBWSxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUM7UUFDeEMsSUFBSSxDQUFDLGVBQWUsR0FBRyxNQUFNLENBQUMsZUFBZSxDQUFDO1FBQzlDLElBQUksQ0FBQyx3QkFBd0IsR0FBRyxNQUFNLENBQUMsd0JBQXdCLENBQUM7SUFDbEUsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsUUFBZ0IsRUFBRSxJQUFzQixFQUFFLE1BQXFCO1FBQzFFLE1BQU0sVUFBVSxHQUFHLE1BQU0sRUFBRSxJQUFJLElBQUksU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZELElBQUksT0FBTyxHQUFHLE1BQU0sRUFBRSxPQUFPLElBQUksS0FBSyxDQUFDO1FBQ3ZDLElBQUksTUFBTSxFQUFFLFVBQVUsRUFBRSxDQUFDO1lBQ3ZCLE9BQU8sR0FBRyxLQUFLLENBQUM7UUFDbEIsQ0FBQztRQUNELE9BQU8sSUFBSSxXQUFXLENBQUM7WUFDckIsVUFBVTtZQUNWLFlBQVksRUFBRSxRQUFRO1lBQ3RCLElBQUk7WUFDSixPQUFPO1lBQ1AsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPO1lBQ3hCLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTztZQUN4QixPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU87WUFDeEIsYUFBYSxFQUFFLE1BQU0sRUFBRSxhQUFhO1lBQ3BDLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUztZQUM1QixVQUFVLEVBQUUsTUFBTSxFQUFFLFVBQVU7WUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPO1lBQ3hCLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWTtZQUNsQyxlQUFlLEVBQUUsTUFBTSxFQUFFLGVBQWU7WUFDeEMsd0JBQXdCLEVBQUUsTUFBTSxFQUFFLHdCQUF3QjtTQUMzRCxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YifQ==
|
|
@@ -1,21 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
propertyName: string;
|
|
1
|
+
import { type EggProtoImplClass, IndexType } from '@eggjs/tegg-types';
|
|
2
|
+
import type { IndexParams, IndexStoreType } from '@eggjs/tegg-types';
|
|
3
|
+
import { ColumnModel } from './ColumnModel.ts';
|
|
4
|
+
export interface IndexKey {
|
|
5
|
+
columnName: string;
|
|
6
|
+
propertyName: string;
|
|
8
7
|
}
|
|
9
|
-
declare class IndexModel {
|
|
10
|
-
name: string;
|
|
11
|
-
keys: IndexKey[];
|
|
12
|
-
type: IndexType;
|
|
13
|
-
storeType?: IndexStoreType;
|
|
14
|
-
comment?: string;
|
|
15
|
-
engineAttribute?: string;
|
|
16
|
-
secondaryEngineAttribute?: string;
|
|
17
|
-
parser?: string;
|
|
18
|
-
constructor(params: {
|
|
8
|
+
export declare class IndexModel {
|
|
19
9
|
name: string;
|
|
20
10
|
keys: IndexKey[];
|
|
21
11
|
type: IndexType;
|
|
@@ -24,9 +14,16 @@ declare class IndexModel {
|
|
|
24
14
|
engineAttribute?: string;
|
|
25
15
|
secondaryEngineAttribute?: string;
|
|
26
16
|
parser?: string;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
17
|
+
constructor(params: {
|
|
18
|
+
name: string;
|
|
19
|
+
keys: IndexKey[];
|
|
20
|
+
type: IndexType;
|
|
21
|
+
storeType?: IndexStoreType;
|
|
22
|
+
comment?: string;
|
|
23
|
+
engineAttribute?: string;
|
|
24
|
+
secondaryEngineAttribute?: string;
|
|
25
|
+
parser?: string;
|
|
26
|
+
});
|
|
27
|
+
static buildIndexName(keys: string[], type: IndexType): string;
|
|
28
|
+
static build(params: IndexParams, columns: ColumnModel[], clazz: EggProtoImplClass<unknown>): IndexModel;
|
|
30
29
|
}
|
|
31
|
-
//#endregion
|
|
32
|
-
export { IndexKey, IndexModel };
|
package/dist/model/IndexModel.js
CHANGED
|
@@ -1,52 +1,51 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
//#
|
|
52
|
-
export { IndexModel };
|
|
1
|
+
import { IndexType } from '@eggjs/tegg-types';
|
|
2
|
+
import { ColumnModel } from "./ColumnModel.js";
|
|
3
|
+
export class IndexModel {
|
|
4
|
+
name;
|
|
5
|
+
keys;
|
|
6
|
+
type;
|
|
7
|
+
storeType;
|
|
8
|
+
comment;
|
|
9
|
+
engineAttribute;
|
|
10
|
+
secondaryEngineAttribute;
|
|
11
|
+
parser;
|
|
12
|
+
constructor(params) {
|
|
13
|
+
this.name = params.name;
|
|
14
|
+
this.keys = params.keys;
|
|
15
|
+
this.type = params.type;
|
|
16
|
+
this.storeType = params.storeType;
|
|
17
|
+
this.comment = params.comment;
|
|
18
|
+
this.engineAttribute = params.engineAttribute;
|
|
19
|
+
this.secondaryEngineAttribute = params.secondaryEngineAttribute;
|
|
20
|
+
this.parser = params.parser;
|
|
21
|
+
}
|
|
22
|
+
static buildIndexName(keys, type) {
|
|
23
|
+
const prefix = type === IndexType.UNIQUE ? 'uk_' : 'idx_';
|
|
24
|
+
return prefix + keys.join('_');
|
|
25
|
+
}
|
|
26
|
+
static build(params, columns, clazz) {
|
|
27
|
+
const type = params.type ?? IndexType.INDEX;
|
|
28
|
+
const keys = params.keys.map(t => {
|
|
29
|
+
const column = columns.find(c => c.propertyName === t);
|
|
30
|
+
if (!column) {
|
|
31
|
+
throw new Error(`Table ${clazz.name} index configuration error: has no property named "${t}"`);
|
|
32
|
+
}
|
|
33
|
+
return {
|
|
34
|
+
propertyName: column.propertyName,
|
|
35
|
+
columnName: column.columnName,
|
|
36
|
+
};
|
|
37
|
+
});
|
|
38
|
+
const name = params.name ?? IndexModel.buildIndexName(keys.map(t => t.columnName), type);
|
|
39
|
+
return new IndexModel({
|
|
40
|
+
name,
|
|
41
|
+
keys,
|
|
42
|
+
type,
|
|
43
|
+
storeType: params.storeType,
|
|
44
|
+
comment: params.comment,
|
|
45
|
+
engineAttribute: params.engineAttribute,
|
|
46
|
+
secondaryEngineAttribute: params.secondaryEngineAttribute,
|
|
47
|
+
parser: params.parser,
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5kZXhNb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tb2RlbC9JbmRleE1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBMEIsU0FBUyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHdEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBTy9DLE1BQU0sT0FBTyxVQUFVO0lBQ3JCLElBQUksQ0FBUztJQUNiLElBQUksQ0FBYTtJQUNqQixJQUFJLENBQVk7SUFFaEIsU0FBUyxDQUFrQjtJQUMzQixPQUFPLENBQVU7SUFDakIsZUFBZSxDQUFVO0lBQ3pCLHdCQUF3QixDQUFVO0lBQ2xDLE1BQU0sQ0FBVTtJQUVoQixZQUFZLE1BU1g7UUFDQyxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUM7UUFDeEIsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQztRQUN4QixJQUFJLENBQUMsU0FBUyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUM7UUFDbEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDO1FBQzlCLElBQUksQ0FBQyxlQUFlLEdBQUcsTUFBTSxDQUFDLGVBQWUsQ0FBQztRQUM5QyxJQUFJLENBQUMsd0JBQXdCLEdBQUcsTUFBTSxDQUFDLHdCQUF3QixDQUFDO1FBQ2hFLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUM5QixDQUFDO0lBRUQsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFjLEVBQUUsSUFBZTtRQUNuRCxNQUFNLE1BQU0sR0FBRyxJQUFJLEtBQUssU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUM7UUFDMUQsT0FBTyxNQUFNLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFtQixFQUFFLE9BQXNCLEVBQUUsS0FBaUM7UUFDekYsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksSUFBSSxTQUFTLENBQUMsS0FBSyxDQUFDO1FBQzVDLE1BQU0sSUFBSSxHQUFvQixNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRTtZQUNoRCxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQztZQUN2RCxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQ1osTUFBTSxJQUFJLEtBQUssQ0FBQyxTQUFTLEtBQUssQ0FBQyxJQUFJLHNEQUFzRCxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pHLENBQUM7WUFDRCxPQUFPO2dCQUNMLFlBQVksRUFBRSxNQUFPLENBQUMsWUFBWTtnQkFDbEMsVUFBVSxFQUFFLE1BQU8sQ0FBQyxVQUFVO2FBQy9CLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztRQUNILE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLElBQUksVUFBVSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3pGLE9BQU8sSUFBSSxVQUFVLENBQUM7WUFDcEIsSUFBSTtZQUNKLElBQUk7WUFDSixJQUFJO1lBQ0osU0FBUyxFQUFFLE1BQU0sQ0FBQyxTQUFTO1lBQzNCLE9BQU8sRUFBRSxNQUFNLENBQUMsT0FBTztZQUN2QixlQUFlLEVBQUUsTUFBTSxDQUFDLGVBQWU7WUFDdkMsd0JBQXdCLEVBQUUsTUFBTSxDQUFDLHdCQUF3QjtZQUN6RCxNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07U0FDdEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIn0=
|