@contember/engine-content-api 1.1.0-alpha.6 → 1.1.0-beta.0
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/Authorizator.d.ts +2 -1
- package/dist/src/acl/Authorizator.d.ts.map +1 -1
- package/dist/src/acl/Authorizator.js +4 -3
- package/dist/src/acl/Authorizator.js.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js +2 -0
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js.map +1 -1
- package/dist/src/mapper/Mapper.d.ts.map +1 -1
- package/dist/src/mapper/Mapper.js +10 -12
- package/dist/src/mapper/Mapper.js.map +1 -1
- package/dist/src/mapper/select/ConditionBuilder.d.ts +1 -1
- package/dist/src/mapper/select/ConditionBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/ConditionBuilder.js +5 -5
- package/dist/src/mapper/select/ConditionBuilder.js.map +1 -1
- package/dist/src/mapper/select/JoinBuilder.js +2 -2
- package/dist/src/mapper/select/JoinBuilder.js.map +1 -1
- package/dist/src/mapper/select/JoinVisitor.js +4 -4
- package/dist/src/mapper/select/JoinVisitor.js.map +1 -1
- package/dist/src/mapper/select/OrderByBuilder.js +2 -2
- package/dist/src/mapper/select/OrderByBuilder.js.map +1 -1
- package/dist/src/mapper/select/Path.d.ts +2 -1
- package/dist/src/mapper/select/Path.d.ts.map +1 -1
- package/dist/src/mapper/select/Path.js +3 -2
- package/dist/src/mapper/select/Path.js.map +1 -1
- package/dist/src/mapper/select/RelationFetcher.js +2 -2
- package/dist/src/mapper/select/RelationFetcher.js.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.d.ts +1 -1
- package/dist/src/mapper/select/SelectBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.js +7 -10
- package/dist/src/mapper/select/SelectBuilder.js.map +1 -1
- package/dist/src/mapper/select/SelectHydrator.d.ts +2 -1
- package/dist/src/mapper/select/SelectHydrator.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectHydrator.js +34 -11
- package/dist/src/mapper/select/SelectHydrator.js.map +1 -1
- package/dist/src/mapper/select/WhereBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/WhereBuilder.js +5 -4
- package/dist/src/mapper/select/WhereBuilder.js.map +1 -1
- package/dist/src/mapper/select/handlers/FieldsVisitor.js +2 -2
- package/dist/src/mapper/select/handlers/FieldsVisitor.js.map +1 -1
- package/dist/src/mapper/select/handlers/MetaHandler.js +1 -1
- package/dist/src/mapper/select/handlers/MetaHandler.js.map +1 -1
- package/dist/src/resolvers/MutationResolver.d.ts.map +1 -1
- package/dist/src/resolvers/MutationResolver.js +4 -3
- package/dist/src/resolvers/MutationResolver.js.map +1 -1
- package/dist/src/schema/CustomTypesProvider.d.ts.map +1 -1
- package/dist/src/schema/CustomTypesProvider.js +18 -3
- package/dist/src/schema/CustomTypesProvider.js.map +1 -1
- package/dist/src/schema/OrderByTypeProvider.d.ts.map +1 -1
- package/dist/src/schema/OrderByTypeProvider.js +2 -0
- package/dist/src/schema/OrderByTypeProvider.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/integration/graphQlDb/update/invalidInput.test.js +0 -23
- package/dist/tests/cases/integration/graphQlDb/update/invalidInput.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/relations/oneHasMany.test.js +87 -0
- package/dist/tests/cases/integration/graphQlRequests/query/relations/oneHasMany.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/sorting/sortNulls.test.d.ts +2 -0
- package/dist/tests/cases/integration/graphQlRequests/query/sorting/sortNulls.test.d.ts.map +1 -0
- package/dist/tests/cases/integration/graphQlRequests/query/sorting/sortNulls.test.js +35 -0
- package/dist/tests/cases/integration/graphQlRequests/query/sorting/sortNulls.test.js.map +1 -0
- package/dist/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.js +45 -2
- package/dist/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.js +1 -1
- package/dist/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlSchema/schema-acl-allowed.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-acl-predicate.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-acl-predicate2.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-acl-restricted-create.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-acl-restricted-delete.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-acl-restricted-update.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-acl.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-aliased-type.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-basic.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-bug-66.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-custom-primary.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-has-many-reduction.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-new-builder.gql +2 -0
- package/dist/tests/cases/integration/graphQlSchema/schema-view-entity.gql +2 -0
- package/dist/tests/cases/unit/uuidType.test.d.ts +2 -0
- package/dist/tests/cases/unit/uuidType.test.d.ts.map +1 -0
- package/dist/tests/cases/unit/uuidType.test.js +23 -0
- package/dist/tests/cases/unit/uuidType.test.js.map +1 -0
- package/dist/tests/src/test.js +1 -1
- package/dist/tests/src/test.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/acl/Authorizator.ts +5 -2
- package/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts +2 -0
- package/src/mapper/Mapper.ts +10 -13
- package/src/mapper/select/ConditionBuilder.ts +5 -4
- package/src/mapper/select/JoinBuilder.ts +2 -2
- package/src/mapper/select/JoinVisitor.ts +4 -4
- package/src/mapper/select/OrderByBuilder.ts +2 -2
- package/src/mapper/select/Path.ts +4 -2
- package/src/mapper/select/RelationFetcher.ts +2 -2
- package/src/mapper/select/SelectBuilder.ts +7 -11
- package/src/mapper/select/SelectHydrator.ts +52 -19
- package/src/mapper/select/WhereBuilder.ts +6 -3
- package/src/mapper/select/handlers/FieldsVisitor.ts +2 -2
- package/src/mapper/select/handlers/MetaHandler.ts +1 -1
- package/src/resolvers/MutationResolver.ts +4 -3
- package/src/schema/CustomTypesProvider.ts +21 -4
- package/src/schema/OrderByTypeProvider.ts +2 -0
- package/tests/cases/integration/graphQlDb/update/invalidInput.test.ts +0 -26
- package/tests/cases/integration/graphQlRequests/query/relations/oneHasMany.test.ts +87 -0
- package/tests/cases/integration/graphQlRequests/query/sorting/sortNulls.test.ts +34 -0
- package/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.ts +49 -2
- package/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.ts +1 -1
- package/tests/cases/integration/graphQlSchema/schema-acl-allowed.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-acl-predicate.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-acl-predicate2.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-acl-restricted-create.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-acl-restricted-delete.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-acl-restricted-update.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-acl.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-aliased-type.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-basic.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-bug-66.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-custom-primary.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-has-many-reduction.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-new-builder.gql +2 -0
- package/tests/cases/integration/graphQlSchema/schema-view-entity.gql +2 -0
- package/tests/cases/unit/uuidType.test.ts +25 -0
- package/tests/src/test.ts +1 -1
|
@@ -2,7 +2,8 @@ import { Acl } from '@contember/schema';
|
|
|
2
2
|
export declare type AuthorizationResult = 'yes' | 'no' | 'maybe';
|
|
3
3
|
export declare class Authorizator {
|
|
4
4
|
private readonly permissions;
|
|
5
|
-
|
|
5
|
+
private readonly defaultCustomPrimary;
|
|
6
|
+
constructor(permissions: Acl.Permissions, defaultCustomPrimary: boolean);
|
|
6
7
|
getEntityPermission(operation: Acl.Operation, entity: string): AuthorizationResult;
|
|
7
8
|
getFieldPredicate(operation: Acl.Operation.create | Acl.Operation.read | Acl.Operation.update, entity: string, field: string): Acl.Predicate;
|
|
8
9
|
getFieldPermissions(operation: Acl.Operation.create | Acl.Operation.read | Acl.Operation.update, entity: string, field: string): AuthorizationResult;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Authorizator.d.ts","sourceRoot":"","sources":["../../../src/acl/Authorizator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAGvC,oBAAY,mBAAmB,GAAG,KAAK,GAAG,IAAI,GAAG,OAAO,CAAA;AAExD,qBAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"Authorizator.d.ts","sourceRoot":"","sources":["../../../src/acl/Authorizator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAGvC,oBAAY,mBAAmB,GAAG,KAAK,GAAG,IAAI,GAAG,OAAO,CAAA;AAExD,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBADpB,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,oBAAoB,EAAE,OAAO;IAI/C,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,mBAAmB;IAgBlF,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS;IAI5I,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,mBAAmB;IAQpJ,OAAO,CAAC,iBAAiB;IAWzB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAG/C"}
|
|
@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Authorizator = void 0;
|
|
4
4
|
const schema_1 = require("@contember/schema");
|
|
5
5
|
class Authorizator {
|
|
6
|
-
constructor(permissions) {
|
|
6
|
+
constructor(permissions, defaultCustomPrimary) {
|
|
7
7
|
this.permissions = permissions;
|
|
8
|
+
this.defaultCustomPrimary = defaultCustomPrimary;
|
|
8
9
|
}
|
|
9
10
|
getEntityPermission(operation, entity) {
|
|
10
11
|
if (!this.permissions[entity]) {
|
|
@@ -41,8 +42,8 @@ class Authorizator {
|
|
|
41
42
|
return 'maybe';
|
|
42
43
|
}
|
|
43
44
|
isCustomPrimaryAllowed(entity) {
|
|
44
|
-
var _a, _b, _c;
|
|
45
|
-
return ((_c = (_b = (_a = this.permissions) === null || _a === void 0 ? void 0 : _a[entity]) === null || _b === void 0 ? void 0 : _b.operations) === null || _c === void 0 ? void 0 : _c.customPrimary)
|
|
45
|
+
var _a, _b, _c, _d;
|
|
46
|
+
return (_d = (_c = (_b = (_a = this.permissions) === null || _a === void 0 ? void 0 : _a[entity]) === null || _b === void 0 ? void 0 : _b.operations) === null || _c === void 0 ? void 0 : _c.customPrimary) !== null && _d !== void 0 ? _d : this.defaultCustomPrimary;
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
49
|
exports.Authorizator = Authorizator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Authorizator.js","sourceRoot":"","sources":["../../../src/acl/Authorizator.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AAKvC,MAAa,YAAY;IACxB,
|
|
1
|
+
{"version":3,"file":"Authorizator.js","sourceRoot":"","sources":["../../../src/acl/Authorizator.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AAKvC,MAAa,YAAY;IACxB,YACkB,WAA4B,EAC5B,oBAA6B;QAD7B,gBAAW,GAAX,WAAW,CAAiB;QAC5B,yBAAoB,GAApB,oBAAoB,CAAS;IAE/C,CAAC;IAED,mBAAmB,CAAC,SAAwB,EAAE,MAAc;QAC3D,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAA;SACX;QACD,MAAM,iBAAiB,GAA0B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAEzE,IAAI,SAAS,KAAK,YAAG,CAAC,SAAS,CAAC,MAAM,EAAE;YACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;SAClE;QACD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAChE,IAAI,CAAC,gBAAgB,EAAE;YACtB,OAAO,IAAI,CAAA;SACX;QACD,OAAO,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;IACpF,CAAC;IAED,iBAAiB,CAAC,SAA2E,EAAE,MAAc,EAAE,KAAa;;QAC3H,OAAO,MAAA,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,0CAAE,UAAU,CAAC,SAAS,CAAC,0CAAG,KAAK,CAAC,mCAAI,KAAK,CAAA;IACzE,CAAC;IAED,mBAAmB,CAAC,SAA2E,EAAE,MAAc,EAAE,KAAa;QAC7H,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;QACzE,IAAI,CAAC,gBAAgB,EAAE;YACtB,OAAO,IAAI,CAAA;SACX;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IAChD,CAAC;IAEO,iBAAiB,CAAC,SAAoC;QAC7D,IAAI,CAAC,SAAS,EAAE;YACf,OAAO,IAAI,CAAA;SACX;QACD,IAAI,SAAS,KAAK,IAAI,EAAE;YACvB,OAAO,KAAK,CAAA;SACZ;QACD,OAAO,OAAO,CAAA;IACf,CAAC;IAGD,sBAAsB,CAAC,MAAc;;QACpC,OAAO,MAAA,MAAA,MAAA,MAAA,IAAI,CAAC,WAAW,0CAAG,MAAM,CAAC,0CAAE,UAAU,0CAAE,aAAa,mCAAI,IAAI,CAAC,oBAAoB,CAAA;IAC1F,CAAC;CACD;AAjDD,oCAiDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaginatedHasManyFieldProviderVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAA;AAExF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAA;
|
|
1
|
+
{"version":3,"file":"PaginatedHasManyFieldProviderVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAA;AAExF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAA;AAGtF,qBAAa,oCAAqC,YACjD,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC,EACrE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,2BAA2B;IAE/E,eAAe,CACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,QAAQ,CAAC,sCAAsC,CAAC;IAInD,sBAAsB,CACrB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,QAAQ,CAAC,sCAAsC,CAAC;IAInD,uBAAuB,CACtB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,QAAQ,CAAC,sCAAsC,CAAC;IAInD,OAAO,CAAC,WAAW;IAenB,WAAW;IAIX,eAAe;IAIf,qBAAqB;IAIrB,oBAAoB;CAGpB"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PaginatedHasManyFieldProviderVisitor = void 0;
|
|
4
4
|
const utils_1 = require("../../utils");
|
|
5
|
+
const schema_1 = require("../../schema");
|
|
5
6
|
class PaginatedHasManyFieldProviderVisitor {
|
|
6
7
|
constructor(paginatedFieldFactory) {
|
|
7
8
|
this.paginatedFieldFactory = paginatedFieldFactory;
|
|
@@ -22,6 +23,7 @@ class PaginatedHasManyFieldProviderVisitor {
|
|
|
22
23
|
extensions: {
|
|
23
24
|
relationName: relation.name,
|
|
24
25
|
},
|
|
26
|
+
resolve: schema_1.aliasAwareResolver,
|
|
25
27
|
},
|
|
26
28
|
};
|
|
27
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaginatedHasManyFieldProviderVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":";;;AAGA,uCAAmD;
|
|
1
|
+
{"version":3,"file":"PaginatedHasManyFieldProviderVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":";;;AAGA,uCAAmD;AAEnD,yCAAiD;AAEjD,MAAa,oCAAoC;IAIhD,YAA6B,qBAAkD;QAAlD,0BAAqB,GAArB,qBAAqB,CAA6B;IAAG,CAAC;IAEnF,eAAe,CACd,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,sBAAsB,CACrB,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,uBAAuB,CACtB,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAEO,WAAW,CAClB,MAAoB,EACpB,QAAwB;QAExB,OAAO;YACN,CAAC,WAAW,IAAA,6BAAqB,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACpD,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACvD,UAAU,EAAE;oBACX,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC3B;gBACD,OAAO,EAAE,2BAAkB;aAC3B;SACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,OAAO,EAAE,CAAA;IACV,CAAC;IAED,eAAe;QACd,OAAO,EAAE,CAAA;IACV,CAAC;IAED,qBAAqB;QACpB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,oBAAoB;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;CACD;AA/DD,oFA+DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mapper.d.ts","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Mapper.d.ts","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,8 +46,8 @@ class Mapper {
|
|
|
46
46
|
let indexByAlias = null;
|
|
47
47
|
if (indexBy) {
|
|
48
48
|
const path = this.pathFactory.create([]);
|
|
49
|
-
indexByAlias = path.for(indexBy).
|
|
50
|
-
qb = qb.select([path.
|
|
49
|
+
indexByAlias = path.for(indexBy).alias;
|
|
50
|
+
qb = qb.select([path.alias, (0, schema_utils_1.getColumnName)(this.schema, entity, indexBy)], indexByAlias);
|
|
51
51
|
}
|
|
52
52
|
const rows = await this.selectRows(hydrator, qb, entity, input);
|
|
53
53
|
return await (indexByAlias !== null ? hydrator.hydrateAll(rows, indexByAlias) : hydrator.hydrateAll(rows));
|
|
@@ -63,26 +63,24 @@ class Mapper {
|
|
|
63
63
|
let qb = database_1.SelectBuilder.create();
|
|
64
64
|
const path = this.pathFactory.create([]);
|
|
65
65
|
const groupingKey = '__grouping_key';
|
|
66
|
-
qb = qb.select([path.
|
|
66
|
+
qb = qb.select([path.alias, relation.joiningColumn.columnName], groupingKey);
|
|
67
67
|
const rows = await this.selectRows(hydrator, qb, entity, input, relation.name);
|
|
68
68
|
return await hydrator.hydrateGroups(rows, groupingKey);
|
|
69
69
|
}
|
|
70
70
|
async selectRows(hydrator, qb, entity, input, groupBy) {
|
|
71
71
|
const inputWithOrder = select_2.OrderByHelper.appendDefaultOrderBy(entity, input, []);
|
|
72
72
|
const path = this.pathFactory.create([]);
|
|
73
|
-
const augmentedBuilder = qb.from(entity.tableName, path.
|
|
73
|
+
const augmentedBuilder = qb.from(entity.tableName, path.alias).meta('path', [...input.path, input.alias]);
|
|
74
74
|
const selector = this.selectBuilderFactory.create(augmentedBuilder, hydrator);
|
|
75
75
|
const filterWithPredicates = this.predicatesInjector.inject(entity, inputWithOrder.args.filter || {});
|
|
76
76
|
const inputWithPredicates = inputWithOrder.withArg('filter', filterWithPredicates);
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
await selectPromise;
|
|
80
|
-
return rows;
|
|
77
|
+
selector.select(this, entity, inputWithPredicates, path, groupBy);
|
|
78
|
+
return await selector.execute(this.db);
|
|
81
79
|
}
|
|
82
80
|
async count(entity, filter) {
|
|
83
81
|
const path = this.pathFactory.create([]);
|
|
84
82
|
const qb = database_1.SelectBuilder.create()
|
|
85
|
-
.from(entity.tableName, path.
|
|
83
|
+
.from(entity.tableName, path.alias)
|
|
86
84
|
.select(expr => expr.raw('count(*)'), 'row_count');
|
|
87
85
|
const withPredicates = this.predicatesInjector.inject(entity, filter);
|
|
88
86
|
const qbWithWhere = this.whereBuilder.build(qb, entity, path, withPredicates);
|
|
@@ -92,10 +90,10 @@ class Mapper {
|
|
|
92
90
|
async countGrouped(entity, filter, relation) {
|
|
93
91
|
const path = this.pathFactory.create([]);
|
|
94
92
|
const qb = database_1.SelectBuilder.create()
|
|
95
|
-
.from(entity.tableName, path.
|
|
93
|
+
.from(entity.tableName, path.alias)
|
|
96
94
|
.select(expr => expr.raw('count(*)'), 'row_count')
|
|
97
|
-
.select([path.
|
|
98
|
-
.groupBy([path.
|
|
95
|
+
.select([path.alias, relation.joiningColumn.columnName])
|
|
96
|
+
.groupBy([path.alias, relation.joiningColumn.columnName]);
|
|
99
97
|
const withPredicates = this.predicatesInjector.inject(entity, filter);
|
|
100
98
|
const qbWithWhere = this.whereBuilder.build(qb, entity, path, withPredicates);
|
|
101
99
|
const rows = await qbWithWhere.getResult(this.db);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":";;;AACA,0DAAuD;AACvD,qCAAyF;AAGzF,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,CAAC,CAAA;QAC/F,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAE/C,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,CAAC;IAQM,KAAK,CAAC,MAAM,CAClB,MAAoB,EACpB,KAAuC,EACvC,OAAgB;QAEhB,MAAM,QAAQ,GAAG,IAAI,uBAAc,EAAE,CAAA;QACrC,IAAI,EAAE,GAAwC,wBAAa,CAAC,MAAM,EAAE,CAAA;QACpE,IAAI,YAAY,GAAkB,IAAI,CAAA;QACtC,IAAI,OAAO,EAAE;YACZ,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACxC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Input } from '@contember/schema';
|
|
2
2
|
import { ConditionBuilder as SqlConditionBuilder } from '@contember/database';
|
|
3
3
|
export declare class ConditionBuilder {
|
|
4
|
-
build(builder: SqlConditionBuilder, tableName: string, columnName: string, condition: Input.Condition<any>): SqlConditionBuilder;
|
|
4
|
+
build(builder: SqlConditionBuilder, tableName: string, columnName: string, columnType: string, condition: Input.Condition<any>): SqlConditionBuilder;
|
|
5
5
|
}
|
|
6
6
|
//# sourceMappingURL=ConditionBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,gBAAgB,IAAI,mBAAmB,EAAY,MAAM,qBAAqB,CAAA;AAGrG,qBAAa,gBAAgB;IACrB,KAAK,CACX,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAC7B,mBAAmB;CA8CtB"}
|
|
1
|
+
{"version":3,"file":"ConditionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,gBAAgB,IAAI,mBAAmB,EAAY,MAAM,qBAAqB,CAAA;AAGrG,qBAAa,gBAAgB;IACrB,KAAK,CACX,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAC7B,mBAAmB;CA8CtB"}
|
|
@@ -4,7 +4,7 @@ exports.ConditionBuilder = void 0;
|
|
|
4
4
|
const database_1 = require("@contember/database");
|
|
5
5
|
const exception_1 = require("../../exception");
|
|
6
6
|
class ConditionBuilder {
|
|
7
|
-
build(builder, tableName, columnName, condition) {
|
|
7
|
+
build(builder, tableName, columnName, columnType, condition) {
|
|
8
8
|
const keys = Object.keys(condition);
|
|
9
9
|
if (keys.length === 0) {
|
|
10
10
|
return builder;
|
|
@@ -15,13 +15,13 @@ class ConditionBuilder {
|
|
|
15
15
|
}
|
|
16
16
|
const columnIdentifier = [tableName, columnName];
|
|
17
17
|
const handler = {
|
|
18
|
-
and: (builder, expressions) => builder.and(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, expr), builder2)),
|
|
19
|
-
or: (builder, expressions) => builder.or(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, expr), builder2)),
|
|
20
|
-
not: (builder, expression) => builder.not(builder2 => this.build(builder2, tableName, columnName, expression)),
|
|
18
|
+
and: (builder, expressions) => builder.and(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, columnType, expr), builder2)),
|
|
19
|
+
or: (builder, expressions) => builder.or(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, columnType, expr), builder2)),
|
|
20
|
+
not: (builder, expression) => builder.not(builder2 => this.build(builder2, tableName, columnName, columnType, expression)),
|
|
21
21
|
eq: (builder, value) => builder.compare(columnIdentifier, database_1.Operator.eq, value),
|
|
22
22
|
notEq: (builder, value) => builder.compare(columnIdentifier, database_1.Operator.notEq, value),
|
|
23
23
|
isNull: (builder, value) => value ? builder.isNull(columnIdentifier) : builder.not(clause => clause.isNull(columnIdentifier)),
|
|
24
|
-
in: (builder, values) => builder.in(columnIdentifier, values),
|
|
24
|
+
in: (builder, values) => builder.in(columnIdentifier, values, columnType),
|
|
25
25
|
notIn: (builder, values) => builder.not(builder2 => builder2.in(columnIdentifier, values)),
|
|
26
26
|
lt: (builder, value) => builder.compare(columnIdentifier, database_1.Operator.lt, value),
|
|
27
27
|
lte: (builder, value) => builder.compare(columnIdentifier, database_1.Operator.lte, value),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":";;;AACA,kDAAqG;AACrG,+CAA2C;AAE3C,MAAa,gBAAgB;IACrB,KAAK,CACX,OAA4B,EAC5B,SAAiB,EACjB,UAAkB,EAClB,SAA+B;QAE/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAA6C,CAAA;QAC/E,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,OAAO,CAAA;SACd;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,MAAM,IAAI,qBAAS,CAClB,oGAAoG;gBACnG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAC1B,CAAA;SACD;QACD,MAAM,gBAAgB,GAAkC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAE/E,MAAM,OAAO,GAKT;YACH,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,11 +15,11 @@ class JoinBuilder {
|
|
|
15
15
|
}
|
|
16
16
|
const joins = (0, schema_utils_1.acceptRelationTypeVisitor)(this.schema, entity, relationName, new JoinVisitor_1.JoinVisitor(path));
|
|
17
17
|
return joins.reduce((qb, join) => {
|
|
18
|
-
const targetAlias = join.targetAlias || path.
|
|
18
|
+
const targetAlias = join.targetAlias || path.alias;
|
|
19
19
|
if (qb.options.join.find(it => it.alias === targetAlias)) {
|
|
20
20
|
return qb;
|
|
21
21
|
}
|
|
22
|
-
const sourceAlias = join.sourceAlias || path.back().
|
|
22
|
+
const sourceAlias = join.sourceAlias || path.back().alias;
|
|
23
23
|
return qb.leftJoin(join.tableName, targetAlias, clause => clause.compareColumns([sourceAlias, join.sourceColumn], database_1.Operator.eq, [targetAlias, join.targetColumn]));
|
|
24
24
|
}, qb);
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JoinBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/JoinBuilder.ts"],"names":[],"mappings":";;;AACA,0DAAoF;AAEpF,+CAA2C;AAC3C,kDAA8C;AAG9C,MAAa,WAAW;IACvB,YAA6B,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;IAAG,CAAC;IAErD,IAAI,CACH,EAAuC,EACvC,IAAU,EACV,MAAoB,EACpB,YAAoB;QAEpB,MAAM,YAAY,GAAG,IAAA,8BAAe,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;QACvE,IAAI,CAAC,YAAY,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,2CAA2C,MAAM,CAAC,IAAI,KAAK,YAAY,YAAY,CAAC,CAAA;SACpG;QAED,MAAM,KAAK,GAAG,IAAA,wCAAyB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,yBAAW,CAAC,IAAI,CAAC,CAAC,CAAA;QAEjG,OAAO,KAAK,CAAC,MAAM,CAAsC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;YACrE,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"JoinBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/JoinBuilder.ts"],"names":[],"mappings":";;;AACA,0DAAoF;AAEpF,+CAA2C;AAC3C,kDAA8C;AAG9C,MAAa,WAAW;IACvB,YAA6B,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;IAAG,CAAC;IAErD,IAAI,CACH,EAAuC,EACvC,IAAU,EACV,MAAoB,EACpB,YAAoB;QAEpB,MAAM,YAAY,GAAG,IAAA,8BAAe,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;QACvE,IAAI,CAAC,YAAY,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,2CAA2C,MAAM,CAAC,IAAI,KAAK,YAAY,YAAY,CAAC,CAAA;SACpG;QAED,MAAM,KAAK,GAAG,IAAA,wCAAyB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,yBAAW,CAAC,IAAI,CAAC,CAAC,CAAA;QAEjG,OAAO,KAAK,CAAC,MAAM,CAAsC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;YACrE,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAA;YAClD,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,WAAW,CAAC,EAAE;gBACzD,OAAO,EAAE,CAAA;aACT;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAA;YAEzD,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,CACxD,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,EAAE,mBAAQ,CAAC,EAAE,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CACtG,CAAA;QACF,CAAC,EAAE,EAAE,CAAC,CAAA;IACP,CAAC;CACD;AA5BD,kCA4BC"}
|
|
@@ -43,8 +43,8 @@ class JoinVisitor {
|
|
|
43
43
|
];
|
|
44
44
|
}
|
|
45
45
|
visitManyHasManyOwning(entity, relation, targetEntity) {
|
|
46
|
-
const sourceAlias = this.path.back().
|
|
47
|
-
const targetAlias = this.path.
|
|
46
|
+
const sourceAlias = this.path.back().alias;
|
|
47
|
+
const targetAlias = this.path.alias;
|
|
48
48
|
const joiningAlias = `${sourceAlias}_x_${targetAlias}`;
|
|
49
49
|
return [
|
|
50
50
|
{
|
|
@@ -65,8 +65,8 @@ class JoinVisitor {
|
|
|
65
65
|
];
|
|
66
66
|
}
|
|
67
67
|
visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
|
|
68
|
-
const sourceAlias = this.path.back().
|
|
69
|
-
const targetAlias = this.path.
|
|
68
|
+
const sourceAlias = this.path.back().alias;
|
|
69
|
+
const targetAlias = this.path.alias;
|
|
70
70
|
const joiningAlias = `${sourceAlias}_x_${targetAlias}`;
|
|
71
71
|
return [
|
|
72
72
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JoinVisitor.js","sourceRoot":"","sources":["../../../../src/mapper/select/JoinVisitor.ts"],"names":[],"mappings":";;;AAGA,MAAa,WAAW;IACvB,YAA6B,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAG,CAAC;IAE3C,oBAAoB,CACnB,MAAoB,EACpB,QAAuC,EACvC,YAA0B;QAE1B,OAAO;YACN;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU;gBAC/C,YAAY,EAAE,YAAY,CAAC,aAAa;aACxC;SACD,CAAA;IACF,CAAC;IAED,qBAAqB,CACpB,MAAoB,EACpB,QAAwC,EACxC,YAA0B,EAC1B,cAA6C;QAE7C,OAAO;YACN;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,MAAM,CAAC,aAAa;gBAClC,YAAY,EAAE,cAAc,CAAC,aAAa,CAAC,UAAU;aACrD;SACD,CAAA;IACF,CAAC;IAED,eAAe,CACd,MAAoB,EACpB,QAAkC,EAClC,YAA0B;QAE1B,OAAO;YACN;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU;gBAC/C,YAAY,EAAE,YAAY,CAAC,aAAa;aACxC;SACD,CAAA;IACF,CAAC;IAED,eAAe,CACd,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO;YACN;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,MAAM,CAAC,aAAa;gBAClC,YAAY,EAAE,cAAc,CAAC,aAAa,CAAC,UAAU;gBACrD,IAAI,EAAE,IAAI;aACV;SACD,CAAA;IACF,CAAC;IAED,sBAAsB,CACrB,MAAoB,EACpB,QAAyC,EACzC,YAA0B;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"JoinVisitor.js","sourceRoot":"","sources":["../../../../src/mapper/select/JoinVisitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ class OrderByBuilder {
|
|
|
15
15
|
buildOne(qb, orderable, entity, path, orderBy) {
|
|
16
16
|
const entries = Object.entries(orderBy);
|
|
17
17
|
if (entries.length !== 1) {
|
|
18
|
-
const fields = entries.join(', ');
|
|
18
|
+
const fields = entries.map(it => it[0]).join(', ');
|
|
19
19
|
throw new exception_1.UserError('Order by: only one field is expected in each item of order by clause, got: ' + fields);
|
|
20
20
|
}
|
|
21
21
|
if (orderBy._random || orderBy._randomSeeded) {
|
|
@@ -37,7 +37,7 @@ class OrderByBuilder {
|
|
|
37
37
|
const [fieldName, value] = entries[0];
|
|
38
38
|
if (typeof value === 'string') {
|
|
39
39
|
const columnName = (0, schema_utils_1.getColumnName)(this.schema, entity, fieldName);
|
|
40
|
-
const applyOrder = (orderable) => orderable.orderBy([path.
|
|
40
|
+
const applyOrder = (orderable) => orderable.orderBy([path.alias, columnName], value);
|
|
41
41
|
qb = applyOrder(qb);
|
|
42
42
|
if (orderable !== null) {
|
|
43
43
|
orderable = applyOrder(orderable);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderByBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByBuilder.ts"],"names":[],"mappings":";;;AAGA,kDAA0E;AAC1E,0DAAwE;AACxE,+CAA2C;AAE3C,MAAa,cAAc;IAC1B,YAA6B,MAAoB,EAAmB,WAAwB;QAA/D,WAAM,GAAN,MAAM,CAAc;QAAmB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAEzF,KAAK,CACX,EAAuC,EACvC,SAAoB,EACpB,MAAoB,EACpB,IAAU,EACV,OAAwB;QAExB,OAAO,OAAO,CAAC,MAAM,CACpB,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,EAC3F,CAAC,EAAE,EAAE,SAAS,CAAC,CACf,CAAA;IACF,CAAC;IAEO,QAAQ,CACf,EAAuC,EACvC,SAAoB,EACpB,MAAoB,EACpB,IAAU,EACV,OAAsB;QAEtB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACvC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"OrderByBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,10 @@ export declare class Path {
|
|
|
11
11
|
readonly path: string[];
|
|
12
12
|
private readonly aliasContext;
|
|
13
13
|
readonly rootAlias: string;
|
|
14
|
+
readonly alias: string;
|
|
14
15
|
constructor(path: string[], aliasContext: AliasContext, rootAlias?: string);
|
|
15
16
|
back(): Path;
|
|
16
17
|
for(path: string): Path;
|
|
17
|
-
|
|
18
|
+
private createAlias;
|
|
18
19
|
}
|
|
19
20
|
//# sourceMappingURL=Path.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/Path.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACxB,OAAO,CAAC,UAAU,CAA4B;IAEvC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAS3C;AAED,qBAAa,WAAW;IACvB,OAAO,CAAC,YAAY,CAAqB;;IAIlC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,SAAS,SAAU;CAGjD;AAED,qBAAa,IAAI;
|
|
1
|
+
{"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/Path.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACxB,OAAO,CAAC,UAAU,CAA4B;IAEvC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAS3C;AAED,qBAAa,WAAW;IACvB,OAAO,CAAC,YAAY,CAAqB;;IAIlC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,SAAS,SAAU;CAGjD;AAED,qBAAa,IAAI;aAIC,IAAI,EAAE,MAAM,EAAE;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;aACb,SAAS;IAL1B,SAAgB,KAAK,SAAqB;gBAGzB,IAAI,EAAE,MAAM,EAAE,EACb,YAAY,EAAE,YAAY,EAC3B,SAAS,SAAU;IAG7B,IAAI;IAMJ,GAAG,CAAC,IAAI,EAAE,MAAM;IAIvB,OAAO,CAAC,WAAW;CAUnB"}
|
|
@@ -31,6 +31,7 @@ class Path {
|
|
|
31
31
|
this.path = path;
|
|
32
32
|
this.aliasContext = aliasContext;
|
|
33
33
|
this.rootAlias = rootAlias;
|
|
34
|
+
this.alias = this.createAlias();
|
|
34
35
|
}
|
|
35
36
|
back() {
|
|
36
37
|
const newPath = [...this.path];
|
|
@@ -40,14 +41,14 @@ class Path {
|
|
|
40
41
|
for(path) {
|
|
41
42
|
return new Path([...this.path, path], this.aliasContext, this.rootAlias);
|
|
42
43
|
}
|
|
43
|
-
|
|
44
|
+
createAlias() {
|
|
44
45
|
const alias = this.rootAlias + this.path.join('_');
|
|
45
46
|
// intentionally not allowing == MAX_IDENTIFIER_LENGTH
|
|
46
47
|
if (alias.length < MAX_IDENTIFIER_LENGTH) {
|
|
47
48
|
return alias;
|
|
48
49
|
}
|
|
49
50
|
const index = this.aliasContext.getAliasIndex(alias).toString();
|
|
50
|
-
return alias.
|
|
51
|
+
return alias.substring(0, MAX_IDENTIFIER_LENGTH - index.length - 1) + '_' + index;
|
|
51
52
|
}
|
|
52
53
|
}
|
|
53
54
|
exports.Path = Path;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Path.js","sourceRoot":"","sources":["../../../../src/mapper/select/Path.ts"],"names":[],"mappings":";;;AAAA,MAAM,qBAAqB,GAAG,EAAE,CAAA;AAEhC,MAAa,YAAY;IAAzB;QACS,eAAU,GAAG,IAAI,GAAG,EAAkB,CAAA;IAW/C,CAAC;IATO,aAAa,CAAC,KAAa;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACxC,IAAI,KAAK,KAAK,SAAS,EAAE;YACxB,OAAO,KAAK,CAAA;SACZ;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAA;QACzC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACpC,OAAO,QAAQ,CAAA;IAChB,CAAC;CACD;AAZD,oCAYC;AAED,MAAa,WAAW;IAGvB;QAFQ,iBAAY,GAAG,IAAI,YAAY,EAAE,CAAA;IAEnB,CAAC;IAEhB,MAAM,CAAC,IAAc,EAAE,SAAS,GAAG,OAAO;QAChD,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpD,CAAC;CACD;AARD,kCAQC;AAED,MAAa,IAAI;
|
|
1
|
+
{"version":3,"file":"Path.js","sourceRoot":"","sources":["../../../../src/mapper/select/Path.ts"],"names":[],"mappings":";;;AAAA,MAAM,qBAAqB,GAAG,EAAE,CAAA;AAEhC,MAAa,YAAY;IAAzB;QACS,eAAU,GAAG,IAAI,GAAG,EAAkB,CAAA;IAW/C,CAAC;IATO,aAAa,CAAC,KAAa;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACxC,IAAI,KAAK,KAAK,SAAS,EAAE;YACxB,OAAO,KAAK,CAAA;SACZ;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAA;QACzC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACpC,OAAO,QAAQ,CAAA;IAChB,CAAC;CACD;AAZD,oCAYC;AAED,MAAa,WAAW;IAGvB;QAFQ,iBAAY,GAAG,IAAI,YAAY,EAAE,CAAA;IAEnB,CAAC;IAEhB,MAAM,CAAC,IAAc,EAAE,SAAS,GAAG,OAAO;QAChD,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACpD,CAAC;CACD;AARD,kCAQC;AAED,MAAa,IAAI;IAGhB,YACiB,IAAc,EACb,YAA0B,EAC3B,YAAY,OAAO;QAFnB,SAAI,GAAJ,IAAI,CAAU;QACb,iBAAY,GAAZ,YAAY,CAAc;QAC3B,cAAS,GAAT,SAAS,CAAU;QALpB,UAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;IAMvC,CAAC;IAEG,IAAI;QACV,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9B,OAAO,CAAC,GAAG,EAAE,CAAA;QACb,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC5D,CAAC;IAEM,GAAG,CAAC,IAAY;QACtB,OAAO,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IACzE,CAAC;IAEO,WAAW;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAElD,sDAAsD;QACtD,IAAI,KAAK,CAAC,MAAM,GAAG,qBAAqB,EAAE;YACzC,OAAO,KAAK,CAAA;SACZ;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC/D,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,qBAAqB,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,KAAK,CAAA;IAClF,CAAC;CACD;AA7BD,oBA6BC"}
|
|
@@ -110,8 +110,8 @@ class RelationFetcher {
|
|
|
110
110
|
objectArgs.orderBy[0]._randomSeeded === undefined;
|
|
111
111
|
if (hasWhere || hasFieldOrderBy) {
|
|
112
112
|
const path = this.pathFactory.create([]);
|
|
113
|
-
qb = qb.join(targetEntity.tableName, path.
|
|
114
|
-
path.
|
|
113
|
+
qb = qb.join(targetEntity.tableName, path.alias, condition => condition.compareColumns(['junction_', column.targetColumn.columnName], database_1.Operator.eq, [
|
|
114
|
+
path.alias,
|
|
115
115
|
targetEntity.primaryColumn,
|
|
116
116
|
]));
|
|
117
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationFetcher.js","sourceRoot":"","sources":["../../../../src/mapper/select/RelationFetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RelationFetcher.js","sourceRoot":"","sources":["../../../../src/mapper/select/RelationFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export declare class SelectBuilder {
|
|
|
26
26
|
[key: string]: SelectExecutionHandler<any>;
|
|
27
27
|
}, pathFactory: PathFactory);
|
|
28
28
|
execute(db: Client): Promise<SelectRow[]>;
|
|
29
|
-
select(mapper: Mapper, entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, path: Path, groupBy?: string):
|
|
29
|
+
select(mapper: Mapper, entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, path: Path, groupBy?: string): void;
|
|
30
30
|
private selectInternal;
|
|
31
31
|
private getColumnValues;
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAuB,aAAa,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAiC,MAAM,0BAA0B,CAAA;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAa,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAG7D,qBAAa,aAAa;IASxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAhB7B,OAAO,CAAC,QAAQ,CAEf;IACD,SAAgB,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAoD;IAE9F,OAAO,CAAC,YAAY,CAAmC;gBAGrC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW,EACjC,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC,EAClC,QAAQ,EAAE,cAAc,EACxB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;KAAE,EAC9D,WAAW,EAAE,WAAW;IAG7B,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"SelectBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAuB,aAAa,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAiC,MAAM,0BAA0B,CAAA;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAa,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAG7D,qBAAa,aAAa;IASxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAhB7B,OAAO,CAAC,QAAQ,CAEf;IACD,SAAgB,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAoD;IAE9F,OAAO,CAAC,YAAY,CAAmC;gBAGrC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW,EACjC,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC,EAClC,QAAQ,EAAE,cAAc,EACxB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;KAAE,EAC9D,WAAW,EAAE,WAAW;IAG7B,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAW/C,MAAM,CACZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EACvC,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,MAAM;IA8BjB,OAAO,CAAC,cAAc;YA0DR,eAAe;CAM7B"}
|
|
@@ -33,8 +33,8 @@ class SelectBuilder {
|
|
|
33
33
|
this.resolver(result);
|
|
34
34
|
return result;
|
|
35
35
|
}
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
select(mapper, entity, input, path, groupBy) {
|
|
37
|
+
this.selectInternal(mapper, entity, path, input);
|
|
38
38
|
const where = input.args.filter;
|
|
39
39
|
if (where) {
|
|
40
40
|
this.qb = this.whereBuilder.build(this.qb, entity, path, where);
|
|
@@ -42,7 +42,7 @@ class SelectBuilder {
|
|
|
42
42
|
const orderBy = input.args.orderBy || [];
|
|
43
43
|
if (groupBy) {
|
|
44
44
|
const groupByColumn = (0, schema_utils_1.getColumnName)(this.schema, entity, groupBy);
|
|
45
|
-
this.queryWrapper = new database_1.LimitByGroupWrapper([path.
|
|
45
|
+
this.queryWrapper = new database_1.LimitByGroupWrapper([path.alias, groupByColumn], (orderable, qb) => {
|
|
46
46
|
if (orderBy.length > 0) {
|
|
47
47
|
[qb, orderable] = this.orderByBuilder.build(qb, orderable, entity, this.pathFactory.create([]), orderBy);
|
|
48
48
|
}
|
|
@@ -55,9 +55,8 @@ class SelectBuilder {
|
|
|
55
55
|
}
|
|
56
56
|
this.qb = this.qb.limit(input.args.limit, input.args.offset);
|
|
57
57
|
}
|
|
58
|
-
await promise;
|
|
59
58
|
}
|
|
60
|
-
|
|
59
|
+
selectInternal(mapper, entity, path, input) {
|
|
61
60
|
if (!input.fields.find(it => it.name === entity.primary && it.alias === entity.primary)) {
|
|
62
61
|
input = input.withField(new inputProcessing_1.FieldNode(entity.primary, entity.primary, {}));
|
|
63
62
|
}
|
|
@@ -109,12 +108,10 @@ class SelectBuilder {
|
|
|
109
108
|
}
|
|
110
109
|
}
|
|
111
110
|
async getColumnValues(columnPath, columnName) {
|
|
112
|
-
this.qb = this.qb.select([columnPath.back().
|
|
111
|
+
this.qb = this.qb.select([columnPath.back().alias, columnName], columnPath.alias);
|
|
113
112
|
const rows = await this.rows;
|
|
114
|
-
const columnAlias = columnPath.
|
|
115
|
-
return rows
|
|
116
|
-
.map((it) => it[columnAlias])
|
|
117
|
-
.filter((val, index, all) => all.indexOf(val) === index);
|
|
113
|
+
const columnAlias = columnPath.alias;
|
|
114
|
+
return Array.from(new Set(rows.map((it) => it[columnAlias])));
|
|
118
115
|
}
|
|
119
116
|
}
|
|
120
117
|
exports.SelectBuilder = SelectBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":";;;AACA,0DAA2E;AAI3E,kDAAmG;AAMnG,2DAA6D;AAC7D,uCAAyC;AAEzC,MAAa,aAAa;IAQzB,YACkB,MAAoB,EACpB,YAA0B,EAC1B,cAA8B,EAC9B,WAAwB,EACjC,EAA2C,EAClC,QAAwB,EACxB,oBAA0C,EAC1C,cAA8D,EAC9D,WAAwB;QARxB,WAAM,GAAN,MAAM,CAAc;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACjC,OAAE,GAAF,EAAE,CAAyC;QAClC,aAAQ,GAAR,QAAQ,CAAgB;QACxB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgD;QAC9D,gBAAW,GAAX,WAAW,CAAa;QAhBlC,aAAQ,GAAiC,GAAG,EAAE;YACrD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC3D,CAAC,CAAA;QACe,SAAI,GAAyB,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAA;QAEtF,iBAAY,GAA+B,IAAI,CAAA;IAYpD,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EAAU;QAC9B,IAAI,MAAmB,CAAA;QACvB,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;SACvD;aAAM;YACN,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;SACpC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACrB,OAAO,MAAM,CAAA;IACd,CAAC;IAEM,
|
|
1
|
+
{"version":3,"file":"SelectBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,12 @@ export declare class SelectHydrator {
|
|
|
4
4
|
private columns;
|
|
5
5
|
private promises;
|
|
6
6
|
addColumn(path: Path): void;
|
|
7
|
-
addPromise(path: Path, parentKeyPath: Path, data:
|
|
7
|
+
addPromise(path: Path, parentKeyPath: Path, data: Promise<SelectNestedData>, defaultValue: SelectNestedDefaultValue): void;
|
|
8
8
|
hydrateGroups(rows: SelectRow[], groupBy: string): Promise<SelectGroupedObjects>;
|
|
9
9
|
hydrateAll(rows: SelectRow[]): Promise<SelectResultObject[]>;
|
|
10
10
|
hydrateAll(rows: SelectRow[], indexBy: string): Promise<SelectIndexedResultObjects>;
|
|
11
11
|
private hydrateRow;
|
|
12
|
+
private resolveDataPromises;
|
|
12
13
|
private formatValue;
|
|
13
14
|
}
|
|
14
15
|
export declare type SelectRow = {
|