@webresto/graphql 1.4.0 → 1.4.2

package/lib/afterHook.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const graphql_1 = require("../src/graphql");
-const bindTranslations_1 = require("./bindTranslations");
+const graphql_1 = __importDefault(require("../src/graphql"));
+const bindTranslations_1 = __importDefault(require("./bindTranslations"));
 let cache = null;
 const eventHelper_1 = require("./eventHelper");
 async function default_1() {

package/lib/bindTranslations.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const fs = require("fs");
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
 function bindTranslations() {
     // load adminpanel translations
     const moduleTranslationPath = path.resolve(__dirname, `../translations`);

package/lib/eventHelper.js

@@ -1,8 +1,34 @@
 "use strict";
+var __createBinding = (this && this.__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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRandom = exports.sendAction = exports.sendMessage = void 0;
-const graphql_1 = require("../src/graphql");
-const crypto = require("crypto");
+const graphql_1 = __importDefault(require("../src/graphql"));
+const crypto = __importStar(require("crypto"));
 exports.default = {
     sendMessage,
     sendAction,

package/lib/graphqlHelper.js

@@ -1,12 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setWhiteList = exports.addModelResolver = exports.addDirResolvers = exports.addAllSailsModels = exports.addToReplaceList = exports.addCustomField = exports.addToBlackList = exports.getSchema = exports.addResolvers = exports.addType = exports.addModel = void 0;
 const _ = require("lodash");
 const worktime_1 = require("@webresto/worktime");
-const WLCriteria = require("waterline-criteria");
+const WLCriteria = __importStar(require("waterline-criteria"));
 const jwt_1 = require("./jwt");
-const fs = require("fs");
-const path = require("path");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const scalarTypes = {
     string: "String",
     number: "Float",

package/lib/initialize.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const hookTools_1 = require("@webresto/core/libs/hookTools");
-const afterHook_1 = require("@webresto/graphql/lib/afterHook");
+const hookTools_1 = __importDefault(require("@webresto/core/libs/hookTools"));
+const afterHook_1 = __importDefault(require("@webresto/graphql/lib/afterHook"));
 function ToInitialize() {
     /**
      * List of hooks that required

package/lib/jwt.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JWTAuth = void 0;
-const jwt = require("jsonwebtoken");
+const jwt = __importStar(require("jsonwebtoken"));
 class JWTAuth {
     static sign(authData) {
         return jwt.sign({

package/package.json

@@ -36,7 +36,7 @@
     "faker": "^4.1.0",
     "mocha": "^8.1.1",
     "ts-node": "^10.7.0",
-    "typescript": "^3.9.7",
+    "typescript": "^5.3.3",
     "i18n-2": "^0.7.3"
   },
   "deprecated": false,
@@ -68,5 +68,5 @@
     "test:js": "mocha test/bootstrap.js './test/{,!(fixture)/**}/*.test.js' --exit",
     "test:init": "cd ./test/fixture && npm i --no-package-lock --prefix ./ && cd -"
   },
-  "version": "1.4.0"
+  "version": "1.4.2"
 }

package/src/graphql.js

@@ -1,9 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const helper = require("../lib/graphqlHelper");
+const helper = __importStar(require("../lib/graphqlHelper"));
 const _ = require("lodash");
 const additionalResolvers_1 = require("./additionalResolvers");
-const langParser = require("accept-language-parser");
+const langParser = __importStar(require("accept-language-parser"));
 const apollo_server_express_1 = require("apollo-server-express");
 const fs = require("fs");
 const path = require("path");
@@ -181,7 +204,7 @@ exports.default = {
         emitter.on("send-message", "graphql", function ({ orderId, message }) {
             pubsub.publish("message", { orderId, message });
         });
-        emitter.on("core-dish-after-update", "graphql", function (record) {
+        emitter.on("core:dish-after-update", "graphql", function (record) {
             pubsub.publish("dish-changed", record);
         });
         emitter.on("core-maintenance-enabled", "graphql", function (record) {
@@ -235,6 +258,7 @@ exports.default = {
                             path: error.path
                         },
                     };
+                    sails.log.error(`Grahql error:`, JSON.stringify(graphQLFormattedError));
                     return graphQLFormattedError;
                 },
                 context: ({ req, connection }) => {

package/src/graphql.ts

@@ -201,7 +201,7 @@ export default {
     emitter.on("send-message", "graphql", function ({ orderId, message }) {
       pubsub.publish("message", { orderId, message });
     });
-    emitter.on("core-dish-after-update", "graphql", function (record) {
+    emitter.on("core:dish-after-update", "graphql", function (record) {
       pubsub.publish("dish-changed", record);
     });
     emitter.on("core-maintenance-enabled", "graphql", function (record) {
@@ -263,6 +263,7 @@ export default {
               path: error.path
             },
           }
+          sails.log.error(`Grahql error:`, JSON.stringify(graphQLFormattedError));
           return graphQLFormattedError;
         },
         context: ({ req, connection }) => {

package/src/resolvers/checkout.js

@@ -1,7 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const eventHelper = require("../../lib/eventHelper");
-const graphqlHelper_1 = require("../../lib/graphqlHelper");
+const eventHelper = __importStar(require("../../lib/eventHelper"));
+const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
 const jwt_1 = require("../../lib/jwt");
 graphqlHelper_1.default.addType(`#graphql    
   input InputOrderCheckout {

package/src/resolvers/order.d.ts

@@ -7,6 +7,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -14,6 +15,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -32,7 +42,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -49,7 +61,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
     };
@@ -61,6 +72,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -68,6 +80,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -86,7 +107,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -103,7 +126,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
         orderReplaceDish: {
@@ -113,6 +135,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -120,6 +143,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -138,7 +170,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -155,7 +189,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
         orderRemoveDish: {
@@ -165,6 +198,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -172,6 +206,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -190,7 +233,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -207,7 +252,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
         orderSetDishAmount: {
@@ -217,6 +261,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -224,6 +269,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -242,7 +296,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -259,7 +315,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
         orderSetDishComment: {
@@ -269,6 +324,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -276,6 +332,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -294,7 +359,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -311,7 +378,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
         orderUpdate: {
@@ -321,6 +387,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -328,6 +395,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -346,7 +422,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -363,7 +441,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
         orderClone: {
@@ -373,6 +450,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -380,6 +458,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -398,7 +485,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -415,7 +504,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
         orderPromocodeApply: {
@@ -425,6 +513,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -432,6 +521,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -450,7 +548,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -467,7 +567,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
         orderPromocodeReset: {
@@ -477,6 +576,7 @@ declare const _default: {
                 updatedAt?: Date;
                 id?: string;
                 shortId?: string;
+                state?: string;
                 concept?: string;
                 isMixedConcept?: boolean;
                 dishes?: number[] | import("@webresto/core/models/OrderDish").default[];
@@ -484,6 +584,15 @@ declare const _default: {
                 paymentMethodTitle?: string;
                 paid?: boolean;
                 isPaymentPromise?: boolean;
+                promotionState?: import("@webresto/core/models/Order").PromotionState[];
+                promotionCode?: string | import("@webresto/core/models/PromotionCode").default;
+                promotionCodeDescription?: string;
+                promotionCodeString?: string;
+                promotionFlatDiscount?: number;
+                promotionDelivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
+                promotionCodeCheckValidTill?: string;
+                promotionUnorderable?: boolean;
+                isPromoting?: boolean;
                 dishesCount?: number;
                 uniqueDishes?: number;
                 modifiers?: any;
@@ -502,7 +611,9 @@ declare const _default: {
                 rmsErrorCode?: string;
                 rmsStatusCode?: string;
                 deliveryStatus?: string;
+                pickupPoint?: string | import("@webresto/core/models/Place").default;
                 selfService?: boolean;
+                delivery?: import("@webresto/core/adapters/delivery/DeliveryAdapter").Delivery;
                 deliveryDescription?: string;
                 message?: string;
                 deliveryItem?: string | import("@webresto/core/models/Dish").default;
@@ -519,7 +630,6 @@ declare const _default: {
                 deviceId?: string;
                 user?: string | import("@webresto/core/models/User").default;
                 customData?: any;
-                state?: string;
             }>;
         };
     };

package/src/resolvers/order.js

@@ -1,11 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const checkExpression_1 = require("@webresto/core/libs/checkExpression");
+const checkExpression_1 = __importDefault(require("@webresto/core/libs/checkExpression"));
 const jwt_1 = require("../../lib/jwt");
 const graphqlHelper_1 = require("@webresto/graphql/lib/graphqlHelper");
 (0, graphqlHelper_1.addToReplaceList)("Order.promotionState", "promotionState: [PromotionState]");
 (0, graphqlHelper_1.addToReplaceList)("Order.pickupPoint", "pickupPoint: PickupPoint");
-const graphqlHelper_2 = require("../../lib/graphqlHelper");
+const graphqlHelper_2 = __importDefault(require("../../lib/graphqlHelper"));
 graphqlHelper_2.default.addType(`#graphql    
   input InputOrderUpdate {
     id: String!

package/src/resolvers/restrictions.js

@@ -1,6 +1,9 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const graphqlHelper_1 = require("../../lib/graphqlHelper");
+const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
 graphqlHelper_1.default.addType(`#graphql    
   type UserRestrictions {
     "Indicate main login field"

package/src/resolvers/telemetry.js

@@ -1,6 +1,9 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const graphqlHelper_1 = require("../../lib/graphqlHelper");
+const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
 graphqlHelper_1.default.addType(`#graphql
   type Telemetry {
     "System uptime in seconds"

package/src/resolvers/user.js

@@ -1,10 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 // const userAuth = sails.config.restographql.authService;
 const jwt_1 = require("../../lib/jwt");
 const adapters_1 = require("@webresto/core/adapters");
 let captchaAdapter = adapters_1.Captcha.getAdapter();
-const graphqlHelper_1 = require("../../lib/graphqlHelper");
+const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
 graphqlHelper_1.default.addType(`#graphql    
   type UserResponse {
     user: User
@@ -397,7 +400,7 @@ exports.default = {
       ): Response`,
             fn: async (parent, payload, context, info) => {
                 const auth = await jwt_1.JWTAuth.verify(context.connectionParams.authorization);
-                await User.delete(auth.userId, payload.otp);
+                await User.delete(auth.userId, payload.otp, false);
                 let message = {
                     deviceId: null,
                     title: context.i18n.__("Success"),

package/src/resolvers/user.ts

@@ -599,7 +599,7 @@ export default {
           context.connectionParams.authorization
         );
 
-        await User.delete(auth.userId, payload.otp);
+        await User.delete(auth.userId, payload.otp, false);
 
         let message: Message = {
           deviceId: null,

package/src/resolvers/userLocation.js

@@ -1,10 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 // const userAuth = sails.config.restographql.authService;
 const jwt_1 = require("../../lib/jwt");
 const adapters_1 = require("@webresto/core/adapters");
 let captchaAdapter = adapters_1.Captcha.getAdapter();
-const graphqlHelper_1 = require("../../lib/graphqlHelper");
+const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
 graphqlHelper_1.default.addType(`#graphql    
   input InputLocation {
     street: String

package/src/resolvers/userOTPrequest.js

@@ -1,11 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 // const userAuth = sails.config.restographql.authService;
 const adapters_1 = require("@webresto/core/adapters");
 const adapters_2 = require("@webresto/core/adapters");
 let captchaAdapter = adapters_1.Captcha.getAdapter();
 let OTPAdapter = adapters_2.OTP.getAdapter();
-const graphqlHelper_1 = require("../../lib/graphqlHelper");
+const graphqlHelper_1 = __importDefault(require("../../lib/graphqlHelper"));
 graphqlHelper_1.default.addType(`#graphql    
   type OTPResponse {
     id: String

package/test/e2e_helper.js

@@ -3,13 +3,39 @@
 // E2E Test Setup
 // e2e_helpers.js
 //
+var __createBinding = (this && this.__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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runGQL = exports.createSubscription = exports.TestApolloClient = void 0;
 const utilities_1 = require("@apollo/client/utilities");
 const ws_1 = require("@apollo/client/link/ws");
-const cross_fetch_1 = require("cross-fetch");
-const ws = require("ws");
-const axios_1 = require("axios");
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
+const ws = __importStar(require("ws"));
+const axios_1 = __importDefault(require("axios"));
 const client_1 = require("@apollo/client");
 const host = "127.0.0.1";
 const port = process.env.PORT === undefined ? "42772" : process.env.PORT;

package/test/integration/subscriptions.test.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
-const e2e = require("../e2e_helper");
+const e2e = __importStar(require("../e2e_helper"));
 const e2e_helper_1 = require("../e2e_helper");
 const apollo_server_core_1 = require("apollo-server-core");
 const e2e_helper_2 = require("../e2e_helper");

package/tsconfig.json

@@ -16,6 +16,7 @@
     "declaration": true,
     "removeComments": false,
     "skipLibCheck": true,
+    "esModuleInterop": true
     // TODO: ts with "strict": true,
     // "alwaysStrict": true
   },

package/types/global.d.ts

@@ -1,11 +1,13 @@
 import sails from "@42pub/typed-sails";
 import { Config } from "@webresto/core/interfaces/Config";
 import AwaitEmitter from "@webresto/core/libs/AwaitEmitter";
-import { NotificationManager } from "@webresto/core/libs/NotificationManager";
+import BonusProgram from "@webresto/core/models/BonusProgram";
+import PaymentMethod from "@webresto/core/models/PaymentMethod";
+import Order from "@webresto/core/models/Order";
 type sailsConfig = typeof sails.config;
 declare global {
     const emitter: AwaitEmitter;
-    const NotificationManager: NotificationManager;
+    const NotificationManager: typeof import("@webresto/core/libs/NotificationManager").NotificationManager;
     const Adapter: typeof import("@webresto/core/adapters").Adapter;
     export interface Sails extends sails.Sails {
         on: any;
@@ -27,4 +29,28 @@ declare global {
     type ResType = sails.Response;
     type PropType<TObj, TProp extends keyof TObj> = TObj[TProp];
 }
+declare global {
+    interface IAwaitEmitter {
+        [key: `graphql-query-${string}`]: [any];
+        [key: `http-api:before-send-${string}`]: [any];
+        'graphql-return-payment-method': [string, PaymentMethod[]];
+        "http-api:create-newcart": [Order];
+        "http-api:init-newcart": [Order];
+        "http-api:before-response-order-update": [Order];
+        /**
+         * В данном случае надо указывать PopulatedOrder
+         */
+        "http-api:before-response-order-set-dish-comment": [Order];
+        "http-api:before-response-order-set-dish-amount": [Order];
+        "http-api:before-response-order-remove-dish": [Order];
+        "http-api:before-response-order-replace-dish": [Order];
+        "http-api:before-response-order-add-dish": [Order];
+        "http-api:before-response-order": [Order];
+        "graphql-return-bonus-program": [string, BonusProgram[]];
+        "send-message": [{
+            orderId: string;
+            message: any;
+        }];
+    }
+}
 export {};

package/types/global.ts

@@ -1,12 +1,16 @@
 import sails from "@42pub/typed-sails";
 import { Config } from "@webresto/core/interfaces/Config";
 import AwaitEmitter from "@webresto/core/libs/AwaitEmitter";
-import { NotificationManager } from "@webresto/core/libs/NotificationManager"
+import BonusProgram from "@webresto/core/models/BonusProgram";
+import PaymentMethod from "@webresto/core/models/PaymentMethod";
+import Order from "@webresto/core/models/Order";
+import Dish from "@webresto/core/models/Dish";
+
 type sailsConfig = typeof sails.config;
 
 declare global {
   const emitter: AwaitEmitter;
-  const NotificationManager: NotificationManager
+  const NotificationManager: typeof import("@webresto/core/libs/NotificationManager").NotificationManager
   const Adapter: typeof import("@webresto/core/adapters").Adapter
   
   export interface Sails extends sails.Sails {
@@ -28,4 +32,30 @@ declare global {
   type ReqType = sails.Request;
   type ResType = sails.Response;
   type PropType<TObj, TProp extends keyof TObj> = TObj[TProp];
+}
+
+declare global {
+  interface IAwaitEmitter { 
+    [key: `graphql-query-${string}`]: [any];
+    [key: `http-api:before-send-${string}`]: [any];
+    'graphql-return-payment-method': [string, PaymentMethod[]]
+    "http-api:create-newcart": [Order]
+    "http-api:init-newcart": [Order]
+    "http-api:before-response-order-update": [Order]
+    
+    /**
+     * В данном случае надо указывать PopulatedOrder
+     */
+    "http-api:before-response-order-set-dish-comment": [Order]
+    "http-api:before-response-order-set-dish-amount": [Order]
+    "http-api:before-response-order-remove-dish": [Order]
+    "http-api:before-response-order-replace-dish":[Order]
+    "http-api:before-response-order-add-dish": [Order]
+    "http-api:before-response-order": [Order]
+    "graphql-return-bonus-program": [string, BonusProgram[]]
+
+    "send-message": [{orderId: string, message: any}]
+
+
+  }
 }