@infrab4a/connect 3.2.3 → 3.2.5-beta.0

package/bundles/infrab4a-connect.umd.js

@@ -2684,19 +2684,18 @@
         function OrderFirestoreRepository(firestore) {
             var _this = _super.call(this) || this;
             _this.firestore = firestore;
-            _this.orderFromFirestore = function (order, id) {
+            _this.orderFromFirestore = function (order) {
                 var _a;
-                var modifiedOrder = _this.model.toInstance(Object.assign(Object.assign({}, order), { id: id }));
-                if (!!((_a = modifiedOrder === null || modifiedOrder === void 0 ? void 0 : modifiedOrder.lineItems) === null || _a === void 0 ? void 0 : _a.length)) {
-                    modifiedOrder.lineItems = modifiedOrder.lineItems.map(function (lineItem) {
-                        if (!!lineItem.price[modifiedOrder.shop]) {
-                            var shopPrice = lineItem['price'][modifiedOrder.shop];
+                if (!!((_a = order === null || order === void 0 ? void 0 : order.lineItems) === null || _a === void 0 ? void 0 : _a.length)) {
+                    order.lineItems = order.lineItems.map(function (lineItem) {
+                        if (!!lineItem.price[order.shop]) {
+                            var shopPrice = lineItem['price'][order.shop];
                             lineItem['price'] = shopPrice;
                         }
                         return lineItem;
                     });
                 }
-                return modifiedOrder;
+                return order;
             };
             _this.collectionName = 'orders';
             _this.model = Order;
@@ -2709,7 +2708,7 @@
                 toFirestore: function (data) { return toFirestore((data === null || data === void 0 ? void 0 : data.toPlain) ? data.toPlain() : data); },
                 fromFirestore: function (snap) {
                     var instance = fromFirestore(snap);
-                    return _this.orderFromFirestore(instance, snap.id);
+                    return _this.orderFromFirestore(instance);
                 },
             };
         };
@@ -2986,6 +2985,117 @@
         return Object.assign({ attributeName: attributeName || columnName, columnName: columnName }, fieldOption);
     };
 
+    var HasuraGraphQLWhere;
+    (function (HasuraGraphQLWhere) {
+        HasuraGraphQLWhere["EQUALS"] = "_eq";
+        HasuraGraphQLWhere["GT"] = "_gt";
+        HasuraGraphQLWhere["GTE"] = "_gte";
+        HasuraGraphQLWhere["IN"] = "_in";
+        HasuraGraphQLWhere["NOTIN"] = "_nin";
+        HasuraGraphQLWhere["LT"] = "_lt";
+        HasuraGraphQLWhere["LTE"] = "_lte";
+        HasuraGraphQLWhere["LIKE"] = "_like";
+        HasuraGraphQLWhere["NOTLIKE"] = "_nlike";
+        HasuraGraphQLWhere["ISNULL"] = "_is_null";
+        HasuraGraphQLWhere["ISNOTNULL"] = "_is_null";
+    })(HasuraGraphQLWhere || (HasuraGraphQLWhere = {}));
+
+    var HasuraGraphQLColumnType;
+    (function (HasuraGraphQLColumnType) {
+        HasuraGraphQLColumnType["Int"] = "Int";
+        HasuraGraphQLColumnType["Float"] = "Float";
+        HasuraGraphQLColumnType["Boolean"] = "Boolean";
+        HasuraGraphQLColumnType["String"] = "String";
+        HasuraGraphQLColumnType["DateTime"] = "timestampz";
+        HasuraGraphQLColumnType["Json"] = "json";
+        HasuraGraphQLColumnType["Jsonb"] = "jsonb";
+        HasuraGraphQLColumnType["Enum"] = "enum";
+        HasuraGraphQLColumnType["Uuid"] = "uuid";
+    })(HasuraGraphQLColumnType || (HasuraGraphQLColumnType = {}));
+
+    var FilterOptionHelper = /** @class */ (function () {
+        function FilterOptionHelper() {
+        }
+        return FilterOptionHelper;
+    }());
+    FilterOptionHelper.CheckIfIsFilterOption = function (filter) { return !lodash.isNil(filter === null || filter === void 0 ? void 0 : filter.operator); };
+    FilterOptionHelper.GetValueFromFilter = function (filter, fieldOption) {
+        if (!FilterOptionHelper.CheckIfIsFilterOption(filter))
+            return filter;
+        if (filter.operator === exports.Where.ISNULL)
+            return true;
+        if (filter.operator === exports.Where.ISNOTNULL)
+            return false;
+        var converter = fieldOption.to
+            ? fieldOption.to
+            : function (value) { return filter.operator === exports.Where.LIKE && !Array.isArray(filter.value) && value.indexOf('%') < 0
+                ? "%" + value + "%"
+                : value; };
+        return Array.isArray(filter.value) && !fieldOption.fields && [exports.Where.IN, exports.Where.NOTIN].includes(filter.operator)
+            ? filter.value.map(function (fieldValue) { return converter(fieldValue); })
+            : converter(filter.value);
+    };
+
+    var BindFilterQueryHelper = /** @class */ (function () {
+        function BindFilterQueryHelper() {
+        }
+        return BindFilterQueryHelper;
+    }());
+    BindFilterQueryHelper.MakeGraphQLWhere = function (filter, fields) { return Object.keys(filter).reduce(function (variables, fieldName) {
+        var _a;
+        var columnOption = AttributeOptionHelper.FindByAttribute(fieldName, fields);
+        if (!columnOption.bindFindFilter)
+            return Object.assign(Object.assign({}, variables), (_a = {},
+                _a[columnOption.columnName] = BindFilterQueryHelper.BuildWhereSentence(fieldName, filter[fieldName], fields),
+                _a));
+        var builtFilter = columnOption.bindFindFilter(filter[fieldName]);
+        return Object.assign(Object.assign({}, variables), Object.keys(builtFilter).reduce(function (variablesList, columnName) {
+            var _a;
+            return (Object.assign(Object.assign({}, variablesList), (_a = {}, _a[columnName] = BindFilterQueryHelper.BuildWhereSentence(fieldName, builtFilter[columnName], fields), _a)));
+        }, {}));
+    }, {}); };
+    BindFilterQueryHelper.BuildWhereSentence = function (field, options, fields) {
+        var _a;
+        var fieldSentenceOptions = AttributeOptionHelper.FindByAttribute(field, fields);
+        if (!Array.isArray(options) &&
+            lodash.isObject(options) &&
+            lodash.isNil(options === null || options === void 0 ? void 0 : options.operator) &&
+            lodash.isNil(options === null || options === void 0 ? void 0 : options.value) &&
+            lodash.isNil(fieldSentenceOptions === null || fieldSentenceOptions === void 0 ? void 0 : fieldSentenceOptions.to))
+            return Object.keys(options).reduce(function (variables, key) {
+                var _a;
+                var fieldOptions = AttributeOptionHelper.FindByAttribute(key, (fieldSentenceOptions === null || fieldSentenceOptions === void 0 ? void 0 : fieldSentenceOptions.fields) || fields);
+                var columnName = fieldOptions.columnName;
+                var columnFields = fieldOptions.fields;
+                return Object.assign(Object.assign({}, variables), (_a = {}, _a[columnName] = BindFilterQueryHelper.BuildWhereSentence(key, options[key], columnFields || []), _a));
+            }, {});
+        if (!Array.isArray(options) && !lodash.isNil(fieldSentenceOptions.fields))
+            return _a = {},
+                _a[fieldSentenceOptions.fields[0]] = BindFilterQueryHelper.BuildOperatorSentence(options, fieldSentenceOptions),
+                _a;
+        if (lodash.isObject(options) && !FilterOptionHelper.CheckIfIsFilterOption(options))
+            options = Object.values(options)[0];
+        return Array.isArray(options)
+            ? options.reduce(function (whereSentence, option) { return (Object.assign(Object.assign({}, whereSentence), BindFilterQueryHelper.BuildOperatorSentence(option, fieldSentenceOptions))); }, {})
+            : BindFilterQueryHelper.BuildOperatorSentence(options, fieldSentenceOptions);
+    };
+    BindFilterQueryHelper.BuildOperatorSentence = function (options, fieldOption) {
+        var _a;
+        return (_a = {},
+            _a[BindFilterQueryHelper.GetHasuraOperator(options, fieldOption)] = FilterOptionHelper.GetValueFromFilter(options, fieldOption),
+            _a);
+    };
+    BindFilterQueryHelper.GetHasuraOperator = function (options, fieldOption) { return FilterOptionHelper.CheckIfIsFilterOption(options)
+        ? fieldOption.type === HasuraGraphQLColumnType.Jsonb
+            ? BindFilterQueryHelper.GetHasuraJsonbOperator(options)
+            : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find(function (graphQLOperator) { return graphQLOperator === Object.keys(exports.Where).find(function (operator) { return exports.Where[operator] === (options === null || options === void 0 ? void 0 : options.operator); }); })]
+        : HasuraGraphQLWhere.EQUALS; };
+    BindFilterQueryHelper.GetHasuraJsonbOperator = function (options) { return options.operator === exports.Where.IN
+        ? '_contains'
+        : options.operator === exports.Where.LIKE
+            ? '_has_keys_any'
+            : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find(function (graphQLOperator) { return graphQLOperator === Object.keys(exports.Where).find(function (operator) { return exports.Where[operator] === (options === null || options === void 0 ? void 0 : options.operator); }); })]; };
+
     var GraphQLFieldHelper = /** @class */ (function () {
         function GraphQLFieldHelper() {
         }
@@ -2994,7 +3104,7 @@
     GraphQLFieldHelper.CheckIsGraphQLParams = function (params) { return !lodash.isString(params) && Array.isArray(params) && params.length >= 0 && !!params[0].operation; };
     GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields = function (fields) {
         return fields === null || fields === void 0 ? void 0 : fields.map(function (field) {
-            var _b, _c;
+            var _b, _c, _d;
             if (lodash.isString(field))
                 return field.toString();
             var fieldName = Object.keys(field).shift();
@@ -3004,9 +3114,21 @@
             if (!AttributeOptionHelper.CheckIsColumnOption(fieldValue))
                 return;
             if (fieldValue.fields)
-                return _c = {},
-                    _c[fieldValue.columnName || fieldName] = GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields(fieldValue.fields),
-                    _c;
+                return !fieldValue.filters
+                    ? (_c = {},
+                        _c[fieldValue.columnName || fieldName] = GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields(fieldValue.fields),
+                        _c) : {
+                    operation: fieldValue.columnName || fieldName,
+                    fields: GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields(fieldValue.fields),
+                    variables: (_d = {},
+                        _d[fieldValue.columnName + "_where"] = {
+                            name: 'where',
+                            type: fieldValue.filters.filterType,
+                            value: BindFilterQueryHelper.MakeGraphQLWhere(fieldValue.filters.filters, fieldValue.fields),
+                            required: true,
+                        },
+                        _d),
+                };
             return fieldValue.columnName;
         }).filter(function (field) { return !!field; });
     };
@@ -3065,29 +3187,6 @@
         }, {});
     };
 
-    var FilterOptionHelper = /** @class */ (function () {
-        function FilterOptionHelper() {
-        }
-        return FilterOptionHelper;
-    }());
-    FilterOptionHelper.CheckIfIsFilterOption = function (filter) { return !lodash.isNil(filter === null || filter === void 0 ? void 0 : filter.operator); };
-    FilterOptionHelper.GetValueFromFilter = function (filter, fieldOption) {
-        if (!FilterOptionHelper.CheckIfIsFilterOption(filter))
-            return filter;
-        if (filter.operator === exports.Where.ISNULL)
-            return true;
-        if (filter.operator === exports.Where.ISNOTNULL)
-            return false;
-        var converter = fieldOption.to
-            ? fieldOption.to
-            : function (value) { return filter.operator === exports.Where.LIKE && !Array.isArray(filter.value) && value.indexOf('%') < 0
-                ? "%" + value + "%"
-                : value; };
-        return Array.isArray(filter.value) && !fieldOption.fields && [exports.Where.IN, exports.Where.NOTIN].includes(filter.operator)
-            ? filter.value.map(function (fieldValue) { return converter(fieldValue); })
-            : converter(filter.value);
-    };
-
     var withCreateHasuraGraphQL = function (MixinBase) {
         return /** @class */ (function (_super) {
             __extends(CreateHasuraGraphQLMixin, _super);
@@ -3441,92 +3540,11 @@
         }(MixinBase));
     };
 
-    var HasuraGraphQLWhere;
-    (function (HasuraGraphQLWhere) {
-        HasuraGraphQLWhere["EQUALS"] = "_eq";
-        HasuraGraphQLWhere["GT"] = "_gt";
-        HasuraGraphQLWhere["GTE"] = "_gte";
-        HasuraGraphQLWhere["IN"] = "_in";
-        HasuraGraphQLWhere["NOTIN"] = "_nin";
-        HasuraGraphQLWhere["LT"] = "_lt";
-        HasuraGraphQLWhere["LTE"] = "_lte";
-        HasuraGraphQLWhere["LIKE"] = "_like";
-        HasuraGraphQLWhere["NOTLIKE"] = "_nlike";
-        HasuraGraphQLWhere["ISNULL"] = "_is_null";
-        HasuraGraphQLWhere["ISNOTNULL"] = "_is_null";
-    })(HasuraGraphQLWhere || (HasuraGraphQLWhere = {}));
-
-    var HasuraGraphQLColumnType;
-    (function (HasuraGraphQLColumnType) {
-        HasuraGraphQLColumnType["Int"] = "Int";
-        HasuraGraphQLColumnType["Float"] = "Float";
-        HasuraGraphQLColumnType["Boolean"] = "Boolean";
-        HasuraGraphQLColumnType["String"] = "String";
-        HasuraGraphQLColumnType["DateTime"] = "timestampz";
-        HasuraGraphQLColumnType["Json"] = "json";
-        HasuraGraphQLColumnType["Jsonb"] = "jsonb";
-        HasuraGraphQLColumnType["Enum"] = "enum";
-        HasuraGraphQLColumnType["Uuid"] = "uuid";
-    })(HasuraGraphQLColumnType || (HasuraGraphQLColumnType = {}));
-
     var withFindHasuraGraphQL = function (MixinBase) {
         return /** @class */ (function (_super) {
             __extends(FindHasuraGraphQLMixin, _super);
             function FindHasuraGraphQLMixin() {
-                var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-                _this.makeGraphQLWhere = function (filter, fields) { return Object.keys(filter).reduce(function (variables, fieldName) {
-                    var _b;
-                    var columnOption = AttributeOptionHelper.FindByAttribute(fieldName, fields);
-                    if (!columnOption.bindFindFilter)
-                        return Object.assign(Object.assign({}, variables), (_b = {}, _b[columnOption.columnName] = _this.buildWhereSentence(fieldName, filter[fieldName], fields), _b));
-                    var builtFilter = columnOption.bindFindFilter(filter[fieldName]);
-                    return Object.assign(Object.assign({}, variables), Object.keys(builtFilter).reduce(function (variablesList, columnName) {
-                        var _b;
-                        return (Object.assign(Object.assign({}, variablesList), (_b = {}, _b[columnName] = _this.buildWhereSentence(fieldName, builtFilter[columnName], fields), _b)));
-                    }, {}));
-                }, {}); };
-                _this.buildWhereSentence = function (field, options, fields) {
-                    var _b;
-                    var fieldSentenceOptions = AttributeOptionHelper.FindByAttribute(field, fields);
-                    if (!Array.isArray(options) &&
-                        lodash.isObject(options) &&
-                        lodash.isNil(options === null || options === void 0 ? void 0 : options.operator) &&
-                        lodash.isNil(options === null || options === void 0 ? void 0 : options.value) &&
-                        lodash.isNil(fieldSentenceOptions === null || fieldSentenceOptions === void 0 ? void 0 : fieldSentenceOptions.to))
-                        return Object.keys(options).reduce(function (variables, key) {
-                            var _b;
-                            var fieldOptions = AttributeOptionHelper.FindByAttribute(key, (fieldSentenceOptions === null || fieldSentenceOptions === void 0 ? void 0 : fieldSentenceOptions.fields) || fields);
-                            var columnName = fieldOptions.columnName;
-                            var columnFields = fieldOptions.fields;
-                            return Object.assign(Object.assign({}, variables), (_b = {}, _b[columnName] = _this.buildWhereSentence(key, options[key], columnFields || []), _b));
-                        }, {});
-                    if (!Array.isArray(options) && !lodash.isNil(fieldSentenceOptions.fields))
-                        return _b = {},
-                            _b[fieldSentenceOptions.fields[0]] = _this.buildOperatorSentence(options, fieldSentenceOptions),
-                            _b;
-                    if (lodash.isObject(options) && !FilterOptionHelper.CheckIfIsFilterOption(options))
-                        options = Object.values(options)[0];
-                    return Array.isArray(options)
-                        ? options.reduce(function (whereSentence, option) { return (Object.assign(Object.assign({}, whereSentence), _this.buildOperatorSentence(option, fieldSentenceOptions))); }, {})
-                        : _this.buildOperatorSentence(options, fieldSentenceOptions);
-                };
-                _this.buildOperatorSentence = function (options, fieldOption) {
-                    var _b;
-                    return (_b = {},
-                        _b[_this.getHasuraOperator(options, fieldOption)] = FilterOptionHelper.GetValueFromFilter(options, fieldOption),
-                        _b);
-                };
-                _this.getHasuraOperator = function (options, fieldOption) { return FilterOptionHelper.CheckIfIsFilterOption(options)
-                    ? fieldOption.type === HasuraGraphQLColumnType.Jsonb
-                        ? _this.getHasuraJsonbOperator(options)
-                        : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find(function (graphQLOperator) { return graphQLOperator === Object.keys(exports.Where).find(function (operator) { return exports.Where[operator] === (options === null || options === void 0 ? void 0 : options.operator); }); })]
-                    : HasuraGraphQLWhere.EQUALS; };
-                _this.getHasuraJsonbOperator = function (options) { return options.operator === exports.Where.IN
-                    ? '_contains'
-                    : options.operator === exports.Where.LIKE
-                        ? '_has_keys_any'
-                        : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find(function (graphQLOperator) { return graphQLOperator === Object.keys(exports.Where).find(function (operator) { return exports.Where[operator] === (options === null || options === void 0 ? void 0 : options.operator); }); })]; };
-                return _this;
+                return _super !== null && _super.apply(this, arguments) || this;
             }
             FindHasuraGraphQLMixin.prototype.find = function (options) {
                 return __awaiter(this, void 0, void 0, function () {
@@ -3540,7 +3558,7 @@
                                     ? {}
                                     : {
                                         where: {
-                                            value: this.makeGraphQLWhere(filters, this.fields),
+                                            value: BindFilterQueryHelper.MakeGraphQLWhere(filters, this.fields),
                                             type: this.tableName + "_bool_exp",
                                             required: true,
                                         },
@@ -4078,6 +4096,10 @@
                 {
                     rate: {
                         columnName: 'reviews_aggregate',
+                        filters: {
+                            filters: { status: true },
+                            filterType: 'product_review_bool_exp',
+                        },
                         fields: [{ aggregate: [{ avg: ['rate'] }] }],
                         from: function (value) { return value.aggregate.avg.rate; },
                     },