@infrab4a/connect 3.4.3-beta.0 → 3.5.0-beta.1

package/bundles/infrab4a-connect.umd.js

@@ -1,13 +1,14 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('reflect-metadata'), require('class-transformer'), require('date-fns'), require('lodash'), require('ts-custom-error'), require('axios'), require('firebase'), require('gql-query-builder')) :
-    typeof define === 'function' && define.amd ? define('@infrab4a/connect', ['exports', 'reflect-metadata', 'class-transformer', 'date-fns', 'lodash', 'ts-custom-error', 'axios', 'firebase', 'gql-query-builder'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.infrab4a = global.infrab4a || {}, global.infrab4a.connect = {}), null, global["class-transformer"], global["date-fns"], global.lodash, global["ts-custom-error"], global.axios, global.firebase, global["gql-query-builder"]));
-})(this, (function (exports, reflectMetadata, classTransformer, dateFns, lodash, tsCustomError, axios, firebase, gqlQueryBuilder) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('reflect-metadata'), require('class-transformer'), require('date-fns'), require('lodash'), require('ts-custom-error'), require('axios'), require('firebase'), require('gql-query-builder'), require('node-fetch')) :
+    typeof define === 'function' && define.amd ? define('@infrab4a/connect', ['exports', 'reflect-metadata', 'class-transformer', 'date-fns', 'lodash', 'ts-custom-error', 'axios', 'firebase', 'gql-query-builder', 'node-fetch'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.infrab4a = global.infrab4a || {}, global.infrab4a.connect = {}), null, global["class-transformer"], global["date-fns"], global.lodash, global["ts-custom-error"], global.axios, global.firebase, global["gql-query-builder"], global["node-fetch"]));
+})(this, (function (exports, reflectMetadata, classTransformer, dateFns, lodash, tsCustomError, axios, firebase, gqlQueryBuilder, fetch) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
     var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
     var firebase__default = /*#__PURE__*/_interopDefaultLegacy(firebase);
+    var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 
     var BaseModel = /** @class */ (function () {
         function BaseModel(args) {
@@ -289,7 +290,7 @@
         Status["CANCELLED"] = "Cancelado";
     })(exports.Status || (exports.Status = {}));
 
-    /******************************************************************************
+    /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -356,64 +357,6 @@
     function __param(paramIndex, decorator) {
         return function (target, key) { decorator(target, key, paramIndex); };
     }
-    function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-        function accept(f) { if (f !== void 0 && typeof f !== "function")
-            throw new TypeError("Function expected"); return f; }
-        var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-        var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
-        var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-        var _, done = false;
-        for (var i = decorators.length - 1; i >= 0; i--) {
-            var context = {};
-            for (var p in contextIn)
-                context[p] = p === "access" ? {} : contextIn[p];
-            for (var p in contextIn.access)
-                context.access[p] = contextIn.access[p];
-            context.addInitializer = function (f) { if (done)
-                throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
-            var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
-            if (kind === "accessor") {
-                if (result === void 0)
-                    continue;
-                if (result === null || typeof result !== "object")
-                    throw new TypeError("Object expected");
-                if (_ = accept(result.get))
-                    descriptor.get = _;
-                if (_ = accept(result.set))
-                    descriptor.set = _;
-                if (_ = accept(result.init))
-                    initializers.push(_);
-            }
-            else if (_ = accept(result)) {
-                if (kind === "field")
-                    initializers.push(_);
-                else
-                    descriptor[key] = _;
-            }
-        }
-        if (target)
-            Object.defineProperty(target, contextIn.name, descriptor);
-        done = true;
-    }
-    ;
-    function __runInitializers(thisArg, initializers, value) {
-        var useValue = arguments.length > 2;
-        for (var i = 0; i < initializers.length; i++) {
-            value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-        }
-        return useValue ? value : void 0;
-    }
-    ;
-    function __propKey(x) {
-        return typeof x === "symbol" ? x : "".concat(x);
-    }
-    ;
-    function __setFunctionName(f, name, prefix) {
-        if (typeof name === "symbol")
-            name = name.description ? "[".concat(name.description, "]") : "";
-        return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
-    }
-    ;
     function __metadata(metadataKey, metadataValue) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
             return Reflect.metadata(metadataKey, metadataValue);
@@ -445,7 +388,7 @@
         function step(op) {
             if (f)
                 throw new TypeError("Generator is already executing.");
-            while (g && (g = 0, op[0] && (_ = 0)), _)
+            while (_)
                 try {
                     if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
                         return t;
@@ -509,11 +452,7 @@
     var __createBinding = Object.create ? (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
-        var desc = Object.getOwnPropertyDescriptor(m, k);
-        if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-            desc = { enumerable: true, get: function () { return m[k]; } };
-        }
-        Object.defineProperty(o, k2, desc);
+        Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
     }) : (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
@@ -613,7 +552,7 @@
     function __asyncDelegator(o) {
         var i, p;
         return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
     }
     function __asyncValues(o) {
         if (!Symbol.asyncIterator)
@@ -667,11 +606,6 @@
         if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
             throw new TypeError("Cannot write private member to an object whose class did not declare it");
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-    }
-    function __classPrivateFieldIn(state, receiver) {
-        if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function"))
-            throw new TypeError("Cannot use 'in' operator on non-object");
-        return typeof state === "function" ? receiver === state : state.has(receiver);
     }
 
     var Edition = /** @class */ (function (_super) {
@@ -1531,8 +1465,8 @@
         OrderStatus["EM_PREPARO"] = "Preparando pedido";
         OrderStatus["NF_EMITIDA"] = "Nota Fiscal Emitida";
         OrderStatus["AGUARDANDO_ENVIO"] = "Aguardando Transaportadora";
-        OrderStatus["ENVIADO"] = "Enviado";
-        OrderStatus["ENTREGUE"] = "Entregue";
+        OrderStatus["ENVIADO"] = "Pedido Enviado";
+        OrderStatus["ENTREGUE"] = "Pedido entregue";
         OrderStatus["CANCELADO"] = "Cancelado";
         OrderStatus["CREDIT_CARD"] = "credit_card";
     })(exports.OrderStatus || (exports.OrderStatus = {}));
@@ -1961,30 +1895,6 @@
     }());
 
     var withFirestore = function (MixinBase) {
-        var isObjectsAndNoDate = function (data) { return data &&
-            !Array.isArray(data) &&
-            typeof data === 'object' &&
-            (data === null || data === void 0 ? void 0 : data.constructor.name) !== 'Timestamp' &&
-            !('seconds' in data); };
-        var bindDate = function (data, keyName) {
-            if ((data === null || data === void 0 ? void 0 : data.constructor.name) === 'Timestamp')
-                return data.toDate();
-            if (data && typeof data === 'object' && 'seconds' in data)
-                return new Date(data.seconds * 1000);
-            if (typeof data === 'number' && ['createdAt', 'updatedAt'].includes(keyName))
-                return new Date(data);
-            return data;
-        };
-        var bindAllDateFromObject = function (data) {
-            return Object.keys(data).reduce(function (object, key) {
-                var _a;
-                return (Object.assign(Object.assign({}, object), (_a = {}, _a[key] = isObjectsAndNoDate(data[key])
-                    ? bindAllDateFromObject(data[key])
-                    : Array.isArray(data[key])
-                        ? data[key].map(function (element) { return (isObjectsAndNoDate(element) ? bindAllDateFromObject(element) : element); })
-                        : bindDate(data[key], key), _a)));
-            }, {});
-        };
         return /** @class */ (function (_super) {
             __extends(class_1, _super);
             function class_1() {
@@ -1999,18 +1909,12 @@
                     toFirestore: function (data) { return ((data === null || data === void 0 ? void 0 : data.toPlain) ? data.toPlain() : data); },
                     fromFirestore: function (snap) {
                         var data = snap.data();
-                        var bindedData;
-                        try {
-                            var ids = { id: snap.id };
-                            bindedData = bindAllDateFromObject(data);
-                            return _this.model.toInstance(Object.assign(Object.assign({}, bindedData), ids));
-                        }
-                        catch (error) {
-                            console.info('id', snap.id);
-                            console.info('data', JSON.stringify(bindedData));
-                            console.error(error);
-                            throw error;
-                        }
+                        Object.keys(data).forEach(function (key) {
+                            if (data[key] && typeof data[key] === 'object' && '_seconds' in data[key]) {
+                                data[key] = data[key].toDate();
+                            }
+                        });
+                        return _this.model.toInstance(Object.assign(Object.assign({}, data), { id: snap.id }));
                     },
                 };
             };
@@ -2072,16 +1976,6 @@
         }(MixinBase));
     };
 
-    var FirestoreFieldType;
-    (function (FirestoreFieldType) {
-        FirestoreFieldType["String"] = "string";
-        FirestoreFieldType["Number"] = "number";
-        FirestoreFieldType["Boolean"] = "boolean";
-        FirestoreFieldType["Timestamp"] = "timestamp";
-        FirestoreFieldType["Array"] = "array";
-        FirestoreFieldType["Map"] = "map";
-    })(FirestoreFieldType || (FirestoreFieldType = {}));
-
     var withFindFirestore = function (MixinBase) {
         var checkIfIsFilterOption = function (filter) { return !lodash.isNil(filter === null || filter === void 0 ? void 0 : filter.operator); };
         var getValueFromFilter = function (filter) {
@@ -2106,16 +2000,13 @@
                         ? fieldName.toString()
                         : Object.keys(plainInstance).find(function (key) { return plainInstance[key]; });
                     if ((options === null || options === void 0 ? void 0 : options.operator) === exports.Where.LIKE) {
-                        if (Array.isArray(options === null || options === void 0 ? void 0 : options.value) &&
-                            (_this.fields[firestoreFieldName] === FirestoreFieldType.Array || !_this.fields[firestoreFieldName]))
+                        if (Array.isArray(options === null || options === void 0 ? void 0 : options.value))
                             return queryReference.where(firestoreFieldName, 'array-contains-any', options.value);
                         queryReference = queryReference.where(firestoreFieldName, '>=', options.value);
                         queryReference = queryReference.where(firestoreFieldName, '<=', options.value + "~");
                         return queryReference;
                     }
-                    if ((options === null || options === void 0 ? void 0 : options.operator) === exports.Where.IN &&
-                        Array.isArray(options === null || options === void 0 ? void 0 : options.value) &&
-                        (_this.fields[firestoreFieldName] === FirestoreFieldType.Array || !_this.fields[firestoreFieldName]))
+                    if ((options === null || options === void 0 ? void 0 : options.operator) === exports.Where.IN && Array.isArray(options === null || options === void 0 ? void 0 : options.value))
                         return queryReference.where(firestoreFieldName, 'array-contains', options.value);
                     if (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)) {
                         return Object.keys(options).reduce(function (queryReferenceWithWhere, key) { return _this.buildWhereSentence(queryReferenceWithWhere, fieldName.toString() + "." + key, options[key]); }, queryReference);
@@ -2124,37 +2015,35 @@
                 };
                 return _this;
             }
-            FindFirestore.prototype.find = function (_b) {
-                var _c = _b === void 0 ? {} : _b, filters = _c.filters, limits = _c.limits, orderBy = _c.orderBy, options = _c.options;
-                var _a;
+            FindFirestore.prototype.find = function (_a) {
+                var _b = _a === void 0 ? {} : _a, filters = _b.filters, limits = _b.limits, orderBy = _b.orderBy;
                 return __awaiter(this, void 0, void 0, function () {
-                    var orderByKeys, enableCount, query, filtersKeysWithUnordered, docs, data;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                    var orderByKeys, query, filtersKeysWithUnordered, docs, data;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
                             case 0:
                                 orderByKeys = Object.keys(orderBy || {});
-                                enableCount = (_a = options === null || options === void 0 ? void 0 : options.enableCount) !== null && _a !== void 0 ? _a : true;
                                 query = this.collection(this.buildCollectionPathForFind(filters || {}));
                                 query = this.makeFirestoreWhere(query, filters || {});
                                 if (orderByKeys.length) {
                                     filtersKeysWithUnordered = Object.keys(filters || {}).filter(function (filterKey) { return !orderByKeys.includes(filterKey); });
                                     if (filtersKeysWithUnordered.length)
                                         filtersKeysWithUnordered.forEach(function (filterKey) {
-                                            var _b;
-                                            return (orderBy = Object.assign(Object.assign({}, (![exports.Where.EQUALS].includes(filters[filterKey].operator) ? (_b = {}, _b[filterKey] = 'asc', _b) : {})), orderBy));
+                                            var _a;
+                                            return (orderBy = Object.assign(Object.assign({}, (![exports.Where.EQUALS].includes(filters[filterKey].operator) ? (_a = {}, _a[filterKey] = 'asc', _a) : {})), orderBy));
                                         });
                                     Object.keys(orderBy).forEach(function (fieldName) { return (query = query.orderBy(fieldName, orderBy[fieldName])); });
                                 }
                                 return [4 /*yield*/, this.defineLimits(query, filters, limits)];
                             case 1:
-                                query = _b.sent();
+                                query = _a.sent();
                                 return [4 /*yield*/, query.get()];
                             case 2:
-                                docs = _b.sent();
+                                docs = _a.sent();
                                 data = docs.docs.map(function (doc) { return doc.data(); });
                                 return [2 /*return*/, {
                                         data: data,
-                                        count: enableCount ? this.calculateCount(data, limits) : Infinity,
+                                        count: this.calculateCount(data, limits),
                                     }];
                         }
                     });
@@ -2169,23 +2058,23 @@
             };
             FindFirestore.prototype.defineLimits = function (query, filters, limits) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var _b, _c;
-                    return __generator(this, function (_d) {
-                        switch (_d.label) {
+                    var _a, _b;
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
                                 if (!(limits === null || limits === void 0 ? void 0 : limits.offset)) return [3 /*break*/, 3];
                                 if (!this.model.isModel(limits.offset)) return [3 /*break*/, 2];
-                                _c = (_b = query).startAfter;
+                                _b = (_a = query).startAfter;
                                 return [4 /*yield*/, this.collection(this.buildCollectionPathForFind(filters))
                                         .doc(limits.offset[limits.offset.identifiersFields.shift()])
                                         .get()];
                             case 1:
-                                query = _c.apply(_b, [_d.sent()]);
+                                query = _b.apply(_a, [_c.sent()]);
                                 return [3 /*break*/, 3];
                             case 2:
                                 if (lodash.isNumber(limits.offset) || lodash.isString(limits.offset))
                                     query = query.startAt(limits.offset);
-                                _d.label = 3;
+                                _c.label = 3;
                             case 3:
                                 if (limits === null || limits === void 0 ? void 0 : limits.limit)
                                     query = query.limit(limits.limit);
@@ -2877,8 +2766,7 @@
                 var _a;
                 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) {
-                        var _a;
-                        if (!!((_a = lineItem.price) === null || _a === void 0 ? void 0 : _a[order.shop])) {
+                        if (!!lineItem.price[order.shop]) {
                             var shopPrice = lineItem['price'][order.shop];
                             lineItem['price'] = shopPrice;
                         }
@@ -2889,9 +2777,6 @@
             };
             _this.collectionName = 'orders';
             _this.model = Order;
-            _this.fields = {
-                status: FirestoreFieldType.String,
-            };
             return _this;
         }
         OrderFirestoreRepository.prototype.buildModelInstance = function () {
@@ -3529,19 +3414,21 @@
             };
             HasuraGraphQLMixin.prototype.fetch = function (params) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var headers, result;
+                    var headers, response, result;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
                                 headers = this.headers;
-                                return [4 /*yield*/, axios__default["default"]({
-                                        url: "" + this.endpoint,
+                                return [4 /*yield*/, fetch__default["default"]("" + this.endpoint, {
                                         method: 'POST',
-                                        data: params,
+                                        body: JSON.stringify(params),
                                         headers: headers,
                                     })];
                             case 1:
-                                result = (_a.sent()).data;
+                                response = _a.sent();
+                                return [4 /*yield*/, response.json()];
+                            case 2:
+                                result = _a.sent();
                                 if (!lodash.isNil(result.errors))
                                     throw new Error(JSON.stringify(result.errors));
                                 return [2 /*return*/, result.data];
@@ -3713,16 +3600,14 @@
             function FindHasuraGraphQLMixin() {
                 return _super !== null && _super.apply(this, arguments) || this;
             }
-            FindHasuraGraphQLMixin.prototype.find = function (params) {
-                var _a;
+            FindHasuraGraphQLMixin.prototype.find = function (options) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var _b, filters, limits, orderBy, options, enableCount, variablesCount, variables, result, data;
+                    var _b, filters, limits, orderBy, variablesCount, variables, result, data, count;
                     var _this = this;
                     return __generator(this, function (_c) {
                         switch (_c.label) {
                             case 0:
-                                _b = params || {}, filters = _b.filters, limits = _b.limits, orderBy = _b.orderBy, options = _b.options;
-                                enableCount = (_a = options === null || options === void 0 ? void 0 : options.enableCount) !== null && _a !== void 0 ? _a : true;
+                                _b = options || {}, filters = _b.filters, limits = _b.limits, orderBy = _b.orderBy;
                                 variablesCount = Object.assign(Object.assign({}, (lodash.isNil(orderBy) ? {} : { order_by: { type: this.tableName + "_order_by!", list: true, value: orderBy } })), (lodash.isNil(filters)
                                     ? {}
                                     : {
@@ -3733,11 +3618,11 @@
                                         },
                                     }));
                                 variables = Object.assign(Object.assign({}, (lodash.isNil(limits) ? {} : limits)), variablesCount);
-                                return [4 /*yield*/, this.query(__spreadArray([
+                                return [4 /*yield*/, this.query([
                                         {
                                             operation: this.tableName,
-                                            fields: params.fields
-                                                ? params.fields
+                                            fields: options.fields
+                                                ? options.fields
                                                     .map(function (fieldName) {
                                                     var _a;
                                                     return (_a = _this.fields.find(function (fieldOption) { return fieldOption === fieldName; })) !== null && _a !== void 0 ? _a : _this.fields.find(function (fieldOption) { return Object.keys(fieldOption).shift() === fieldName; });
@@ -3745,20 +3630,18 @@
                                                     .filter(Boolean)
                                                 : this.fields,
                                             variables: variables,
-                                        }
-                                    ], __read((enableCount
-                                        ? [
-                                            {
-                                                operation: this.tableName + "_aggregate",
-                                                fields: [{ aggregate: ['count'] }],
-                                                variables: variablesCount,
-                                            },
-                                        ]
-                                        : []))))];
+                                        },
+                                        {
+                                            operation: this.tableName + "_aggregate",
+                                            fields: [{ aggregate: ['count'] }],
+                                            variables: variablesCount,
+                                        },
+                                    ])];
                             case 1:
                                 result = _c.sent();
                                 data = result[this.tableName].map(function (row) { return _this.convertDataFromHasura(row); });
-                                return [2 /*return*/, { data: data, count: enableCount ? result[this.tableName + "_aggregate"].aggregate.count : Infinity }];
+                                count = result[this.tableName + "_aggregate"].aggregate.count;
+                                return [2 /*return*/, { count: count, data: data }];
                         }
                     });
                 });
@@ -3912,7 +3795,7 @@
                     switch (_d.label) {
                         case 0:
                             if (!Number.isNaN(+identifiers.id)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.find({ filters: { firestoreId: identifiers.id }, options: { enableCount: false } })];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: identifiers.id } })];
                         case 1:
                             _c = (_a = (_d.sent()).data) === null || _a === void 0 ? void 0 : _a[0];
                             return [3 /*break*/, 3];
@@ -3966,19 +3849,19 @@
         };
         CategoryHasuraGraphQLRepository.prototype.getCategoryBySlug = function (slug, shop) {
             return __awaiter(this, void 0, void 0, function () {
-                var data;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var _c, data, count;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             if (!slug)
                                 return [2 /*return*/];
-                            return [4 /*yield*/, this.find({ filters: { slug: slug, shop: shop, published: true }, options: { enableCount: false } })];
+                            return [4 /*yield*/, this.find({ filters: { slug: slug, shop: shop, published: true } })];
                         case 1:
-                            data = (_c.sent()).data;
-                            if (!data.length)
-                                throw new NotFoundError("Category with slug " + slug + " not found");
-                            if (data.length > 1)
+                            _c = _d.sent(), data = _c.data, count = _c.count;
+                            if (count > 1)
                                 throw new DuplicatedResultsError('Query returned duplicated values');
+                            if (!count)
+                                throw new NotFoundError("Category with slug " + slug + " not found");
                             return [2 /*return*/, data.shift()];
                     }
                 });
@@ -3987,46 +3870,17 @@
         CategoryHasuraGraphQLRepository.prototype.getCategoriesForHome = function (categoryIds, limit) {
             if (limit === void 0) { limit = 4; }
             return __awaiter(this, void 0, void 0, function () {
-                var categoriesFirestore, categoriesHasura, categories, _c, _d, _e, _f, _g, _h, _j, _k, homeSections;
+                var _c, categories, count, homeSections;
                 var _this = this;
-                return __generator(this, function (_l) {
-                    switch (_l.label) {
-                        case 0:
-                            if (!(categoryIds === null || categoryIds === void 0 ? void 0 : categoryIds.length))
-                                return [2 /*return*/, []];
-                            categoriesFirestore = categoryIds.filter(function (categoryId) { return Number.isNaN(+categoryId); });
-                            categoriesHasura = categoryIds.filter(function (categoryId) { return +categoryId > 0; });
-                            categories = [];
-                            if (!categoriesFirestore.length) return [3 /*break*/, 2];
-                            _d = (_c = categories.push).apply;
-                            _e = [categories];
-                            _f = [[]];
-                            return [4 /*yield*/, this.find({
-                                    filters: { firestoreId: { operator: exports.Where.IN, value: categoriesFirestore.filter(Boolean) }, published: true },
-                                }).then(function (_c) {
-                                    var data = _c.data;
-                                    return data;
-                                })];
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0: return [4 /*yield*/, this.find({
+                                filters: { firestoreId: { operator: exports.Where.IN, value: categoryIds.filter(Boolean) }, published: true },
+                            })];
                         case 1:
-                            _d.apply(_c, _e.concat([__spreadArray.apply(void 0, _f.concat([__read.apply(void 0, [(_l.sent())])]))]));
-                            _l.label = 2;
-                        case 2:
-                            if (!categoriesHasura.length) return [3 /*break*/, 4];
-                            _h = (_g = categories.push).apply;
-                            _j = [categories];
-                            _k = [[]];
-                            return [4 /*yield*/, this.find({
-                                    filters: { id: { operator: exports.Where.IN, value: categoriesHasura.filter(Boolean) }, published: true },
-                                }).then(function (_c) {
-                                    var data = _c.data;
-                                    return data;
-                                })];
-                        case 3:
-                            _h.apply(_g, _j.concat([__spreadArray.apply(void 0, _k.concat([__read.apply(void 0, [(_l.sent())])]))]));
-                            _l.label = 4;
-                        case 4:
-                            if (!categories.length)
-                                return [2 /*return*/, []];
+                            _c = _d.sent(), categories = _c.data, count = _c.count;
+                            if (!count)
+                                throw new NotFoundError('Categories not found');
                             return [4 /*yield*/, Promise.all(categories.map(function (category) { return __awaiter(_this, void 0, void 0, function () {
                                     var _c;
                                     return __generator(this, function (_d) {
@@ -4041,24 +3895,23 @@
                                         }
                                     });
                                 }); }))];
-                        case 5:
-                            homeSections = _l.sent();
+                        case 2:
+                            homeSections = _d.sent();
                             return [2 /*return*/, homeSections];
                     }
                 });
             });
         };
         CategoryHasuraGraphQLRepository.prototype.mountCategory = function (category, options) {
-            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var products, productsData;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            if (!((_a = category === null || category === void 0 ? void 0 : category.products) === null || _a === void 0 ? void 0 : _a.length))
-                                return [2 /*return*/, []];
+                            if (!category.products)
+                                throw new RequiredArgumentError(['Category products is empty']);
                             products = [];
-                            return [4 /*yield*/, this.productRepository.find(Object.assign(Object.assign({ filters: Object.assign({ id: { operator: exports.Where.IN, value: category.products }, published: true }, ((options === null || options === void 0 ? void 0 : options.hasStock) ? { stock: { quantity: { operator: exports.Where.GT, value: 0 } } } : {})), fields: [
+                            return [4 /*yield*/, this.productRepository.find(Object.assign({ filters: Object.assign({ id: { operator: exports.Where.IN, value: category.products }, published: true }, ((options === null || options === void 0 ? void 0 : options.hasStock) ? { stock: { quantity: { operator: exports.Where.GT, value: 0 } } } : {})), fields: [
                                         'id',
                                         'name',
                                         'slug',
@@ -4082,7 +3935,7 @@
                                         'tags',
                                         'type',
                                         'shoppingCount',
-                                    ] }, ((options === null || options === void 0 ? void 0 : options.limit) ? { limits: { limit: options === null || options === void 0 ? void 0 : options.limit } } : {})), { options: { enableCount: false } }))];
+                                    ] }, ((options === null || options === void 0 ? void 0 : options.limit) ? { limits: { limit: options === null || options === void 0 ? void 0 : options.limit } } : {})))];
                         case 1:
                             productsData = (_c.sent()).data;
                             products.push.apply(products, __spreadArray([], __read(productsData)));
@@ -4100,7 +3953,7 @@
                         case 0:
                             if (!Number.isNaN(+id))
                                 return [2 /*return*/, id];
-                            return [4 /*yield*/, this.find({ filters: { firestoreId: id }, options: { enableCount: false } })];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: id } })];
                         case 1:
                             data = (_c.sent()).data;
                             if ((_a = data === null || data === void 0 ? void 0 : data[0]) === null || _a === void 0 ? void 0 : _a.id)
@@ -4420,7 +4273,7 @@
                     switch (_f.label) {
                         case 0:
                             if (!Number.isNaN(+identifiers.id)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.find({ filters: { firestoreId: identifiers.id }, options: { enableCount: false } })];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: identifiers.id } })];
                         case 1:
                             _c = (_a = (_f.sent()).data) === null || _a === void 0 ? void 0 : _a[0];
                             return [3 /*break*/, 4];
@@ -4465,21 +4318,21 @@
         ProductHasuraGraphQLRepository.prototype.getBySlug = function (slug) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var result, product;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var result, product, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0: return [4 /*yield*/, this.find({
                                 filters: {
                                     slug: slug,
                                 },
-                                fields: this.fields.map(function (field) { return typeof field === 'string' ? field : Object.keys(field).shift(); }),
-                                options: {
-                                    enableCount: false,
-                                },
                             })];
                         case 1:
-                            result = _c.sent();
+                            result = _d.sent();
                             product = (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.shift();
+                            _c = product;
+                            return [4 /*yield*/, this.findReviewsByProduct(+product.id)];
+                        case 2:
+                            _c.reviews = _d.sent();
                             return [2 /*return*/, product];
                     }
                 });
@@ -4760,7 +4613,7 @@
                         case 0:
                             if (!Number.isNaN(+id))
                                 return [2 /*return*/, id];
-                            return [4 /*yield*/, this.find({ filters: { firestoreId: id }, options: { enableCount: false } })];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: id } })];
                         case 1:
                             data = (_c.sent()).data;
                             if ((_a = data === null || data === void 0 ? void 0 : data[0]) === null || _a === void 0 ? void 0 : _a.id)
@@ -4990,7 +4843,7 @@
                         case 0:
                             if (!Number.isNaN(+id))
                                 return [2 /*return*/, id];
-                            return [4 /*yield*/, this.find({ filters: { firestoreId: id }, options: { enableCount: false } })];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: id } })];
                         case 1:
                             data = (_c.sent()).data;
                             if ((_a = data === null || data === void 0 ? void 0 : data[0]) === null || _a === void 0 ? void 0 : _a.id)