@webiny/handler-client 0.0.0-mt-3 → 0.0.0-unstable.06b2ede40f

package/HandlerClient.d.ts

@@ -1,8 +1,12 @@
-import { Context } from "@webiny/handler/types";
-import { HandlerClientPlugin, InvokeArgs } from "./types";
+import type { InvokeArgs, ClientContext } from "./types";
 declare class HandlerClient {
-    plugin: HandlerClientPlugin;
-    constructor(context: Context);
+    private readonly plugin;
+    /**
+     * We need the default plugin to later on fetch another plugin than initially selected.
+     * If name of the required plugin is not the default one, fetch new one.
+     */
+    private readonly default;
+    constructor(context: ClientContext);
     invoke<TInvokeArgsPayload = any, TResponse = any>(params: InvokeArgs<TInvokeArgsPayload>): Promise<TResponse>;
 }
 export default HandlerClient;

package/HandlerClient.js

@@ -1,61 +1,79 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
-class HandlerClient {
-  constructor(context) {
-    (0, _defineProperty2.default)(this, "plugin", void 0);
-    this.plugin = context.plugins.byName("handler-client");
-
-    if (!this.plugin) {
-      // If not specified, use a fallback plugin that fetches different handlers via plugins.
-      // This might also be useful for testing purposes.
-      this.plugin = {
-        type: "handler-client",
-        name: "handler-client",
-
-        async invoke({
-          name,
-          payload,
-          await: useAwait
-        }) {
-          const plugin = context.plugins.byName(name);
-
-          if (!plugin) {
-            throw new _error.default(`Could not find "${name}" handler plugin.`);
-          }
-
-          const promise = plugin.invoke(payload);
-
-          if (useAwait === false) {
-            return null;
-          }
-
-          return promise;
-        }
-
-      };
+var _HandlerClientPlugin = require("./HandlerClientPlugin");
+const defaultPluginName = "handler-client";
+const getPluginFetcher = context => {
+  const pl = new _HandlerClientPlugin.HandlerClientPlugin({
+    invoke: async params => {
+      const {
+        name,
+        payload,
+        await: useAwait
+      } = params;
+      const plugin = context.plugins.byName(name);
+      if (!plugin) {
+        throw new _error.default(`Could not find "${name}" handler plugin.`);
+      }
+      const promise = plugin.invoke(payload);
+      if (useAwait === false) {
+        return null;
+      }
+      return promise;
     }
+  });
+  pl.name = defaultPluginName;
+  return pl;
+};
+const getHandlerClientPlugin = context => {
+  const plugin = context.plugins.byName("handler-client");
+  if (plugin) {
+    return plugin;
   }
+  // If not specified, use a fallback plugin that fetches different handlers via plugins.
+  // This might also be useful for testing purposes.
+  return getPluginFetcher(context);
+};
+class HandlerClient {
+  /**
+   * We need the default plugin to later on fetch another plugin than initially selected.
+   * If name of the required plugin is not the default one, fetch new one.
+   */
 
-  invoke(params) {
+  constructor(context) {
+    this.plugin = getHandlerClientPlugin(context);
+    this.default = getPluginFetcher(context);
+  }
+  async invoke(params) {
+    let plugin = this.plugin;
+    if (plugin.canHandle && plugin.canHandle(params) === false) {
+      plugin = this.default;
+    }
     try {
-      return this.plugin.invoke(params);
-    } catch (e) {
-      throw new _error.default(`An error occurred while trying to invoke another handler with the following params: ${JSON.stringify(params, null, 2)}`);
+      return await plugin.invoke(params);
+    } catch (ex) {
+      /**
+       * We collect error that was caught and the description of the invoke, if any.
+       */
+      const data = {
+        error: {
+          message: ex.message,
+          data: ex.data,
+          code: ex.code
+        }
+      };
+      if (params.description) {
+        data.description = params.description;
+      }
+      throw new _error.default(`An error occurred while trying to invoke another handler with the following params: ${JSON.stringify(params, null, 2)}`, "INVOKE_ERROR", data);
     }
   }
-
 }
+var _default = exports.default = HandlerClient;
 
-var _default = HandlerClient;
-exports.default = _default;
+//# sourceMappingURL=HandlerClient.js.map

package/HandlerClient.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_error","_interopRequireDefault","require","_HandlerClientPlugin","defaultPluginName","getPluginFetcher","context","pl","HandlerClientPlugin","invoke","params","name","payload","await","useAwait","plugin","plugins","byName","WebinyError","promise","getHandlerClientPlugin","HandlerClient","constructor","default","canHandle","ex","data","error","message","code","description","JSON","stringify","_default","exports"],"sources":["HandlerClient.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { HandlerClientHandlerPlugin, InvokeArgs, ClientContext } from \"./types\";\nimport { HandlerClientPlugin } from \"~/HandlerClientPlugin\";\n\nconst defaultPluginName = \"handler-client\";\n\nconst getPluginFetcher = (context: ClientContext): HandlerClientPlugin => {\n    const pl = new HandlerClientPlugin({\n        invoke: async params => {\n            const { name, payload, await: useAwait } = params;\n            const plugin = context.plugins.byName<HandlerClientHandlerPlugin>(name);\n            if (!plugin) {\n                throw new WebinyError(`Could not find \"${name}\" handler plugin.`);\n            }\n\n            const promise = plugin.invoke(payload);\n            if (useAwait === false) {\n                return null;\n            }\n\n            return promise;\n        }\n    });\n    pl.name = defaultPluginName;\n    return pl;\n};\n\nconst getHandlerClientPlugin = (context: ClientContext): HandlerClientPlugin => {\n    const plugin = context.plugins.byName<HandlerClientPlugin>(\"handler-client\");\n    if (plugin) {\n        return plugin;\n    }\n    // If not specified, use a fallback plugin that fetches different handlers via plugins.\n    // This might also be useful for testing purposes.\n    return getPluginFetcher(context);\n};\n\nclass HandlerClient {\n    private readonly plugin: HandlerClientPlugin;\n    /**\n     * We need the default plugin to later on fetch another plugin than initially selected.\n     * If name of the required plugin is not the default one, fetch new one.\n     */\n    private readonly default: HandlerClientPlugin;\n\n    constructor(context: ClientContext) {\n        this.plugin = getHandlerClientPlugin(context);\n        this.default = getPluginFetcher(context);\n    }\n\n    public async invoke<TInvokeArgsPayload = any, TResponse = any>(\n        params: InvokeArgs<TInvokeArgsPayload>\n    ): Promise<TResponse> {\n        let plugin: HandlerClientPlugin = this.plugin;\n        if (plugin.canHandle && plugin.canHandle(params) === false) {\n            plugin = this.default;\n        }\n        try {\n            return await plugin.invoke(params);\n        } catch (ex) {\n            /**\n             * We collect error that was caught and the description of the invoke, if any.\n             */\n            const data: Record<string, any> = {\n                error: {\n                    message: ex.message,\n                    data: ex.data,\n                    code: ex.code\n                }\n            };\n            if (params.description) {\n                data.description = params.description;\n            }\n            throw new WebinyError(\n                `An error occurred while trying to invoke another handler with the following params: ${JSON.stringify(\n                    params,\n                    null,\n                    2\n                )}`,\n                \"INVOKE_ERROR\",\n                data\n            );\n        }\n    }\n}\n\nexport default HandlerClient;\n"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,oBAAA,GAAAD,OAAA;AAEA,MAAME,iBAAiB,GAAG,gBAAgB;AAE1C,MAAMC,gBAAgB,GAAIC,OAAsB,IAA0B;EACtE,MAAMC,EAAE,GAAG,IAAIC,wCAAmB,CAAC;IAC/BC,MAAM,EAAE,MAAMC,MAAM,IAAI;MACpB,MAAM;QAAEC,IAAI;QAAEC,OAAO;QAAEC,KAAK,EAAEC;MAAS,CAAC,GAAGJ,MAAM;MACjD,MAAMK,MAAM,GAAGT,OAAO,CAACU,OAAO,CAACC,MAAM,CAA6BN,IAAI,CAAC;MACvE,IAAI,CAACI,MAAM,EAAE;QACT,MAAM,IAAIG,cAAW,CAAC,mBAAmBP,IAAI,mBAAmB,CAAC;MACrE;MAEA,MAAMQ,OAAO,GAAGJ,MAAM,CAACN,MAAM,CAACG,OAAO,CAAC;MACtC,IAAIE,QAAQ,KAAK,KAAK,EAAE;QACpB,OAAO,IAAI;MACf;MAEA,OAAOK,OAAO;IAClB;EACJ,CAAC,CAAC;EACFZ,EAAE,CAACI,IAAI,GAAGP,iBAAiB;EAC3B,OAAOG,EAAE;AACb,CAAC;AAED,MAAMa,sBAAsB,GAAId,OAAsB,IAA0B;EAC5E,MAAMS,MAAM,GAAGT,OAAO,CAACU,OAAO,CAACC,MAAM,CAAsB,gBAAgB,CAAC;EAC5E,IAAIF,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;EACA;EACA;EACA,OAAOV,gBAAgB,CAACC,OAAO,CAAC;AACpC,CAAC;AAED,MAAMe,aAAa,CAAC;EAEhB;AACJ;AACA;AACA;;EAGIC,WAAWA,CAAChB,OAAsB,EAAE;IAChC,IAAI,CAACS,MAAM,GAAGK,sBAAsB,CAACd,OAAO,CAAC;IAC7C,IAAI,CAACiB,OAAO,GAAGlB,gBAAgB,CAACC,OAAO,CAAC;EAC5C;EAEA,MAAaG,MAAMA,CACfC,MAAsC,EACpB;IAClB,IAAIK,MAA2B,GAAG,IAAI,CAACA,MAAM;IAC7C,IAAIA,MAAM,CAACS,SAAS,IAAIT,MAAM,CAACS,SAAS,CAACd,MAAM,CAAC,KAAK,KAAK,EAAE;MACxDK,MAAM,GAAG,IAAI,CAACQ,OAAO;IACzB;IACA,IAAI;MACA,OAAO,MAAMR,MAAM,CAACN,MAAM,CAACC,MAAM,CAAC;IACtC,CAAC,CAAC,OAAOe,EAAE,EAAE;MACT;AACZ;AACA;MACY,MAAMC,IAAyB,GAAG;QAC9BC,KAAK,EAAE;UACHC,OAAO,EAAEH,EAAE,CAACG,OAAO;UACnBF,IAAI,EAAED,EAAE,CAACC,IAAI;UACbG,IAAI,EAAEJ,EAAE,CAACI;QACb;MACJ,CAAC;MACD,IAAInB,MAAM,CAACoB,WAAW,EAAE;QACpBJ,IAAI,CAACI,WAAW,GAAGpB,MAAM,CAACoB,WAAW;MACzC;MACA,MAAM,IAAIZ,cAAW,CACjB,uFAAuFa,IAAI,CAACC,SAAS,CACjGtB,MAAM,EACN,IAAI,EACJ,CACJ,CAAC,EAAE,EACH,cAAc,EACdgB,IACJ,CAAC;IACL;EACJ;AACJ;AAAC,IAAAO,QAAA,GAAAC,OAAA,CAAAX,OAAA,GAEcF,aAAa","ignoreList":[]}

package/HandlerClientPlugin.d.ts

@@ -0,0 +1,18 @@
+import { Plugin } from "@webiny/plugins/Plugin";
+import type { InvokeArgs } from "./types";
+interface HandlerClientPluginCallable<Payload = any, Response = any> {
+    (params: InvokeArgs<Payload>): Promise<Response>;
+}
+export interface HandlerClientPluginParams {
+    invoke: HandlerClientPluginCallable;
+    canUse?: (params: InvokeArgs) => boolean;
+}
+export declare class HandlerClientPlugin extends Plugin {
+    static type: string;
+    private readonly _invoke;
+    private readonly canUse?;
+    constructor({ invoke, canUse }: HandlerClientPluginParams);
+    canHandle(params: InvokeArgs): boolean;
+    invoke<Payload = any, Response = any>(params: InvokeArgs<Payload>): Promise<Response>;
+}
+export {};

package/HandlerClientPlugin.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.HandlerClientPlugin = void 0;
+var _Plugin = require("@webiny/plugins/Plugin");
+class HandlerClientPlugin extends _Plugin.Plugin {
+  static type = "handler-client";
+  constructor({
+    invoke,
+    canUse
+  }) {
+    super();
+    this._invoke = invoke;
+    this.canUse = canUse;
+  }
+  canHandle(params) {
+    if (!this.canUse) {
+      return true;
+    }
+    return this.canUse(params);
+  }
+  invoke(params) {
+    return this._invoke(params);
+  }
+}
+exports.HandlerClientPlugin = HandlerClientPlugin;
+
+//# sourceMappingURL=HandlerClientPlugin.js.map

package/HandlerClientPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_Plugin","require","HandlerClientPlugin","Plugin","type","constructor","invoke","canUse","_invoke","canHandle","params","exports"],"sources":["HandlerClientPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins/Plugin\";\nimport type { InvokeArgs } from \"~/types\";\n\ninterface HandlerClientPluginCallable<Payload = any, Response = any> {\n    (params: InvokeArgs<Payload>): Promise<Response>;\n}\n\nexport interface HandlerClientPluginParams {\n    invoke: HandlerClientPluginCallable;\n    canUse?: (params: InvokeArgs) => boolean;\n}\n\nexport class HandlerClientPlugin extends Plugin {\n    public static override type = \"handler-client\";\n\n    private readonly _invoke: HandlerClientPluginCallable;\n    private readonly canUse?: (params: InvokeArgs) => boolean;\n\n    public constructor({ invoke, canUse }: HandlerClientPluginParams) {\n        super();\n        this._invoke = invoke;\n        this.canUse = canUse;\n    }\n\n    public canHandle(params: InvokeArgs): boolean {\n        if (!this.canUse) {\n            return true;\n        }\n        return this.canUse(params);\n    }\n\n    public invoke<Payload = any, Response = any>(params: InvokeArgs<Payload>): Promise<Response> {\n        return this._invoke(params);\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAYO,MAAMC,mBAAmB,SAASC,cAAM,CAAC;EAC5C,OAAuBC,IAAI,GAAG,gBAAgB;EAKvCC,WAAWA,CAAC;IAAEC,MAAM;IAAEC;EAAkC,CAAC,EAAE;IAC9D,KAAK,CAAC,CAAC;IACP,IAAI,CAACC,OAAO,GAAGF,MAAM;IACrB,IAAI,CAACC,MAAM,GAAGA,MAAM;EACxB;EAEOE,SAASA,CAACC,MAAkB,EAAW;IAC1C,IAAI,CAAC,IAAI,CAACH,MAAM,EAAE;MACd,OAAO,IAAI;IACf;IACA,OAAO,IAAI,CAACA,MAAM,CAACG,MAAM,CAAC;EAC9B;EAEOJ,MAAMA,CAAgCI,MAA2B,EAAqB;IACzF,OAAO,IAAI,CAACF,OAAO,CAACE,MAAM,CAAC;EAC/B;AACJ;AAACC,OAAA,CAAAT,mBAAA,GAAAA,mBAAA","ignoreList":[]}

package/index.d.ts

@@ -1,6 +1,7 @@
-import { Context } from "@webiny/handler/types";
-declare const _default: () => {
+import type { ClientContext } from "./types";
+export * from "./HandlerClientPlugin";
+export declare const createHandlerClient: () => {
     type: string;
-    apply(context: Context): void;
+    name: string;
+    apply(context: ClientContext): Promise<void>;
 };
-export default _default;

package/index.js

@@ -1,21 +1,33 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
+var _exportNames = {
+  createHandlerClient: true
+};
+exports.createHandlerClient = void 0;
 var _HandlerClient = _interopRequireDefault(require("./HandlerClient"));
-
-var _default = () => ({
+var _HandlerClientPlugin = require("./HandlerClientPlugin");
+Object.keys(_HandlerClientPlugin).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _HandlerClientPlugin[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _HandlerClientPlugin[key];
+    }
+  });
+});
+const createHandlerClient = () => ({
   type: "context",
-
-  apply(context) {
+  name: "handler-client.context",
+  async apply(context) {
     context.handlerClient = new _HandlerClient.default(context);
   }
-
 });
+exports.createHandlerClient = createHandlerClient;
 
-exports.default = _default;
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_HandlerClient","_interopRequireDefault","require","_HandlerClientPlugin","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","createHandlerClient","type","name","apply","context","handlerClient","HandlerClient"],"sources":["index.ts"],"sourcesContent":["import HandlerClient from \"./HandlerClient\";\nimport type { ClientContext } from \"~/types\";\n\nexport * from \"./HandlerClientPlugin\";\n\nexport const createHandlerClient = () => ({\n    type: \"context\",\n    name: \"handler-client.context\",\n    async apply(context: ClientContext) {\n        context.handlerClient = new HandlerClient(context);\n    }\n});\n"],"mappings":";;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,IAAAC,oBAAA,GAAAD,OAAA;AAAAE,MAAA,CAAAC,IAAA,CAAAF,oBAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,oBAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,oBAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AAEO,MAAMS,mBAAmB,GAAGA,CAAA,MAAO;EACtCC,IAAI,EAAE,SAAS;EACfC,IAAI,EAAE,wBAAwB;EAC9B,MAAMC,KAAKA,CAACC,OAAsB,EAAE;IAChCA,OAAO,CAACC,aAAa,GAAG,IAAIC,sBAAa,CAACF,OAAO,CAAC;EACtD;AACJ,CAAC,CAAC;AAACR,OAAA,CAAAI,mBAAA,GAAAA,mBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/handler-client",
-	"version": "0.0.0-mt-3",
+	"version": "0.0.0-unstable.06b2ede40f",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -14,31 +14,23 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@babel/runtime": "7.15.4",
-		"@webiny/error": "0.0.0-mt-3",
-		"@webiny/handler": "0.0.0-mt-3",
-		"@webiny/plugins": "0.0.0-mt-3"
+		"@webiny/api": "0.0.0-unstable.06b2ede40f",
+		"@webiny/error": "0.0.0-unstable.06b2ede40f",
+		"@webiny/plugins": "0.0.0-unstable.06b2ede40f"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.5.5",
-		"@babel/core": "^7.5.5",
-		"@babel/preset-env": "^7.5.5",
-		"@babel/preset-typescript": "^7.8.3",
-		"@webiny/cli": "^0.0.0-mt-3",
-		"@webiny/project-utils": "^0.0.0-mt-3",
-		"babel-plugin-lodash": "^3.3.4",
-		"jest": "^26.6.3",
-		"merge": "^1.2.1",
-		"rimraf": "^3.0.2",
-		"typescript": "^4.1.3"
+		"@webiny/project-utils": "0.0.0-unstable.06b2ede40f",
+		"jest": "29.7.0",
+		"rimraf": "6.0.1",
+		"typescript": "5.3.3"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
 	"scripts": {
-		"build": "yarn webiny run build",
-		"watch": "yarn webiny run watch"
+		"build": "node ../cli/bin.js run build",
+		"watch": "node ../cli/bin.js run watch"
 	},
-	"gitHead": "ebea815be2be99404591cba465cc1fe88355bd48"
+	"gitHead": "06b2ede40fc2212a70eeafd74afd50b56fb0ce82"
 }

package/types.d.ts

@@ -1,19 +1,16 @@
-import HandlerClient from "./HandlerClient";
-import { Plugin } from "@webiny/plugins/types";
-export declare type InvokeArgs<TInvokeArgsPayload = any> = {
+import type HandlerClient from "./HandlerClient";
+import type { Plugin } from "@webiny/plugins/types";
+import type { Context } from "@webiny/api/types";
+export type InvokeArgs<TInvokeArgsPayload = any> = {
     name: string;
     payload?: TInvokeArgsPayload;
     await?: boolean;
+    description?: string;
 };
-export declare type HandlerClientPlugin = Plugin & {
-    type: "handler-client";
-    name: "handler-client";
-    invoke: <TInvokeArgsPayload = Record<string, any>>(params: InvokeArgs<TInvokeArgsPayload>) => any;
-};
-export declare type HandlerClientHandlerPlugin = Plugin & {
+export type HandlerClientHandlerPlugin = Plugin & {
     type: "handler-client-handler";
     invoke: <TArgs = Record<string, any>, TResponse = Record<string, any>>(params: TArgs) => TResponse | Promise<TResponse>;
 };
-export declare type ClientContext = {
+export interface ClientContext extends Context {
     handlerClient: HandlerClient;
-};
+}

package/types.js

@@ -2,4 +2,6 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+
+//# sourceMappingURL=types.js.map

package/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type HandlerClient from \"./HandlerClient\";\nimport type { Plugin } from \"@webiny/plugins/types\";\nimport type { Context } from \"@webiny/api/types\";\n\nexport type InvokeArgs<TInvokeArgsPayload = any> = {\n    name: string;\n    payload?: TInvokeArgsPayload;\n    await?: boolean;\n    description?: string;\n};\n\nexport type HandlerClientHandlerPlugin = Plugin & {\n    type: \"handler-client-handler\";\n    invoke: <TArgs = Record<string, any>, TResponse = Record<string, any>>(\n        params: TArgs\n    ) => TResponse | Promise<TResponse>;\n};\n\nexport interface ClientContext extends Context {\n    handlerClient: HandlerClient;\n}\n"],"mappings":"","ignoreList":[]}