@forestadmin/datasource-sequelize 1.3.4 → 1.3.6

package/dist/collection.js

@@ -31,24 +31,32 @@ class SequelizeCollection extends datasource_toolkit_1.BaseCollection {
         return records.map(record => serializer_1.default.serialize(record.get({ plain: true })));
     }
     async list(caller, filter, projection) {
-        let include = this.queryConverter.getIncludeWithAttributesFromProjection(projection);
-        if (filter.conditionTree) {
-            include = include.concat(this.queryConverter.getIncludeFromProjection(filter.conditionTree.projection));
-        }
-        if (filter.sort) {
-            include = include.concat(this.queryConverter.getIncludeFromProjection(filter.sort.projection));
-        }
         const query = {
             attributes: projection.columns,
             where: this.queryConverter.getWhereFromConditionTree(filter.conditionTree),
-            include,
+            include: this.queryConverter.getIncludeFromProjection(
+            // Bugfix [CU-860rc94dq](https://app.clickup.com/t/860rc94dq)
+            // When we provide sequelize with an include which has empty `.attributes` in it, it stops
+            // there and doesn't go further in the include tree.
+            // To ensure that no `.attributes` are not empty, we add the pk of each collection in the
+            // projection.
+            //
+            // include: [{
+            //   association: 'users',
+            //   attributes: [],
+            //   include: { association: 'posts', attributes: ['i_want_this_field'] }
+            // }]
+            projection.withPks(this), new datasource_toolkit_1.Projection().union(filter.conditionTree?.projection, filter.sort?.projection)),
             limit: filter.page?.limit,
             offset: filter.page?.skip,
             order: this.queryConverter.getOrderFromSort(filter.sort),
             subQuery: false,
         };
         const records = await this.model.findAll(query);
-        return records.map(record => serializer_1.default.serialize(record.get({ plain: true })));
+        const rawRecords = records.map(record => serializer_1.default.serialize(record.get({ plain: true })));
+        // Use projection to filter out the unwanted primary keys that were added to the projection
+        // so that sequelize can do its job.
+        return projection.apply(rawRecords);
     }
     async update(caller, filter, patch) {
         const options = {
@@ -78,19 +86,14 @@ class SequelizeCollection extends datasource_toolkit_1.BaseCollection {
             aggregationFunction,
             this.aggregationUtils.aggregateFieldName,
         ];
-        const { groups, attributes: groupAttributes } = this.aggregationUtils.getGroupAndAttributesFromAggregation(aggregation.groups);
-        let include = this.queryConverter.getIncludeFromProjection(aggregation.projection);
-        if (filter.conditionTree) {
-            include = include.concat(this.queryConverter.getIncludeFromProjection(filter.conditionTree.projection));
-        }
-        const order = this.aggregationUtils.getOrder(aggregationFunction);
+        const { groups, attributes } = this.aggregationUtils.getGroupAndAttributesFromAggregation(aggregation.groups);
         const query = {
-            attributes: [...groupAttributes, aggregationAttribute],
+            attributes: [...attributes, aggregationAttribute],
             group: groups,
             where: this.queryConverter.getWhereFromConditionTree(filter.conditionTree),
-            include,
+            include: this.queryConverter.getIncludeFromProjection(new datasource_toolkit_1.Projection(), aggregation.projection.union(filter.conditionTree?.projection)),
             limit,
-            order: [order],
+            order: [this.aggregationUtils.getOrder(aggregationFunction)],
             subQuery: false,
             raw: true,
         };
@@ -99,4 +102,4 @@ class SequelizeCollection extends datasource_toolkit_1.BaseCollection {
     }
 }
 exports.default = SequelizeCollection;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0VBYXlDO0FBR3pDLHNFQUFtRDtBQUNuRCwwRUFBaUQ7QUFDakQsd0hBQTBFO0FBQzFFLDhFQUFxRDtBQUNyRCxvRUFBNEM7QUFFNUMsTUFBcUIsbUJBQW9CLFNBQVEsbUNBQWM7SUFTN0QsWUFDRSxJQUFZLEVBQ1osVUFBc0I7SUFDdEIsOERBQThEO0lBQzlELEtBQTZCLEVBQzdCLE1BQWU7UUFFZixLQUFLLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRXhCLElBQUksQ0FBQyxLQUFLO1lBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBRTlELElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1FBRWxDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLHFCQUFnQixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUkseUJBQWMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFckQsTUFBTSxXQUFXLEdBQUcsOENBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztRQUUvRCxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDbkIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDbkMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0VBYXlDO0FBR3pDLHNFQUFtRDtBQUNuRCwwRUFBaUQ7QUFDakQsd0hBQTBFO0FBQzFFLDhFQUFxRDtBQUNyRCxvRUFBNEM7QUFFNUMsTUFBcUIsbUJBQW9CLFNBQVEsbUNBQWM7SUFTN0QsWUFDRSxJQUFZLEVBQ1osVUFBc0I7SUFDdEIsOERBQThEO0lBQzlELEtBQTZCLEVBQzdCLE1BQWU7UUFFZixLQUFLLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRXhCLElBQUksQ0FBQyxLQUFLO1lBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBRTlELElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1FBRWxDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLHFCQUFnQixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUkseUJBQWMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFckQsTUFBTSxXQUFXLEdBQUcsOENBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztRQUUvRCxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDbkIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDbkMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENB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

package/dist/utils/query-converter.d.ts

@@ -13,9 +13,7 @@ export default class QueryConverter {
     private makeLikeWhereClause;
     getWhereFromConditionTreeToByPassInclude(conditionTree?: ConditionTree): Promise<WhereOptions>;
     getWhereFromConditionTree(conditionTree?: ConditionTree): WhereOptions;
-    private computeIncludeFromProjection;
-    getIncludeFromProjection(projection: Projection): IncludeOptions[];
-    getIncludeWithAttributesFromProjection(projection: Projection): IncludeOptions[];
+    getIncludeFromProjection(attrProjection: Projection, tableProjection?: Projection): IncludeOptions[];
     getOrderFromSort(sort: Sort): OrderItem[];
 }
 //# sourceMappingURL=query-converter.d.ts.map

package/dist/utils/query-converter.js

@@ -99,7 +99,9 @@ class QueryConverter {
      * This method is developed to by pass this problem.
      */
     async getWhereFromConditionTreeToByPassInclude(conditionTree) {
-        const include = conditionTree ? this.getIncludeFromProjection(conditionTree.projection) : [];
+        const include = conditionTree
+            ? this.getIncludeFromProjection(new datasource_toolkit_1.Projection(), conditionTree.projection)
+            : [];
         const whereOptions = this.getWhereFromConditionTree(conditionTree);
         if (include.length === 0) {
             return whereOptions;
@@ -139,21 +141,18 @@ class QueryConverter {
         }
         return sequelizeWhereClause;
     }
-    computeIncludeFromProjection(projection, withAttributes = true) {
-        return Object.entries(projection.relations).map(([relationName, relationProjection]) => {
+    getIncludeFromProjection(attrProjection, tableProjection = new datasource_toolkit_1.Projection()) {
+        const projection = attrProjection.union(tableProjection);
+        return Object.keys(projection.relations).map(name => {
+            const relAttrProjection = attrProjection.relations[name] ?? new datasource_toolkit_1.Projection();
+            const relTableProjection = tableProjection.relations[name] ?? new datasource_toolkit_1.Projection();
             return {
-                association: relationName,
-                attributes: withAttributes ? relationProjection.columns : [],
-                include: this.computeIncludeFromProjection(relationProjection, withAttributes),
+                association: name,
+                attributes: relAttrProjection.columns,
+                include: this.getIncludeFromProjection(relAttrProjection, relTableProjection),
             };
         });
     }
-    getIncludeFromProjection(projection) {
-        return this.computeIncludeFromProjection(projection, false);
-    }
-    getIncludeWithAttributesFromProjection(projection) {
-        return this.computeIncludeFromProjection(projection);
-    }
     getOrderFromSort(sort) {
         return (sort ?? []).map(({ field, ascending }) => {
             const path = field.split(':');
@@ -162,4 +161,4 @@ class QueryConverter {
     }
 }
 exports.default = QueryConverter;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query-converter.js","sourceRoot":"","sources":["../../src/utils/query-converter.ts"],"names":[],"mappings":";;;;;AAAA,wEAQyC;AACzC,yCAQmB;AAEnB,gEAA4C;AAE5C,MAAqB,cAAc;IAOjC,YAAY,KAAqC;QAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,EAAa,CAAC;QAC5D,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC;QACpC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC;IAC1C,CAAC;IAED,8DAA8D;IACtD,eAAe,CAAC,KAAa,EAAE,QAAkB,EAAE,KAAe;QACxE,QAAQ,QAAQ,EAAE;YAChB,WAAW;YACX,KAAK,SAAS;gBACZ,OAAO,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC;YAC3B,KAAK,SAAS;gBACZ,OAAO,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC;YAE3B,WAAW;YACX,KAAK,OAAO;gBACV,OAAO,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,cAAE,CAAC,EAAE,CAAC,CAAC,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;YACrD,KAAK,UAAU;gBACb,OAAO,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;YAC5B,KAAK,IAAI;gBACP,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC9C,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAEjD,aAAa;YACb,KAAK,UAAU;gBACb,OAAO,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;YAC5B,KAAK,aAAa;gBAChB,OAAO,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;YAE5B,UAAU;YACV,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAe,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACvE,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAe,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACxE,KAAK,aAAa;gBAChB,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,KAAK,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAEnE,SAAS;YACT,KAAK,aAAa;gBAChB,OAAO,EAAE,CAAC,cAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAEnE;gBACE,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,IAAI,CAAC,CAAC;SAC3D;IACH,CAAC;IAEO,iBAAiB,CAAC,KAAa,EAAE,KAAc;QACrD,MAAM,YAAY,GAAG,KAAkB,CAAC;QAExC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9D;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC/B,MAAM,uBAAuB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YAErE,OAAO;gBACL,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,uBAAuB,CAAC,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC;aACrF,CAAC;SACH;QAED,OAAO,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC;IACnC,CAAC;IAEO,oBAAoB,CAAC,KAAa,EAAE,KAAc;QACxD,MAAM,YAAY,GAAG,KAAkB,CAAC;QAExC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACjE;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC/B,MAAM,uBAAuB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YAErE,OAAO;gBACL,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC;aACzF,CAAC;SACH;QAED,OAAO,EAAE,CAAC,cAAE,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IACtC,CAAC;IAEO,mBAAmB,CACzB,KAAa,EACb,KAAa,EACb,aAAsB,EACtB,GAAY;QAEZ,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;QACrC,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,cAAE,CAAC,OAAO,CAAC,CAAC,CAAC,cAAE,CAAC,IAAI,CAAC;QAEzC,IAAI,aAAa,EAAE;YACjB,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;gBAC7B,MAAM,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;gBAE3C,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;aAC3F;YAED,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;gBACxD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YAEnE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;SAC3B;QAED,IAAI,IAAI,CAAC,OAAO,KAAK,UAAU;YAAE,OAAO,EAAE,CAAC,cAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;QAC9D,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ;YACrF,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;QAE5B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACtF,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,wCAAwC,CAC5C,aAA6B;QAE7B,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7F,MAAM,YAAY,GAAG,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC;QAEnE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO,YAAY,CAAC;SACrB;QAED,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7F,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,sCAAiB,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAElF,OAAO,yCAAoB,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,yCAAoB,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,CAAC;QAExD,OAAO,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,yBAAyB,CAAC,aAA6B;QACrD,IAAI,CAAC,aAAa;YAAE,OAAO,EAAE,CAAC;QAE9B,MAAM,oBAAoB,GAAG,EAAE,CAAC;QAEhC,IAAK,aAAqC,CAAC,UAAU,KAAK,SAAS,EAAE;YACnE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAoC,CAAC;YAExE,IAAI,UAAU,KAAK,IAAI,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;aAC/C;YAED,MAAM,iBAAiB,GAAG,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,cAAE,CAAC,GAAG,CAAC,CAAC,CAAC,cAAE,CAAC,EAAE,CAAC;YAEhE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC9B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YAED,oBAAoB,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CACnE,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAC1C,CAAC;SACH;aAAM,IAAK,aAAmC,CAAC,QAAQ,KAAK,SAAS,EAAE;YACtE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,aAAkC,CAAC;YACtE,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAEvC,MAAM,SAAS,GAAG,IAAA,qBAAe,EAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAErD,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,eAAe,CACpF,SAAS,EACT,QAAQ,EACR,KAAK,CACN,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3C;QAED,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAEO,4BAA4B,CAClC,UAAsB,EACtB,cAAc,GAAG,IAAI;QAErB,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,kBAAkB,CAAC,EAAE,EAAE;YACrF,OAAO;gBACL,WAAW,EAAE,YAAY;gBACzB,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC5D,OAAO,EAAE,IAAI,CAAC,4BAA4B,CAAC,kBAAkB,EAAE,cAAc,CAAC;aAC/E,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,wBAAwB,CAAC,UAAsB;QAC7C,OAAO,IAAI,CAAC,4BAA4B,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAED,sCAAsC,CAAC,UAAsB;QAC3D,OAAO,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAED,gBAAgB,CAAC,IAAU;QACzB,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAa,EAAE;YAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAa,CAAC;YAE1C,OAAO,CAAC,GAAG,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAxND,iCAwNC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query-converter.js","sourceRoot":"","sources":["../../src/utils/query-converter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/datasource-sequelize",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -12,7 +12,7 @@
     "directory": "packages/datasource-sequelize"
   },
   "dependencies": {
-    "@forestadmin/datasource-toolkit": "1.5.2"
+    "@forestadmin/datasource-toolkit": "1.6.0"
   },
   "files": [
     "dist/**/*.js",