@cheetah.js/orm 0.1.2 → 0.1.4
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/SqlBuilder.d.ts +8 -3
- package/dist/SqlBuilder.js +40 -5
- package/dist/SqlBuilder.js.map +1 -1
- package/dist/bun/index.d.ts +3 -0
- package/dist/bun/index.js +1075 -105
- package/dist/bun/index.js.map +50 -36
- package/dist/common/email.vo.d.ts +4 -0
- package/dist/common/email.vo.js +8 -0
- package/dist/common/email.vo.js.map +1 -0
- package/dist/common/uuid.d.ts +4 -0
- package/dist/common/uuid.js +7 -0
- package/dist/common/uuid.js.map +1 -0
- package/dist/common/value-object.d.ts +49 -0
- package/dist/common/value-object.js +53 -0
- package/dist/common/value-object.js.map +1 -0
- package/dist/decorators/property.decorator.d.ts +1 -0
- package/dist/decorators/property.decorator.js.map +1 -1
- package/dist/domain/base-entity.d.ts +4 -3
- package/dist/domain/base-entity.js +3 -9
- package/dist/domain/base-entity.js.map +1 -1
- package/dist/domain/entities.d.ts +1 -1
- package/dist/domain/entities.js +7 -3
- package/dist/domain/entities.js.map +1 -1
- package/dist/domain/reference.js +1 -0
- package/dist/domain/reference.js.map +1 -1
- package/dist/driver/driver.interface.d.ts +8 -4
- package/dist/driver/pg-driver.js +5 -2
- package/dist/driver/pg-driver.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/migration/diff-calculator.js +39 -9
- package/dist/migration/diff-calculator.js.map +1 -1
- package/dist/migration/migrator.js +3 -1
- package/dist/migration/migrator.js.map +1 -1
- package/dist/orm.js +7 -2
- package/dist/orm.js.map +1 -1
- package/dist/orm.service.js +3 -1
- package/dist/orm.service.js.map +1 -1
- package/dist/utils.js +1 -13
- package/dist/utils.js.map +1 -1
- package/package.json +2 -2
- package/src/SqlBuilder.ts +36 -5
- package/src/common/email.vo.ts +10 -0
- package/src/common/uuid.ts +8 -0
- package/src/common/value-object.ts +76 -0
- package/src/decorators/property.decorator.ts +1 -0
- package/src/domain/base-entity.ts +2 -10
- package/src/domain/entities.ts +3 -1
- package/src/driver/driver.interface.ts +13 -4
- package/src/driver/pg-driver.ts +5 -3
- package/src/index.ts +4 -1
- package/src/migration/diff-calculator.ts +41 -12
- package/src/utils.ts +1 -16
- package/test/domain/base-entity.spec.ts +45 -1
- package/test/migration/{migator.spec.ts → migrator.spec.ts} +45 -0
- package/test/migration/test.sql +1 -5
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ValueObject } from '@cheetah.js/orm/common/value-object';
|
|
2
|
+
const REGEX = /^[a-z0-9.]+@[a-z0-9]+\.[a-z]+(\.[a-z]+)?$/i;
|
|
3
|
+
export class Email extends ValueObject {
|
|
4
|
+
validate(value) {
|
|
5
|
+
return REGEX.test(value);
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=email.vo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email.vo.js","sourceRoot":"","sources":["../../src/common/email.vo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,MAAM,KAAK,GAAG,4CAA4C,CAAC;AAE3D,MAAM,OAAO,KAAM,SAAQ,WAA0B;IAEzC,QAAQ,CAAC,KAAa;QAC9B,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"uuid.js","sourceRoot":"","sources":["../../src/common/uuid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,OAAO,IAAK,SAAQ,WAAyB;IAEvC,QAAQ,CAAC,KAAa;QAC9B,OAAO,yCAAyC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC;CACF"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
type VoExtended<T, Vo> = Vo extends ValueObject<T, Vo> ? Vo : ValueObject<T, Vo>;
|
|
2
|
+
export declare abstract class ValueObject<T, Vo> {
|
|
3
|
+
/**
|
|
4
|
+
* Validates the value of the Value Object.
|
|
5
|
+
* It is abstract so that each Value Object can implement its own validation.
|
|
6
|
+
* It is protected from being called directly.
|
|
7
|
+
*
|
|
8
|
+
* @param value
|
|
9
|
+
* @protected
|
|
10
|
+
*/
|
|
11
|
+
protected abstract validate(value: T): boolean;
|
|
12
|
+
/**
|
|
13
|
+
* Valor do Value Object.
|
|
14
|
+
* É privado para não ser alterado diretamente.
|
|
15
|
+
* O valor também é imutável.
|
|
16
|
+
*
|
|
17
|
+
* @private
|
|
18
|
+
*/
|
|
19
|
+
private value;
|
|
20
|
+
constructor(value: T);
|
|
21
|
+
/**
|
|
22
|
+
* Creates a Value Object instance from a value.
|
|
23
|
+
*
|
|
24
|
+
* @example
|
|
25
|
+
* Email.from('test@test.com');
|
|
26
|
+
*
|
|
27
|
+
* @param value
|
|
28
|
+
*/
|
|
29
|
+
static from<T, Vo>(this: new (value: T) => VoExtended<T, Vo>, value: T): VoExtended<T, Vo>;
|
|
30
|
+
/**
|
|
31
|
+
* Returns the scalar value of the Value Object.
|
|
32
|
+
*
|
|
33
|
+
*/
|
|
34
|
+
getValue(): T;
|
|
35
|
+
/**
|
|
36
|
+
* Compares the value of the Value Object with another Value Object.
|
|
37
|
+
*
|
|
38
|
+
* @param vo
|
|
39
|
+
*/
|
|
40
|
+
equals(vo: ValueObject<T, Vo>): boolean;
|
|
41
|
+
/**
|
|
42
|
+
* Sets the value of the Value Object.
|
|
43
|
+
*
|
|
44
|
+
* @param value
|
|
45
|
+
* @private
|
|
46
|
+
*/
|
|
47
|
+
private setValue;
|
|
48
|
+
}
|
|
49
|
+
export {};
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { HttpException } from '@cheetah.js/core';
|
|
2
|
+
export class ValueObject {
|
|
3
|
+
/**
|
|
4
|
+
* Valor do Value Object.
|
|
5
|
+
* É privado para não ser alterado diretamente.
|
|
6
|
+
* O valor também é imutável.
|
|
7
|
+
*
|
|
8
|
+
* @private
|
|
9
|
+
*/
|
|
10
|
+
value;
|
|
11
|
+
constructor(value) {
|
|
12
|
+
if (!this.validate(value)) {
|
|
13
|
+
throw new HttpException(`Invalid value for ${this.constructor.name}`, 400);
|
|
14
|
+
}
|
|
15
|
+
this.setValue(value);
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Creates a Value Object instance from a value.
|
|
19
|
+
*
|
|
20
|
+
* @example
|
|
21
|
+
* Email.from('test@test.com');
|
|
22
|
+
*
|
|
23
|
+
* @param value
|
|
24
|
+
*/
|
|
25
|
+
static from(value) {
|
|
26
|
+
return new this(value);
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Returns the scalar value of the Value Object.
|
|
30
|
+
*
|
|
31
|
+
*/
|
|
32
|
+
getValue() {
|
|
33
|
+
return this.value;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Compares the value of the Value Object with another Value Object.
|
|
37
|
+
*
|
|
38
|
+
* @param vo
|
|
39
|
+
*/
|
|
40
|
+
equals(vo) {
|
|
41
|
+
return this.getValue() === vo.getValue();
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Sets the value of the Value Object.
|
|
45
|
+
*
|
|
46
|
+
* @param value
|
|
47
|
+
* @private
|
|
48
|
+
*/
|
|
49
|
+
setValue(value) {
|
|
50
|
+
this.value = value;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=value-object.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"value-object.js","sourceRoot":"","sources":["../../src/common/value-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMjD,MAAM,OAAgB,WAAW;IAW/B;;;;;;OAMG;IACK,KAAK,CAAI;IAEjB,YAAY,KAAQ;QAClB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACzB,MAAM,IAAI,aAAa,CAAC,qBAAqB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;SAC5E;QAED,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,CAET,KAAQ;QAER,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED;;;OAGG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,EAAsB;QAClC,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACK,QAAQ,CAAC,KAAQ;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF"}
|
|
@@ -4,6 +4,7 @@ export type PropertyOptions = {
|
|
|
4
4
|
default?: any;
|
|
5
5
|
length?: number;
|
|
6
6
|
unique?: boolean;
|
|
7
|
+
dbType?: 'varchar' | 'text' | 'int' | 'bigint' | 'float' | 'double' | 'decimal' | 'date' | 'datetime' | 'time' | 'timestamp' | 'boolean' | 'json' | 'jsonb' | 'enum' | 'array' | 'uuid';
|
|
7
8
|
autoIncrement?: boolean;
|
|
8
9
|
onUpdate?: () => any;
|
|
9
10
|
onInsert?: () => any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"property.decorator.js","sourceRoot":"","sources":["../../src/decorators/property.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"property.decorator.js","sourceRoot":"","sources":["../../src/decorators/property.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAgB5C,MAAM,UAAU,QAAQ,CAAC,OAAyB;IAChD,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC7B,MAAM,UAAU,GAAW,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC9E,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,OAAO,GAAG,EAAC,MAAM,EAAE,GAAG,OAAO,EAAC,CAAC;QAC/B,UAAU,CAAC,IAAI,CAAC,EAAC,WAAW,EAAE,OAAO,EAAC,CAAC,CAAC;QACxC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QAEzD,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,MAAM,OAAO,GAA2C,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAC1G,OAAO,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,WAAqB,CAAC,EAAC,CAAC,CAAC;YAC1E,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;SACtD;QAED,UAAU,CAAC,OAAO,CAAC,CAAC,QAAc,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAC1E,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5D,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAC,CAAC;YAChE,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SqlBuilder } from '../SqlBuilder';
|
|
2
|
-
import { FilterQuery, FindOneOption, FindOptions,
|
|
2
|
+
import { FilterQuery, FindOneOption, FindOptions, ValueOrInstance } from '../driver/driver.interface';
|
|
3
3
|
export declare abstract class BaseEntity {
|
|
4
4
|
private _oldValues;
|
|
5
5
|
private _changedValues;
|
|
@@ -36,7 +36,8 @@ export declare abstract class BaseEntity {
|
|
|
36
36
|
} & typeof BaseEntity, options: FindOptions<T, Hint>): Promise<T[]>;
|
|
37
37
|
static create<T extends BaseEntity>(this: {
|
|
38
38
|
new (): T;
|
|
39
|
-
} & typeof BaseEntity, where: Partial<
|
|
40
|
-
|
|
39
|
+
} & typeof BaseEntity, where: Partial<{
|
|
40
|
+
[K in keyof T]: ValueOrInstance<T[K]>;
|
|
41
|
+
}>): Promise<T>;
|
|
41
42
|
save(): Promise<void>;
|
|
42
43
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { SqlBuilder } from '../SqlBuilder';
|
|
2
2
|
export class BaseEntity {
|
|
3
|
+
_oldValues = {};
|
|
4
|
+
_changedValues = {};
|
|
5
|
+
$_isPersisted = false;
|
|
3
6
|
constructor() {
|
|
4
|
-
this._oldValues = {};
|
|
5
|
-
this._changedValues = {};
|
|
6
|
-
this.$_isPersisted = false;
|
|
7
7
|
return new Proxy(this, {
|
|
8
8
|
set(target, p, newValue) {
|
|
9
9
|
if (p.startsWith('$')) {
|
|
@@ -79,12 +79,6 @@ export class BaseEntity {
|
|
|
79
79
|
.insert(where)
|
|
80
80
|
.executeAndReturnFirstOrFail();
|
|
81
81
|
}
|
|
82
|
-
static getTableName() {
|
|
83
|
-
if ('tableName' in this) {
|
|
84
|
-
return this.tableName;
|
|
85
|
-
}
|
|
86
|
-
return this.name.toLowerCase();
|
|
87
|
-
}
|
|
88
82
|
async save() {
|
|
89
83
|
const qb = this.createQueryBuilder();
|
|
90
84
|
if (this.$_isPersisted) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-entity.js","sourceRoot":"","sources":["../../src/domain/base-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,MAAM,OAAgB,UAAU;
|
|
1
|
+
{"version":3,"file":"base-entity.js","sourceRoot":"","sources":["../../src/domain/base-entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare class EntityStorage {
|
|
|
24
24
|
}, properties: {
|
|
25
25
|
[key: string]: Property;
|
|
26
26
|
}, relations: Relationship<any>[]): void;
|
|
27
|
-
get(entity: Function): Options
|
|
27
|
+
get(entity: Function): Options;
|
|
28
28
|
entries(): IterableIterator<[Function, Options]>;
|
|
29
29
|
static getInstance(): EntityStorage;
|
|
30
30
|
snapshot(values: Options): Promise<SnapshotTable>;
|
package/dist/domain/entities.js
CHANGED
|
@@ -10,9 +10,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var EntityStorage_1;
|
|
11
11
|
import { Metadata, Service } from '@cheetah.js/core';
|
|
12
12
|
import { getDefaultLength } from '../utils';
|
|
13
|
-
let EntityStorage =
|
|
13
|
+
let EntityStorage = class EntityStorage {
|
|
14
|
+
static { EntityStorage_1 = this; }
|
|
15
|
+
static instance;
|
|
16
|
+
entities = new Map();
|
|
14
17
|
constructor() {
|
|
15
|
-
this.entities = new Map();
|
|
16
18
|
EntityStorage_1.instance = this;
|
|
17
19
|
}
|
|
18
20
|
add(entity, properties, relations) {
|
|
@@ -54,9 +56,10 @@ let EntityStorage = EntityStorage_1 = class EntityStorage {
|
|
|
54
56
|
let properties = Object.entries(values.showProperties).map(([key, value]) => {
|
|
55
57
|
return {
|
|
56
58
|
name: key,
|
|
57
|
-
type: value.type.name,
|
|
59
|
+
type: value.options.dbType ?? value.type.name,
|
|
58
60
|
nullable: value.options?.nullable,
|
|
59
61
|
default: value.options?.default,
|
|
62
|
+
autoIncrement: value.options?.autoIncrement,
|
|
60
63
|
primary: value.options?.isPrimary,
|
|
61
64
|
unique: value.options?.unique,
|
|
62
65
|
length: value.options?.length,
|
|
@@ -72,6 +75,7 @@ let EntityStorage = EntityStorage_1 = class EntityStorage {
|
|
|
72
75
|
unique: relation.unique,
|
|
73
76
|
length: relation.length || getDefaultLength(type),
|
|
74
77
|
default: relation.default,
|
|
78
|
+
autoIncrement: relation.autoIncrement,
|
|
75
79
|
primary: relation.isPrimary,
|
|
76
80
|
foreignKeys: [
|
|
77
81
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/domain/entities.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiBrC,IAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/domain/entities.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiBrC,IAAM,aAAa,GAAnB,MAAM,aAAa;;IACxB,MAAM,CAAC,QAAQ,CAAgB;IAEvB,QAAQ,GAA2B,IAAI,GAAG,EAAE,CAAC;IAErD;QACE,eAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;IAChC,CAAC;IAED,GAAG,CAAC,MAA0C,EAAE,UAAqC,EAAE,SAA8B;QACnH,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,EAAE,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjF,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE;YAC/B,cAAc,EAAE,UAAU;YAC1B,cAAc,EAAE,EAAE;YAClB,SAAS;YACT,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,KAA2C,EAAE,EAAE;gBACnE,OAAO;oBACL,KAAK,EAAE,UAAU;oBACjB,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC;oBACpD,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;iBACvC,CAAA;YACH,CAAC,CAAC;YACF,SAAS,EAAE,UAAU;YACrB,GAAG,MAAM,CAAC,OAAO;SAClB,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,MAAgB;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO,eAAa,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAe;QAC5B,OAAO;YACL,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,QAAQ;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE;YAC7B,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;SACtC,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,MAAe;QAErC,IAAI,UAAU,GAAkB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACzF,OAAO;gBACL,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI;gBAC7C,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ;gBACjC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO;gBAC/B,aAAa,EAAE,KAAK,CAAC,OAAO,EAAE,aAAa;gBAC3C,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,SAAS;gBACjC,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM;gBAC7B,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM;aAC9B,CAAA;QACH,CAAC,CAAC,CAAA;QACF,aAAa;QACb,IAAI,SAAS,GAAkB,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YAErC,OAAO;gBACL,IAAI,EAAE,QAAQ,CAAC,WAAqB;gBACpC,IAAI;gBACJ,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC;gBACjD,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,OAAO,EAAE,QAAQ,CAAC,SAAS;gBAC3B,WAAW,EAAE;oBACX;wBACE,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBAC7C,mBAAmB,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAS,CAAE,CAAC,SAAS;qBACnE;iBACF;aACF,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,EAAE,CAAA;SACf;QACD,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,EAAE,CAAA;SAChB;QAED,OAAO,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC,CAAA;IACtC,CAAC;IAEO,eAAe,CAAC,MAAe;QACrC,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAChE,OAAO;gBACL,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,GAAG;gBACf,KAAK,EAAE,MAAM,CAAC,SAAS;aACxB,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,SAAS,CAAC,QAA2B;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAS,CAAC,CAAA;QACjD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,SAAS,CAAA;SACjB;QAED,OAAO,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IACjE,CAAC;IAED;;;;OAIG;IACK,QAAQ,CAAC,YAA+B;QAC9C,oEAAoE;QACpE,IAAI,OAAO,YAAY,CAAC,KAAK,KAAK,WAAW,EAAE;YAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAS,CAAC,CAAC;YAC/D,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,MAAO,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;YACjH,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,UAAU,MAAO,CAAC,SAAS,8BAA8B,CAAC,CAAC;aAC5E;YAED,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;SACpB;QAED,6FAA6F;QAC7F,4CAA4C;QAC5C,IAAI,OAAO,YAAY,CAAC,KAAK,KAAK,QAAQ,EAAE;YAC1C,OAAO,YAAY,CAAC,KAAK,CAAC;SAC3B;QAED,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5E,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IAChD,CAAC;CACF,CAAA;AA5IY,aAAa;IADzB,OAAO,EAAE;;GACG,aAAa,CA4IzB"}
|
package/dist/domain/reference.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.js","sourceRoot":"","sources":["../../src/domain/reference.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,SAAS;
|
|
1
|
+
{"version":3,"file":"reference.js","sourceRoot":"","sources":["../../src/domain/reference.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,SAAS;IACA;IAApB,YAAoB,MAAS;QAAT,WAAM,GAAN,MAAM,CAAG;QAC3B,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IACtC,CAAC;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { PropertyOptions } from '../decorators/property.decorator';
|
|
2
2
|
import { Collection } from '../domain/collection';
|
|
3
3
|
import { Reference } from '../domain/reference';
|
|
4
|
+
import { ValueObject } from '../common/value-object';
|
|
4
5
|
export interface DriverInterface {
|
|
5
6
|
connectionString: string;
|
|
6
7
|
executeStatement(statement: Statement<any>): Promise<{
|
|
@@ -37,6 +38,7 @@ export interface DriverInterface {
|
|
|
37
38
|
commitTransaction(): Promise<void>;
|
|
38
39
|
rollbackTransaction(): Promise<void>;
|
|
39
40
|
}
|
|
41
|
+
export type ValueOrInstance<T> = T extends ValueObject<any, any> ? T | T['value'] : NonNullable<T>;
|
|
40
42
|
export type SnapshotConstraintInfo = {
|
|
41
43
|
indexName: string;
|
|
42
44
|
consDef: string;
|
|
@@ -123,6 +125,7 @@ export type ColumnsInfo = {
|
|
|
123
125
|
default?: string | null;
|
|
124
126
|
primary?: boolean;
|
|
125
127
|
unique?: boolean;
|
|
128
|
+
autoIncrement?: boolean;
|
|
126
129
|
length?: number;
|
|
127
130
|
foreignKeys?: ForeignKeyInfo[];
|
|
128
131
|
};
|
|
@@ -141,6 +144,7 @@ export type ColDiff = {
|
|
|
141
144
|
primary?: boolean;
|
|
142
145
|
unique?: boolean;
|
|
143
146
|
nullable?: boolean;
|
|
147
|
+
autoIncrement?: boolean;
|
|
144
148
|
foreignKeys?: ForeignKeyInfo[];
|
|
145
149
|
};
|
|
146
150
|
};
|
|
@@ -189,12 +193,12 @@ export type OperatorMap<T> = {
|
|
|
189
193
|
$lte?: ExpandScalar<T>;
|
|
190
194
|
$like?: string;
|
|
191
195
|
};
|
|
192
|
-
export type ExcludeFunctions<T, K extends keyof T> = T[K] extends Function ?
|
|
196
|
+
export type ExcludeFunctions<T, K extends keyof T> = T[K] extends Function ? ValueOrInstance<T> : (K extends symbol ? never : K);
|
|
193
197
|
export type Scalar = boolean | number | string | bigint | symbol | Date | RegExp | Uint8Array | {
|
|
194
198
|
toHexString(): string;
|
|
195
199
|
};
|
|
196
|
-
export type ExpandProperty<T> = T extends (infer U)[] ?
|
|
197
|
-
export type ExpandScalar<T> = null | (T extends string ? T | RegExp : T extends Date ? Date | string : T);
|
|
200
|
+
export type ExpandProperty<T> = T extends (infer U)[] ? ValueOrInstance<U> : ValueOrInstance<T>;
|
|
201
|
+
export type ExpandScalar<T> = null | ValueOrInstance<T> | (T extends string ? T | RegExp : T extends Date ? Date | string : T);
|
|
198
202
|
type ExpandObject<T> = T extends object ? T extends Scalar ? never : {
|
|
199
203
|
-readonly [K in keyof T as ExcludeFunctions<T, K>]?: Query<ExpandProperty<T[K]>> | FilterValue<ExpandProperty<T[K]>> | null;
|
|
200
204
|
} : never;
|
|
@@ -211,7 +215,7 @@ export type EntityName<T> = string | EntityClass<T> | {
|
|
|
211
215
|
name: string;
|
|
212
216
|
};
|
|
213
217
|
export type ObjectQuery<T> = ExpandObject<T> & OperatorMap<T>;
|
|
214
|
-
export type FilterQuery<T> = ObjectQuery<T> | NonNullable<ExpandScalar<Primary<T>>> | NonNullable<EntityProps<T> & OperatorMap<T>> | FilterQuery<T>[];
|
|
218
|
+
export type FilterQuery<T> = ValueOrInstance<T> | ObjectQuery<T> | NonNullable<ExpandScalar<Primary<T>>> | NonNullable<EntityProps<T> & OperatorMap<T>> | FilterQuery<T>[];
|
|
215
219
|
export type Relationship<T> = {
|
|
216
220
|
isRelation?: boolean;
|
|
217
221
|
relation: 'one-to-many' | 'many-to-one';
|
package/dist/driver/pg-driver.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Client } from 'pg';
|
|
2
2
|
export class PgDriver {
|
|
3
|
+
connectionString;
|
|
4
|
+
client;
|
|
3
5
|
constructor(options) {
|
|
4
6
|
if (options.connectionString) {
|
|
5
7
|
this.connectionString = options.connectionString;
|
|
@@ -14,8 +16,9 @@ export class PgDriver {
|
|
|
14
16
|
}
|
|
15
17
|
getCreateTableInstruction(schema, tableName, creates) {
|
|
16
18
|
return `CREATE TABLE "${schema}"."${tableName}" (${creates.map(colDiff => {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
const isAutoIncrement = colDiff.colChanges?.autoIncrement;
|
|
20
|
+
let sql = `"${colDiff.colName}" ${isAutoIncrement ? 'SERIAL' : colDiff.colType + (colDiff.colLength ? `(${colDiff.colLength})` : '')}`;
|
|
21
|
+
if (!isAutoIncrement && !colDiff.colChanges?.nullable) {
|
|
19
22
|
sql += ' NOT NULL';
|
|
20
23
|
}
|
|
21
24
|
if (colDiff.colChanges?.primary) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-driver.js","sourceRoot":"","sources":["../../src/driver/pg-driver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAA;AAE3B,MAAM,OAAO,QAAQ;
|
|
1
|
+
{"version":3,"file":"pg-driver.js","sourceRoot":"","sources":["../../src/driver/pg-driver.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -10,4 +10,7 @@ export * from './driver/pg-driver';
|
|
|
10
10
|
export * from './utils';
|
|
11
11
|
export * from './driver/driver.interface';
|
|
12
12
|
export * from './entry';
|
|
13
|
+
export * from './common/value-object';
|
|
14
|
+
export * from './common/email.vo';
|
|
15
|
+
export * from './common/uuid';
|
|
13
16
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,OAAO,CAAA;AACrB,cAAc,eAAe,CAAA;AAC7B,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,SAAS,CAAA;AACvB,cAAc,2BAA2B,CAAA;AACzC,cAAc,SAAS,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,OAAO,CAAA;AACrB,cAAc,eAAe,CAAA;AAC7B,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,SAAS,CAAA;AACvB,cAAc,2BAA2B,CAAA;AACzC,cAAc,SAAS,CAAA;AACvB,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export class DiffCalculator {
|
|
2
|
+
entities;
|
|
2
3
|
constructor(entities) {
|
|
3
4
|
this.entities = entities;
|
|
4
5
|
}
|
|
@@ -71,7 +72,10 @@ export class DiffCalculator {
|
|
|
71
72
|
colDiffs.push({
|
|
72
73
|
actionType: 'INDEX',
|
|
73
74
|
colName: '*',
|
|
74
|
-
indexTables: entityTable.indexes.map(index => ({
|
|
75
|
+
indexTables: entityTable.indexes.map(index => ({
|
|
76
|
+
name: index.indexName,
|
|
77
|
+
properties: index.columnName.split(','),
|
|
78
|
+
})),
|
|
75
79
|
});
|
|
76
80
|
}
|
|
77
81
|
if (!entityTable || !entityTable.indexes) {
|
|
@@ -107,12 +111,14 @@ export class DiffCalculator {
|
|
|
107
111
|
}
|
|
108
112
|
}
|
|
109
113
|
createNewColumn(entityCol, colDiffs) {
|
|
114
|
+
const colType = this.convertEntityTypeToSqlType(entityCol.type);
|
|
110
115
|
colDiffs.push({
|
|
111
116
|
actionType: 'CREATE',
|
|
112
117
|
colName: entityCol.name,
|
|
113
|
-
colType:
|
|
114
|
-
colLength: entityCol.length,
|
|
118
|
+
colType: colType.type,
|
|
119
|
+
colLength: entityCol.length ?? colType.len,
|
|
115
120
|
colChanges: {
|
|
121
|
+
autoIncrement: entityCol.autoIncrement,
|
|
116
122
|
default: entityCol.default,
|
|
117
123
|
primary: entityCol.primary,
|
|
118
124
|
unique: entityCol.unique,
|
|
@@ -123,12 +129,15 @@ export class DiffCalculator {
|
|
|
123
129
|
return colDiffs;
|
|
124
130
|
}
|
|
125
131
|
diffColumnType(bdCol, entityCol, colDiffs) {
|
|
126
|
-
|
|
132
|
+
const colT = this.convertEntityTypeToSqlType(entityCol.type);
|
|
133
|
+
const colType = colT.type;
|
|
134
|
+
const length = entityCol.length ?? colT.len;
|
|
135
|
+
if (bdCol.type !== colType || bdCol.length !== length) {
|
|
127
136
|
colDiffs.push({
|
|
128
137
|
actionType: 'ALTER',
|
|
129
138
|
colName: entityCol.name,
|
|
130
|
-
colType:
|
|
131
|
-
colLength:
|
|
139
|
+
colType: colType,
|
|
140
|
+
colLength: length,
|
|
132
141
|
});
|
|
133
142
|
}
|
|
134
143
|
}
|
|
@@ -215,14 +224,35 @@ export class DiffCalculator {
|
|
|
215
224
|
}
|
|
216
225
|
}
|
|
217
226
|
// TODO: Precisa ser de acordo com o driver
|
|
227
|
+
// adicionar 'varchar' | 'text' | 'int' | 'bigint' | 'float' | 'double' | 'decimal' | 'date' | 'datetime' | 'time' | 'timestamp' | 'boolean' | 'json' | 'jsonb' | 'enum' | 'array' | 'uuid'
|
|
218
228
|
convertEntityTypeToSqlType(entityType) {
|
|
219
229
|
switch (entityType) {
|
|
220
230
|
case "Number":
|
|
221
|
-
|
|
231
|
+
case 'int':
|
|
232
|
+
return { type: 'numeric', len: 11 };
|
|
233
|
+
case 'bigint':
|
|
234
|
+
return { type: 'bigint' };
|
|
235
|
+
case 'float':
|
|
236
|
+
return { type: 'float4' };
|
|
237
|
+
case 'double':
|
|
238
|
+
return { type: 'float8' };
|
|
239
|
+
case 'decimal':
|
|
240
|
+
return { type: 'decimal' };
|
|
222
241
|
case "String":
|
|
223
|
-
|
|
242
|
+
case "varchar":
|
|
243
|
+
return { type: 'character varying', len: 255 };
|
|
244
|
+
case "Boolean":
|
|
245
|
+
return { type: "boolean" };
|
|
246
|
+
case "Date":
|
|
247
|
+
return { type: "timestamp" };
|
|
248
|
+
case "Object":
|
|
249
|
+
return { type: "json" };
|
|
250
|
+
case 'uuid':
|
|
251
|
+
return { type: 'uuid' };
|
|
252
|
+
case 'text':
|
|
253
|
+
return { type: 'text' };
|
|
224
254
|
default:
|
|
225
|
-
return "character varying";
|
|
255
|
+
return { type: "character varying", len: 255 };
|
|
226
256
|
//... mais casos aqui ...
|
|
227
257
|
}
|
|
228
258
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-calculator.js","sourceRoot":"","sources":["../../src/migration/diff-calculator.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,cAAc;
|
|
1
|
+
{"version":3,"file":"diff-calculator.js","sourceRoot":"","sources":["../../src/migration/diff-calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,10 @@ import * as path from 'path';
|
|
|
7
7
|
import * as fs from 'fs';
|
|
8
8
|
import { DiffCalculator } from './diff-calculator';
|
|
9
9
|
export class Migrator {
|
|
10
|
+
config;
|
|
11
|
+
orm;
|
|
12
|
+
entities = new EntityStorage();
|
|
10
13
|
constructor() {
|
|
11
|
-
this.entities = new EntityStorage();
|
|
12
14
|
}
|
|
13
15
|
async initConfigFile(basePath = process.cwd()) {
|
|
14
16
|
const paths = await globby(['cheetah.config.ts'], { absolute: true, cwd: basePath });
|