@contember/engine-content-api 1.1.0-beta.1 → 1.1.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/mapper/select/JoinVisitor.js +2 -2
- package/dist/src/mapper/select/JoinVisitor.js.map +1 -1
- package/dist/src/schema/CustomTypesProvider.js +1 -1
- package/dist/src/schema/CustomTypesProvider.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.js +48 -0
- package/dist/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/mapper/select/JoinVisitor.ts +2 -2
- package/src/schema/CustomTypesProvider.ts +1 -1
- package/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.ts +59 -0
|
@@ -45,7 +45,7 @@ class JoinVisitor {
|
|
|
45
45
|
visitManyHasManyOwning(entity, relation, targetEntity) {
|
|
46
46
|
const sourceAlias = this.path.back().alias;
|
|
47
47
|
const targetAlias = this.path.alias;
|
|
48
|
-
const joiningAlias =
|
|
48
|
+
const joiningAlias = this.path.back().for('x_' + this.path.alias).alias;
|
|
49
49
|
return [
|
|
50
50
|
{
|
|
51
51
|
tableName: relation.joiningTable.tableName,
|
|
@@ -67,7 +67,7 @@ class JoinVisitor {
|
|
|
67
67
|
visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
|
|
68
68
|
const sourceAlias = this.path.back().alias;
|
|
69
69
|
const targetAlias = this.path.alias;
|
|
70
|
-
const joiningAlias =
|
|
70
|
+
const joiningAlias = this.path.back().for('x_' + this.path.alias).alias;
|
|
71
71
|
return [
|
|
72
72
|
{
|
|
73
73
|
tableName: targetRelation.joiningTable.tableName,
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"JoinVisitor.js","sourceRoot":"","sources":["../../../../src/mapper/select/JoinVisitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CustomTypesProvider = void 0;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const graphql_utils_1 = require("@contember/graphql-utils");
|
|
6
|
-
const uuidPattern = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[
|
|
6
|
+
const uuidPattern = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;
|
|
7
7
|
/** dashes are optional */
|
|
8
8
|
const isUuid = (value) => {
|
|
9
9
|
return (value.length <= 36 &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomTypesProvider.js","sourceRoot":"","sources":["../../../src/schema/CustomTypesProvider.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AACjD,4DAAmD;AAGnD,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"CustomTypesProvider.js","sourceRoot":"","sources":["../../../src/schema/CustomTypesProvider.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AACjD,4DAAmD;AAGnD,MAAM,WAAW,GAAG,qEAAqE,CAAA;AACzF,0BAA0B;AAC1B,MAAM,MAAM,GAAG,CAAC,KAAa,EAAW,EAAE;IACzC,OAAO,CACN,KAAK,CAAC,MAAM,IAAI,EAAE;QAClB,KAAK,CAAC,MAAM,IAAI,EAAE;QAClB,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,CACjC,CAAA;AACF,CAAC,CAAA;AAED,MAAa,mBAAmB;IAAhC;QACiB,aAAQ,GAAsB,IAAI,2BAAiB,CAAC;YACnE,IAAI,EAAE,MAAM;YACZ,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YAC7B,UAAU,EAAE,GAAG,CAAC,EAAE;gBACjB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;oBAC5C,OAAO,SAAS,CAAA;iBAChB;gBACD,OAAO,GAAG,CAAA;YACX,CAAC;YACD,YAAY,EAAE,SAAS,YAAY,CAAC,GAAG;gBACtC,IAAI,GAAG,CAAC,IAAI,KAAK,cAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;oBACnD,OAAO,SAAS,CAAA;iBAChB;gBACD,OAAO,GAAG,CAAC,KAAK,CAAA;YACjB,CAAC;SACD,CAAC,CAAA;QAEF,iEAAiE;QACjD,aAAQ,GAAsB,IAAI,2BAAiB,CAAC;YACnE,IAAI,EAAE,MAAM;YACZ,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YAC7B,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YAC9B,YAAY,EAAE,SAAS,YAAY,CAAC,GAAG;gBACtC,OAAO,GAAG,CAAC,IAAI,KAAK,cAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;YACxD,CAAC;SACD,CAAC,CAAA;QACc,iBAAY,GAAsB,IAAI,2BAAiB,CAAC;YACvE,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YAC7B,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YAC9B,YAAY,EAAE,SAAS,YAAY,CAAC,GAAG;gBACtC,OAAO,GAAG,CAAC,IAAI,KAAK,cAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;YACxD,CAAC;SACD,CAAC,CAAA;QACc,aAAQ,GAAsB,wBAAQ,CAAA;IACvD,CAAC;CAAA;AApCD,kDAoCC"}
|