npm - @contember/engine-content-api - Versions diffs - 1.2.0-alpha.1 → 1.2.0-alpha.12 - Mend

@contember/engine-content-api 1.2.0-alpha.1 → 1.2.0-alpha.12

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.

Files changed (361) hide show

package/dist/src/mapper/MapperContainer.js CHANGED Viewed

@@ -9,16 +9,19 @@ const mapper_1 = require("../mapper");
 const dic_1 = require("@contember/dic");
 const PaginatedHasManyExecutionHandler_1 = require("../extensions/paginatedHasMany/PaginatedHasManyExecutionHandler");
 const PaginatedHasManyFieldProvider_1 = require("../extensions/paginatedHasMany/PaginatedHasManyFieldProvider");
+const WhereOptimizer_1 = require("./select/optimizer/WhereOptimizer");
+const ConditionOptimizer_1 = require("./select/optimizer/ConditionOptimizer");
 const createMapperContainer = ({ permissions, schema, identityVariables, providers }) => {
     const builder = new dic_1.Builder({})
         .addService('providers', () => providers)
         .addService('variableInjector', () => new acl_1.VariableInjector(schema.model, identityVariables))
-        .addService('predicateFactory', ({ variableInjector }) => new acl_1.PredicateFactory(permissions, variableInjector))
+        .addService('predicateFactory', ({ variableInjector }) => new acl_1.PredicateFactory(permissions, schema.model, variableInjector))
         .addService('predicatesInjector', ({ predicateFactory }) => new acl_1.PredicatesInjector(schema.model, predicateFactory))
         .addService('joinBuilder', () => new select_1.JoinBuilder(schema.model))
         .addService('conditionBuilder', () => new select_1.ConditionBuilder())
         .addService('pathFactory', () => new mapper_1.PathFactory())
-        .addService('whereBuilder', ({ joinBuilder, conditionBuilder, pathFactory }) => new select_1.WhereBuilder(schema.model, joinBuilder, conditionBuilder, pathFactory))
+        .addService('whereOptimized', () => new WhereOptimizer_1.WhereOptimizer(schema.model, new ConditionOptimizer_1.ConditionOptimizer()))
+        .addService('whereBuilder', ({ joinBuilder, conditionBuilder, pathFactory, whereOptimized }) => new select_1.WhereBuilder(schema.model, joinBuilder, conditionBuilder, pathFactory, whereOptimized))
         .addService('orderByBuilder', ({ joinBuilder }) => new select_1.OrderByBuilder(schema.model, joinBuilder))
         .addService('relationFetcher', ({ whereBuilder, orderByBuilder, predicatesInjector, pathFactory }) => new select_1.RelationFetcher(whereBuilder, orderByBuilder, predicatesInjector, pathFactory))
         .addService('fieldsVisitorFactory', ({ relationFetcher, predicateFactory, whereBuilder }) => new select_1.FieldsVisitorFactory(schema.model, relationFetcher, predicateFactory, whereBuilder))
@@ -31,8 +34,8 @@ const createMapperContainer = ({ permissions, schema, identityVariables, provide
         [PaginatedHasManyFieldProvider_1.PaginatedHasManyFieldProvider.extensionName]: paginatedHasManyExecutionHandler,
     }))
         .addService('selectBuilderFactory', ({ whereBuilder, orderByBuilder, fieldsVisitorFactory, metaHandler, selectHandlers, pathFactory }) => new (class {
-        create(qb, hydrator) {
-            return new mapper_1.SelectBuilder(schema.model, whereBuilder, orderByBuilder, metaHandler, qb, hydrator, fieldsVisitorFactory, selectHandlers, pathFactory);
+        create(qb, hydrator, relationPath) {
+            return new mapper_1.SelectBuilder(schema.model, whereBuilder, orderByBuilder, metaHandler, qb, hydrator, fieldsVisitorFactory, selectHandlers, pathFactory, relationPath);
         }
     })())
         .addService('insertBuilderFactory', ({ whereBuilder, pathFactory }) => new mapper_1.InsertBuilderFactory(schema.model, whereBuilder, pathFactory))

package/dist/src/mapper/MapperContainer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MapperContainer.js","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":";;;AAAA,gCAA+E;AAC/E,qCAQiB;AACjB,wDAAwD;AACxD,8CAA8F;AAC9F,sCAekB;AAClB,wCAAwC;AAIxC,sHAAkH;AAClH,gHAA4G;~~AAarG~~,MAAM,qBAAqB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAuB,EAAE,EAAE;IACnH,MAAM,OAAO,GAAG,IAAI,aAAO,CAAC,EAAE,CAAC;SAC7B,UAAU,CAAC,WAAW,EAAE,GAAG,EAAE,CAC7B,SAAS,CAAC;SACV,UAAU,CAAC,kBAAkB,EAAE,GAAG,EAAE,CACpC,IAAI,sBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;SACtD,UAAU,CAAC,kBAAkB,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CACxD,IAAI,sBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;~~SACpD~~,UAAU,CAAC,oBAAoB,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAC1D,IAAI,wBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;SACvD,UAAU,CAAC,aAAa,EAAE,GAAG,EAAE,CAC/B,IAAI,oBAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC9B,UAAU,CAAC,kBAAkB,EAAE,GAAG,EAAE,CACpC,IAAI,yBAAgB,EAAE,CAAC;SACvB,UAAU,CAAC,aAAa,EAAE,GAAG,EAAE,CAC/B,IAAI,oBAAW,EAAE,CAAC;SAClB,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,EAAE,EAAE,~~CAC9E~~,IAAI,qBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;~~SAC3E~~,UAAU,CAAC,gBAAgB,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CACjD,IAAI,uBAAc,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;SAC9C,UAAU,CAAC,iBAAiB,EAAE,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,EAAE,CACpG,IAAI,wBAAe,CAAC,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC;SACnF,UAAU,CAAC,sBAAsB,EAAE,CAAC,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,EAAE,EAAE,CAC3F,IAAI,6BAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;SACxF,UAAU,CAAC,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,gBAAgB,EAAE,EAAE,EAAE,CACjE,IAAI,oBAAW,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;SAChD,UAAU,CAAC,qBAAqB,EAAE,GAAG,EAAE,CACvC,IAAI,qCAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACtC,UAAU,CAAC,wBAAwB,EAAE,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CACjE,IAAI,mDAAsC,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;SAC9E,UAAU,CAAC,kCAAkC,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CACvE,IAAI,mEAAgC,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;SACpE,UAAU,CAAC,gBAAgB,EAAE,CAAC,EAAE,sBAAsB,EAAE,gCAAgC,EAAE,EAAE,EAAE,CAAC,CAAC;QAChG,CAAC,mCAAsB,CAAC,aAAa,CAAC,EAAE,sBAAsB;QAC9D,CAAC,6DAA6B,CAAC,aAAa,CAAC,EAAE,gCAAgC;KAC/E,CAAC,CAAC;SACF,UAAU,CAAC,sBAAsB,EAAE,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,oBAAoB,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,EAAE,EAAE,CACxI,IAAI,CAAC;QACJ,MAAM,CAAC,EAAmB,EAAE,QAAwB;~~YACnD~~,OAAO,IAAI,sBAAa,CACvB,MAAM,CAAC,KAAK,EACZ,YAAY,EACZ,cAAc,EACd,WAAW,EACX,EAAE,EACF,QAAQ,EACR,oBAAoB,EACpB,cAAc,EACd,WAAW,~~CACX~~,CAAA;QACF,CAAC;KACD,CAAC,EAAE,CAAC;SACL,UAAU,CAAC,sBAAsB,EAAE,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,CACrE,IAAI,6BAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;SAClE,UAAU,CAAC,sBAAsB,EAAE,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,CACrE,IAAI,6BAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;SAClE,UAAU,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAC1C,IAAI,+BAAsB,EAAE,CAAC;SAC7B,UAAU,CAAC,2BAA2B,EAAE,CAAC,EAAE,EAAE,EAAE,CAC/C,IAAI,kCAAyB,EAAE,CAAC;SAChC,UAAU,CAAC,sBAAsB,EAAE,CAAC,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,WAAW,EAAE,EAAE,EAAE,CAC1I,IAAI,6BAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,WAAW,CAAC,CAAC;SACvI,UAAU,CAAC,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,CACvG,IAAI,uBAAc,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,oBAAoB,EAAE,WAAW,CAAC,CAAC;SACpG,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,EAAE,EAAE,CACrE,IAAI,gBAAO,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;SAClE,UAAU,CAAC,UAAU,EAAE,CAAC,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,SAAS,EAAE,EAAE,EAAE,CACjF,IAAI,iBAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC;SAC9E,UAAU,CAAC,eAAe,EAAE,CAAC,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE;QACtL,OAAO,CAAC,EAAU,EAAE,EAAE,CACrB,IAAI,eAAM,CACT,MAAM,CAAC,KAAK,EACZ,EAAE,EACF,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,YAAY,EACZ,oBAAoB,EACpB,cAAc,EACd,OAAO,EACP,QAAQ,EACR,WAAW,CACX,CAAA;IACH,CAAC,CAAC,CAAA;IACH,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;AAC7C,CAAC,CAAA;~~AArFY~~,QAAA,qBAAqB,~~yBAqFjC~~"}
1	+ {"version":3,"file":"MapperContainer.js","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/delete/DeleteExecutor.js CHANGED Viewed

@@ -98,8 +98,8 @@ class DeleteExecutor {
             visitManyHasManyOwning: () => null,
             visitOneHasOneInverse: () => null,
             visitOneHasMany: () => null,
-            visitOneHasOneOwning: ({}, relation) => [entity, relation],
-            visitManyHasOne: ({}, relation) => [entity, relation],
+            visitOneHasOneOwning: ({ relation }) => [entity, relation],
+            visitManyHasOne: ({ relation }) => [entity, relation],
         }))
             .reduce((acc, value) => [
             ...acc,
@@ -114,7 +114,7 @@ class DeleteExecutor {
             visitManyHasManyOwning: () => null,
             visitOneHasOneInverse: () => null,
             visitOneHasMany: () => null,
-            visitOneHasOneOwning: ({}, relation, targetEntity) => relation.orphanRemoval ? [targetEntity, relation] : null,
+            visitOneHasOneOwning: ({ relation, targetEntity }) => relation.orphanRemoval ? [targetEntity, relation] : null,
             visitManyHasOne: () => null,
         })).filter((it) => it !== null);
     }

package/dist/src/mapper/delete/DeleteExecutor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DeleteExecutor.js","sourceRoot":"","sources":["../../../../src/mapper/delete/DeleteExecutor.ts"],"names":[],"mappings":"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~~QAAQ,~~EAA6B,EAAE,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC;YACrF,eAAe,EAAE,CAAC,EAAE,EAAE,~~QAAQ,~~EAA6B,EAAE,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC;SAChF,CAAC,CACF;aACA,MAAM,CACN,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;YACf,GAAG,GAAG;YACN,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAC7B,CAAC,EAAE,EAAmC,EAAE,CAAC,EAAE,KAAK,IAAI,CACpD;SACD,EACD,EAAE,CACF;aACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,CAAA;IAC9D,CAAC;IAEO,8BAA8B,CAAC,MAAoB;QAC1D,OAAO,MAAM,CAAC,MAAM,CACnB,IAAA,sCAAuB,EAAsC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE;YACjF,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;YACvB,uBAAuB,EAAE,GAAG,EAAE,CAAC,IAAI;YACnC,sBAAsB,EAAE,GAAG,EAAE,CAAC,IAAI;YAClC,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI;YACjC,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI;YAC3B,oBAAoB,EAAE,CAAC,EAAE,~~EAAE,~~QAAQ,EAAE,YAAY,EAAE,EAAE,CACpD,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;YACzD,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI;SAC3B,CAAC,CACF,CAAC,MAAM,CAAC,CAAC,EAAE,EAAsC,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,CAAA;IAClE,CAAC;CACD;AA7ID,wCA6IC"}
1	+ {"version":3,"file":"DeleteExecutor.js","sourceRoot":"","sources":["../../../../src/mapper/delete/DeleteExecutor.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts CHANGED Viewed

@@ -1,15 +1,17 @@
+import { Input, Model } from '@contember/schema';
 import { Mapper } from '../Mapper';
 import { InsertBuilder } from './InsertBuilder';
 import { Providers } from '@contember/schema-utils';
 import { CreateInputProcessor } from '../../inputProcessing';
-import * as Context from '../../inputProcessing';
 import { MutationResultList } from '../Result';
 export declare class SqlCreateInputProcessor implements CreateInputProcessor<MutationResultList> {
     private readonly insertBuilder;
     private readonly mapper;
     private readonly providers;
     constructor(insertBuilder: InsertBuilder, mapper: Mapper, providers: Providers);
-    column(context: Context.ColumnContext): Promise<MutationResultList>;
+    column(context: Model.ColumnContext & {
+        input: Input.ColumnValue | undefined;
+    }): Promise<MutationResultList>;
     manyHasManyInverse: CreateInputProcessor<MutationResultList>['manyHasManyInverse'];
     manyHasManyOwning: CreateInputProcessor<MutationResultList>['manyHasManyOwning'];
     manyHasOne: CreateInputProcessor<MutationResultList>['manyHasOne'];

package/dist/src/mapper/insert/SqlCreateInputProcessor.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SqlCreateInputProcessor.d.ts","sourceRoot":"","sources":["../../../../src/mapper/insert/SqlCreateInputProcessor.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAsB,MAAM,yBAAyB,CAAA;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;~~AAC5D~~,OAAO,~~KAAK,OAAO,MAAM,uBAAuB,CAAA;AAChD,OAAO,~~EAAgD,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAI5F,qBAAa,uBAAwB,YAAW,oBAAoB,CAAC,kBAAkB,CAAC;IAEtF,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAGzB,MAAM,CAAC,OAAO,EAAE,~~OAAO~~,CAAC,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC;~~IAUhF~~,kBAAkB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC,CAmCjF;IAED,iBAAiB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,mBAAmB,CAAC,CA8B/E;IAED,UAAU,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAC,CA+BjE;IAED,UAAU,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAC,CAwBjE;IAED,eAAe,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,iBAAiB,CAAC,CAiC3E;IAED,gBAAgB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CAwB7E;CACD"}
1	+ {"version":3,"file":"SqlCreateInputProcessor.d.ts","sourceRoot":"","sources":["../../../../src/mapper/insert/SqlCreateInputProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAS,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAsB,MAAM,yBAAyB,CAAA;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAE5D,OAAO,EAAgD,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAI5F,qBAAa,uBAAwB,YAAW,oBAAoB,CAAC,kBAAkB,CAAC;IAEtF,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAGzB,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,GAAG;QAAE,KAAK,EAAE,KAAK,CAAC,WAAW,GAAG,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAUzH,kBAAkB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC,CAmCjF;IAED,iBAAiB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,mBAAmB,CAAC,CA8B/E;IAED,UAAU,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAC,CA+BjE;IAED,UAAU,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,YAAY,CAAC,CAwBjE;IAED,eAAe,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,iBAAiB,CAAC,CAiC3E;IAED,gBAAgB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CAwB7E;CACD"}

package/dist/src/mapper/insert/SqlCreateInputProcessor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SqlCreateInputProcessor.js","sourceRoot":"","sources":["../../../../src/mapper/insert/SqlCreateInputProcessor.ts"],"names":[],"mappings":"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~~OAAsE~~,EAA+B,EAAE;~~gBAC7G~~,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBACrF,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;oBAClE,MAAM,KAAK,GAAG,MAAM,YAAY,CAAA;oBAChC,IAAI,CAAC,KAAK,EAAE;wBACX,OAAO,sBAAW,CAAA;qBAClB;oBACD,OAAO,KAAK,CAAA;gBACb,CAAC,CAAC,CAAA;gBACF,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,EAAE;oBAC1B,OAAO,CAAC,IAAI,mCAA0B,CAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;iBAC1D;gBACD,OAAO,EAAE,CAAA;YACV,CAAC,CACD;YACD,MAAM,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACtE,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC7E,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;oBACxE,MAAM,YAAY,GAAG,MAAM,aAAa,CAAA;oBACxC,MAAM,OAAO,GAAG,IAAA,yBAAgB,EAAC,YAAY,CAAC,CAAA;oBAC9C,IAAI,CAAC,OAAO,EAAE;wBACb,OAAO,sBAAW,CAAA;qBAClB;oBACD,OAAO,OAAO,CAAA;gBACf,CAAC,CAAC,CAAA;gBACF,OAAO,MAAM,aAAa,CAAA;YAC3B,CAAC,CAAC;SACF,CAAA;QAED,qBAAgB,GAAiE;YAChF,OAAO,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACvE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBAC7C,IAAI,CAAC,KAAK,EAAE;oBACX,OAAO,EAAE,CAAA;iBACT;gBACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,EAAE;oBACpE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;wBAC9B,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE;qBAC5C;iBACD,CAAC,CAAA;YACH,CAAC,CAAC;YACF,MAAM,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACtE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBAC/C,IAAI,CAAC,OAAO,EAAE;oBACb,OAAO,EAAE,CAAA;iBACT;gBACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;oBACrD,GAAG,OAAO,CAAC,KAAK;oBAChB,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;wBAC9B,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE;qBAC9C;iBACD,CAAC,CAAA;YACH,CAAC,CAAC;SACF,CAAA;IAvME,CAAC;IAEG,KAAK,CAAC,MAAM,CAAC,~~OAA8B~~;~~QACjD~~,IAAI,CAAC,aAAa,CAAC,aAAa,CAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,EACnB,CAAC,GAA0D,EAAE;YAC5D,OAAO,IAAA,iCAAkB,EAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACnD,CAAC,CAAC,EAAE,CACJ,CAAA;QACD,OAAO,EAAE,CAAA;IACV,CAAC;CA8LD;AA7MD,0DA6MC"}
1	+ {"version":3,"file":"SqlCreateInputProcessor.js","sourceRoot":"","sources":["../../../../src/mapper/insert/SqlCreateInputProcessor.ts"],"names":[],"mappings":";;;AAGA,0DAAuE;AAGvE,sCAA4F;AAC5F,wEAA8E;AAC9E,yCAAwC;AAExC,MAAa,uBAAuB;IACnC,YACkB,aAA4B,EAC5B,MAAc,EACd,SAAoB;QAFpB,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAQ;QACd,cAAS,GAAT,SAAS,CAAW;QAatC,uBAAkB,GAAmE;YACpF,OAAO,EAAE,IAAA,0CAAgB,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACxE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBACtD,IAAI,CAAC,cAAc,EAAE;oBACpB,OAAO,EAAE,CAAA;iBACT;gBACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC5F,IAAI,CAAC,aAAa,EAAE;oBACnB,OAAO,CAAC,IAAI,mCAA0B,CAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;iBAC1D;gBACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CACvC,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,cAAc,EACtB,aAAa,EACb,cAAc,CACd,CAAA;YACF,CAAC,CAAC;YACF,MAAM,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACtE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBACtD,IAAI,CAAC,cAAc,EAAE;oBACpB,OAAO,EAAE,CAAA;iBACT;gBACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAClF,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,YAAY,CAAC,CAAA;gBACpD,IAAI,aAAa,EAAE;oBAClB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CACtD,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,cAAc,EACtB,aAAa,EACb,cAAc,CACd,CAAA;oBACD,OAAO,CAAC,GAAG,YAAY,EAAE,GAAG,aAAa,CAAC,CAAA;iBAC1C;gBACD,OAAO,YAAY,CAAA;YACpB,CAAC,CAAC;SACF,CAAA;QAED,sBAAiB,GAAkE;YAClF,OAAO,EAAE,IAAA,0CAAgB,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACxE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBAC/C,IAAI,CAAC,OAAO,EAAE;oBACb,OAAO,EAAE,CAAA;iBACT;gBACD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC7F,IAAI,CAAC,cAAc,EAAE;oBACpB,OAAO,CAAC,IAAI,mCAA0B,CAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;iBAC1D;gBACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,CAAA;YACpG,CAAC,CAAC;YACF,MAAM,EAAE,IAAA,0CAAgB,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACvE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBAC/C,IAAI,CAAC,OAAO,EAAE;oBACb,OAAO,EAAE,CAAA;iBACT;gBACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAClF,MAAM,cAAc,GAAG,IAAA,yBAAgB,EAAC,YAAY,CAAC,CAAA;gBACrD,IAAI,cAAc,EAAE;oBACnB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CACtD,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,QAAQ,EAChB,OAAO,EACP,cAAc,CACd,CAAA;oBACD,OAAO,CAAC,GAAG,YAAY,EAAE,GAAG,aAAa,CAAC,CAAA;iBAC1C;gBACD,OAAO,YAAY,CAAA;YACpB,CAAC,CAAC;SACF,CAAA;QAED,eAAU,GAA2D;YACpE,OAAO,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;gBACpB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;gBACzD,OAAO,EAAE,CAAA;YACV,CAAC;YACD,OAAO,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACvE,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBACrF,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;oBAClE,MAAM,KAAK,GAAG,MAAM,YAAY,CAAA;oBAChC,IAAI,CAAC,KAAK,EAAE;wBACX,OAAO,sBAAW,CAAA;qBAClB;oBACD,OAAO,KAAK,CAAA;gBACb,CAAC,CAAC,CAAA;gBACF,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,EAAE;oBAC1B,OAAO,CAAC,IAAI,mCAA0B,CAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;iBAC1D;gBACD,OAAO,EAAE,CAAA;YACV,CAAC,CAAC;YACF,MAAM,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACtE,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC7E,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;oBACxE,MAAM,YAAY,GAAG,MAAM,aAAa,CAAA;oBACxC,MAAM,OAAO,GAAG,IAAA,yBAAgB,EAAC,YAAY,CAAC,CAAA;oBAC9C,IAAI,CAAC,OAAO,EAAE;wBACb,OAAO,sBAAW,CAAA;qBAClB;oBACD,OAAO,OAAO,CAAA;gBACf,CAAC,CAAC,CAAA;gBACF,OAAO,MAAM,aAAa,CAAA;YAC3B,CAAC,CAAC;SACF,CAAA;QAED,eAAU,GAA2D;YACpE,OAAO,EAAE,IAAA,0CAAgB,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACxE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBAC/C,IAAI,CAAC,OAAO,EAAE;oBACb,OAAO,EAAE,CAAA;iBACT;gBACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,EAAE;oBACpE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;wBAC9B,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE;qBAC9C;iBACD,CAAC,CAAA;YACH,CAAC,CAAC;YACF,MAAM,EAAE,IAAA,0CAAgB,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACvE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBAC/C,IAAI,CAAC,OAAO,EAAE;oBACb,OAAO,EAAE,CAAA;iBACT;gBACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;oBACrD,GAAG,OAAO,CAAC,KAAK;oBAChB,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;wBAC9B,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE;qBAC9C;iBACD,CAAC,CAAA;YACH,CAAC,CAAC;SACF,CAAA;QAED,oBAAe,GAAgE;YAC9E,OAAO,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;gBACpB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;gBACzD,OAAO,EAAE,CAAA;YACV,CAAC;YACD,OAAO,EAAE,IAAA,yCAAe,EACvB,KAAK,EAAE,OAAoE,EAA+B,EAAE;gBAC3G,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBACrF,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;oBAClE,MAAM,KAAK,GAAG,MAAM,YAAY,CAAA;oBAChC,IAAI,CAAC,KAAK,EAAE;wBACX,OAAO,sBAAW,CAAA;qBAClB;oBACD,OAAO,KAAK,CAAA;gBACb,CAAC,CAAC,CAAA;gBACF,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,EAAE;oBAC1B,OAAO,CAAC,IAAI,mCAA0B,CAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;iBAC1D;gBACD,OAAO,EAAE,CAAA;YACV,CAAC,CACD;YACD,MAAM,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACtE,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC7E,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;oBACxE,MAAM,YAAY,GAAG,MAAM,aAAa,CAAA;oBACxC,MAAM,OAAO,GAAG,IAAA,yBAAgB,EAAC,YAAY,CAAC,CAAA;oBAC9C,IAAI,CAAC,OAAO,EAAE;wBACb,OAAO,sBAAW,CAAA;qBAClB;oBACD,OAAO,OAAO,CAAA;gBACf,CAAC,CAAC,CAAA;gBACF,OAAO,MAAM,aAAa,CAAA;YAC3B,CAAC,CAAC;SACF,CAAA;QAED,qBAAgB,GAAiE;YAChF,OAAO,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACvE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBAC7C,IAAI,CAAC,KAAK,EAAE;oBACX,OAAO,EAAE,CAAA;iBACT;gBACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,EAAE;oBACpE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;wBAC9B,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE;qBAC5C;iBACD,CAAC,CAAA;YACH,CAAC,CAAC;YACF,MAAM,EAAE,IAAA,yCAAe,EAAC,KAAK,EAAE,OAAO,EAA+B,EAAE;gBACtE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAA;gBAC/C,IAAI,CAAC,OAAO,EAAE;oBACb,OAAO,EAAE,CAAA;iBACT;gBACD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;oBACrD,GAAG,OAAO,CAAC,KAAK;oBAChB,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;wBAC9B,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE;qBAC9C;iBACD,CAAC,CAAA;YACH,CAAC,CAAC;SACF,CAAA;IAvME,CAAC;IAEG,KAAK,CAAC,MAAM,CAAC,OAAuE;QAC1F,IAAI,CAAC,aAAa,CAAC,aAAa,CAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,EACnB,CAAC,GAA0D,EAAE;YAC5D,OAAO,IAAA,iCAAkB,EAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACnD,CAAC,CAAC,EAAE,CACJ,CAAA;QACD,OAAO,EAAE,CAAA;IACV,CAAC;CA8LD;AA7MD,0DA6MC"}

package/dist/src/mapper/select/JoinVisitor.d.ts CHANGED Viewed

@@ -3,12 +3,12 @@ import { Path } from './Path';
 export declare class JoinVisitor implements Model.RelationByTypeVisitor<JoinDefinition[]> {
     private readonly path;
     constructor(path: Path);
-    visitOneHasOneOwning(entity: Model.Entity, relation: Model.OneHasOneOwningRelation, targetEntity: Model.Entity): JoinDefinition[];
-    visitOneHasOneInverse(entity: Model.Entity, relation: Model.OneHasOneInverseRelation, targetEntity: Model.Entity, targetRelation: Model.OneHasOneOwningRelation): JoinDefinition[];
-    visitManyHasOne(entity: Model.Entity, relation: Model.ManyHasOneRelation, targetEntity: Model.Entity): JoinDefinition[];
-    visitOneHasMany(entity: Model.Entity, relation: Model.OneHasManyRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation): JoinDefinition[];
-    visitManyHasManyOwning(entity: Model.Entity, relation: Model.ManyHasManyOwningRelation, targetEntity: Model.Entity): JoinDefinition[];
-    visitManyHasManyInverse(entity: Model.Entity, relation: Model.ManyHasManyInverseRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation): JoinDefinition[];
+    visitOneHasOneOwning({ targetEntity, relation }: Model.OneHasOneOwningContext): JoinDefinition[];
+    visitOneHasOneInverse({ targetEntity, entity, targetRelation }: Model.OneHasOneInverseContext): JoinDefinition[];
+    visitManyHasOne({ targetEntity, relation }: Model.ManyHasOneContext): JoinDefinition[];
+    visitOneHasMany({ targetEntity, targetRelation, entity }: Model.OneHasManyContext): JoinDefinition[];
+    visitManyHasManyOwning({ relation, entity, targetEntity }: Model.ManyHasManyOwningContext): JoinDefinition[];
+    visitManyHasManyInverse({ targetRelation, entity, targetEntity }: Model.ManyHasManyInverseContext): JoinDefinition[];
 }
 export interface JoinDefinition {
     sourceAlias?: string;

package/dist/src/mapper/select/JoinVisitor.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JoinVisitor.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/JoinVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,qBAAa,WAAY,YAAW,KAAK,CAAC,qBAAqB,CAAC,cAAc,EAAE,CAAC;IACpE,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAEvC,oBAAoB,~~CACnB~~,~~MAAM,~~EAAE,~~KAAK~~,~~CAAC~~,~~MAAM,EACpB,~~QAAQ,EAAE,~~KAAK,CAAC,uBAAuB,EACvC,YAAY,~~EAAE,KAAK,CAAC,~~MAAM~~,~~GACxB~~,cAAc,EAAE;~~IAUnB~~,qBAAqB,~~CACpB,MAAM,EAAE,KAAK,~~CAAC,~~MAAM,EACpB,QAAQ,~~EAAE,~~KAAK,CAAC,wBAAwB,EACxC,~~YAAY,EAAE,~~KAAK,CAAC,~~MAAM,~~EAC1B~~,cAAc,EAAE,KAAK,CAAC,uBAAuB,~~GAC3C~~,cAAc,EAAE;~~IAUnB~~,eAAe,~~CACd~~,~~MAAM,~~EAAE,~~KAAK~~,~~CAAC~~,~~MAAM,EACpB,~~QAAQ,EAAE,~~KAAK,CAAC,kBAAkB,EAClC,YAAY,~~EAAE,KAAK,CAAC,~~MAAM~~,~~GACxB~~,cAAc,EAAE;~~IAUnB~~,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~~,cAAc,EAAE;~~IAWnB~~,sBAAsB,~~CACrB~~,~~MAAM,~~EAAE,~~KAAK~~,~~CAAC~~,MAAM,~~EACpB,QAAQ,~~EAAE,~~KAAK,CAAC,yBAAyB,EACzC,~~YAAY,EAAE,KAAK,CAAC,~~MAAM~~,~~GACxB~~,cAAc,EAAE;~~IAuBnB~~,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~~,cAAc,EAAE;~~CAsBnB~~;AAED,MAAM,WAAW,cAAc;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,IAAI,CAAA;CACX"}
1	+ {"version":3,"file":"JoinVisitor.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/JoinVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,qBAAa,WAAY,YAAW,KAAK,CAAC,qBAAqB,CAAC,cAAc,EAAE,CAAC;IACpE,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAEvC,oBAAoB,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,sBAAsB,GAAG,cAAc,EAAE;IAUhG,qBAAqB,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,KAAK,CAAC,uBAAuB,GAAG,cAAc,EAAE;IAUhH,eAAe,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,iBAAiB,GAAG,cAAc,EAAE;IAUtF,eAAe,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,iBAAiB,GAAG,cAAc,EAAE;IAWpG,sBAAsB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,KAAK,CAAC,wBAAwB,GAAG,cAAc,EAAE;IAuB5G,uBAAuB,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,KAAK,CAAC,yBAAyB,GAAG,cAAc,EAAE;CAsBpH;AAED,MAAM,WAAW,cAAc;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,IAAI,CAAA;CACX"}

package/dist/src/mapper/select/JoinVisitor.js CHANGED Viewed

@@ -5,7 +5,7 @@ class JoinVisitor {
     constructor(path) {
         this.path = path;
     }
-    visitOneHasOneOwning(entity, relation, targetEntity) {
+    visitOneHasOneOwning({ targetEntity, relation }) {
         return [
             {
                 tableName: targetEntity.tableName,
@@ -14,7 +14,7 @@ class JoinVisitor {
             },
         ];
     }
-    visitOneHasOneInverse(entity, relation, targetEntity, targetRelation) {
+    visitOneHasOneInverse({ targetEntity, entity, targetRelation }) {
         return [
             {
                 tableName: targetEntity.tableName,
@@ -23,7 +23,7 @@ class JoinVisitor {
             },
         ];
     }
-    visitManyHasOne(entity, relation, targetEntity) {
+    visitManyHasOne({ targetEntity, relation }) {
         return [
             {
                 tableName: targetEntity.tableName,
@@ -32,7 +32,7 @@ class JoinVisitor {
             },
         ];
     }
-    visitOneHasMany(entity, relation, targetEntity, targetRelation) {
+    visitOneHasMany({ targetEntity, targetRelation, entity }) {
         return [
             {
                 tableName: targetEntity.tableName,
@@ -42,7 +42,7 @@ class JoinVisitor {
             },
         ];
     }
-    visitManyHasManyOwning(entity, relation, targetEntity) {
+    visitManyHasManyOwning({ relation, entity, targetEntity }) {
         const sourceAlias = this.path.back().alias;
         const targetAlias = this.path.alias;
         const joiningAlias = this.path.back().for('x_' + this.path.alias).alias;
@@ -64,7 +64,7 @@ class JoinVisitor {
             },
         ];
     }
-    visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
+    visitManyHasManyInverse({ targetRelation, entity, targetEntity }) {
         const sourceAlias = this.path.back().alias;
         const targetAlias = this.path.alias;
         const joiningAlias = this.path.back().for('x_' + this.path.alias).alias;

package/dist/src/mapper/select/JoinVisitor.js.map CHANGED Viewed

	@@ -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,KAAK,CAAA;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAA;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAA;QACvE,OAAO;YACN;gBACC,SAAS,EAAE,QAAQ,CAAC,YAAY,CAAC,SAAS;gBAC1C,WAAW,EAAE,WAAW;gBACxB,WAAW,EAAE,YAAY;gBACzB,YAAY,EAAE,MAAM,CAAC,aAAa;gBAClC,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU;gBAC5D,IAAI,EAAE,IAAI;aACV;YACD;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,WAAW,EAAE,YAAY;gBACzB,WAAW,EAAE,WAAW;gBACxB,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,UAAU;gBACnE,YAAY,EAAE,YAAY,CAAC,aAAa;aACxC;SACD,CAAA;IACF,CAAC;IAED,uBAAuB,~~CACtB~~,~~MAAoB~~,~~EACpB~~,~~QAA0C~~,~~EAC1C~~,~~YAA0B~~,~~EAC1B~~,~~cAA+C~~;~~QAE/C~~,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAA;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAA;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAA;QACvE,OAAO;YACN;gBACC,SAAS,EAAE,cAAc,CAAC,YAAY,CAAC,SAAS;gBAChD,WAAW,EAAE,WAAW;gBACxB,WAAW,EAAE,YAAY;gBACzB,YAAY,EAAE,MAAM,CAAC,aAAa;gBAClC,YAAY,EAAE,cAAc,CAAC,YAAY,CAAC,oBAAoB,CAAC,UAAU;gBACzE,IAAI,EAAE,IAAI;aACV;YACD;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,WAAW,EAAE,YAAY;gBACzB,WAAW,EAAE,WAAW;gBACxB,YAAY,EAAE,cAAc,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU;gBAClE,YAAY,EAAE,YAAY,CAAC,aAAa;aACxC;SACD,CAAA;IACF,CAAC;CACD;~~AApHD~~,~~kCAoHC~~"}
1	+ {"version":3,"file":"JoinVisitor.js","sourceRoot":"","sources":["../../../../src/mapper/select/JoinVisitor.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/select/RelationFetcher.d.ts CHANGED Viewed

@@ -4,23 +4,50 @@ import { Input, Model } from '@contember/schema';
 import { OrderByBuilder } from './OrderByBuilder';
 import { PredicatesInjector } from '../../acl';
 import { ObjectNode } from '../../inputProcessing';
-import { JoiningColumns } from '../types';
 import { SelectGroupedObjects } from './SelectHydrator';
 import { Mapper } from '../Mapper';
 export declare type GroupedCounts = Record<Input.PrimaryValue, number>;
+declare type CountOneHasManyGroupsArgs = {
+    mapper: Mapper;
+    filter: Input.OptionalWhere | undefined;
+    relationPath: Model.AnyRelationContext[];
+    relationContext: Model.OneHasManyContext;
+    ids: Input.PrimaryValue[];
+};
+declare type FetchOneHasManyGroupsArgs = {
+    mapper: Mapper;
+    objectNode: ObjectNode<Input.ListQueryInput>;
+    relationPath: Model.AnyRelationContext[];
+    relationContext: Model.OneHasManyContext;
+    ids: Input.PrimaryValue[];
+};
+declare type ManyHasManyBaseArgs = {
+    mapper: Mapper;
+    ids: Input.PrimaryValue[];
+    relationPath: Model.AnyRelationContext[];
+    relationContext: Model.ManyHasManyInverseContext | Model.ManyHasManyOwningContext;
+};
+declare type CountManyHasManyGroupArgs = ManyHasManyBaseArgs & {
+    filter: Input.OptionalWhere | undefined;
+};
+declare type FetchManyHasManyGroupsArgs = ManyHasManyBaseArgs & {
+    field: ObjectNode<Input.ListQueryInput>;
+};
 export declare class RelationFetcher {
     private readonly whereBuilder;
     private readonly orderBuilder;
     private readonly predicateInjector;
     private readonly pathFactory;
     constructor(whereBuilder: WhereBuilder, orderBuilder: OrderByBuilder, predicateInjector: PredicatesInjector, pathFactory: PathFactory);
-    countOneHasManyGroups(mapper: Mapper, filter: Input.OptionalWhere | undefined, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation, ids: Input.PrimaryValue[]): Promise<GroupedCounts>;
-    fetchOneHasManyGroups(mapper: Mapper, objectNode: ObjectNode<Input.ListQueryInput>, targetEntity: Model.Entity, relation: Model.OneHasManyRelation, targetRelation: Model.ManyHasOneRelation, ids: Input.PrimaryValue[]): Promise<SelectGroupedObjects>;
+    countOneHasManyGroups({ mapper, filter, relationContext, relationPath, ids, }: CountOneHasManyGroupsArgs): Promise<GroupedCounts>;
+    fetchOneHasManyGroups({ mapper, objectNode, relationContext, relationPath, ids, }: FetchOneHasManyGroupsArgs): Promise<SelectGroupedObjects>;
     private createOneHasManyFilter;
-    countManyHasManyGroups(mapper: Mapper, filter: Input.OptionalWhere | undefined, targetEntity: Model.Entity, owningRelation: Model.ManyHasManyOwningRelation, ids: Input.PrimaryValue[], joiningColumns: JoiningColumns): Promise<GroupedCounts>;
-    fetchManyHasManyGroups(mapper: Mapper, field: ObjectNode<Input.ListQueryInput>, targetEntity: Model.Entity, fromRelation: Model.ManyHasManyOwningRelation | Model.ManyHasManyInverseRelation, owningRelation: Model.ManyHasManyOwningRelation, joiningColumns: JoiningColumns, ids: Input.PrimaryValue[]): Promise<SelectGroupedObjects>;
+    countManyHasManyGroups({ mapper, filter, relationContext, relationPath, ids, }: CountManyHasManyGroupArgs): Promise<GroupedCounts>;
+    fetchManyHasManyGroups({ mapper, field, relationContext, relationPath, ids, }: FetchManyHasManyGroupsArgs): Promise<SelectGroupedObjects>;
+    private resolveJoiningColumns;
     private buildManyHasManyGroups;
     private fetchJunction;
     private buildJunctionQb;
 }
+export {};
 //# sourceMappingURL=RelationFetcher.d.ts.map

package/dist/src/mapper/select/RelationFetcher.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RelationFetcher.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/RelationFetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAS,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAa,UAAU,EAAE,MAAM,uBAAuB,CAAA;~~AAC7D~~,OAAO,EAAE,~~cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,OAAO,EAAE,~~oBAAoB,EAAiC,MAAM,kBAAkB,CAAA;AACtF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAElC,oBAAY,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;AAE9D,~~qBAAa~~,~~eAAe~~;~~IAE1B~~,~~OAAO~~,~~CAAC~~,~~QAAQ~~,~~CAAC,YAAY~~;~~IAC7B~~,~~OAAO~~,~~CAAC~~,~~QAAQ~~,CAAC,~~YAAY;IAC7B~~,~~OAAO~~,~~CAAC~~,~~QAAQ~~,~~CAAC~~,~~iBAAiB;IAClC~~,~~OAAO~~,CAAC,~~QAAQ~~,~~CAAC~~,~~WAAW~~;~~gBAHX~~,~~YAAY~~,EAAE,~~YAAY~~,~~EAC1B~~,~~YAAY~~,EAAE,~~cAAc~~,~~EAC5B~~,~~iBAAiB~~,EAAE,~~kBAAkB~~,~~EACrC~~,~~WAAW~~,~~EAAE~~,~~WAAW~~;~~IAG7B~~,~~qBAAqB,CACjC,~~MAAM,EAAE,MAAM,~~EACd~~,~~MAAM~~,EAAE,KAAK,CAAC,~~aAAa~~,~~GAAG~~,~~SAAS~~,~~EACvC,~~YAAY,EAAE,KAAK,CAAC,~~MAAM~~,~~EAC1B~~,~~cAAc~~,EAAE,KAAK,CAAC,~~kBAAkB~~,~~EACxC~~,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,~~GACvB~~,~~OAAO~~,~~CAAC~~,~~aAAa~~,~~CAAC~~;~~IAKZ~~,~~qBAAqB,CACjC,~~MAAM,EAAE,MAAM,~~EACd~~,~~UAAU~~,EAAE,~~UAAU,CAAC,~~KAAK,CAAC,~~cAAc~~,~~CAAC~~,~~EAC5C~~,YAAY,EAAE,KAAK,CAAC,~~MAAM~~,~~EAC1B~~,~~QAAQ~~,EAAE,KAAK,CAAC,~~kBAAkB~~,~~EAClC~~,~~cAAc~~,EAAE,KAAK,CAAC,~~kBAAkB~~,~~EACxC,~~GAAG,EAAE,KAAK,CAAC,~~YAAY~~,~~EAAE~~,~~GACvB~~,OAAO,CAAC,~~oBAAoB~~,CAAC;~~IAYhC~~,OAAO,CAAC,~~sBAAsB~~;~~IAejB~~,~~sBAAsB~~,~~CAClC~~,~~MAAM~~,~~EAAE~~,~~MAAM~~,~~EACd~~,~~MAAM~~,~~EAAE~~,~~KAAK,~~CAAC,~~aAAa~~,~~GAAG~~,~~SAAS~~,~~EACvC~~,YAAY,EAAE,~~KAAK~~,~~CAAC~~,~~MAAM~~,~~EAC1B~~,~~cAAc~~,EAAE,~~KAAK~~,CAAC,~~yBAAyB~~,~~EAC/C~~,~~GAAG~~,~~EAAE~~,~~KAAK~~,~~CAAC~~,YAAY,~~EAAE~~,~~EACzB~~,~~cAAc~~,EAAE,~~cAAc~~,~~GAC5B~~,OAAO,CAAC,aAAa,CAAC;~~IAaZ~~,~~sBAAsB~~,~~CAClC~~,MAAM,~~EAAE~~,~~MAAM~~,~~EACd~~,~~KAAK~~,EAAE,~~UAAU~~,~~CAAC~~,~~KAAK~~,CAAC,~~cAAc~~,CAAC,~~EACvC~~,~~YAAY~~,~~EAAE~~,~~KAAK~~,CAAC,MAAM,~~EAC1B~~,YAAY,~~EAAE~~,~~KAAK~~,~~CAAC~~,yBAAyB,GAAG,~~KAAK~~,CAAC,~~0BAA0B~~,~~EAChF~~,~~cAAc~~,~~EAAE,KAAK,~~CAAC,~~yBAAyB~~,~~EAC/C~~,~~cAAc~~,~~EAAE~~,~~cAAc~~,~~EAC9B~~,~~GAAG~~,~~EAAE~~,~~KAAK~~,~~CAAC~~,~~YAAY~~,EAAE,~~GACvB~~,OAAO,CAAC,oBAAoB,CAAC;~~IAkChC~~,OAAO,CAAC,sBAAsB;YAyBhB,aAAa;~~IAiC3B~~,OAAO,CAAC,eAAe;~~CAqCvB~~"}
1	+ {"version":3,"file":"RelationFetcher.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/RelationFetcher.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/select/RelationFetcher.js CHANGED Viewed

@@ -11,15 +11,23 @@ class RelationFetcher {
         this.predicateInjector = predicateInjector;
         this.pathFactory = pathFactory;
     }
-    async countOneHasManyGroups(mapper, filter, targetEntity, targetRelation, ids) {
+    async countOneHasManyGroups({ mapper, filter, relationContext, relationPath, ids, }) {
+        const { targetRelation, targetEntity } = relationContext;
         const filterWithParent = this.createOneHasManyFilter(targetEntity, targetRelation, ids, filter);
-        return mapper.countGrouped(targetEntity, filterWithParent, targetRelation);
+        return mapper.countGrouped(targetEntity, filterWithParent, targetRelation, [
+            ...relationPath,
+            relationContext,
+        ]);
     }
-    async fetchOneHasManyGroups(mapper, objectNode, targetEntity, relation, targetRelation, ids) {
+    async fetchOneHasManyGroups({ mapper, objectNode, relationContext, relationPath, ids, }) {
+        const { relation, targetEntity, targetRelation } = relationContext;
         const filter = this.createOneHasManyFilter(targetEntity, targetRelation, ids, objectNode.args.filter);
         const objectNodeWithWhere = objectNode.withArg('filter', filter);
         const objectNodeWithOrder = OrderByHelper_1.OrderByHelper.appendDefaultOrderBy(targetEntity, objectNodeWithWhere, relation.orderBy || []);
-        return mapper.selectGrouped(targetEntity, objectNodeWithOrder, targetRelation);
+        return mapper.selectGrouped(targetEntity, objectNodeWithOrder, targetRelation, [
+            ...relationPath,
+            relationContext,
+        ]);
     }
     createOneHasManyFilter(targetEntity, targetRelation, ids, filter) {
         const targetRelationFilter = { [targetEntity.primary]: { in: ids } };
@@ -30,8 +38,10 @@ class RelationFetcher {
                 : { and: [filter[targetRelation.name], targetRelationFilter] },
         };
     }
-    async countManyHasManyGroups(mapper, filter, targetEntity, owningRelation, ids, joiningColumns) {
-        const qb = this.buildJunctionQb(owningRelation, ids, joiningColumns, targetEntity, { filter })
+    async countManyHasManyGroups({ mapper, filter, relationContext, relationPath, ids, }) {
+        const owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation;
+        const joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable });
+        const qb = this.buildJunctionQb(owningRelation, ids, joiningColumns, relationContext.targetEntity, { filter }, relationPath)
             .select(['junction_', joiningColumns.sourceColumn.columnName])
             .select(expr => expr.raw('count(*)'), 'row_count')
             .groupBy(['junction_', joiningColumns.sourceColumn.columnName]);
@@ -42,10 +52,13 @@ class RelationFetcher {
         }
         return Object.fromEntries(result);
     }
-    async fetchManyHasManyGroups(mapper, field, targetEntity, fromRelation, owningRelation, joiningColumns, ids) {
-        const defaultOrderBy = fromRelation.orderBy || [];
-        const objectNode = OrderByHelper_1.OrderByHelper.appendDefaultOrderBy(targetEntity, field, defaultOrderBy);
-        const junctionValues = await this.fetchJunction(mapper.db, owningRelation, ids, joiningColumns, targetEntity, objectNode);
+    async fetchManyHasManyGroups({ mapper, field, relationContext, relationPath, ids, }) {
+        const owningRelation = relationContext.type === 'manyHasManyInverse' ? relationContext.targetRelation : relationContext.relation;
+        const joiningColumns = this.resolveJoiningColumns({ relationType: relationContext.type, joiningTable: owningRelation.joiningTable });
+        const defaultOrderBy = relationContext.relation.orderBy || [];
+        const objectNode = OrderByHelper_1.OrderByHelper.appendDefaultOrderBy(relationContext.targetEntity, field, defaultOrderBy);
+        const { targetEntity } = relationContext;
+        const junctionValues = await this.fetchJunction(mapper.db, owningRelation, ids, joiningColumns, targetEntity, objectNode, relationPath);
         if (junctionValues.length === 0) {
             return {};
         }
@@ -61,9 +74,18 @@ class RelationFetcher {
             },
         })
             .withField(primaryField);
-        const result = await mapper.select(targetEntity, queryWithWhere);
+        const result = await mapper.select(targetEntity, queryWithWhere, [...relationPath, relationContext]);
         return this.buildManyHasManyGroups(targetEntity, joiningColumns, result, junctionValues);
     }
+    resolveJoiningColumns({ relationType, joiningTable }) {
+        return relationType === 'manyHasManyOwning' ? {
+            sourceColumn: joiningTable.joiningColumn,
+            targetColumn: joiningTable.inverseJoiningColumn,
+        } : {
+            sourceColumn: joiningTable.inverseJoiningColumn,
+            targetColumn: joiningTable.joiningColumn,
+        };
+    }
     buildManyHasManyGroups(entity, joiningColumns, resultObjects, junctionValues) {
         const dataById = {};
         for (let object of resultObjects) {
@@ -83,9 +105,9 @@ class RelationFetcher {
         }
         return groupedResult;
     }
-    async fetchJunction(db, relation, values, column, targetEntity, object) {
+    async fetchJunction(db, relation, values, column, targetEntity, object, relationPath) {
         const joiningTable = relation.joiningTable;
-        const qb = this.buildJunctionQb(relation, values, column, targetEntity, object.args)
+        const qb = this.buildJunctionQb(relation, values, column, targetEntity, object.args, relationPath)
             .select(['junction_', joiningTable.inverseJoiningColumn.columnName])
             .select(['junction_', joiningTable.joiningColumn.columnName]);
         const wrapper = new database_1.LimitByGroupWrapper(['junction_', column.sourceColumn.columnName], (orderable, qb) => {
@@ -96,7 +118,7 @@ class RelationFetcher {
         }, object.args.offset, object.args.limit);
         return await wrapper.getResult(qb, db);
     }
-    buildJunctionQb(relation, ids, column, targetEntity, objectArgs) {
+    buildJunctionQb(relation, ids, column, targetEntity, objectArgs, relationPath) {
         const joiningTable = relation.joiningTable;
         const whereColumn = column.sourceColumn.columnName;
         let qb = database_1.SelectBuilder.create()
@@ -116,7 +138,7 @@ class RelationFetcher {
             ]));
         }
         if (where && hasWhere) {
-            qb = this.whereBuilder.build(qb, targetEntity, this.pathFactory.create([]), where);
+            qb = this.whereBuilder.build(qb, targetEntity, this.pathFactory.create([]), where, relationPath);
         }
         return qb;
     }

package/dist/src/mapper/select/RelationFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RelationFetcher.js","sourceRoot":"","sources":["../../../../src/mapper/select/RelationFetcher.ts"],"names":[],"mappings":";;;AAEA,kDAA0F;AAI1F,2DAA6D;AAE7D,mDAA+C;~~AAM~~/C,MAAa,eAAe;IAC3B,YACkB,YAA0B,EAC1B,YAA4B,EAC5B,iBAAqC,EACrC,WAAwB;QAHxB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAgB;QAC5B,sBAAiB,GAAjB,iBAAiB,CAAoB;QACrC,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEG,KAAK,CAAC,qBAAqB,~~CACjC~~,~~MAAc~~,~~EACd~~,~~MAAuC~~,~~EACvC~~,~~YAA0B~~,~~EAC1B~~,~~cAAwC~~,~~EACxC~~,~~GAAyB~~;~~QAEzB~~,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;QAC/F,OAAO,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAA;~~IAC3E~~,CAAC;IAEM,KAAK,CAAC,qBAAqB,~~CACjC~~,~~MAAc~~,~~EACd~~,~~UAA4C~~,~~EAC5C~~,~~YAA0B~~,~~EAC1B~~,~~QAAkC~~,~~EAClC~~,~~cAAwC~~,~~EACxC~~,~~GAAyB~~;~~QAEzB~~,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,cAAc,EAAE,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACrG,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,CAAuB,QAAQ,EAAE,MAAM,CAAC,CAAA;QACtF,MAAM,mBAAmB,GAAG,6BAAa,CAAC,oBAAoB,CAC7D,YAAY,EACZ,mBAAmB,EACnB,QAAQ,CAAC,OAAO,IAAI,EAAE,CACtB,CAAA;QAED,OAAO,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAAA;~~IAC/E~~,CAAC;IAEO,sBAAsB,CAC7B,YAA0B,EAC1B,cAAwC,EACxC,GAAyB,EACzB,MAAuC;QAEvC,MAAM,oBAAoB,GAAwB,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAA;QACzF,OAAO;YACN,GAAG,MAAM;YACT,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,cAAc,CAAC,IAAI,CAAC,CAAA;gBACpD,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAE,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,oBAAoB,CAAC,EAA0B;SACxF,CAAA;IACF,CAAC;IAEM,KAAK,CAAC,sBAAsB,~~CAClC~~,~~MAAc~~,~~EACd~~,~~MAAuC~~,~~EACvC~~,~~YAA0B~~,~~EAC1B~~,~~cAA+C~~,~~EAC/C~~,~~GAAyB~~,~~EACzB~~,~~cAA8B~~;~~QAE9B~~,MAAM,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC;~~aAC5F~~,MAAM,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;aAC7D,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC;aACjD,OAAO,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAA;~~QAChE~~,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAA;QACxC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC1C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACvB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAA;SACtF;~~QACD~~,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAEM,KAAK,CAAC,sBAAsB,~~CAClC~~,~~MAAc~~,~~EACd~~,~~KAAuC~~,~~EACvC~~,~~YAA0B~~,~~EAC1B~~,~~YAAgF~~,~~EAChF~~,~~cAA+C~~,~~EAC/C~~,~~cAA8B~~,~~EAC9B~~,~~GAAyB~~;~~QAEzB~~,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,IAAI,EAAE,CAAA;~~QACjD~~,MAAM,UAAU,GAAG,6BAAa,CAAC,oBAAoB,CAAC,YAAY,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;~~QAE1F~~,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAC9C,MAAM,CAAC,EAAE,EACT,cAAc,EACd,GAAG,EACH,cAAc,EACd,YAAY,EACZ,UAAU,~~CACV~~,CAAA;QACD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAChC,OAAO,EAAE,CAAA;SACT;QAED,MAAM,YAAY,GAAG,IAAI,2BAAS,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;QAClF,MAAM,oBAAoB,GAAG,cAAc,CAAC,YAAY,CAAC,UAAU,CAAA;QACnE,MAAM,UAAU,GAAG,cAAc;aAC/B,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;aACnC,MAAM,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,CAAA;QAEvD,MAAM,cAAc,GAAG,UAAU;aAC/B,QAAQ,CAAC;YACT,MAAM,EAAE;gBACP,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;aAC1C;SACD,CAAC;aACD,SAAS,CAAC,YAAY,CAAC,CAAA;QACzB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;~~QAEhE~~,OAAO,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,CAAC,CAAA;IACzF,CAAC;IAEO,sBAAsB,CAC7B,MAAoB,EACpB,cAA8B,EAC9B,aAAmC,EACnC,cAA2B;QAE3B,MAAM,QAAQ,GAAyC,EAAE,CAAA;QACzD,KAAK,IAAI,MAAM,IAAI,aAAa,EAAE;YACjC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAuB,CAAC,GAAG,MAAM,CAAA;SAC/D;QACD,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,UAAU,CAAA;QAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,UAAU,CAAA;QAC3D,MAAM,aAAa,GAAyB,EAAE,CAAA;QAC9C,KAAK,IAAI,IAAI,IAAI,cAAc,EAAE;YAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAuB,CAAC,EAAE;gBAC7D,aAAa,CAAC,IAAI,CAAC,YAAY,CAAuB,CAAC,GAAG,EAAE,CAAA;aAC5D;YACD,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAuB,CAAC,CAAA;YACvE,IAAI,YAAY,EAAE;gBACjB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAuB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;aAC1E;SACD;QACD,OAAO,aAAa,CAAA;IACrB,CAAC;IAEO,KAAK,CAAC,aAAa,CAC1B,EAAU,EACV,QAAyC,EACzC,MAA4B,EAC5B,MAAsB,EACtB,YAA0B,EAC1B,MAAwC;QAExC,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC;~~aAClF~~,MAAM,CAAC,CAAC,WAAW,EAAE,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;aACnE,MAAM,CAAC,CAAC,WAAW,EAAE,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAA;QAC9D,MAAM,OAAO,GAAG,IAAI,8BAAmB,CACtC,CAAC,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EAC7C,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE;YACjB,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE;gBACxB,CAAC,EAAE,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CACxC,EAAE,EACF,SAAS,EACT,YAAY,EACZ,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAC3B,MAAM,CAAC,IAAI,CAAC,OAAO,CACnB,CAAA;aACD;YACD,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;QACvB,CAAC,EACD,MAAM,CAAC,IAAI,CAAC,MAAM,EAClB,MAAM,CAAC,IAAI,CAAC,KAAK,CACjB,CAAA;QAED,OAAO,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IACvC,CAAC;IAEO,eAAe,CACtB,QAAyC,EACzC,GAAyB,EACzB,MAAsB,EACtB,YAA0B,EAC1B,UAAgC;~~QAEhC~~,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;QAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,UAAU,CAAA;QAClD,IAAI,EAAE,GAAG,wBAAa,CAAC,MAAM,EAAE;aAC7B,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,WAAW,CAAC;aACzC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;QAE7D,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;QAClF,MAAM,QAAQ,GAAG,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;QACvD,MAAM,eAAe,GACpB,UAAU,CAAC,OAAO;YAClB,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAC7B,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO;YAC9B,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,SAAS,CAAA;QAElD,IAAI,QAAQ,IAAI,eAAe,EAAE;YAChC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACxC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAC5D,SAAS,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,mBAAQ,CAAC,EAAE,EAAE;gBACpF,IAAI,CAAC,KAAK;gBACV,YAAY,CAAC,aAAa;aAC1B,CAAC,CACF,CAAA;SACD;QAED,IAAI,KAAK,IAAI,QAAQ,EAAE;YACtB,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;~~SAClF~~;QACD,OAAO,EAAE,CAAA;IACV,CAAC;CACD;~~AAlND~~,~~0CAkNC~~"}
1	+ {"version":3,"file":"RelationFetcher.js","sourceRoot":"","sources":["../../../../src/mapper/select/RelationFetcher.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/select/SelectBuilder.d.ts CHANGED Viewed

@@ -19,12 +19,13 @@ export declare class SelectBuilder {
     private readonly fieldsVisitorFactory;
     private readonly selectHandlers;
     private readonly pathFactory;
+    private readonly relationPath;
     private resolver;
     readonly rows: Promise<SelectRow[]>;
     private queryWrapper;
     constructor(schema: Model.Schema, whereBuilder: WhereBuilder, orderByBuilder: OrderByBuilder, metaHandler: MetaHandler, qb: DbSelectBuilder<DbSelectBuilder.Result>, hydrator: SelectHydrator, fieldsVisitorFactory: FieldsVisitorFactory, selectHandlers: {
         [key: string]: SelectExecutionHandler<any>;
-    }, pathFactory: PathFactory);
+    }, pathFactory: PathFactory, relationPath: Model.AnyRelationContext[]);
     execute(db: Client): Promise<SelectRow[]>;
     select(mapper: Mapper, entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, path: Path, groupBy?: string): void;
     private selectInternal;

package/dist/src/mapper/select/SelectBuilder.d.ts.map CHANGED Viewed

	@@ -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;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"}
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;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAjB9B,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,EACxB,YAAY,EAAE,KAAK,CAAC,kBAAkB,EAAE;IAG7C,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;YA2DR,eAAe;CAM7B"}

package/dist/src/mapper/select/SelectBuilder.js CHANGED Viewed

@@ -6,7 +6,7 @@ const database_1 = require("@contember/database");
 const inputProcessing_1 = require("../../inputProcessing");
 const utils_1 = require("../../utils");
 class SelectBuilder {
-    constructor(schema, whereBuilder, orderByBuilder, metaHandler, qb, hydrator, fieldsVisitorFactory, selectHandlers, pathFactory) {
+    constructor(schema, whereBuilder, orderByBuilder, metaHandler, qb, hydrator, fieldsVisitorFactory, selectHandlers, pathFactory, relationPath) {
         this.schema = schema;
         this.whereBuilder = whereBuilder;
         this.orderByBuilder = orderByBuilder;
@@ -16,6 +16,7 @@ class SelectBuilder {
         this.fieldsVisitorFactory = fieldsVisitorFactory;
         this.selectHandlers = selectHandlers;
         this.pathFactory = pathFactory;
+        this.relationPath = relationPath;
         this.resolver = () => {
             throw new Error('SelectBuilder: Resolver called too soon');
         };
@@ -37,7 +38,7 @@ class SelectBuilder {
         this.selectInternal(mapper, entity, path, input);
         const where = input.args.filter;
         if (where) {
-            this.qb = this.whereBuilder.build(this.qb, entity, path, where);
+            this.qb = this.whereBuilder.build(this.qb, entity, path, where, this.relationPath);
         }
         const orderBy = input.args.orderBy || [];
         if (groupBy) {
@@ -73,6 +74,7 @@ class SelectBuilder {
             })();
             const executionContext = {
                 mapper,
+                relationPath: this.relationPath,
                 addData: async (fieldName, cb, defaultValue = null) => {
                     const columnName = (0, schema_utils_1.getColumnName)(this.schema, entity, fieldName);
                     const ids = (await this.getColumnValues(path.for(fieldName), columnName)).filter(it => it !== null);

package/dist/src/mapper/select/SelectBuilder.js.map CHANGED Viewed

	@@ -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,MAAM,CACZ,MAAc,EACd,MAAoB,EACpB,KAAuC,EACvC,IAAU,EACV,OAAgB;QAEhB,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QAChD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAA;QAC/B,IAAI,KAAK,EAAE;YACV,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;~~SAC/D~~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~~AAlID~~,~~sCAkIC~~"}
1	+ {"version":3,"file":"SelectBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/select/SelectBuilderFactory.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
 import { SelectBuilder } from './SelectBuilder';
 import { SelectHydrator } from './SelectHydrator';
 import { SelectBuilder as DbSelectBuilder } from '@contember/database';
+import { Model } from '@contember/schema';
 export interface SelectBuilderFactory {
-    create(qb: DbSelectBuilder<DbSelectBuilder.Result>, hydrator: SelectHydrator): SelectBuilder;
+    create(qb: DbSelectBuilder<DbSelectBuilder.Result>, hydrator: SelectHydrator, relationPath: Model.AnyRelationContext[]): SelectBuilder;
 }
 //# sourceMappingURL=SelectBuilderFactory.d.ts.map