@webda/core 1.6.0-beta.1 → 2.0.0-beta.0

package/lib/queues/queue.spec.js

@@ -21,40 +21,42 @@ class QueueItemTest {
     }
 }
 class QueueTest extends test_1.WebdaTest {
-    simple(queue, inconsistentSize = false) {
+    simple(queue, inconsistentSize = false, ackDelayMs = 1000) {
         return __awaiter(this, void 0, void 0, function* () {
             var msg;
+            this.log("DEBUG", "Send test message 1");
             yield queue.sendMessage(new QueueItemTest(1));
             let size = yield queue.size();
             if (!inconsistentSize) {
                 assert.strictEqual(size, 1);
             }
+            this.log("DEBUG", "Send test message 2");
             yield queue.sendMessage(new QueueItemTest(2));
             // Pause for 1s - to verify the repopulation
-            yield this.sleep(1000);
+            yield this.sleep(ackDelayMs);
             size = yield queue.size();
             if (!inconsistentSize) {
                 assert.strictEqual(size, 2);
             }
+            this.log("DEBUG", "Receive a message");
             msg = yield queue.receiveMessage();
             assert.strictEqual(msg[0].Message.getDouble, undefined);
             size = yield queue.size();
             if (!inconsistentSize) {
                 assert.strictEqual(size, 2);
             }
-            if (msg.length > 0) {
-                yield queue.deleteMessage(msg[0].ReceiptHandle);
-            }
+            this.log("DEBUG", "Delete message");
+            yield queue.deleteMessage(msg[0].ReceiptHandle);
             // Pause for 1s - to verify the repopulation
-            yield this.sleep(1000);
+            yield this.sleep(ackDelayMs);
+            this.log("DEBUG", "Receive a message with prototype");
             msg = yield queue.receiveMessage(QueueItemTest);
             assert.notStrictEqual(msg[0].Message.getDouble, undefined);
             if (!inconsistentSize) {
                 assert.strictEqual(msg.length, 1);
             }
-            if (msg.length > 0) {
-                yield queue.deleteMessage(msg[0].ReceiptHandle);
-            }
+            this.log("DEBUG", "Delete message");
+            yield queue.deleteMessage(msg[0].ReceiptHandle);
             if (!inconsistentSize) {
                 assert.strictEqual(yield queue.size(), 0);
             }

package/lib/queues/queue.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue.spec.js","sourceRoot":"","sources":["../../src/queues/queue.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kCAAoC;AACpC,iCAAiC;AAEjC,MAAM,aAAa;IAGjB,YAAY,IAAa;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,SAAU,SAAQ,gBAAS;IACzB,MAAM,CAAC,KAAK,EAAE,mBAA4B,KAAK;;YACnD,IAAI,GAAG,CAAC;YACR,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACnC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACxD,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;aACjD;YACD,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YAChD,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAC3D,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aACnC;YACD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;aACjD;YACD,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC;KAAA;CACF;AAEQ,8BAAS"}
+{"version":3,"file":"queue.spec.js","sourceRoot":"","sources":["../../src/queues/queue.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kCAAoC;AACpC,iCAAiC;AAEjC,MAAM,aAAa;IAGjB,YAAY,IAAa;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,SAAU,SAAQ,gBAAS;IACzB,MAAM,CAAC,KAAK,EAAE,mBAA4B,KAAK,EAAE,aAAqB,IAAI;;YAC9E,IAAI,GAAG,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;YACzC,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;YACzC,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC7B,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;YACvC,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YACnC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACxD,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC7B;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YACpC,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAEhD,4CAA4C;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;YACtD,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YAChD,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAC3D,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aACnC;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YACpC,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAEhD,IAAI,CAAC,gBAAgB,EAAE;gBACrB,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC;KAAA;CACF;AAEQ,8BAAS"}

package/lib/queues/queueservice.js

@@ -119,7 +119,7 @@ class Queue extends pubsubservice_1.PubSubService {
                 yield canceller();
             }
         });
-        let parentQueueCallback = (canceller) => __awaiter(this, void 0, void 0, function* () {
+        let parentQueueCallback = (_canceller) => __awaiter(this, void 0, void 0, function* () {
             let res = yield this.consumerReceiveMessage();
             if (res.items > 0 && res.speed < 3000 && consumers.size < this.getMaxConsumers() - 1) {
                 this.log("TRACE", `Launching a new queue consumer for ${this.getName()}`);

package/lib/queues/queueservice.js.map

@@ -1 +1 @@
-{"version":3,"file":"queueservice.js","sourceRoot":"","sources":["../../src/queues/queueservice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queueservice.js","sourceRoot":"","sources":["../../src/queues/queueservice.ts"],"names":[],"mappings":"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"}

package/lib/router.d.ts

@@ -1,6 +1,43 @@
+import { JSONSchema7 } from "json-schema";
 import { OpenAPIV3 } from "openapi-types";
 import { Core } from "./core";
 import { Context, HttpMethodType } from "./utils/context";
+declare type RecursivePartial<T> = {
+    [P in keyof T]?: RecursivePartial<T[P]>;
+};
+export interface OpenApiWebdaOperation extends RecursivePartial<OpenAPIV3.OperationObject> {
+    schemas?: {
+        input?: JSONSchema7 | string;
+        output?: JSONSchema7 | string;
+    };
+}
+/**
+ * Define overridable OpenAPI description
+ */
+export interface OpenAPIWebdaDefinition extends RecursivePartial<OpenAPIV3.PathItemObject> {
+    /**
+     * Do not output for this specific Route
+     *
+     * It can still be output with --include-hidden, as it is needed to declare
+     * the route in API Gateway or any other internal documentation
+     */
+    hidden?: boolean;
+    /**
+     * If defined will link to the model schema instead of a generic Object
+     */
+    model?: string;
+    /**
+     * Tags defined for all methods
+     */
+    tags?: string[];
+    post?: OpenApiWebdaOperation;
+    put?: OpenApiWebdaOperation;
+    patch?: OpenApiWebdaOperation;
+    get?: OpenApiWebdaOperation;
+}
+/**
+ * Route Information default information
+ */
 export interface RouteInfo {
     /**
      * HTTP Method to expose
@@ -21,7 +58,7 @@ export interface RouteInfo {
     /**
      * OpenAPI definition
      */
-    openapi?: any;
+    openapi?: OpenAPIWebdaDefinition;
     /**
      * URI Template parser
      */
@@ -47,6 +84,12 @@ export declare class Router {
     }[];
     protected webda: Core;
     constructor(webda: Core);
+    /**
+     * Include prefix to the url if not present
+     * @param url
+     * @returns
+     */
+    getFinalUrl(url: string): string;
     /**
      * Add a route dynamicaly
      *
@@ -83,6 +126,7 @@ export declare class Router {
      * Get the route from a method / url
      */
     getRouteFromUrl(ctx: Context, method: HttpMethodType, url: string): any;
+    protected getOpenAPISchema(schema: any): any;
     /**
      * Add all known routes to paths
      *
@@ -91,3 +135,4 @@ export declare class Router {
      */
     completeOpenAPI(openapi: OpenAPIV3.Document, skipHidden?: boolean): void;
 }
+export {};

package/lib/router.js

@@ -2,6 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = void 0;
 const uriTemplates = require("uri-templates");
+var HttpMethods;
+(function (HttpMethods) {
+    HttpMethods["GET"] = "get";
+    HttpMethods["PUT"] = "put";
+    HttpMethods["POST"] = "post";
+    HttpMethods["DELETE"] = "delete";
+    HttpMethods["OPTIONS"] = "options";
+    HttpMethods["HEAD"] = "head";
+    HttpMethods["PATCH"] = "patch";
+    HttpMethods["TRACE"] = "trace";
+})(HttpMethods || (HttpMethods = {}));
 /**
  * Manage Route resolution
  * @category CoreFeatures
@@ -12,6 +23,18 @@ class Router {
         this.initiated = false;
         this.webda = webda;
     }
+    /**
+     * Include prefix to the url if not present
+     * @param url
+     * @returns
+     */
+    getFinalUrl(url) {
+        const prefix = this.webda.getGlobalParams().routePrefix || "";
+        if (prefix && url.startsWith(prefix)) {
+            return url;
+        }
+        return `${prefix}${url}`;
+    }
     /**
      * Add a route dynamicaly
      *
@@ -20,25 +43,26 @@ class Router {
      */
     addRoute(url, info) {
         var _a;
-        this.webda.log("TRACE", `Add route ${url}`);
+        const finalUrl = this.getFinalUrl(url);
+        this.webda.log("TRACE", `Add route ${info.methods.join(",")} ${finalUrl}`);
         (_a = info.openapi) !== null && _a !== void 0 ? _a : (info.openapi = {});
-        if (this.routes[url]) {
+        if (this.routes[finalUrl]) {
             // If route is already added do not do anything
-            if (this.routes[url].includes(info)) {
+            if (this.routes[finalUrl].includes(info)) {
                 return;
             }
             // Check and add warning if same method is used
-            let methods = this.routes[url].map((r) => r.methods).flat();
+            let methods = this.routes[finalUrl].map((r) => r.methods).flat();
             info.methods.forEach(m => {
                 if (methods.indexOf(m) >= 0) {
-                    this.webda.log("WARN", `${m} ${url} overlap with another defined route`);
+                    this.webda.log("WARN", `${m} ${finalUrl} overlap with another defined route`);
                 }
             });
             // Last added need to be overriding
-            this.routes[url].unshift(info);
+            this.routes[finalUrl].unshift(info);
         }
         else {
-            this.routes[url] = [info];
+            this.routes[finalUrl] = [info];
         }
         if (this.initiated) {
             this.remapRoutes();
@@ -50,11 +74,12 @@ class Router {
      * @param {String} url to remove
      */
     removeRoute(url, info = undefined) {
+        const finalUrl = this.getFinalUrl(url);
         if (!info) {
-            delete this.routes[url];
+            delete this.routes[finalUrl];
         }
-        else if (this.routes[url] && this.routes[url].includes(info)) {
-            this.routes[url].splice(this.routes[url].indexOf(info), 1);
+        else if (this.routes[finalUrl] && this.routes[finalUrl].includes(info)) {
+            this.routes[finalUrl].splice(this.routes[finalUrl].indexOf(info), 1);
         }
         this.remapRoutes();
     }
@@ -65,6 +90,16 @@ class Router {
      * Sort all routes again
      */
     remapRoutes() {
+        // Might need to ensure each routes is prefixed
+        const prefix = this.webda.getGlobalParams().routePrefix || "";
+        if (prefix) {
+            Object.keys(this.routes)
+                .filter(k => !k.startsWith(prefix))
+                .forEach(k => {
+                this.routes[this.getFinalUrl(k)] = this.routes[k];
+                delete this.routes[k];
+            });
+        }
         this.initURITemplates(this.routes);
         // Order path desc
         this.pathMap = [];
@@ -116,12 +151,13 @@ class Router {
      * @param url
      */
     getRouteMethodsFromUrl(url) {
+        const finalUrl = this.getFinalUrl(url);
         let methods = new Set();
         for (let i in this.pathMap) {
             var routeUrl = this.pathMap[i].url;
             var map = this.pathMap[i].config;
-            if (routeUrl !== url &&
-                (map._uriTemplateParse === undefined || map._uriTemplateParse.fromUri(url) === undefined)) {
+            if (routeUrl !== finalUrl &&
+                (map._uriTemplateParse === undefined || map._uriTemplateParse.fromUri(finalUrl) === undefined)) {
                 continue;
             }
             map.methods.forEach(m => methods.add(m));
@@ -132,6 +168,7 @@ class Router {
      * Get the route from a method / url
      */
     getRouteFromUrl(ctx, method, url) {
+        const finalUrl = this.getFinalUrl(url);
         let parameters = this.webda.getConfiguration().parameters;
         for (let i in this.pathMap) {
             var routeUrl = this.pathMap[i].url;
@@ -140,14 +177,14 @@ class Router {
             if (map.methods.indexOf(method) === -1) {
                 continue;
             }
-            if (routeUrl === url) {
+            if (routeUrl === finalUrl) {
                 ctx.setServiceParameters(parameters);
                 return map;
             }
             if (map._uriTemplateParse === undefined) {
                 continue;
             }
-            var parse_result = map._uriTemplateParse.fromUri(url);
+            var parse_result = map._uriTemplateParse.fromUri(finalUrl);
             if (parse_result !== undefined) {
                 ctx.setServiceParameters(parameters);
                 ctx.setPathParameters(parse_result);
@@ -155,6 +192,19 @@ class Router {
             }
         }
     }
+    getOpenAPISchema(schema) {
+        if (!schema) {
+            return {
+                $ref: "#/definitions/Object"
+            };
+        }
+        else if (typeof schema === "string") {
+            return {
+                $ref: "#/definitions/" + schema
+            };
+        }
+        return schema;
+    }
     /**
      * Add all known routes to paths
      *
@@ -180,7 +230,7 @@ class Router {
                 let path = i;
                 if (i.indexOf("{?") >= 0) {
                     urlParameters = i.substring(i.indexOf("{?") + 2, i.length - 1).split(",");
-                    path = i.substr(0, i.indexOf("{?"));
+                    path = i.substring(0, i.indexOf("{?"));
                 }
                 openapi.paths[path] = openapi.paths[path] || {};
                 if (route._uriTemplateParse) {
@@ -207,79 +257,67 @@ class Router {
                     });
                 }
                 route.methods.forEach(method => {
+                    var _a, _b, _c, _d, _e, _f, _g;
+                    var _h;
                     let responses;
                     let schema;
                     let description;
                     let summary;
                     let operationId;
+                    let tags = (_a = route.openapi.tags) !== null && _a !== void 0 ? _a : [];
                     if (route.openapi[method.toLowerCase()]) {
                         responses = route.openapi[method.toLowerCase()].responses;
-                        schema = route.openapi[method.toLowerCase()].schema;
+                        schema = this.getOpenAPISchema((_b = route.openapi[method.toLowerCase()].schemas) === null || _b === void 0 ? void 0 : _b.output);
                         description = route.openapi[method.toLowerCase()].description;
                         summary = route.openapi[method.toLowerCase()].summary;
                         operationId = route.openapi[method.toLowerCase()].operationId;
+                        tags.push(...(route.openapi[method.toLowerCase()].tags || []));
                     }
-                    schema = schema || {
-                        $ref: "#/definitions/" + (route.openapi.model || "Object")
-                    };
                     responses = responses || {
                         200: {
                             description: "Operation success"
                         }
                     };
                     for (let j in responses) {
-                        if (typeof responses[j] === "string") {
-                            responses[j] = {
-                                description: responses[j]
-                            };
-                        }
-                        if (!responses[j].schema && responses[j].model) {
-                            responses[j].schema = {
-                                $ref: "#/definitions/" + responses[j].model
-                            };
-                            delete responses[j].model;
-                        }
+                        (_c = (_h = responses[j]).content) !== null && _c !== void 0 ? _c : (_h.content = {});
+                        responses[j].content["application/json"] = {
+                            schema
+                        };
+                        // Add default answer
                         let code = parseInt(j);
                         if (code < 300 && code >= 200 && !responses[j].description) {
                             responses[j].description = "Operation success";
                         }
                     }
+                    if (tags.length === 0) {
+                        tags.push(route.executor);
+                    }
                     let desc = {
-                        tags: route.openapi.tags || [route.executor],
+                        tags,
                         responses: responses,
                         description,
                         summary,
                         operationId
                     };
-                    if (method.toLowerCase().startsWith("p")) {
-                        desc.parameters = [
-                            {
-                                in: "body",
-                                name: "body",
-                                description: "",
-                                required: true,
-                                schema: schema
+                    if (method.toLowerCase().startsWith("p") && ((_e = (_d = route.openapi[method.toLowerCase()]) === null || _d === void 0 ? void 0 : _d.schemas) === null || _e === void 0 ? void 0 : _e.input)) {
+                        // Add request schema if exist
+                        desc.requestBody = {
+                            content: {
+                                "application/json": {
+                                    schema: this.getOpenAPISchema((_g = (_f = route.openapi[method.toLowerCase()]) === null || _f === void 0 ? void 0 : _f.schemas) === null || _g === void 0 ? void 0 : _g.input)
+                                }
                             }
-                        ];
+                        };
                     }
                     openapi.paths[path][method.toLowerCase()] = desc;
-                });
-                if (route.openapi.tags) {
-                    route.openapi.tags.forEach(tag => {
+                    tags.forEach(tag => {
                         if (!hasTag(tag)) {
                             openapi.tags.push({
                                 name: tag
                             });
                         }
                     });
-                }
-                if (!route.openapi.tags) {
-                    if (!hasTag(route.executor)) {
-                        openapi.tags.push({
-                            name: route.executor
-                        });
-                    }
-                }
+                });
             });
         }
     }

package/lib/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}

package/lib/router.spec.js

@@ -33,12 +33,21 @@ let RouterTest = class RouterTest extends test_1.WebdaTest {
         };
         this.webda.addRoute("/plop", { methods: ["GET"], executor: "DefinedMailer" });
         assert.deepStrictEqual(call, [
-            { level: "TRACE", args: ["Add route /plop"] },
+            { level: "TRACE", args: ["Add route GET /plop"] },
             { level: "WARN", args: ["GET /plop overlap with another defined route"] }
         ]);
         // Should be skipped
         this.webda.addRoute("/plop", info);
     }
+    testRouterWithPrefix() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.webda.addRoute("/test/{uuid}", { methods: ["GET"], executor: "DefinedMailer" });
+            this.webda.getGlobalParams().routePrefix = "/reprefix";
+            assert.strictEqual(this.webda.getRouter().getFinalUrl("/test/plop"), "/reprefix/test/plop");
+            assert.strictEqual(this.webda.getRouter().getFinalUrl("/reprefix/test/plop"), "/reprefix/test/plop");
+            this.webda.getRouter().remapRoutes();
+        });
+    }
     testRouteWithPrefix() {
         return __awaiter(this, void 0, void 0, function* () {
             this.webda.addRoute("/test/{uuid}", { methods: ["GET"], executor: "DefinedMailer" });
@@ -79,7 +88,12 @@ let RouterTest = class RouterTest extends test_1.WebdaTest {
             executor: "DefinedMailer",
             openapi: {
                 tags: ["plop", "test"],
-                hidden: true
+                hidden: true,
+                get: {
+                    schemas: {
+                        output: "test"
+                    }
+                }
             }
         };
         this.webda.addRoute("/plop{?*path}", info);
@@ -95,6 +109,9 @@ let RouterTest = class RouterTest extends test_1.WebdaTest {
 __decorate([
     mocha_1.test
 ], RouterTest.prototype, "testGetRouteMethodsFromUrl", null);
+__decorate([
+    mocha_1.test
+], RouterTest.prototype, "testRouterWithPrefix", null);
 __decorate([
     mocha_1.test
 ], RouterTest.prototype, "testRouteWithPrefix", null);

package/lib/router.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.spec.js","sourceRoot":"","sources":["../src/router.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.spec.js","sourceRoot":"","sources":["../src/router.spec.ts"],"names":[],"mappings":"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"}

package/lib/services/asyncevents.d.ts

@@ -73,6 +73,7 @@ export declare class EventServiceParameters extends ServiceParameters {
 }
 /**
  * @category CoreServices
+ * @WebdaModda AsyncEvents
  */
 declare class EventService<T extends EventServiceParameters = EventServiceParameters> extends Service<T> {
     _callbacks: any;

package/lib/services/asyncevents.js

@@ -29,7 +29,7 @@ class AsyncEvent {
      * @returns
      */
     toJSON() {
-        return Object.assign(Object.assign({}, this), { payload: JSON.stringify(this.payload, (key, value) => {
+        return Object.assign(Object.assign({}, this), { payload: JSON.stringify(this.payload, (_key, value) => {
                 if (value instanceof service_1.Service) {
                     return `${AsyncEvent.ServiceTag}${value.getName()}`;
                 }
@@ -44,9 +44,9 @@ class AsyncEvent {
      * @returns
      */
     static fromQueue(data, service) {
-        let evt = new AsyncEvent(data.service, data.type, JSON.parse(data.payload, (key, value) => {
+        let evt = new AsyncEvent(data.service, data.type, JSON.parse(data.payload, (_key, value) => {
             if (typeof value === "string" && value.startsWith(AsyncEvent.ServiceTag)) {
-                return service.getService(value.substr(AsyncEvent.ServiceTag.length));
+                return service.getService(value.substring(AsyncEvent.ServiceTag.length));
             }
             return value;
         }));
@@ -83,6 +83,7 @@ class EventServiceParameters extends service_1.ServiceParameters {
 exports.EventServiceParameters = EventServiceParameters;
 /**
  * @category CoreServices
+ * @WebdaModda AsyncEvents
  */
 class EventService extends service_1.Service {
     constructor() {

package/lib/services/asyncevents.js.map

@@ -1 +1 @@
-{"version":3,"file":"asyncevents.js","sourceRoot":"","sources":["../../src/services/asyncevents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"asyncevents.js","sourceRoot":"","sources":["../../src/services/asyncevents.ts"],"names":[],"mappings":"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"}