npm - @contember/engine-content-api - Versions diffs - 1.1.0-alpha.7 → 1.1.0-beta.1 - Mend

@contember/engine-content-api 1.1.0-alpha.7 → 1.1.0-beta.1

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 (116) hide show

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

	@@ -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;~~AAEzC~~,qBAAa,cAAc;IAC1B,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,QAAQ,~~CAKR~~;~~IAED~~,SAAS,CAAC,IAAI,EAAE,IAAI;IAIpB,UAAU,CAChB,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,~~WAAW~~,CAAC,gBAAgB,CAAC,~~EACnC~~,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;~~YAkBlF~~,UAAU;~~IA0BxB~~,OAAO,CAAC,WAAW;CAMnB;AAED,oBAAY,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,WAAW,CAAA;CAAE,CAAA;AAC5D,oBAAY,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAAA;AAC7C,oBAAY,0BAA0B,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;CAAE,CAAA;AAC9E,oBAAY,oBAAoB,GAAG;IAAE,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAAA;CAAE,CAAA;AAClF,oBAAY,gBAAgB,GAAG,oBAAoB,GAAG,0BAA0B,CAAA;AAChF,oBAAY,wBAAwB,GAAG,EAAE,GAAG,IAAI,CAAA"}
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;AAiBzC,qBAAa,cAAc;IAC1B,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,QAAQ,CAAqB;IAE9B,SAAS,CAAC,IAAI,EAAE,IAAI;IAIpB,UAAU,CAChB,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,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;YAyBJ,mBAAmB;IAqBjC,OAAO,CAAC,WAAW;CAMnB;AAED,oBAAY,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,WAAW,CAAA;CAAE,CAAA;AAC5D,oBAAY,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAAA;AAC7C,oBAAY,0BAA0B,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;CAAE,CAAA;AAC9E,oBAAY,oBAAoB,GAAG;IAAE,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAAA;CAAE,CAAA;AAClF,oBAAY,gBAAgB,GAAG,oBAAoB,GAAG,0BAA0B,CAAA;AAChF,oBAAY,wBAAwB,GAAG,EAAE,GAAG,IAAI,CAAA"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectHydrator = void 0;
+const utils_1 = require("../../utils");
 class SelectHydrator {
     constructor() {
         this.columns = [];
@@ -13,49 +14,71 @@ class SelectHydrator {
         this.promises.push({ path, parentKeyPath, data, defaultValue });
     }
     async hydrateGroups(rows, groupBy) {
-        await Promise.all(this.promises.map(it => it.data));
+        const resolved = await this.resolveDataPromises();
         const result = {};
         for (let row of rows) {
             const key = row[groupBy];
             if (!result[key]) {
                 result[key] = [];
             }
-            result[key].push(await this.hydrateRow(row));
+            result[key].push(this.hydrateRow(row, resolved));
         }
         return result;
     }
     async hydrateAll(rows, indexBy) {
-        await Promise.all(this.promises.map(it => it.data));
+        const resolved = await this.resolveDataPromises();
         if (indexBy) {
             const result = {};
             for (let row of rows) {
-                result[row[indexBy]] = await this.hydrateRow(row);
+                result[row[indexBy]] = this.hydrateRow(row, resolved);
             }
             return result;
         }
-        return Promise.all(rows.map(row => this.hydrateRow(row)));
+        const result = [];
+        for (const row of rows) {
+            result.push(this.hydrateRow(row, resolved));
+        }
+        return result;
     }
-    async hydrateRow(row) {
+    hydrateRow(row, resolvedData) {
         const result = {};
         for (let columnPath of this.columns) {
             const path = [...columnPath.path];
             const last = path.pop();
             const currentObject = path.reduce((obj, part) => (obj[part] = obj[part] || {}), result);
-            const field = row[columnPath.getAlias()];
+            const field = row[columnPath.alias];
             currentObject[last] = this.formatValue(field);
         }
-        for (let { path, parentKeyPath, data, defaultValue } of this.promises) {
-            const awaitedData = await data;
+        for (let { path, parentKeyPath, data, defaultValue } of resolvedData) {
             const pathTmp = [...path.path];
             const last = pathTmp.pop();
             const currentObject = pathTmp.reduce((obj, part) => (obj && obj[part]) || undefined, result);
-            const parentValue = row[parentKeyPath.getAlias()];
+            const parentValue = row[parentKeyPath.alias];
             if (currentObject) {
-                currentObject[last] = (parentValue ? awaitedData[parentValue] : undefined) || defaultValue;
+                currentObject[last] = (parentValue ? data[parentValue] : undefined) || defaultValue;
             }
         }
         return result;
     }
+    async resolveDataPromises() {
+        const results = await Promise.allSettled(this.promises.map(async (it) => ({
+            defaultValue: it.defaultValue,
+            parentKeyPath: it.parentKeyPath,
+            path: it.path,
+            data: await it.data,
+        })));
+        const failures = (0, utils_1.getRejections)(results);
+        if (failures.length > 0) {
+            if (failures.length > 1) {
+                // eslint-disable-next-line no-console
+                console.error('Multiple error has occurred, printing them & rethrowing the first one');
+                // eslint-disable-next-line no-console
+                failures.slice(1).map(e => console.error(e));
+            }
+            throw failures[0];
+        }
+        return (0, utils_1.getFulfilledValues)(results);
+    }
     formatValue(value) {
         if (value instanceof Date) {
             return value.toISOString();

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

	@@ -1 +1 @@
1	- {"version":3,"file":"SelectHydrator.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectHydrator.ts"],"names":[],"mappings":";;;~~AAGA~~,MAAa,cAAc;IAA3B;QACS,YAAO,GAAW,EAAE,CAAA;QACpB,aAAQ,~~GAKV~~,EAAE,CAAA;~~IA+ET~~,CAAC;~~IA7EO~~,SAAS,CAAC,IAAU;QAC1B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC;IAEM,UAAU,CAChB,IAAU,EACV,aAAmB,EACnB,~~IAAmC~~,~~EACnC~~,YAAsC;QAEtC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;IAChE,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,IAAiB,EAAE,OAAe;QAC5D,MAAM,~~OAAO~~,~~CAAC,~~GAAG,~~CAAC~~,IAAI,CAAC,~~QAAQ~~,~~CAAC,GAAG,CAAC,~~EAAE,~~CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,~~CAAA;~~QACnD~~,MAAM,MAAM,GAAyB,EAAE,CAAA;QACvC,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YACrB,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAuB,CAAA;YAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBACjB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;aAChB;YACD,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,~~MAAM,~~IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;~~SAC5C~~;QACD,OAAO,MAAM,CAAA;IACd,CAAC;IAKM,KAAK,CAAC,UAAU,CACtB,IAAiB,EACjB,OAAgB;QAEhB,MAAM,~~OAAO~~,~~CAAC,~~GAAG,~~CAAC~~,IAAI,CAAC,~~QAAQ~~,~~CAAC,GAAG,CAAC,~~EAAE,~~CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,~~CAAA;~~QACnD~~,IAAI,OAAO,EAAE;YACZ,MAAM,MAAM,GAA+B,EAAE,CAAA;YAC7C,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;gBACrB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAuB,CAAC,GAAG,~~MAAM,~~IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;~~aACvE~~;YACD,OAAO,MAAM,CAAA;SACb;~~QAED~~,~~OAAO~~,~~OAAO~~,~~CAAC~~,~~GAAG~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,GAAG,~~CAAC~~,~~GAAG~~,CAAC,~~EAAE~~,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,~~CAAC~~,CAAC,CAAC,CAAA;~~IAC1D~~,CAAC;IAEO,~~KAAK~~,CAAC,~~UAAU~~,~~CAAC~~,~~GAAc~~;~~QACtC~~,MAAM,MAAM,GAAuB,EAAE,CAAA;QAErC,KAAK,IAAI,UAAU,IAAI,IAAI,CAAC,OAAO,EAAE;YACpC,MAAM,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;YACjC,MAAM,IAAI,GAAW,IAAI,CAAC,GAAG,EAAY,CAAA;YACzC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAM,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;YAE5F,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,~~QAAQ~~,~~EAAE,~~CAAC,CAAA;~~YACxC~~,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;SAC7C;QAED,KAAK,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,~~IAAI~~,~~CAAC,QAAQ,~~EAAE;~~YACtE~~,MAAM,~~WAAW,GAAG,MAAM,IAAI,CAAA;YAC9B,MAAM,~~OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;YAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAY,CAAA;YACpC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAM,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,SAAS,EAAE,MAAM,CAAC,CAAA;YACjG,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,~~QAAQ~~,~~EAAE,~~CAAuB,CAAA;~~YACvE~~,IAAI,aAAa,EAAE;gBAClB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,~~WAAW~~,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,YAAY,CAAA;~~aAC1F~~;SACD;QAED,OAAO,MAAM,CAAA;IACd,CAAC;IAEO,WAAW,CAAC,KAAU;QAC7B,IAAI,KAAK,YAAY,IAAI,EAAE;YAC1B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAA;SAC1B;QACD,OAAO,KAAK,CAAA;IACb,CAAC;CACD;~~AAtFD~~,~~wCAsFC~~"}
1	+ {"version":3,"file":"SelectHydrator.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectHydrator.ts"],"names":[],"mappings":"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"}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"WhereBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,gBAAgB,IAAI,mBAAmB,EAA0B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEpH,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAHX,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW;IAGnC,KAAK,CACX,EAAE,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACvC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,aAAa,GAAE,OAAe;IAKxB,aAAa,CACnB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,mBAAmB,KAAK,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACjH,aAAa,GAAE,OAAe;IAW/B,OAAO,CAAC,aAAa;~~IAyIrB~~,OAAO,CAAC,yBAAyB;~~IAkCjC~~,OAAO,CAAC,gCAAgC;CA2CxC;AAED,oBAAY,mBAAmB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAA"}
1	+ {"version":3,"file":"WhereBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,gBAAgB,IAAI,mBAAmB,EAA0B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEpH,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAHX,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW;IAGnC,KAAK,CACX,EAAE,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACvC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,aAAa,GAAE,OAAe;IAKxB,aAAa,CACnB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,mBAAmB,KAAK,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACjH,aAAa,GAAE,OAAe;IAW/B,OAAO,CAAC,aAAa;IA0IrB,OAAO,CAAC,yBAAyB;IAoCjC,OAAO,CAAC,gCAAgC;CA2CxC;AAED,oBAAY,mBAAmB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAA"}

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

@@ -20,7 +20,7 @@ class WhereBuilder {
         return joinList.reduce((qb, { path, entity, relationName }) => this.joinBuilder.join(qb, path, entity, relationName), qbWithWhere);
     }
     buildInternal(conditionBuilder, entity, path, where, allowManyJoin, joinList) {
-        const tableName = path.getAlias();
+        const tableName = path.alias;
         if (where.and !== undefined && where.and.length > 0) {
             const expr = where.and;
             conditionBuilder = conditionBuilder.and(clause => expr.reduce((clause2, where) => !where ? clause2 : this.buildInternal(clause2, entity, path, where, allowManyJoin, joinList), clause));
@@ -48,7 +48,7 @@ class WhereBuilder {
                 if ((0, utils_1.isIt)(relation, 'joiningColumn')) {
                     const primaryCondition = this.transformWhereToPrimaryCondition(relationWhere, targetEntity.primary);
                     if (primaryCondition !== null) {
-                        return this.conditionBuilder.build(conditionBuilder, tableName, relation.joiningColumn.columnName, primaryCondition);
+                        return this.conditionBuilder.build(conditionBuilder, tableName, relation.joiningColumn.columnName, targetEntity.fields[targetEntity.primary].columnType, primaryCondition);
                     }
                 }
                 joinList.push({ path: targetPath, entity, relationName: relation.name });
@@ -57,7 +57,7 @@ class WhereBuilder {
             conditionBuilder = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, fieldName, {
                 visitColumn: (entity, column) => {
                     const subWhere = where[column.name];
-                    return this.conditionBuilder.build(conditionBuilder, tableName, column.columnName, subWhere);
+                    return this.conditionBuilder.build(conditionBuilder, tableName, column.columnName, column.columnType, subWhere);
                 },
                 visitOneHasOneInverse: joinedWhere,
                 visitOneHasOneOwning: joinedWhere,
@@ -99,7 +99,8 @@ class WhereBuilder {
             .where(it => it.columnsEq(outerColumn, ['junction_', fromColumn]));
         const primaryCondition = this.transformWhereToPrimaryCondition(relationWhere, targetEntity.primary);
         if (primaryCondition !== null) {
-            return qb.where(condition => this.conditionBuilder.build(condition, 'junction_', toColumn, primaryCondition));
+            const columnType = targetEntity.fields[targetEntity.primary].columnType;
+            return qb.where(condition => this.conditionBuilder.build(condition, 'junction_', toColumn, columnType, primaryCondition));
         }
         const qbJoined = qb.join(targetEntity.tableName, 'sub_', clause => clause.compareColumns(['junction_', toColumn], database_1.Operator.eq, ['sub_', targetEntity.primary]));
         return this.buildAdvanced(targetEntity, this.pathFactory.create([], 'sub_'), relationWhere, cb => qbJoined.where(clause => cb(clause)), true);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"WhereBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAClC,0DAA4D;AAK5D,kDAAoH;AAEpH,MAAa,YAAY;IACxB,YACkB,MAAoB,EACpB,WAAwB,EACxB,gBAAkC,EAClC,WAAwB;QAHxB,WAAM,GAAN,MAAM,CAAc;QACpB,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEG,KAAK,CACX,EAAuC,EACvC,MAAoB,EACpB,IAAU,EACV,KAA0B,EAC1B,gBAAyB,KAAK;QAE9B,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,CAAA;IACpG,CAAC;IAEM,aAAa,CACnB,MAAoB,EACpB,IAAU,EACV,KAA0B,EAC1B,QAAiH,EACjH,gBAAyB,KAAK;QAE9B,MAAM,QAAQ,GAA0B,EAAE,CAAA;QAE1C,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAA;QAChH,OAAO,QAAQ,CAAC,MAAM,CACrB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAC7F,WAAW,CACX,CAAA;IACF,CAAC;IAEO,aAAa,CACpB,gBAAqC,EACrC,MAAoB,EACpB,IAAU,EACV,KAA0B,EAC1B,aAAsB,EACtB,QAA+B;QAE/B,MAAM,SAAS,GAAG,IAAI,CAAC,~~QAAQ~~,~~EAAE,~~CAAA;~~QAEjC~~,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YACpD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAA;YACtB,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAChD,IAAI,CAAC,MAAM,CACV,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAClB,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,EAC7F,MAAM,CACN,CACD,CAAA;SACD;QACD,IAAI,KAAK,CAAC,EAAE,KAAK,SAAS,IAAI,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YAClD,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAA;YACrB,gBAAgB,GAAG,gBAAgB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAC/C,IAAI,CAAC,MAAM,CACV,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAClB,CAAC,KAAK;gBACL,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,EACrG,MAAM,CACN,CACD,CAAA;SACD;QACD,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAA;YACtB,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAChD,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,CACvE,CAAA;SACD;QAED,KAAK,MAAM,SAAS,IAAI,KAAK,EAAE;YAC9B,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,KAAK,EAAE;gBACrE,SAAQ;aACR;YAED,MAAM,WAAW,GAAG,CACnB,MAAoB,EACpB,QAAwB,EACxB,YAA0B,EACJ,EAAE;gBACxB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;gBACtC,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAgB,CAAA;gBACrD,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC5C,OAAO,gBAAgB,CAAA;iBACvB;gBACD,IAAI,IAAA,YAAI,EAA8B,QAAQ,EAAE,eAAe,CAAC,EAAE;oBACjE,MAAM,gBAAgB,GAAG,IAAI,CAAC,gCAAgC,CAAC,aAAa,EAAE,YAAY,CAAC,OAAO,CAAC,CAAA;oBACnG,IAAI,gBAAgB,KAAK,IAAI,EAAE;wBAC9B,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CACjC,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,aAAa,CAAC,UAAU,~~EACjC~~,gBAAgB,CAChB,CAAA;qBACD;iBACD;gBAED,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;gBAExE,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAA;YAC9G,CAAC,CAAA;YAED,gBAAgB,GAAG,IAAA,iCAAkB,EAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE;gBAC1F,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;oBAC/B,MAAM,QAAQ,GAAuC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAuC,CAAA;oBAC7G,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;~~gBAC7F~~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~~CAC/E~~,CAAA;SACD;QAED,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CACjE,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,mBAAQ,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAC3F,CAAA;QACD,OAAO,IAAI,CAAC,aAAa,CACxB,YAAY,EACZ,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,EACnC,aAAa,EACb,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAC1C,IAAI,CACJ,CAAA;IACF,CAAC;IAEO,gCAAgC,CAAC,KAAkB,EAAE,YAAoB;QAChF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACnF,OAAO,IAAI,CAAA;SACX;QACD,IAAI,SAAS,GAIT,EAAE,CAAA;QACN,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG;iBAC1B,MAAM,CAAC,CAAC,EAAE,EAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAA;YACpE,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAC9B,OAAO,IAAI,CAAA;aACX;YACD,SAAS,CAAC,GAAG,GAAG,UAAsC,CAAA;SACtD;QACD,IAAI,KAAK,CAAC,EAAE,EAAE;YACb,MAAM,UAAU,GAAG,KAAK,CAAC,EAAE;iBACzB,MAAM,CAAC,CAAC,EAAE,EAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAA;YACpE,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAC9B,OAAO,IAAI,CAAA;aACX;YACD,SAAS,CAAC,EAAE,GAAG,UAAsC,CAAA;SACrD;QACD,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,MAAM,UAAU,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;YACjF,IAAI,UAAU,KAAK,IAAI,EAAE;gBACxB,OAAO,IAAI,CAAA;aACX;YACD,SAAS,CAAC,GAAG,GAAG,UAAoC,CAAA;SACpD;QACD,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE;YACxB,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAA2B,CAAC,EAAE,CAAA;aAC1E;YACD,OAAO,KAAK,CAAC,YAAY,CAA2B,CAAA;SACpD;QACD,OAAO,SAAS,CAAA;IACjB,CAAC;CACD;~~AAxPD~~,~~oCAwPC~~"}
1	+ {"version":3,"file":"WhereBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/select/handlers/FieldsVisitor.js CHANGED Viewed

@@ -14,8 +14,8 @@ class FieldsVisitor {
     visitColumn(entity, column) {
         const columnPath = this.executionContext.path;
         this.executionContext.addColumn(qb => {
-            const tableAlias = columnPath.back().getAlias();
-            const columnAlias = columnPath.getAlias();
+            const tableAlias = columnPath.back().alias;
+            const columnAlias = columnPath.alias;
             const fieldPredicate = this.predicateFactory.shouldApplyCellLevelPredicate(entity, schema_1.Acl.Operation.read, column.name)
                 ? this.predicateFactory.create(entity, schema_1.Acl.Operation.read, [column.name])
                 : undefined;

package/dist/src/mapper/select/handlers/FieldsVisitor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FieldsVisitor.js","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/FieldsVisitor.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;AAQrD,MAAa,aAAa;IACzB,YACkB,MAAoB,EACpB,eAAgC,EAChC,gBAAkC,EAClC,YAA0B,EAC1B,MAAc,EACd,gBAA+C;QAL/C,WAAM,GAAN,MAAM,CAAc;QACpB,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAA+B;IAC9D,CAAC;IAEJ,WAAW,CAAC,MAAoB,EAAE,MAAuB;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAA;QAC7C,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACpC,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,~~QAAQ~~,~~EAAE,~~CAAA;~~YAC/C~~,MAAM,WAAW,GAAG,UAAU,CAAC,~~QAAQ~~,~~EAAE,~~CAAA;~~YAEzC~~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"}
1	+ {"version":3,"file":"FieldsVisitor.js","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/FieldsVisitor.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/select/handlers/MetaHandler.js CHANGED Viewed

@@ -37,7 +37,7 @@ class MetaHandler {
                     return condition.raw('true');
                 }
                 return condition;
-            }), metaPath.getAlias()));
+            }), metaPath.alias));
         }, metaPath);
     }
 }

package/dist/src/mapper/select/handlers/MetaHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MetaHandler.js","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/MetaHandler.ts"],"names":[],"mappings":";;;AAEA,8CAA8C;AAK9C,MAAa,WAAW;IACvB,YAA6B,YAA0B,EAAmB,gBAAkC;QAA/E,iBAAY,GAAZ,YAAY,CAAc;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAAsC;QAC7C,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QACpC,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,MAAM,EAAE;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAC5C,KAAK,IAAI,QAAQ,IAAK,SAAwB,CAAC,MAAM,EAAE;gBACtD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAK,CAAC,SAAS,CAAC,SAAS,EAAE;oBAChD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;iBAC/F;gBACD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAC/C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC7F;aACD;SACD;IACF,CAAC;IAEO,WAAW,CAClB,OAAsC,EACtC,SAAiB,EACjB,QAAc,EACd,SAAoD;QAEpD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QAChC,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;YACjC,OAAM;SACN;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;QACnF,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,CAChF,EAAE,CAAC,MAAM,CACR,IAAI,CAAC,EAAE,CACN,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;gBAChC,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;gBACzB,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE;oBACxB,OAAO,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;iBAC5B;gBACD,OAAO,SAAS,CAAA;YACjB,CAAC,CAAC,EACH,QAAQ,CAAC,~~QAAQ~~,~~EAAE~~,~~CACnB,~~CACD,CAAA;QACF,CAAC,EAAE,QAAQ,CAAC,CAAA;IACb,CAAC;CACD;AAhDD,kCAgDC"}
1	+ {"version":3,"file":"MetaHandler.js","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/MetaHandler.ts"],"names":[],"mappings":";;;AAEA,8CAA8C;AAK9C,MAAa,WAAW;IACvB,YAA6B,YAA0B,EAAmB,gBAAkC;QAA/E,iBAAY,GAAZ,YAAY,CAAc;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAAsC;QAC7C,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QACpC,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,MAAM,EAAE;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAC5C,KAAK,IAAI,QAAQ,IAAK,SAAwB,CAAC,MAAM,EAAE;gBACtD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAK,CAAC,SAAS,CAAC,SAAS,EAAE;oBAChD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;iBAC/F;gBACD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAC/C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC7F;aACD;SACD;IACF,CAAC;IAEO,WAAW,CAClB,OAAsC,EACtC,SAAiB,EACjB,QAAc,EACd,SAAoD;QAEpD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QAChC,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;YACjC,OAAM;SACN;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;QACnF,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,CAChF,EAAE,CAAC,MAAM,CACR,IAAI,CAAC,EAAE,CACN,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;gBAChC,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;gBACzB,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE;oBACxB,OAAO,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;iBAC5B;gBACD,OAAO,SAAS,CAAA;YACjB,CAAC,CAAC,EACH,QAAQ,CAAC,KAAK,CACd,CACD,CAAA;QACF,CAAC,EAAE,QAAQ,CAAC,CAAA;IACb,CAAC;CACD;AAhDD,kCAgDC"}

package/dist/src/schema/CustomTypesProvider.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CustomTypesProvider.d.ts","sourceRoot":"","sources":["../../../src/schema/CustomTypesProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAQ,MAAM,SAAS,CAAA;~~AAMjD~~,qBAAa,mBAAmB;IAC/B,SAAgB,QAAQ,EAAE,iBAAiB,~~CAOzC~~;~~IAEF~~,SAAgB,QAAQ,EAAE,iBAAiB,CAOzC;IACF,SAAgB,YAAY,EAAE,iBAAiB,CAO7C;IACF,SAAgB,QAAQ,EAAE,iBAAiB,CAAW;CACtD"}
1	+ {"version":3,"file":"CustomTypesProvider.d.ts","sourceRoot":"","sources":["../../../src/schema/CustomTypesProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAQ,MAAM,SAAS,CAAA;AAcjD,qBAAa,mBAAmB;IAC/B,SAAgB,QAAQ,EAAE,iBAAiB,CAezC;IAGF,SAAgB,QAAQ,EAAE,iBAAiB,CAOzC;IACF,SAAgB,YAAY,EAAE,iBAAiB,CAO7C;IACF,SAAgB,QAAQ,EAAE,iBAAiB,CAAW;CACtD"}

package/dist/src/schema/CustomTypesProvider.js CHANGED Viewed

@@ -3,17 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomTypesProvider = void 0;
 const graphql_1 = require("graphql");
 const graphql_utils_1 = require("@contember/graphql-utils");
-//todo: implement serialize, parseValue and parseLiteral properly
+const uuidPattern = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[1-5][0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$/i;
+/** dashes are optional */
+const isUuid = (value) => {
+    return (value.length <= 36 &&
+        value.length >= 32 &&
+        value.match(uuidPattern) !== null);
+};
 class CustomTypesProvider {
     constructor() {
         this.uuidType = new graphql_1.GraphQLScalarType({
             name: 'UUID',
             serialize: str => String(str),
-            parseValue: str => String(str),
+            parseValue: str => {
+                if (typeof str !== 'string' || !isUuid(str)) {
+                    return undefined;
+                }
+                return str;
+            },
             parseLiteral: function parseLiteral(ast) {
-                return ast.kind === graphql_1.Kind.STRING ? ast.value : undefined;
+                if (ast.kind !== graphql_1.Kind.STRING || !isUuid(ast.value)) {
+                    return undefined;
+                }
+                return ast.value;
             },
         });
+        //todo: implement serialize, parseValue and parseLiteral properly
         this.dateType = new graphql_1.GraphQLScalarType({
             name: 'Date',
             serialize: str => String(str),

package/dist/src/schema/CustomTypesProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CustomTypesProvider.js","sourceRoot":"","sources":["../../../src/schema/CustomTypesProvider.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AACjD,4DAAmD;AAGnD,~~iEAAiE~~;~~AAEjE~~,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,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;~~QAEc~~,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;~~AA3BD~~,~~kDA2BC~~"}
1	+ {"version":3,"file":"CustomTypesProvider.js","sourceRoot":"","sources":["../../../src/schema/CustomTypesProvider.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AACjD,4DAAmD;AAGnD,MAAM,WAAW,GAAG,gFAAgF,CAAA;AACpG,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"}

package/dist/src/schema/OrderByTypeProvider.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OrderByTypeProvider.d.ts","sourceRoot":"","sources":["../../../src/schema/OrderByTypeProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,EAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAIrC,qBAAa,mBAAmB;~~IAWnB~~,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,YAAY;~~IAVhF~~,OAAO,CAAC,gBAAgB,CAA+D;IAEvF,OAAO,CAAC,kBAAkB,~~CAMxB~~;gBAE2B,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,YAAY,EAAE,YAAY;IAEvF,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;IAIjE,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,sBAAsB;CA6B9B"}
1	+ {"version":3,"file":"OrderByTypeProvider.d.ts","sourceRoot":"","sources":["../../../src/schema/OrderByTypeProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,EAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAIrC,qBAAa,mBAAmB;IAanB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAZhF,OAAO,CAAC,gBAAgB,CAA+D;IAEvF,OAAO,CAAC,kBAAkB,CAQxB;gBAE2B,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,YAAY,EAAE,YAAY;IAEvF,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;IAIjE,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,sBAAsB;CA6B9B"}

package/dist/src/schema/OrderByTypeProvider.js CHANGED Viewed

@@ -17,6 +17,8 @@ class OrderByTypeProvider {
             values: {
                 asc: { value: 'asc' },
                 desc: { value: 'desc' },
+                ascNullsFirst: { value: 'asc nulls first' },
+                descNullsLast: { value: 'desc nulls last' },
             },
         });
     }

package/dist/src/schema/OrderByTypeProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OrderByTypeProvider.js","sourceRoot":"","sources":["../../../src/schema/OrderByTypeProvider.ts"],"names":[],"mappings":";;;AACA,8CAA8C;AAC9C,0DAA4D;AAC5D,oCAA2C;AAC3C,mCAAqC;AAErC,6DAAyD;AACzD,qCAA6F;AAE7F,MAAa,mBAAmB;~~IAW~~/B,YAA6B,MAAoB,EAAmB,YAA0B;QAAjE,WAAM,GAAN,MAAM,CAAc;QAAmB,iBAAY,GAAZ,YAAY,CAAc;~~QAVtF~~,qBAAgB,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAA;QAE/E,uBAAkB,GAAG,IAAI,yBAAe,CAAC;YAChD,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE;gBACP,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;gBACrB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;~~aACvB~~;SACD,CAAC,CAAA;IAE+F,CAAC;IAE3F,oBAAoB,CAAC,UAAkB;QAC7C,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACzC,CAAC;IAEO,uBAAuB,CAAC,UAAkB;QACjD,OAAO,IAAI,gCAAsB,CAAC;YACjC,IAAI,EAAE,IAAA,mBAAW,EAAA,GAAG,UAAU,SAAS;YACvC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC;SACrD,CAAC,CAAA;IACH,CAAC;IAEO,sBAAsB,CAAC,IAAY;QAC1C,MAAM,MAAM,GAA+B;YAC1C,OAAO,EAAE,EAAE,IAAI,EAAE,wBAAc,EAAE;YACjC,aAAa,EAAE,EAAE,IAAI,EAAE,oBAAU,EAAE;SACnC,CAAA;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEzC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;gBAC7C,SAAQ;aACR;YACD,MAAM,aAAa,GAAG,IAAI,uCAAkB,CAAC,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;YACnF,IAAI,CAAC,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE;gBACrE,SAAQ;aACR;YAED,MAAM,KAAK,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACtD,WAAW,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzF,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS;aAC8B,CAAC,CAAA;YAE7D,IAAI,KAAK,KAAK,SAAS,EAAE;gBACxB,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAA;aACzB;SACD;QAED,OAAO,MAAM,CAAA;IACd,CAAC;CACD;~~AArDD~~,~~kDAqDC~~"}
1	+ {"version":3,"file":"OrderByTypeProvider.js","sourceRoot":"","sources":["../../../src/schema/OrderByTypeProvider.ts"],"names":[],"mappings":";;;AACA,8CAA8C;AAC9C,0DAA4D;AAC5D,oCAA2C;AAC3C,mCAAqC;AAErC,6DAAyD;AACzD,qCAA6F;AAE7F,MAAa,mBAAmB;IAa/B,YAA6B,MAAoB,EAAmB,YAA0B;QAAjE,WAAM,GAAN,MAAM,CAAc;QAAmB,iBAAY,GAAZ,YAAY,CAAc;QAZtF,qBAAgB,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAA;QAE/E,uBAAkB,GAAG,IAAI,yBAAe,CAAC;YAChD,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE;gBACP,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;gBACrB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;gBACvB,aAAa,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE;gBAC3C,aAAa,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE;aAC3C;SACD,CAAC,CAAA;IAE+F,CAAC;IAE3F,oBAAoB,CAAC,UAAkB;QAC7C,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACzC,CAAC;IAEO,uBAAuB,CAAC,UAAkB;QACjD,OAAO,IAAI,gCAAsB,CAAC;YACjC,IAAI,EAAE,IAAA,mBAAW,EAAA,GAAG,UAAU,SAAS;YACvC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC;SACrD,CAAC,CAAA;IACH,CAAC;IAEO,sBAAsB,CAAC,IAAY;QAC1C,MAAM,MAAM,GAA+B;YAC1C,OAAO,EAAE,EAAE,IAAI,EAAE,wBAAc,EAAE;YACjC,aAAa,EAAE,EAAE,IAAI,EAAE,oBAAU,EAAE;SACnC,CAAA;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEzC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;gBAC7C,SAAQ;aACR;YACD,MAAM,aAAa,GAAG,IAAI,uCAAkB,CAAC,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;YACnF,IAAI,CAAC,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE;gBACrE,SAAQ;aACR;YAED,MAAM,KAAK,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACtD,WAAW,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzF,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS;aAC8B,CAAC,CAAA;YAE7D,IAAI,KAAK,KAAK,SAAS,EAAE;gBACxB,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAA;aACzB;SACD;QAED,OAAO,MAAM,CAAA;IACd,CAAC;CACD;AAvDD,kDAuDC"}