@entity-access/entity-access 1.0.252 → 1.0.254
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/.vscode/launch.json +2 -1
- package/dist/common/symbols/symbols.d.ts +1 -0
- package/dist/common/symbols/symbols.d.ts.map +1 -1
- package/dist/common/symbols/symbols.js +1 -0
- package/dist/common/symbols/symbols.js.map +1 -1
- package/dist/decorators/ForeignKey.d.ts +8 -7
- package/dist/decorators/ForeignKey.d.ts.map +1 -1
- package/dist/decorators/ForeignKey.js +43 -8
- package/dist/decorators/ForeignKey.js.map +1 -1
- package/dist/decorators/IColumn.d.ts +6 -3
- package/dist/decorators/IColumn.d.ts.map +1 -1
- package/dist/decorators/Relate.d.ts.map +1 -1
- package/dist/decorators/Relate.js +8 -6
- package/dist/decorators/Relate.js.map +1 -1
- package/dist/entity-query/EntityType.d.ts +5 -1
- package/dist/entity-query/EntityType.d.ts.map +1 -1
- package/dist/entity-query/EntityType.js +61 -25
- package/dist/entity-query/EntityType.js.map +1 -1
- package/dist/migrations/postgres/PostgresAutomaticMigrations.js +1 -1
- package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map +1 -1
- package/dist/migrations/postgres/PostgresMigrations.d.ts +1 -1
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js +1 -1
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map +1 -1
- package/dist/migrations/sql-server/SqlServerMigrations.d.ts +1 -1
- package/dist/model/EntityModel.js +2 -2
- package/dist/model/EntityModel.js.map +1 -1
- package/dist/model/EntitySource.d.ts +6 -1
- package/dist/model/EntitySource.d.ts.map +1 -1
- package/dist/model/EntitySource.js.map +1 -1
- package/dist/model/SourceExpression.d.ts +1 -22
- package/dist/model/SourceExpression.d.ts.map +1 -1
- package/dist/model/SourceExpression.js +116 -98
- package/dist/model/SourceExpression.js.map +1 -1
- package/dist/model/changes/ChangeEntry.d.ts.map +1 -1
- package/dist/model/changes/ChangeEntry.js +62 -25
- package/dist/model/changes/ChangeEntry.js.map +1 -1
- package/dist/model/changes/ChangeSet.d.ts +2 -1
- package/dist/model/changes/ChangeSet.d.ts.map +1 -1
- package/dist/model/changes/ChangeSet.js +4 -3
- package/dist/model/changes/ChangeSet.js.map +1 -1
- package/dist/model/identity/IdentityMap.d.ts +23 -0
- package/dist/model/identity/IdentityMap.d.ts.map +1 -0
- package/dist/model/identity/IdentityMap.js +113 -0
- package/dist/model/identity/IdentityMap.js.map +1 -0
- package/dist/model/identity/RelationMapper.d.ts +2 -3
- package/dist/model/identity/RelationMapper.d.ts.map +1 -1
- package/dist/model/identity/RelationMapper.js +60 -27
- package/dist/model/identity/RelationMapper.js.map +1 -1
- package/dist/model/identity/SearchIndex.d.ts +17 -0
- package/dist/model/identity/SearchIndex.d.ts.map +1 -0
- package/dist/model/identity/SearchIndex.js +109 -0
- package/dist/model/identity/SearchIndex.js.map +1 -0
- package/dist/model/verification/VerificationSession.d.ts +1 -1
- package/dist/model/verification/VerificationSession.d.ts.map +1 -1
- package/dist/model/verification/VerificationSession.js +18 -16
- package/dist/model/verification/VerificationSession.js.map +1 -1
- package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
- package/dist/query/ast/ExpressionToSql.js +74 -52
- package/dist/query/ast/ExpressionToSql.js.map +1 -1
- package/dist/query/expander/QueryExpander.d.ts.map +1 -1
- package/dist/query/expander/QueryExpander.js +41 -10
- package/dist/query/expander/QueryExpander.js.map +1 -1
- package/dist/tests/db-tests/tests/multi-fk-tests.d.ts +3 -0
- package/dist/tests/db-tests/tests/multi-fk-tests.d.ts.map +1 -0
- package/dist/tests/db-tests/tests/multi-fk-tests.js +38 -0
- package/dist/tests/db-tests/tests/multi-fk-tests.js.map +1 -0
- package/dist/tests/expressions/left-joins/child-joins.js +7 -7
- package/dist/tests/model/ShoppingContext.d.ts +9 -0
- package/dist/tests/model/ShoppingContext.d.ts.map +1 -1
- package/dist/tests/model/ShoppingContext.js +34 -0
- package/dist/tests/model/ShoppingContext.js.map +1 -1
- package/dist/tests/security/tests/include-items.d.ts.map +1 -1
- package/dist/tests/security/tests/include-items.js +1 -0
- package/dist/tests/security/tests/include-items.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/symbols/symbols.ts +2 -1
- package/src/decorators/ForeignKey.ts +66 -28
- package/src/decorators/IColumn.ts +4 -3
- package/src/decorators/Relate.ts +8 -6
- package/src/entity-query/EntityType.ts +64 -26
- package/src/migrations/postgres/PostgresAutomaticMigrations.ts +1 -1
- package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts +1 -1
- package/src/model/EntityModel.ts +2 -2
- package/src/model/EntitySource.ts +6 -1
- package/src/model/SourceExpression.ts +132 -132
- package/src/model/changes/ChangeEntry.ts +68 -25
- package/src/model/changes/ChangeSet.ts +4 -3
- package/src/model/identity/IdentityMap.ts +126 -0
- package/src/model/identity/RelationMapper.ts +71 -27
- package/src/model/identity/SearchIndex.ts +120 -0
- package/src/model/verification/VerificationSession.ts +19 -16
- package/src/query/ast/ExpressionToSql.ts +77 -61
- package/src/query/expander/QueryExpander.ts +52 -28
- package/src/tests/db-tests/tests/multi-fk-tests.ts +46 -0
- package/src/tests/expressions/left-joins/child-joins.ts +7 -7
- package/src/tests/model/ShoppingContext.ts +32 -0
- package/src/tests/security/tests/include-items.ts +1 -0
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { entityTypeSymbol } from "../../common/symbols/symbols.js";
|
|
2
|
+
/**
|
|
3
|
+
* Locally cache uniquely identifiable entities
|
|
4
|
+
*/
|
|
5
|
+
export default class IdentityMap {
|
|
6
|
+
constructor() {
|
|
7
|
+
this.map = new Map();
|
|
8
|
+
this.keys = new Map();
|
|
9
|
+
}
|
|
10
|
+
get indexedColumns() {
|
|
11
|
+
return this.keys.keys();
|
|
12
|
+
}
|
|
13
|
+
delete(jsonKey) {
|
|
14
|
+
const item = this.map.get(jsonKey);
|
|
15
|
+
this.map.delete(jsonKey);
|
|
16
|
+
if (item) {
|
|
17
|
+
const type = item[entityTypeSymbol];
|
|
18
|
+
for (const column of type.columns) {
|
|
19
|
+
const values = this.keys.get(column);
|
|
20
|
+
if (!values) {
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
const value = item[column.name];
|
|
24
|
+
if (value === void 0 || value === null) {
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
const entries = values.get(value);
|
|
28
|
+
if (!entries) {
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
const index = entries.findIndex(item);
|
|
32
|
+
entries.splice(index, 1);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
get(jsonKeys) {
|
|
37
|
+
return this.map.get(jsonKeys);
|
|
38
|
+
}
|
|
39
|
+
set(jsonKey, entity, type) {
|
|
40
|
+
entity[entityTypeSymbol] = type;
|
|
41
|
+
this.map.set(jsonKey, entity);
|
|
42
|
+
this.updateSearchIndex(type, entity);
|
|
43
|
+
}
|
|
44
|
+
clear() {
|
|
45
|
+
this.map.clear();
|
|
46
|
+
this.keys.clear();
|
|
47
|
+
}
|
|
48
|
+
build(key) {
|
|
49
|
+
return this.getKeyEntry(key, true);
|
|
50
|
+
}
|
|
51
|
+
searchByKeys(pairs, create = true) {
|
|
52
|
+
let results;
|
|
53
|
+
for (const { key, value } of pairs) {
|
|
54
|
+
const items = this.getAll(key, value, create);
|
|
55
|
+
if (!items?.length) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
if (!results) {
|
|
59
|
+
results = [].concat(items);
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
const old = results;
|
|
63
|
+
results = [];
|
|
64
|
+
for (const item of items) {
|
|
65
|
+
if (old.includes(item)) {
|
|
66
|
+
results.push(item);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return results[0];
|
|
71
|
+
}
|
|
72
|
+
getAll(key, value, create = true) {
|
|
73
|
+
const keyEntry = this.getKeyEntry(key, create);
|
|
74
|
+
return keyEntry.get(value);
|
|
75
|
+
}
|
|
76
|
+
getKeyEntry(key, create = false) {
|
|
77
|
+
let keyEntry = this.keys.get(key);
|
|
78
|
+
if (keyEntry) {
|
|
79
|
+
return keyEntry;
|
|
80
|
+
}
|
|
81
|
+
if (!create) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
keyEntry = new Map();
|
|
85
|
+
this.keys.set(key, keyEntry);
|
|
86
|
+
for (const entry of this.map.values()) {
|
|
87
|
+
this.updateSearchIndex(entry[entityTypeSymbol], entry);
|
|
88
|
+
}
|
|
89
|
+
return keyEntry;
|
|
90
|
+
}
|
|
91
|
+
updateSearchIndex(type, entity) {
|
|
92
|
+
for (const key of this.keys.keys()) {
|
|
93
|
+
if (type.getField(key.name) !== key) {
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
const keyEntry = this.getKeyEntry(key, true);
|
|
97
|
+
const value = entity[key.name];
|
|
98
|
+
if (value === void 0 || value === null) {
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
let values = keyEntry.get(value);
|
|
102
|
+
if (!values) {
|
|
103
|
+
values = [];
|
|
104
|
+
keyEntry.set(value, values);
|
|
105
|
+
}
|
|
106
|
+
if (values.includes(entity)) {
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
values.push(entity);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=IdentityMap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IdentityMap.js","sourceRoot":"","sources":["../../../src/model/identity/IdentityMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,8 @@ import type ChangeSet from "../changes/ChangeSet.js";
|
|
|
3
3
|
export default class RelationMapper {
|
|
4
4
|
private changeSet;
|
|
5
5
|
private identityMap;
|
|
6
|
-
private
|
|
7
|
-
constructor(changeSet: ChangeSet, identityMap?:
|
|
8
|
-
push(id: string, waiter: ChangeEntry): void;
|
|
6
|
+
private events;
|
|
7
|
+
constructor(changeSet: ChangeSet, identityMap?: import("./IdentityMap.js").default);
|
|
9
8
|
fix(entry: ChangeEntry, nest?: boolean): void;
|
|
10
9
|
}
|
|
11
10
|
//# sourceMappingURL=RelationMapper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationMapper.d.ts","sourceRoot":"","sources":["../../../src/model/identity/RelationMapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RelationMapper.d.ts","sourceRoot":"","sources":["../../../src/model/identity/RelationMapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,SAAS,MAAM,yBAAyB,CAAC;AAOrD,MAAM,CAAC,OAAO,OAAO,cAAc;IAO3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,WAAW;IAJvB,OAAO,CAAC,MAAM,CAAoC;gBAGtC,SAAS,EAAE,SAAS,EACpB,WAAW,qCAA+B;IActD,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,UAAO;CAuFtC"}
|
|
@@ -1,18 +1,20 @@
|
|
|
1
|
-
import
|
|
1
|
+
import EventEmitter from "events";
|
|
2
|
+
import { identityMapSymbol } from "./IdentityService.js";
|
|
2
3
|
export default class RelationMapper {
|
|
3
4
|
constructor(changeSet, identityMap = changeSet[identityMapSymbol]) {
|
|
4
5
|
this.changeSet = changeSet;
|
|
5
6
|
this.identityMap = identityMap;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
push(id, waiter) {
|
|
9
|
-
let queue = this.map.get(id);
|
|
10
|
-
if (!queue) {
|
|
11
|
-
queue = [];
|
|
12
|
-
this.map.set(id, queue);
|
|
13
|
-
}
|
|
14
|
-
queue.push(waiter);
|
|
7
|
+
// private map: Map<string, ChangeEntry[]> = new Map();
|
|
8
|
+
this.events = new EventEmitter();
|
|
15
9
|
}
|
|
10
|
+
// push(id: string, waiter: ChangeEntry) {
|
|
11
|
+
// let queue = this.map.get(id);
|
|
12
|
+
// if (!queue) {
|
|
13
|
+
// queue = [];
|
|
14
|
+
// this.map.set(id, queue);
|
|
15
|
+
// }
|
|
16
|
+
// queue.push(waiter);
|
|
17
|
+
// }
|
|
16
18
|
fix(entry, nest = true) {
|
|
17
19
|
// find all parents...
|
|
18
20
|
const { type, entity } = entry;
|
|
@@ -20,21 +22,41 @@ export default class RelationMapper {
|
|
|
20
22
|
if (iterator.isInverseRelation) {
|
|
21
23
|
continue;
|
|
22
24
|
}
|
|
23
|
-
const fkColumn = iterator.fkColumn.name;
|
|
24
|
-
const fkValue = entity[fkColumn];
|
|
25
|
-
if (fkValue === void 0) {
|
|
26
|
-
|
|
27
|
-
}
|
|
25
|
+
// const fkColumn = iterator.fkColumn.name;
|
|
26
|
+
// const fkValue = entity[fkColumn];
|
|
27
|
+
// if (fkValue === void 0) {
|
|
28
|
+
// continue;
|
|
29
|
+
// }
|
|
28
30
|
// get from identity...
|
|
29
|
-
const id = IdentityService.buildIdentity(iterator.relatedEntity, fkValue);
|
|
30
|
-
const parent = this.identityMap.get(id);
|
|
31
|
+
// const id = IdentityService.buildIdentity(iterator.relatedEntity, fkValue);
|
|
32
|
+
// const parent = this.identityMap.get(id);
|
|
33
|
+
// if (!parent) {
|
|
34
|
+
// let waiters = this.map.get(id);
|
|
35
|
+
// if (!waiters) {
|
|
36
|
+
// waiters = [];
|
|
37
|
+
// this.map.set(id, waiters);
|
|
38
|
+
// }
|
|
39
|
+
// waiters.push(entry);
|
|
40
|
+
// continue;
|
|
41
|
+
// }
|
|
42
|
+
const pairs = [];
|
|
43
|
+
for (const { fkColumn, relatedKeyColumn } of iterator.fkMap) {
|
|
44
|
+
this.identityMap.build(relatedKeyColumn);
|
|
45
|
+
const fkValue = entity[fkColumn.name];
|
|
46
|
+
if (fkValue === void 0) {
|
|
47
|
+
continue;
|
|
48
|
+
}
|
|
49
|
+
pairs.push({ key: relatedKeyColumn, value: fkValue });
|
|
50
|
+
}
|
|
51
|
+
const parent = this.identityMap.searchByKeys(pairs, true);
|
|
31
52
|
if (!parent) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
53
|
+
if (nest) {
|
|
54
|
+
for (const { key, value } of pairs) {
|
|
55
|
+
this.events.once(`${key.entityType.name}-${key.name}-${value}`, (k) => {
|
|
56
|
+
this.fix(entry, false);
|
|
57
|
+
});
|
|
58
|
+
}
|
|
36
59
|
}
|
|
37
|
-
waiters.push(entry);
|
|
38
60
|
continue;
|
|
39
61
|
}
|
|
40
62
|
entity[iterator.name] = parent;
|
|
@@ -52,12 +74,23 @@ export default class RelationMapper {
|
|
|
52
74
|
return;
|
|
53
75
|
}
|
|
54
76
|
// see if anyone is waiting for us or not...
|
|
55
|
-
const identity = IdentityService.getIdentity(entry.type, entry.entity);
|
|
56
|
-
const pending = this.map.get(identity);
|
|
57
|
-
if (pending && pending.length) {
|
|
58
|
-
|
|
59
|
-
|
|
77
|
+
// const identity = IdentityService.getIdentity(entry.type, entry.entity);
|
|
78
|
+
// const pending = this.map.get(identity);
|
|
79
|
+
// if (pending && pending.length) {
|
|
80
|
+
// for (const iterator of pending) {
|
|
81
|
+
// this.fix(iterator, false);
|
|
82
|
+
// }
|
|
83
|
+
// }
|
|
84
|
+
for (const iterator of this.identityMap.indexedColumns) {
|
|
85
|
+
if (iterator.entityType !== entry.type) {
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
const value = entry.entity[iterator.name];
|
|
89
|
+
if (value === void 0 || value === null) {
|
|
90
|
+
continue;
|
|
60
91
|
}
|
|
92
|
+
const key = `${iterator.entityType.name}-${iterator.name}-${value}`;
|
|
93
|
+
this.events.emit(key, key);
|
|
61
94
|
}
|
|
62
95
|
}
|
|
63
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationMapper.js","sourceRoot":"","sources":["../../../src/model/identity/RelationMapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RelationMapper.js","sourceRoot":"","sources":["../../../src/model/identity/RelationMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { IColumn } from "../../decorators/IColumn.js";
|
|
2
|
+
import type ChangeEntry from "../changes/ChangeEntry.js";
|
|
3
|
+
export default class SearchIndex {
|
|
4
|
+
private entries;
|
|
5
|
+
private keys;
|
|
6
|
+
constructor(entries: ChangeEntry[]);
|
|
7
|
+
getByKeys(pairs: {
|
|
8
|
+
key: any;
|
|
9
|
+
value: any;
|
|
10
|
+
}[], create?: boolean): any[];
|
|
11
|
+
getAll(key: string, value: any, create?: boolean): any[];
|
|
12
|
+
delete(entry: any): void;
|
|
13
|
+
get(keys: IColumn[], entry: any): any;
|
|
14
|
+
update(keys: IColumn[], entry: any): void;
|
|
15
|
+
private getKeyEntry;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=SearchIndex.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SearchIndex.d.ts","sourceRoot":"","sources":["../../../src/model/identity/SearchIndex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,WAAW,MAAM,2BAA2B,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,WAAW;IAIhB,OAAO,CAAC,OAAO;IAF3B,OAAO,CAAC,IAAI,CAAsC;gBAE9B,OAAO,EAAE,WAAW,EAAE;IAI1C,SAAS,CAAC,KAAK,EAAE;QAAE,GAAG,MAAC;QAAC,KAAK,MAAA;KAAC,EAAE,EAAE,MAAM,UAAO;IAsB/C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,UAAO;IAK7C,MAAM,CAAC,KAAK,KAAA;IAeZ,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,KAAA;IAsB1B,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,KAAA;IAmB7B,OAAO,CAAC,WAAW;CAyBtB"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
export default class SearchIndex {
|
|
2
|
+
constructor(entries) {
|
|
3
|
+
this.entries = entries;
|
|
4
|
+
this.keys = new Map();
|
|
5
|
+
}
|
|
6
|
+
getByKeys(pairs, create = true) {
|
|
7
|
+
let results;
|
|
8
|
+
for (const { key, value } of pairs) {
|
|
9
|
+
const items = this.getAll(key, value, create);
|
|
10
|
+
if (!items?.length) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
if (!results) {
|
|
14
|
+
results = [].concat(items);
|
|
15
|
+
continue;
|
|
16
|
+
}
|
|
17
|
+
const old = results;
|
|
18
|
+
results = [];
|
|
19
|
+
for (const item of items) {
|
|
20
|
+
if (old.includes(item)) {
|
|
21
|
+
results.push(item);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return results;
|
|
26
|
+
}
|
|
27
|
+
getAll(key, value, create = true) {
|
|
28
|
+
const keyEntry = this.getKeyEntry(key, create);
|
|
29
|
+
return keyEntry.get(value);
|
|
30
|
+
}
|
|
31
|
+
delete(entry) {
|
|
32
|
+
for (const [key, values] of this.keys) {
|
|
33
|
+
const value = entry[key];
|
|
34
|
+
if (value === void 0 || value === null) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
const entries = values.get(value);
|
|
38
|
+
if (!entries) {
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const index = entries.findIndex(entry);
|
|
42
|
+
entries.splice(index, 1);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
get(keys, entry) {
|
|
46
|
+
let results;
|
|
47
|
+
for (const { name } of keys) {
|
|
48
|
+
const items = this.getAll(name, entry[name]);
|
|
49
|
+
if (!items?.length) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
if (!results) {
|
|
53
|
+
results = [].concat(items);
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
const old = results;
|
|
57
|
+
results = [];
|
|
58
|
+
for (const item of items) {
|
|
59
|
+
if (old.includes(item)) {
|
|
60
|
+
results.push(item);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return results[0];
|
|
65
|
+
}
|
|
66
|
+
update(keys, entry) {
|
|
67
|
+
for (const key of keys) {
|
|
68
|
+
const keyEntry = this.getKeyEntry(key.name, true);
|
|
69
|
+
const value = entry[key.name];
|
|
70
|
+
if (value === void 0 || value === null) {
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
let values = keyEntry.get(value);
|
|
74
|
+
if (!values) {
|
|
75
|
+
values = [];
|
|
76
|
+
keyEntry.set(value, values);
|
|
77
|
+
}
|
|
78
|
+
if (values.includes(entry)) {
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
values.push(entry);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
getKeyEntry(key, create = false) {
|
|
85
|
+
let keyEntry = this.keys.get(key);
|
|
86
|
+
if (keyEntry) {
|
|
87
|
+
return keyEntry;
|
|
88
|
+
}
|
|
89
|
+
if (!create) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
keyEntry = new Map();
|
|
93
|
+
this.keys.set(key, keyEntry);
|
|
94
|
+
for (const entry of this.entries) {
|
|
95
|
+
const value = entry[key];
|
|
96
|
+
if (value === void 0 || value === null) {
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
let values = keyEntry.get(value);
|
|
100
|
+
if (!values) {
|
|
101
|
+
values = [];
|
|
102
|
+
keyEntry.set(value, values);
|
|
103
|
+
}
|
|
104
|
+
values.push(value);
|
|
105
|
+
}
|
|
106
|
+
return keyEntry;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=SearchIndex.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SearchIndex.js","sourceRoot":"","sources":["../../../src/model/identity/SearchIndex.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export default class VerificationSession {
|
|
|
11
11
|
private field;
|
|
12
12
|
constructor(context: EntityContext);
|
|
13
13
|
queueVerification(change: ChangeEntry, events: EntityEvents<any>): void;
|
|
14
|
-
queueEntityForeignKey(change: ChangeEntry, relation: IEntityRelation, value: any): void;
|
|
14
|
+
queueEntityForeignKey(change: ChangeEntry, relation: IEntityRelation, fkColumn: any, relatedKeyColumn: any, value: any): void;
|
|
15
15
|
queueEntityKey(change: ChangeEntry, keys: KeyValueArray, events: EntityEvents<any>): void;
|
|
16
16
|
verifyAsync(): Promise<any>;
|
|
17
17
|
addError(query: EntityQuery, compare: Expression, error: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerificationSession.d.ts","sourceRoot":"","sources":["../../../src/model/verification/VerificationSession.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,EAA2C,UAAU,EAAwE,MAAM,gCAAgC,CAAC;AAC3K,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,YAAkC,MAAM,2BAA2B,CAAC;AAE3E,KAAK,aAAa,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;AAWrC,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAMxB,OAAO,CAAC,OAAO;IAJ3B,OAAO,CAAC,MAAM,CAAkB;IAEhC,OAAO,CAAC,KAAK,CAA0B;gBAEnB,OAAO,EAAE,aAAa;IAK1C,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"VerificationSession.d.ts","sourceRoot":"","sources":["../../../src/model/verification/VerificationSession.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,EAA2C,UAAU,EAAwE,MAAM,gCAAgC,CAAC;AAC3K,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,YAAkC,MAAM,2BAA2B,CAAC;AAE3E,KAAK,aAAa,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;AAWrC,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAMxB,OAAO,CAAC,OAAO;IAJ3B,OAAO,CAAC,MAAM,CAAkB;IAEhC,OAAO,CAAC,KAAK,CAA0B;gBAEnB,OAAO,EAAE,aAAa;IAK1C,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC;IA0DhE,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,KAAA,EAAE,gBAAgB,KAAA,EAAE,KAAK,KAAA;IA+BvG,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC;IAsB5E,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC;IA2BjC,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM;CAsBlE"}
|
|
@@ -46,28 +46,30 @@ export default class VerificationSession {
|
|
|
46
46
|
if (relation.isInverseRelation) {
|
|
47
47
|
continue;
|
|
48
48
|
}
|
|
49
|
-
const fk = relation.
|
|
49
|
+
const fk = relation.fkMap;
|
|
50
50
|
if (!fk) {
|
|
51
51
|
continue;
|
|
52
52
|
}
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
}
|
|
58
|
-
if (isKeyEmpty(fkValue, relation.fkColumn)) {
|
|
59
|
-
continue;
|
|
60
|
-
}
|
|
61
|
-
// only if it is modified...
|
|
62
|
-
if (change.status !== "inserted") {
|
|
63
|
-
if (!change.isModified(fk.name)) {
|
|
53
|
+
for (const { fkColumn, relatedKeyColumn } of fk) {
|
|
54
|
+
const fkValue = entity[fkColumn.name];
|
|
55
|
+
if (fkValue === void 0) {
|
|
56
|
+
// not set... ignore..
|
|
64
57
|
continue;
|
|
65
58
|
}
|
|
59
|
+
if (isKeyEmpty(fkValue, fkColumn)) {
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
// only if it is modified...
|
|
63
|
+
if (change.status !== "inserted") {
|
|
64
|
+
if (!change.isModified(fkColumn.name)) {
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
this.queueEntityForeignKey(change, relation, fkColumn, relatedKeyColumn, fkValue);
|
|
66
69
|
}
|
|
67
|
-
this.queueEntityForeignKey(change, relation, fkValue);
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
|
-
queueEntityForeignKey(change, relation, value) {
|
|
72
|
+
queueEntityForeignKey(change, relation, fkColumn, relatedKeyColumn, value) {
|
|
71
73
|
const relatedModel = relation.relatedEntity;
|
|
72
74
|
const type = relation.relatedEntity.typeClass;
|
|
73
75
|
const events = this.context.eventsFor(change.type.typeClass);
|
|
@@ -78,7 +80,7 @@ export default class VerificationSession {
|
|
|
78
80
|
events: relatedEvents,
|
|
79
81
|
type: relatedModel,
|
|
80
82
|
name: relation.name,
|
|
81
|
-
fkName:
|
|
83
|
+
fkName: fkColumn.name,
|
|
82
84
|
entity: change.entity
|
|
83
85
|
});
|
|
84
86
|
let query = events.onForeignKeyFilter(fk);
|
|
@@ -89,7 +91,7 @@ export default class VerificationSession {
|
|
|
89
91
|
return;
|
|
90
92
|
}
|
|
91
93
|
const eq = query;
|
|
92
|
-
const compare = Expression.equal(Expression.member(eq.selectStatement.sourceParameter,
|
|
94
|
+
const compare = Expression.equal(Expression.member(eq.selectStatement.sourceParameter, relatedKeyColumn.columnName), Expression.constant(value));
|
|
93
95
|
const typeName = TypeInfo.nameOfType(type);
|
|
94
96
|
this.addError(query, compare, `Unable to access entity ${typeName} through foreign key ${TypeInfo.nameOfType(change.type)}.${relation.name}.\n`);
|
|
95
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerificationSession.js","sourceRoot":"","sources":["../../../src/model/verification/VerificationSession.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,MAAM,mCAAmC,CAAC;AAClE,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,UAAU,EAAE,aAAa,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAI3K,OAAqB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI3E,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,UAAmB,EAAE,EAAE;IACjD,QAAO,UAAU,CAAC,QAAQ,EAAE,CAAC;QACzB,KAAK,QAAQ,CAAC;QACd,KAAK,KAAK;YACN,OAAO,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,KAAK,GAAG,CAAC;IAChD,CAAC;IACD,OAAO,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,EAAE,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAMpC,YAAoB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;QAEtC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,iBAAiB,CAAC,MAAmB,EAAE,MAAyB;QAC5D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAChC,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC/B,8BAA8B;YAC9B,MAAM,IAAI,GAAG,EAAmB,CAAC;YACjC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClC,IAAI,GAAG,KAAK,KAAK,CAAC,EAAE,CAAC;oBACjB,MAAM;gBACV,CAAC;gBACD,IAAI,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;oBAC5B,SAAS;gBACb,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;YAC1C,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACnC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC9C,CAAC;QACL,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACX,CAAC;QAED,2BAA2B;QAC3B,+CAA+C;QAE/C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpC,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBAC7B,SAAS;YACb,CAAC;YAED,MAAM,EAAE,GAAG,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"VerificationSession.js","sourceRoot":"","sources":["../../../src/model/verification/VerificationSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressionToSql.d.ts","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ExpressionToSql.d.ts","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"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"}
|