@contember/engine-content-api 1.4.0-rc.1 → 1.4.0-rc.2
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/SelectBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.js +4 -3
- package/dist/src/mapper/select/SelectBuilder.js.map +1 -1
- package/dist/src/mapper/select/SelectHydrator.d.ts +1 -1
- package/dist/src/mapper/select/SelectHydrator.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectHydrator.js +5 -5
- package/dist/src/mapper/select/SelectHydrator.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/acl/relationAcl.test.d.ts +2 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/relationAcl.test.d.ts.map +1 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/relationAcl.test.js +238 -0
- package/dist/tests/cases/integration/graphQlRequests/query/acl/relationAcl.test.js.map +1 -0
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +11 -11
- package/src/mapper/select/SelectBuilder.ts +10 -4
- package/src/mapper/select/SelectHydrator.ts +7 -7
- package/tests/cases/integration/graphQlRequests/query/acl/relationAcl.test.ts +226 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"SelectBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAS,MAAM,mBAAmB,CAAA;AAE5D,OAAO,EAAqB,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC/E,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;AAE7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAE5C,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;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAlBlC,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,EACxC,gBAAgB,EAAE,gBAAgB;IAGvC,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;YAqHR,eAAe;CAQ7B"}
|
|
@@ -100,14 +100,15 @@ class SelectBuilder {
|
|
|
100
100
|
relationPath: this.relationPath,
|
|
101
101
|
addData: async ({ field, dataProvider, defaultValue, predicate }) => {
|
|
102
102
|
if (predicate === false) {
|
|
103
|
-
this.hydrator.addPromise(fieldPath,
|
|
103
|
+
this.hydrator.addPromise(fieldPath, () => null, Promise.resolve({}), defaultValue !== null && defaultValue !== void 0 ? defaultValue : null);
|
|
104
104
|
return;
|
|
105
105
|
}
|
|
106
106
|
const predicateGetter = predicate !== undefined && predicate !== true ? addPredicate(predicate) : null;
|
|
107
107
|
const columnName = (0, schema_utils_1.getColumnName)(this.schema, entity, field);
|
|
108
|
-
|
|
108
|
+
const parentValuePath = path.for(field);
|
|
109
|
+
let ids = await this.getColumnValues(parentValuePath, columnName, predicateGetter);
|
|
109
110
|
const data = ids.length > 0 ? dataProvider(ids) : Promise.resolve({});
|
|
110
|
-
this.hydrator.addPromise(fieldPath,
|
|
111
|
+
this.hydrator.addPromise(fieldPath, row => predicateGetter === null || predicateGetter(row) ? row[parentValuePath.alias] : null, data, defaultValue !== null && defaultValue !== void 0 ? defaultValue : null);
|
|
111
112
|
},
|
|
112
113
|
addColumn: ({ path = fieldPath, predicate, query, valueGetter }) => {
|
|
113
114
|
if (predicate === false) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"SelectBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare class SelectHydrator {
|
|
|
5
5
|
private columns;
|
|
6
6
|
private promises;
|
|
7
7
|
addColumn(path: Path, getValue: ColumnValueGetter): void;
|
|
8
|
-
addPromise(path: Path,
|
|
8
|
+
addPromise(path: Path, getParentValue: ColumnValueGetter<Value.PrimaryValue | null>, data: Promise<SelectNestedData>, defaultValue: SelectNestedDefaultValue): void;
|
|
9
9
|
hydrateGroups(rows: SelectRow[], groupBy: string): Promise<SelectGroupedObjects>;
|
|
10
10
|
hydrateAll(rows: SelectRow[]): Promise<SelectResultObject[]>;
|
|
11
11
|
hydrateAll(rows: SelectRow[], indexBy: string): Promise<SelectIndexedResultObjects>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectHydrator.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/SelectHydrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAkBzC,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,CAAC,GAAG,EAAE,SAAS,KAAK,CAAC,CAAA;AAOpG,qBAAa,cAAc;IAC1B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,QAAQ,CAAqB;IAE9B,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB;IAIjD,UAAU,CAChB,IAAI,EAAE,IAAI,EACV,
|
|
1
|
+
{"version":3,"file":"SelectHydrator.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/SelectHydrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAkBzC,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,CAAC,GAAG,EAAE,SAAS,KAAK,CAAC,CAAA;AAOpG,qBAAa,cAAc;IAC1B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,QAAQ,CAAqB;IAE9B,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB;IAIjD,UAAU,CAChB,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,iBAAiB,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,EAC5D,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAC/B,YAAY,EAAE,wBAAwB;IAK1B,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAahF,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAC5D,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAqBhG,OAAO,CAAC,UAAU;YAwBJ,mBAAmB;IAkBjC,OAAO,CAAC,WAAW;CAMnB;AAED,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,UAAU,CAAA;CAAE,CAAA;AAC3D,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAAA;AAC7C,MAAM,MAAM,0BAA0B,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;CAAE,CAAA;AAC9E,MAAM,MAAM,oBAAoB,GAAG;IAAE,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAAA;CAAE,CAAA;AAClF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,0BAA0B,CAAA;AAChF,MAAM,MAAM,wBAAwB,GAAG,EAAE,GAAG,IAAI,CAAA"}
|
|
@@ -11,8 +11,8 @@ class SelectHydrator {
|
|
|
11
11
|
addColumn(path, getValue) {
|
|
12
12
|
this.columns.push({ path, getValue });
|
|
13
13
|
}
|
|
14
|
-
addPromise(path,
|
|
15
|
-
this.promises.push({ path,
|
|
14
|
+
addPromise(path, getParentValue, data, defaultValue) {
|
|
15
|
+
this.promises.push({ path, getParentValue, data, defaultValue });
|
|
16
16
|
}
|
|
17
17
|
async hydrateGroups(rows, groupBy) {
|
|
18
18
|
const resolved = await this.resolveDataPromises();
|
|
@@ -49,11 +49,11 @@ class SelectHydrator {
|
|
|
49
49
|
const currentObject = path.reduce((obj, part) => (obj[part] = obj[part] || {}), result);
|
|
50
50
|
currentObject[last] = this.formatValue(columnPath.getValue(row));
|
|
51
51
|
}
|
|
52
|
-
for (let { path,
|
|
52
|
+
for (let { path, getParentValue, data, defaultValue } of resolvedData) {
|
|
53
53
|
const pathTmp = [...path.path];
|
|
54
54
|
const last = pathTmp.pop();
|
|
55
55
|
const currentObject = pathTmp.reduce((obj, part) => (obj && obj[part]) || undefined, result);
|
|
56
|
-
const parentValue = row
|
|
56
|
+
const parentValue = getParentValue(row);
|
|
57
57
|
if (currentObject) {
|
|
58
58
|
currentObject[last] = (parentValue ? data[parentValue] : undefined) || defaultValue;
|
|
59
59
|
}
|
|
@@ -63,7 +63,7 @@ class SelectHydrator {
|
|
|
63
63
|
async resolveDataPromises() {
|
|
64
64
|
const results = await Promise.allSettled(this.promises.map(async (it) => ({
|
|
65
65
|
defaultValue: it.defaultValue,
|
|
66
|
-
|
|
66
|
+
getParentValue: it.getParentValue,
|
|
67
67
|
path: it.path,
|
|
68
68
|
data: await it.data,
|
|
69
69
|
})));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectHydrator.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectHydrator.ts"],"names":[],"mappings":";;;AAEA,uCAA+D;AAC/D,8CAA0C;AAuB1C,MAAa,cAAc;IAA3B;QACS,YAAO,GAAa,EAAE,CAAA;QACtB,aAAQ,GAAmB,EAAE,CAAA;IAkGtC,CAAC;IAhGO,SAAS,CAAC,IAAU,EAAE,QAA2B;QACvD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IACtC,CAAC;IAEM,UAAU,CAChB,IAAU,EACV,
|
|
1
|
+
{"version":3,"file":"SelectHydrator.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectHydrator.ts"],"names":[],"mappings":"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"}
|