@contember/engine-content-api 1.2.0-alpha.12 → 1.2.0-alpha.13
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/src/acl/EvaluatedPredicateReplacer.d.ts +2 -2
- package/dist/src/acl/EvaluatedPredicateReplacer.d.ts.map +1 -1
- package/dist/src/acl/EvaluatedPredicateReplacer.js.map +1 -1
- package/dist/src/acl/PredicateFactory.d.ts +9 -3
- package/dist/src/acl/PredicateFactory.d.ts.map +1 -1
- package/dist/src/acl/PredicateFactory.js +42 -24
- package/dist/src/acl/PredicateFactory.js.map +1 -1
- package/dist/src/acl/PredicatesInjector.d.ts.map +1 -1
- package/dist/src/acl/PredicatesInjector.js +1 -0
- package/dist/src/acl/PredicatesInjector.js.map +1 -1
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js +31 -27
- package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js +18 -14
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.js.map +1 -1
- package/dist/src/mapper/JunctionTableManager.js.map +1 -1
- package/dist/src/mapper/Mapper.js +3 -3
- package/dist/src/mapper/Mapper.js.map +1 -1
- package/dist/src/mapper/MapperContainer.d.ts.map +1 -1
- package/dist/src/mapper/MapperContainer.js +2 -2
- package/dist/src/mapper/MapperContainer.js.map +1 -1
- package/dist/src/mapper/delete/DeleteExecutor.js +1 -1
- package/dist/src/mapper/delete/DeleteExecutor.js.map +1 -1
- package/dist/src/mapper/insert/InsertBuilder.d.ts +1 -1
- package/dist/src/mapper/insert/InsertBuilder.d.ts.map +1 -1
- package/dist/src/mapper/insert/InsertBuilder.js.map +1 -1
- package/dist/src/mapper/select/RelationFetcher.js +1 -1
- package/dist/src/mapper/select/RelationFetcher.js.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.d.ts +3 -1
- package/dist/src/mapper/select/SelectBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.js +50 -12
- package/dist/src/mapper/select/SelectBuilder.js.map +1 -1
- package/dist/src/mapper/select/SelectExecutionHandler.d.ts +15 -4
- package/dist/src/mapper/select/SelectExecutionHandler.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectHydrator.d.ts +3 -2
- package/dist/src/mapper/select/SelectHydrator.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectHydrator.js +4 -5
- package/dist/src/mapper/select/SelectHydrator.js.map +1 -1
- package/dist/src/mapper/select/WhereBuilder.d.ts +3 -3
- package/dist/src/mapper/select/WhereBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/WhereBuilder.js +4 -4
- package/dist/src/mapper/select/WhereBuilder.js.map +1 -1
- package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts +1 -0
- package/dist/src/mapper/select/handlers/FieldsVisitor.d.ts.map +1 -1
- package/dist/src/mapper/select/handlers/FieldsVisitor.js +118 -91
- package/dist/src/mapper/select/handlers/FieldsVisitor.js.map +1 -1
- package/dist/src/mapper/select/handlers/MetaHandler.d.ts.map +1 -1
- package/dist/src/mapper/select/handlers/MetaHandler.js +6 -11
- package/dist/src/mapper/select/handlers/MetaHandler.js.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts +5 -1
- package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereOptimizer.js +10 -3
- package/dist/src/mapper/select/optimizer/WhereOptimizer.js.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts +1 -1
- package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereReplacer.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.js +51 -4
- package/dist/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js +26 -25
- package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js +9 -6
- package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.d.ts +2 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.d.ts.map +1 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.js +109 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.js.map +1 -0
- package/dist/tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.js +9 -13
- package/dist/tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.js.map +1 -1
- package/dist/tests/cases/unit/predicatesInjector.test.js +31 -3
- package/dist/tests/cases/unit/predicatesInjector.test.js.map +1 -1
- package/dist/tests/cases/unit/whereOptimizer.test.js +24 -21
- package/dist/tests/cases/unit/whereOptimizer.test.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/acl/EvaluatedPredicateReplacer.ts +4 -4
- package/src/acl/PredicateFactory.ts +59 -36
- package/src/acl/PredicatesInjector.ts +2 -1
- package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts +5 -5
- package/src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts +5 -5
- package/src/mapper/JunctionTableManager.ts +3 -3
- package/src/mapper/Mapper.ts +3 -3
- package/src/mapper/MapperContainer.ts +2 -1
- package/src/mapper/delete/DeleteExecutor.ts +1 -1
- package/src/mapper/insert/InsertBuilder.ts +2 -2
- package/src/mapper/select/RelationFetcher.ts +1 -1
- package/src/mapper/select/SelectBuilder.ts +69 -13
- package/src/mapper/select/SelectExecutionHandler.ts +15 -8
- package/src/mapper/select/SelectHydrator.ts +13 -7
- package/src/mapper/select/WhereBuilder.ts +5 -5
- package/src/mapper/select/handlers/FieldsVisitor.ts +53 -67
- package/src/mapper/select/handlers/MetaHandler.ts +6 -17
- package/src/mapper/select/optimizer/WhereOptimizer.ts +25 -13
- package/src/mapper/select/optimizer/WhereReplacer.ts +4 -4
- package/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.ts +54 -4
- package/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts +26 -25
- package/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts +9 -6
- package/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.ts +104 -0
- package/tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.ts +9 -13
- package/tests/cases/unit/predicatesInjector.test.ts +37 -7
- package/tests/cases/unit/whereOptimizer.test.ts +20 -17
|
@@ -3,7 +3,7 @@ export declare class EvaluatedPredicateReplacer {
|
|
|
3
3
|
private readonly evaluatedPredicate;
|
|
4
4
|
private readonly sourceEntity;
|
|
5
5
|
private readonly relation;
|
|
6
|
-
constructor(evaluatedPredicate: Input.
|
|
7
|
-
replace(where: Input.
|
|
6
|
+
constructor(evaluatedPredicate: Input.OptionalWhere, sourceEntity: Model.Entity, relation: Model.AnyRelation);
|
|
7
|
+
replace(where: Input.OptionalWhere): Input.OptionalWhere;
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=EvaluatedPredicateReplacer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvaluatedPredicateReplacer.d.ts","sourceRoot":"","sources":["../../../src/acl/EvaluatedPredicateReplacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAG1D,qBAAa,0BAA0B;IAErC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFR,kBAAkB,EAAE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"EvaluatedPredicateReplacer.d.ts","sourceRoot":"","sources":["../../../src/acl/EvaluatedPredicateReplacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAG1D,qBAAa,0BAA0B;IAErC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFR,kBAAkB,EAAE,KAAK,CAAC,aAAa,EACvC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,QAAQ,EAAE,KAAK,CAAC,WAAW;IAItC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa;CAoB/D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvaluatedPredicateReplacer.js","sourceRoot":"","sources":["../../../src/acl/EvaluatedPredicateReplacer.ts"],"names":[],"mappings":";;;AACA,4EAAuE;AAEvE,MAAa,0BAA0B;IACtC,YACkB,
|
|
1
|
+
{"version":3,"file":"EvaluatedPredicateReplacer.js","sourceRoot":"","sources":["../../../src/acl/EvaluatedPredicateReplacer.ts"],"names":[],"mappings":";;;AACA,4EAAuE;AAEvE,MAAa,0BAA0B;IACtC,YACkB,kBAAuC,EACvC,YAA0B,EAC1B,QAA2B;QAF3B,uBAAkB,GAAlB,kBAAkB,CAAqB;QACvC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,aAAQ,GAAR,QAAQ,CAAmB;IAE7C,CAAC;IAEM,OAAO,CAAC,KAA0B;QACxC,MAAM,MAAM,GAAkC,EAAE,CAAA;QAChD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACjD,IAAI,GAAG,KAAK,KAAK,EAAE;gBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAA4B,CAAC,CAAA;aAE1D;iBAAM,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,IAAI,EAAE;gBACzC,MAAM,CAAC,GAAG,CAAC,GAAI,KAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;aAElE;iBAAM,IAAI,GAAG,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBACtC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,4BAAY,EAAC,KAAoB,EAAE,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;aAE5H;iBAAM;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;aACnB;SAED;QACD,OAAO,MAAM,CAAA;IACd,CAAC;CAED;AA5BD,gEA4BC"}
|
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
import { Acl, Input, Model } from '@contember/schema';
|
|
2
2
|
import { VariableInjector } from './VariableInjector';
|
|
3
|
+
export interface FieldRequiredPredicate {
|
|
4
|
+
predicate: Acl.Predicate;
|
|
5
|
+
isSameAsPrimary: boolean;
|
|
6
|
+
}
|
|
3
7
|
export declare class PredicateFactory {
|
|
4
8
|
private readonly permissions;
|
|
5
9
|
private readonly model;
|
|
6
10
|
private readonly variableInjector;
|
|
7
11
|
constructor(permissions: Acl.Permissions, model: Model.Schema, variableInjector: VariableInjector);
|
|
12
|
+
getFieldPredicate(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldName: string): FieldRequiredPredicate;
|
|
8
13
|
shouldApplyCellLevelPredicate(entity: Model.Entity, operation: Acl.Operation.read, fieldName: string): boolean;
|
|
9
|
-
|
|
10
|
-
create(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldNames?: string[], relationContext?: Model.AnyRelationContext): Input.
|
|
14
|
+
createDeletePredicate(entity: Model.Entity): Input.OptionalWhere<never>;
|
|
15
|
+
create(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldNames?: string[], relationContext?: Model.AnyRelationContext): Input.OptionalWhere;
|
|
16
|
+
buildPredicates(entity: Model.Entity, predicates: Acl.PredicateReference[], relationContext?: Model.AnyRelationContext): Input.OptionalWhere;
|
|
11
17
|
private getRequiredPredicates;
|
|
12
|
-
|
|
18
|
+
optimizePredicates(where: Input.OptionalWhere, relationContext?: Model.AnyRelationContext): Input.OptionalWhere<never>;
|
|
13
19
|
}
|
|
14
20
|
//# sourceMappingURL=PredicateFactory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAKrD,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFhB,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,gBAAgB,EAAE,gBAAgB;IAG7C,
|
|
1
|
+
{"version":3,"file":"PredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAKrD,MAAM,WAAW,sBAAsB;IACtC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;CACxB;AAED,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFhB,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,gBAAgB,EAAE,gBAAgB;IAG7C,iBAAiB,CACvB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAC3E,SAAS,EAAE,MAAM,GACf,sBAAsB;IAclB,6BAA6B,CACnC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,EAC7B,SAAS,EAAE,MAAM,GACf,OAAO;IAMH,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM;IAgB1C,MAAM,CACZ,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAC3E,UAAU,GAAE,MAAM,EAA8C,EAChE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GACxC,KAAK,CAAC,aAAa;IAuBf,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,kBAAkB,EAAE,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,aAAa;IAqBnJ,OAAO,CAAC,qBAAqB;IAoBtB,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB;CAYhG"}
|
|
@@ -10,43 +10,61 @@ class PredicateFactory {
|
|
|
10
10
|
this.model = model;
|
|
11
11
|
this.variableInjector = variableInjector;
|
|
12
12
|
}
|
|
13
|
+
getFieldPredicate(entity, operation, fieldName) {
|
|
14
|
+
var _a, _b, _c, _d;
|
|
15
|
+
const permissions = (_b = (_a = this.permissions[entity.name]) === null || _a === void 0 ? void 0 : _a.operations) === null || _b === void 0 ? void 0 : _b[operation];
|
|
16
|
+
const predicate = (_c = permissions === null || permissions === void 0 ? void 0 : permissions[fieldName]) !== null && _c !== void 0 ? _c : false;
|
|
17
|
+
const rowLevelField = getRowLevelPredicatePseudoField(entity);
|
|
18
|
+
const primaryPredicate = (_d = permissions === null || permissions === void 0 ? void 0 : permissions[rowLevelField]) !== null && _d !== void 0 ? _d : false;
|
|
19
|
+
const isSameAsPrimary = predicate === primaryPredicate;
|
|
20
|
+
return {
|
|
21
|
+
isSameAsPrimary,
|
|
22
|
+
predicate,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
13
25
|
shouldApplyCellLevelPredicate(entity, operation, fieldName) {
|
|
14
26
|
var _a, _b;
|
|
15
27
|
const rowLevelField = getRowLevelPredicatePseudoField(entity);
|
|
16
28
|
const permissions = (_b = (_a = this.permissions[entity.name]) === null || _a === void 0 ? void 0 : _a.operations) === null || _b === void 0 ? void 0 : _b[operation];
|
|
17
29
|
return (permissions === null || permissions === void 0 ? void 0 : permissions[fieldName]) !== (permissions === null || permissions === void 0 ? void 0 : permissions[rowLevelField]);
|
|
18
30
|
}
|
|
19
|
-
|
|
31
|
+
createDeletePredicate(entity) {
|
|
32
|
+
const neverCondition = { [entity.primary]: { never: true } };
|
|
33
|
+
const entityPermissions = this.permissions[entity.name];
|
|
34
|
+
if (!entityPermissions) {
|
|
35
|
+
return neverCondition;
|
|
36
|
+
}
|
|
37
|
+
const deletePredicate = entityPermissions.operations.delete;
|
|
38
|
+
if (deletePredicate === undefined || deletePredicate === false) {
|
|
39
|
+
return neverCondition;
|
|
40
|
+
}
|
|
41
|
+
if (deletePredicate === true) {
|
|
42
|
+
return {};
|
|
43
|
+
}
|
|
44
|
+
return this.buildPredicates(entity, [deletePredicate]);
|
|
45
|
+
}
|
|
46
|
+
create(entity, operation, fieldNames = [getRowLevelPredicatePseudoField(entity)], relationContext) {
|
|
20
47
|
const entityPermissions = this.permissions[entity.name];
|
|
21
48
|
const neverCondition = { [entity.primary]: { never: true } };
|
|
22
49
|
if (!entityPermissions) {
|
|
23
50
|
return neverCondition;
|
|
24
51
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const deletePredicate = entityPermissions.operations.delete;
|
|
28
|
-
if (deletePredicate === undefined || deletePredicate === false) {
|
|
29
|
-
return neverCondition;
|
|
30
|
-
}
|
|
31
|
-
if (deletePredicate === true) {
|
|
32
|
-
return {};
|
|
33
|
-
}
|
|
34
|
-
predicates = [deletePredicate];
|
|
52
|
+
if (fieldNames === undefined) {
|
|
53
|
+
fieldNames = [getRowLevelPredicatePseudoField(entity)];
|
|
35
54
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}
|
|
40
|
-
const fieldPermissions = entityPermissions.operations[operation];
|
|
41
|
-
if (fieldPermissions === undefined) {
|
|
42
|
-
return neverCondition;
|
|
43
|
-
}
|
|
44
|
-
const operationPredicates = this.getRequiredPredicates(fieldNames, fieldPermissions);
|
|
45
|
-
if (operationPredicates === false) {
|
|
46
|
-
return neverCondition;
|
|
47
|
-
}
|
|
48
|
-
predicates = operationPredicates;
|
|
55
|
+
const fieldPermissions = entityPermissions.operations[operation];
|
|
56
|
+
if (fieldPermissions === undefined) {
|
|
57
|
+
return neverCondition;
|
|
49
58
|
}
|
|
59
|
+
const operationPredicates = this.getRequiredPredicates(fieldNames, fieldPermissions);
|
|
60
|
+
if (operationPredicates === false) {
|
|
61
|
+
return neverCondition;
|
|
62
|
+
}
|
|
63
|
+
return this.buildPredicates(entity, operationPredicates, relationContext);
|
|
64
|
+
}
|
|
65
|
+
buildPredicates(entity, predicates, relationContext) {
|
|
66
|
+
var _a;
|
|
67
|
+
const entityPermissions = (_a = this.permissions[entity.name]) !== null && _a !== void 0 ? _a : {};
|
|
50
68
|
const predicatesWhere = predicates.reduce((result, name) => {
|
|
51
69
|
if (!entityPermissions.predicates[name]) {
|
|
52
70
|
throw new Error(`${entity.name}: Undefined predicate ${name}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PredicateFactory.js","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;AAErD,6EAAyE;AAEzE,MAAM,+BAA+B,GAAG,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"PredicateFactory.js","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PredicatesInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,qBAAa,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAvD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,gBAAgB,EAAE,gBAAgB;IAE/F,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,aAAa;IAKhI,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"PredicatesInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,qBAAa,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAvD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,gBAAgB,EAAE,gBAAgB;IAE/F,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,aAAa;IAKhI,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,aAAa;CAmCrB"}
|
|
@@ -14,6 +14,7 @@ class PredicatesInjector {
|
|
|
14
14
|
}
|
|
15
15
|
createWhere(entity, fieldNames, where, relationContext) {
|
|
16
16
|
const predicatesWhere = this.predicateFactory.create(entity, schema_1.Acl.Operation.read, fieldNames, relationContext);
|
|
17
|
+
where = this.predicateFactory.optimizePredicates(where, relationContext);
|
|
17
18
|
const and = [where, predicatesWhere].filter(it => Object.keys(it).length > 0);
|
|
18
19
|
if (and.length === 0) {
|
|
19
20
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PredicatesInjector.js","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":";;;AAAA,8CAA+D;AAC/D,0DAA4D;AAG5D,MAAa,kBAAkB;IAC9B,YAA6B,MAAoB,EAAmB,gBAAkC;QAAzE,WAAM,GAAN,MAAM,CAAc;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAEnG,MAAM,CAAC,MAAoB,EAAE,KAA0B,EAAE,eAA0C;QACzG,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC/D,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;IAC7E,CAAC;IAEO,WAAW,CAClB,MAAoB,EACpB,UAAgC,EAChC,KAA0B,EAC1B,eAA0C;QAE1C,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"PredicatesInjector.js","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"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"}
|
package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js
CHANGED
|
@@ -14,33 +14,37 @@ class HasManyToHasOneReducerExecutionHandler {
|
|
|
14
14
|
if (!objectNode) {
|
|
15
15
|
throw new Error();
|
|
16
16
|
}
|
|
17
|
-
addData(
|
|
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
|
-
|
|
17
|
+
addData({
|
|
18
|
+
field: entity.primary,
|
|
19
|
+
dataProvider: async (ids) => {
|
|
20
|
+
const relationContext = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, {
|
|
21
|
+
visitRelation: context => context,
|
|
22
|
+
visitColumn: () => {
|
|
23
|
+
throw new exception_1.ImplementationException('HasManyToHasOneReducerExecutionHandler: Not applicable for a column');
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
const { targetEntity, targetRelation } = relationContext;
|
|
27
|
+
if (!targetRelation || !(0, utils_1.isIt)(targetRelation, 'joiningColumn')) {
|
|
28
|
+
throw new Error('HasManyToHasOneReducerExecutionHandler: only applicable for relations with joiningColumn');
|
|
29
|
+
}
|
|
30
|
+
const uniqueWhere = this.uniqueWhereExpander.expand(targetEntity, {
|
|
31
|
+
...objectNode.args.by,
|
|
32
|
+
[targetRelation.name]: { [entity.primary]: ids },
|
|
33
|
+
});
|
|
34
|
+
if (Object.keys(uniqueWhere).length !== 2) {
|
|
35
|
+
throw new Error('HasManyToHasOneReducerExecutionHandler: only tuple unique keys are allowed');
|
|
36
|
+
}
|
|
37
|
+
const whereWithParentId = {
|
|
38
|
+
and: [objectNode.args.filter || {}, uniqueWhere],
|
|
39
|
+
};
|
|
40
|
+
const newObjectNode = objectNode.withArgs({ filter: whereWithParentId });
|
|
41
|
+
return context.mapper.selectAssoc(targetEntity, newObjectNode, [
|
|
42
|
+
...context.relationPath,
|
|
43
|
+
relationContext,
|
|
44
|
+
], targetRelation.name);
|
|
45
|
+
},
|
|
46
|
+
defaultValue: null,
|
|
47
|
+
});
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
50
|
exports.HasManyToHasOneReducerExecutionHandler = HasManyToHasOneReducerExecutionHandler;
|
package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HasManyToHasOneReducerExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAClC,0DAA4D;AAE5D,+CAAyD;AAIzD,MAAa,sCAAsC;IAElD,YAA6B,MAAoB,EAAmB,mBAAwC;QAA/E,WAAM,GAAN,MAAM,CAAc;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAA+F;QACtG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QAC/C,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,OAAO,
|
|
1
|
+
{"version":3,"file":"HasManyToHasOneReducerExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAClC,0DAA4D;AAE5D,+CAAyD;AAIzD,MAAa,sCAAsC;IAElD,YAA6B,MAAoB,EAAmB,mBAAwC;QAA/E,WAAM,GAAN,MAAM,CAAc;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAA+F;QACtG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QAC/C,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,OAAO,CAAC;YACP,KAAK,EAAE,MAAM,CAAC,OAAO;YACrB,YAAY,EAAE,KAAK,EAAE,GAAyB,EAAE,EAAE;gBAEjD,MAAM,eAAe,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE;oBACnG,aAAa,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO;oBACjC,WAAW,EAAE,GAAU,EAAE;wBACxB,MAAM,IAAI,mCAAuB,CAAC,qEAAqE,CAAC,CAAA;oBACzG,CAAC;iBACD,CAAC,CAAA;gBAEF,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,eAAe,CAAA;gBACxD,IAAI,CAAC,cAAc,IAAI,CAAC,IAAA,YAAI,EAA8B,cAAc,EAAE,eAAe,CAAC,EAAE;oBAC3F,MAAM,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAA;iBAC3G;gBAED,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE;oBACjE,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE;oBACrB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE;iBAChD,CAAC,CAAA;gBACF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC1C,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAA;iBAC7F;gBACD,MAAM,iBAAiB,GAAG;oBACzB,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,WAAW,CAAC;iBAChD,CAAA;gBACD,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAuB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAA;gBAE9F,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE;oBAC9D,GAAG,OAAO,CAAC,YAAY;oBACvB,eAAe;iBACf,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;YACxB,CAAC;YACD,YAAY,EAAE,IAAI;SAClB,CAAC,CAAA;IACH,CAAC;CACD;AA7CD,wFA6CC"}
|
|
@@ -16,20 +16,24 @@ class PaginatedHasManyExecutionHandler {
|
|
|
16
16
|
throw new Error();
|
|
17
17
|
}
|
|
18
18
|
const pagination = (0, utils_1.createPaginationHelper)(objectNode);
|
|
19
|
-
addData(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
result
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
19
|
+
addData({
|
|
20
|
+
field: context.entity.primary,
|
|
21
|
+
dataProvider: async (ids) => {
|
|
22
|
+
var _a, _b;
|
|
23
|
+
const counts = pagination.requiresTotalCount
|
|
24
|
+
? await (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, new PaginatedHasManyCountVisitor_1.PaginatedHasManyCountVisitor(ids, objectNode, this.relationFetcher, mapper, context.relationPath))
|
|
25
|
+
: {};
|
|
26
|
+
const nodes = pagination.nodeField
|
|
27
|
+
? await (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, new PaginatedHasManyNodesVisitor_1.PaginatedHasManyNodesVisitor(ids, pagination.nodeField, this.relationFetcher, mapper, context.relationPath))
|
|
28
|
+
: undefined;
|
|
29
|
+
const result = new Map();
|
|
30
|
+
for (const id of ids) {
|
|
31
|
+
result.set(id, pagination.createResponse((_a = counts === null || counts === void 0 ? void 0 : counts[id]) !== null && _a !== void 0 ? _a : 0, (_b = nodes === null || nodes === void 0 ? void 0 : nodes[id]) !== null && _b !== void 0 ? _b : []));
|
|
32
|
+
}
|
|
33
|
+
return Object.fromEntries(result);
|
|
34
|
+
},
|
|
35
|
+
defaultValue: pagination.createResponse(0, []),
|
|
36
|
+
});
|
|
33
37
|
}
|
|
34
38
|
}
|
|
35
39
|
exports.PaginatedHasManyExecutionHandler = PaginatedHasManyExecutionHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaginatedHasManyExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts"],"names":[],"mappings":";;;AAGA,0DAA4D;AAC5D,uCAAoD;AACpD,iFAA6E;AAC7E,iFAA6E;AAE7E,MAAa,gCAAgC;IAC5C,YACkB,MAAoB,EACpB,eAAgC;QADhC,WAAM,GAAN,MAAM,CAAc;QACpB,oBAAe,GAAf,eAAe,CAAiB;IAC/C,CAAC;IAEJ,OAAO,CACN,OAA0G;QAE1G,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QACvD,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,MAAM,UAAU,GAAG,IAAA,8BAAsB,EAAC,UAAU,CAAC,CAAA;QACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"PaginatedHasManyExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyExecutionHandler.ts"],"names":[],"mappings":";;;AAGA,0DAA4D;AAC5D,uCAAoD;AACpD,iFAA6E;AAC7E,iFAA6E;AAE7E,MAAa,gCAAgC;IAC5C,YACkB,MAAoB,EACpB,eAAgC;QADhC,WAAM,GAAN,MAAM,CAAc;QACpB,oBAAe,GAAf,eAAe,CAAiB;IAC/C,CAAC;IAEJ,OAAO,CACN,OAA0G;QAE1G,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QACvD,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,MAAM,UAAU,GAAG,IAAA,8BAAsB,EAAC,UAAU,CAAC,CAAA;QACrD,OAAO,CAAC;YACP,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;YAC7B,YAAY,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;;gBACzB,MAAM,MAAM,GAAG,UAAU,CAAC,kBAAkB;oBAC3C,CAAC,CAAC,MAAM,IAAA,iCAAkB,EACzB,IAAI,CAAC,MAAM,EACX,MAAM,EACN,UAAU,CAAC,UAAU,CAAC,YAAY,EAClC,IAAI,2DAA4B,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CACnG;oBACH,CAAC,CAAC,EAAE,CAAA;gBAEL,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS;oBACjC,CAAC,CAAC,MAAM,IAAA,iCAAkB,EACzB,IAAI,CAAC,MAAM,EACX,MAAM,EACN,UAAU,CAAC,UAAU,CAAC,YAAY,EAClC,IAAI,2DAA4B,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAC7G;oBACH,CAAC,CAAC,SAAS,CAAA;gBACZ,MAAM,MAAM,GAAG,IAAI,GAAG,EAA2B,CAAA;gBACjD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE;oBACrB,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,cAAc,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,EAAE,CAAC,mCAAI,CAAC,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,EAAE,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAA;iBAC/E;gBACD,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAClC,CAAC;YACD,YAAY,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,EAAE,CAAC;SAC9C,CAAC,CAAA;IACH,CAAC;CACD;AA3CD,4EA2CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JunctionTableManager.js","sourceRoot":"","sources":["../../../src/mapper/JunctionTableManager.ts"],"names":[],"mappings":";;;AAAA,0DAAmD;AAInD,kDAQ4B;AAC5B,8CAAqD;AACrD,qCAOiB;AACjB,4CAAsD;AAItD,MAAa,oBAAoB;IAChC,YACkB,MAAoB,EACpB,gBAAkC,EAClC,YAA0B,EAC1B,sBAA8C,EAC9C,yBAAoD,EACpD,WAAwB;QALxB,WAAM,GAAN,MAAM,CAAc;QACpB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEG,KAAK,CAAC,eAAe,CAC3B,EAAU,EACV,YAA0B,EAC1B,QAAyC,EACzC,YAAgC,EAChC,aAAiC;QAEjC,OAAO;YACN,MAAM,IAAI,CAAC,2BAA2B,CACrC,EAAE,EACF,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,IAAI,CAAC,sBAAsB,CAC3B;SACD,CAAA;IACF,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC9B,EAAU,EACV,YAA0B,EAC1B,QAAyC,EACzC,YAAgC,EAChC,aAAiC;QAEjC,OAAO;YACN,MAAM,IAAI,CAAC,2BAA2B,CACrC,EAAE,EACF,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,IAAI,CAAC,yBAAyB,CAC9B;SACD,CAAA;IACF,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACxC,EAAU,EACV,YAA0B,EAC1B,QAAyC,EACzC,aAAiC,EACjC,cAAkC,EAClC,OAAwB;QAExB,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;QAC1C,MAAM,aAAa,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC7D,IAAI,aAAa,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,EAAE;YAC5C,MAAM,IAAI,mCAAuB,EAAE,CAAA;SACnC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,YAAY,EAAE,YAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QACzG,IAAI,gBAAgB,
|
|
1
|
+
{"version":3,"file":"JunctionTableManager.js","sourceRoot":"","sources":["../../../src/mapper/JunctionTableManager.ts"],"names":[],"mappings":";;;AAAA,0DAAmD;AAInD,kDAQ4B;AAC5B,8CAAqD;AACrD,qCAOiB;AACjB,4CAAsD;AAItD,MAAa,oBAAoB;IAChC,YACkB,MAAoB,EACpB,gBAAkC,EAClC,YAA0B,EAC1B,sBAA8C,EAC9C,yBAAoD,EACpD,WAAwB;QALxB,WAAM,GAAN,MAAM,CAAc;QACpB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEG,KAAK,CAAC,eAAe,CAC3B,EAAU,EACV,YAA0B,EAC1B,QAAyC,EACzC,YAAgC,EAChC,aAAiC;QAEjC,OAAO;YACN,MAAM,IAAI,CAAC,2BAA2B,CACrC,EAAE,EACF,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,IAAI,CAAC,sBAAsB,CAC3B;SACD,CAAA;IACF,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC9B,EAAU,EACV,YAA0B,EAC1B,QAAyC,EACzC,YAAgC,EAChC,aAAiC;QAEjC,OAAO;YACN,MAAM,IAAI,CAAC,2BAA2B,CACrC,EAAE,EACF,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,IAAI,CAAC,yBAAyB,CAC9B;SACD,CAAA;IACF,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACxC,EAAU,EACV,YAA0B,EAC1B,QAAyC,EACzC,aAAiC,EACjC,cAAkC,EAClC,OAAwB;QAExB,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;QAC1C,MAAM,aAAa,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC7D,IAAI,aAAa,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,EAAE;YAC5C,MAAM,IAAI,mCAAuB,EAAE,CAAA;SACnC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,YAAY,EAAE,YAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QACzG,IAAI,gBAAgB,GAAwB,EAAE,CAAA;QAC9C,IAAI,QAAQ,CAAC,UAAU,EAAE;YACxB,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,aAAa,EAAE,YAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;SAC3G;QAED,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,KAAK,CAAC,CAAA;QAE/G,MAAM,eAAe,GAAG,GAAG,EAAE,CAC5B,IAAI,iCAAwB,CAAC,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,CAAC,CAAA;QACxF,IAAI,eAAe,EAAE;YACpB,OAAO,MAAM,OAAO,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC,CAAA;SACxG;aAAM;YACN,MAAM,WAAW,GAAwB;gBACxC,GAAG,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC;aACzE,CAAA;YAED,MAAM,YAAY,GAAwB;gBACzC,GAAG,EAAE,CAAC,gBAAgB,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC;aAC5E,CAAA;YAED,MAAM,YAAY,GAA2B,EAAE,CAAC,EAAE;gBACjD,EAAE,GAAG,EAAE;qBACL,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC;qBAC1G,MAAM,CACN,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC,EAC7D,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAC5C;qBACA,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC;qBAC5C,IAAI,CAAC,IAAI,kBAAO,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC;qBAEzC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;qBAC1E,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC9E,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAA;gBAClG,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,YAAY,CAAC,CAAA;gBACrG,OAAO,EAAE,CAAA;YACV,CAAC,CAAA;YAED,OAAO,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,CAAA;SACxF;IACF,CAAC;CACD;AAvGD,oDAuGC;AAuBD,MAAa,sBAAsB;IAClC,KAAK,CAAC,aAAa,CAAC,EACnB,EAAE,EACF,YAAY,EACZ,aAAa,EACb,cAAc,EACd,eAAe,GACc;QAC7B,MAAM,MAAM,GAAG,MAAM,wBAAa,CAAC,MAAM,EAAE;aACzC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;aAC5B,MAAM,CAAC;YACP,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC;YAChF,CAAC,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC;SACxF,CAAC;aACD,UAAU,CAAC,6BAAkB,CAAC,SAAS,CAAC;aACxC,OAAO,CAAC,EAAE,CAAC,CAAA;QACb,IAAI,MAAM,KAAK,CAAC,EAAE;YACjB,OAAO,IAAI,4BAAmB,CAAC,EAAE,EAAE,0BAAiB,CAAC,aAAa,CAAC,CAAA;SACnE;QACD,OAAO,eAAe,EAAE,CAAA;IACzB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EACpB,EAAE,EACF,YAAY,EACZ,YAAY,EACZ,eAAe,GACe;QAC9B,MAAM,MAAM,GAAG,wBAAa,CAAC,MAAM,EAAE;aACnC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;aAC5B,MAAM,CAAC;YACP,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAC7G,CAAC,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,EAAE,CACtD,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;SACpE,CAAC;aACD,SAAS,CAAC,IAAI,kBAAO,CAAC,kBAAkB,CAAC,CAAC;aAC1C,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3B,UAAU,CAAC,6BAAkB,CAAC,SAAS,CAAC,CAAA;QAE1C,MAAM,EAAE,GAAG,wBAAa,CAAC,MAAM,EAAE;aAC/B,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC;aAC1B,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;aACtB,IAAI,CAAC,IAAI,kBAAO,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC;aACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAC5D,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAChE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,gCAAgC,CAAC,EAAE,UAAU,CAAC;aACtE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,kCAAkC,CAAC,EAAE,UAAU,CAAC,CAAA;QAE1E,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACrC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE;YACpC,OAAO,IAAI,8BAAqB,CAAC,EAAE,CAAC,CAAA;SACpC;QACD,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE;YACpC,OAAO,IAAI,4BAAmB,CAAC,EAAE,EAAE,0BAAiB,CAAC,aAAa,CAAC,CAAA;SACnE;QACD,OAAO,eAAe,EAAE,CAAA;IACzB,CAAC;CACD;AAzDD,wDAyDC;AAED,MAAa,yBAAyB;IAC9B,KAAK,CAAC,aAAa,CAAC,EAC1B,EAAE,EACF,YAAY,EACZ,aAAa,EACb,cAAc,EACd,eAAe,GACc;QAC7B,MAAM,EAAE,GAAG,wBAAa,CAAC,MAAM,EAAE;aAC/B,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;aAC5B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,EAAE,mBAAQ,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;aAC9F,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,oBAAoB,CAAC,UAAU,EAAE,mBAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC,CAAA;QAExG,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACnC,IAAI,MAAM,KAAK,CAAC,EAAE;YACjB,OAAO,IAAI,4BAAmB,CAAC,EAAE,EAAE,0BAAiB,CAAC,aAAa,CAAC,CAAA;SACnE;QACD,OAAO,eAAe,EAAE,CAAA;IACzB,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,EAC3B,EAAE,EACF,YAAY,EACZ,YAAY,EACZ,eAAe,GACe;QAC9B,MAAM,QAAQ,GAAG,wBAAa,CAAC,MAAM,EAAE;aACrC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;aAC5B,KAAK,CAAC,MAAM,CAAC;aACb,KAAK,CAAC,IAAI,CAAC,EAAE;YACb,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,mBAAQ,CAAC,EAAE,EAAE;gBACxG,MAAM;gBACN,YAAY,CAAC,aAAa,CAAC,UAAU;aACrC,CAAC,CAAA;YACF,IAAI,GAAG,IAAI,CAAC,cAAc,CACzB,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,EACtE,mBAAQ,CAAC,EAAE,EACX,CAAC,MAAM,EAAE,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,CACtD,CAAA;YACD,OAAO,IAAI,CAAA;QACZ,CAAC,CAAC;aACD,SAAS,CAAC,IAAI,kBAAO,CAAC,iBAAiB,CAAC,CAAC,CAAA;QAE3C,MAAM,EAAE,GAAG,wBAAa,CAAC,MAAM,EAAE;aAC/B,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC;aAC1B,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC;aACxB,IAAI,CAAC,IAAI,kBAAO,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC;aACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAC5D,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAChE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,gCAAgC,CAAC,EAAE,UAAU,CAAC;aACtE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,iCAAiC,CAAC,EAAE,SAAS,CAAC,CAAA;QAExE,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACrC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE;YACpC,OAAO,IAAI,8BAAqB,CAAC,EAAE,CAAC,CAAA;SACpC;QACD,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE;YACpC,OAAO,IAAI,4BAAmB,CAAC,EAAE,EAAE,0BAAiB,CAAC,aAAa,CAAC,CAAA;SACnE;QACD,OAAO,eAAe,EAAE,CAAA;IACzB,CAAC;CACD;AA7DD,8DA6DC"}
|
|
@@ -36,7 +36,7 @@ class Mapper {
|
|
|
36
36
|
.from(entity.tableName, 'root_')
|
|
37
37
|
.select(['root_', columnName]);
|
|
38
38
|
const expandedWhere = this.uniqueWhereExpander.expand(entity, where);
|
|
39
|
-
const builtQb = this.whereBuilder.build(qb, entity, this.pathFactory.create([]), expandedWhere
|
|
39
|
+
const builtQb = this.whereBuilder.build(qb, entity, this.pathFactory.create([]), expandedWhere);
|
|
40
40
|
const result = await builtQb.getResult(this.db);
|
|
41
41
|
return result[0] !== undefined ? result[0][columnName] : undefined;
|
|
42
42
|
}
|
|
@@ -88,7 +88,7 @@ class Mapper {
|
|
|
88
88
|
.from(entity.tableName, path.alias)
|
|
89
89
|
.select(expr => expr.raw('count(*)'), 'row_count');
|
|
90
90
|
const withPredicates = this.predicatesInjector.inject(entity, filter);
|
|
91
|
-
const qbWithWhere = this.whereBuilder.build(qb, entity, path, withPredicates
|
|
91
|
+
const qbWithWhere = this.whereBuilder.build(qb, entity, path, withPredicates);
|
|
92
92
|
const result = await qbWithWhere.getResult(this.db);
|
|
93
93
|
return result[0].row_count;
|
|
94
94
|
}
|
|
@@ -100,7 +100,7 @@ class Mapper {
|
|
|
100
100
|
.select([path.alias, relation.joiningColumn.columnName])
|
|
101
101
|
.groupBy([path.alias, relation.joiningColumn.columnName]);
|
|
102
102
|
const withPredicates = this.predicatesInjector.inject(entity, filter);
|
|
103
|
-
const qbWithWhere = this.whereBuilder.build(qb, entity, path, withPredicates, relationPath);
|
|
103
|
+
const qbWithWhere = this.whereBuilder.build(qb, entity, path, withPredicates, { relationPath });
|
|
104
104
|
const rows = await qbWithWhere.getResult(this.db);
|
|
105
105
|
const result = new Map();
|
|
106
106
|
for (const row of rows) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":";;;AACA,0DAAuD;AACvD,qCAA+G;AAG/G,kDAA2D;AAK3D,qCAAiE;AACjE,qCAAyE;AAGzE,6CAA0C;AAC1C,qCAAwC;AAGxC,oCAAgC;AAChC,qDAAiD;AACjD,kDAAsD;AACtD,4CAAsD;AAEtD,MAAa,MAAM;IAMlB,YACkB,MAAoB,EACrB,EAAmB,EAClB,kBAAsC,EACtC,oBAA0C,EAC1C,mBAAwC,EACxC,YAA0B,EAC1B,oBAA0C,EAC1C,cAA8B,EAC9B,OAAgB,EAChB,QAAkB,EAClB,WAAwB;QAVxB,WAAM,GAAN,MAAM,CAAc;QACrB,OAAE,GAAF,EAAE,CAAiB;QAClB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,YAAO,GAAP,OAAO,CAAS;QAChB,aAAQ,GAAR,QAAQ,CAAU;QAClB,gBAAW,GAAX,WAAW,CAAa;QAhBlC,oBAAe,GAA6C,EAAE,CAAA;QACtD,oBAAe,GAAG,IAAI,+BAAsB,EAAE,CAAA;QAC9C,UAAK,GAAG,IAAI,aAAK,EAAE,CAAA;QAgBlC,IAAI,CAAC,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,EAAE,CAAC,CAAA;IACjD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,MAAoB,EAAE,KAAwB,EAAE,SAAiB;QACzF,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;QAEhE,MAAM,EAAE,GAAG,wBAAa,CAAC,MAAM,EAAE,CAAC,EAAE;aAClC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC;aAC/B,MAAM,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAA;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapperContainer.d.ts","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"AAYA,OAAO,EAON,MAAM,EACN,aAAa,EAOb,MAAM,WAAW,CAAA;AAElB,OAAO,EAAE,GAAG,EAAS,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,MAAM,EAAoC,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAMnD,aAAK,mBAAmB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAA;IACnC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAA;IAC5B,SAAS,EAAE,SAAS,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,eAAe;IAC/B,aAAa,EAAE,aAAa,CAAA;CAC5B;AAED,eAAO,MAAM,qBAAqB,0DAA2D,mBAAmB;
|
|
1
|
+
{"version":3,"file":"MapperContainer.d.ts","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"AAYA,OAAO,EAON,MAAM,EACN,aAAa,EAOb,MAAM,WAAW,CAAA;AAElB,OAAO,EAAE,GAAG,EAAS,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,MAAM,EAAoC,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAMnD,aAAK,mBAAmB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAA;IACnC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAA;IAC5B,SAAS,EAAE,SAAS,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,eAAe;IAC/B,aAAa,EAAE,aAAa,CAAA;CAC5B;AAED,eAAO,MAAM,qBAAqB,0DAA2D,mBAAmB;wBAyEjG,MAAM;EAgBpB,CAAA"}
|
|
@@ -33,9 +33,9 @@ const createMapperContainer = ({ permissions, schema, identityVariables, provide
|
|
|
33
33
|
[extensions_1.HasManyToHasOneReducer.extensionName]: hasManyToHasOneReducer,
|
|
34
34
|
[PaginatedHasManyFieldProvider_1.PaginatedHasManyFieldProvider.extensionName]: paginatedHasManyExecutionHandler,
|
|
35
35
|
}))
|
|
36
|
-
.addService('selectBuilderFactory', ({ whereBuilder, orderByBuilder, fieldsVisitorFactory, metaHandler, selectHandlers, pathFactory }) => new (class {
|
|
36
|
+
.addService('selectBuilderFactory', ({ whereBuilder, orderByBuilder, fieldsVisitorFactory, metaHandler, selectHandlers, pathFactory, predicateFactory }) => new (class {
|
|
37
37
|
create(qb, hydrator, relationPath) {
|
|
38
|
-
return new mapper_1.SelectBuilder(schema.model, whereBuilder, orderByBuilder, metaHandler, qb, hydrator, fieldsVisitorFactory, selectHandlers, pathFactory, relationPath);
|
|
38
|
+
return new mapper_1.SelectBuilder(schema.model, whereBuilder, orderByBuilder, metaHandler, qb, hydrator, fieldsVisitorFactory, selectHandlers, pathFactory, relationPath, predicateFactory);
|
|
39
39
|
}
|
|
40
40
|
})())
|
|
41
41
|
.addService('insertBuilderFactory', ({ whereBuilder, pathFactory }) => new mapper_1.InsertBuilderFactory(schema.model, whereBuilder, pathFactory))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapperContainer.js","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MapperContainer.js","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ class DeleteExecutor {
|
|
|
35
35
|
}
|
|
36
36
|
async delete(mapper, entity, where) {
|
|
37
37
|
const db = mapper.db;
|
|
38
|
-
const predicate = this.predicateFactory.
|
|
38
|
+
const predicate = this.predicateFactory.createDeletePredicate(entity);
|
|
39
39
|
const inQb = database_1.SelectBuilder.create() //
|
|
40
40
|
.from(entity.tableName, 'root_')
|
|
41
41
|
.select(['root_', entity.primaryColumn]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeleteExecutor.js","sourceRoot":"","sources":["../../../../src/mapper/delete/DeleteExecutor.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;AACrD,uCAAyC;AACzC,0DAAiE;AACjE,kDAAoG;AAIpG,sCAQkB;AAOlB,MAAa,cAAc;IAC1B,YACkB,MAAoB,EACpB,gBAAkC,EAClC,YAA0B,EAC1B,oBAA0C,EAC1C,WAAwB;QAJxB,WAAM,GAAN,MAAM,CAAc;QACpB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEG,KAAK,CAAC,OAAO,CACnB,MAAc,EACd,MAAoB,EACpB,EAAsC,EACtC,MAA4B;QAE5B,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YACtC,MAAM,MAAM,CAAC,gBAAgB,CAAC,wBAAwB,EAAE,CAAA;YACxD,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YAC7D,IAAI,CAAC,YAAY,EAAE;gBAClB,OAAO,CAAC,IAAI,mCAA0B,CAAC,EAAE,EAAE,EAAuB,CAAC,CAAC,CAAA;aACpE;YACD,IAAI,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE;gBAChE,OAAO,CAAC,IAAI,4BAAmB,CAAC,EAAE,EAAE,0BAAiB,CAAC,cAAc,CAAC,CAAC,CAAA;aACtE;YACD,MAAM,YAAY,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,CAAA;YAC/D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;YACzG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxB,OAAO,CAAC,IAAI,8BAAqB,CAAC,EAAE,CAAC,CAAC,CAAA;aACtC;YAED,MAAM,MAAM,CAAC,gBAAgB,CAAC,yBAAyB,EAAE,CAAA;YACzD,OAAO,CAAC,IAAI,yBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,MAAoB,EAAE,KAA0B;QACpF,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAA;QACpB,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"DeleteExecutor.js","sourceRoot":"","sources":["../../../../src/mapper/delete/DeleteExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export declare class InsertBuilder {
|
|
|
20
20
|
private where;
|
|
21
21
|
constructor(schema: Model.Schema, entity: Model.Entity, whereBuilder: WhereBuilder, pathFactory: PathFactory);
|
|
22
22
|
addFieldValue(fieldName: string, value: Value.GenericValueLike<Value.AtomicValue<AbortInsert | undefined>>): void;
|
|
23
|
-
addWhere(where: Input.
|
|
23
|
+
addWhere(where: Input.OptionalWhere): void;
|
|
24
24
|
getResolvedData(): Promise<ResolvedColumnValue<AbortInsert>[]>;
|
|
25
25
|
execute(db: Client): Promise<InsertResult>;
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InsertBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/insert/InsertBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,MAAM,EAAoE,MAAM,qBAAqB,CAAA;AAC9G,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAErD,OAAO,EAAe,mBAAmB,EAAuC,MAAM,gBAAgB,CAAA;AAEtG,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,WAAW,YAAY;IAC5B,MAAM,EAAE,mBAAmB,EAAE,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAA;CACvC;AAED,qBAAa,aAAa;IAUxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAZ7B,OAAO,CAAC,QAAQ,CAEf;IACD,SAAgB,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAoD;IAE9G,OAAO,CAAC,OAAO,CAA6C;IAC5D,OAAO,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"InsertBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/insert/InsertBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,MAAM,EAAoE,MAAM,qBAAqB,CAAA;AAC9G,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAErD,OAAO,EAAe,mBAAmB,EAAuC,MAAM,gBAAgB,CAAA;AAEtG,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,WAAW,YAAY;IAC5B,MAAM,EAAE,mBAAmB,EAAE,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAA;CACvC;AAED,qBAAa,aAAa;IAUxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAZ7B,OAAO,CAAC,QAAQ,CAEf;IACD,SAAgB,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAoD;IAE9G,OAAO,CAAC,OAAO,CAA6C;IAC5D,OAAO,CAAC,KAAK,CAA0B;gBAGrB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW;IAGnC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IAM1G,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,GAAG,IAAI;IAIpC,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC;IAI9D,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAsCvD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InsertBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/insert/InsertBuilder.ts"],"names":[],"mappings":";;;AACA,kDAA8G;AAE9G,0DAAsE;AACtE,gDAAsG;AACtG,+CAAyD;AACzD,yCAAwC;AASxC,MAAa,aAAa;IASzB,YACkB,MAAoB,EACpB,MAAoB,EACpB,YAA0B,EAC1B,WAAwB;QAHxB,WAAM,GAAN,MAAM,CAAc;QACpB,WAAM,GAAN,MAAM,CAAc;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAa;QAZlC,aAAQ,GAA+C,GAAG,EAAE;YACnE,MAAM,IAAI,mCAAuB,CAAC,yCAAyC,CAAC,CAAA;QAC7E,CAAC,CAAA;QACe,WAAM,GAAuC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAA;QAEtG,YAAO,GAA2C,EAAE,CAAA;QACpD,UAAK,
|
|
1
|
+
{"version":3,"file":"InsertBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/insert/InsertBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -138,7 +138,7 @@ class RelationFetcher {
|
|
|
138
138
|
]));
|
|
139
139
|
}
|
|
140
140
|
if (where && hasWhere) {
|
|
141
|
-
qb = this.whereBuilder.build(qb, targetEntity, this.pathFactory.create([]), where, relationPath);
|
|
141
|
+
qb = this.whereBuilder.build(qb, targetEntity, this.pathFactory.create([]), where, { relationPath });
|
|
142
142
|
}
|
|
143
143
|
return qb;
|
|
144
144
|
}
|