@webda/core 2.4.1 → 3.0.0

package/lib/models/user.d.ts

@@ -1,12 +1,13 @@
-import { ModelMappers } from "./coremodel.js";
+import { OperationContext } from "../utils/context.js";
+import { CoreModel } from "./coremodel.js";
 import { Ident } from "./ident.js";
-import { OwnerModel } from "./ownermodel.js";
+import { ModelsMapped } from "./relations.js";
 /**
  * First basic model for User
  * @class
  * @WebdaModel
  */
-export declare class User extends OwnerModel {
+export declare class User extends CoreModel {
     /**
      * Password of the user if defined
      */
@@ -20,19 +21,6 @@ export declare class User extends OwnerModel {
      * Last time the password was recovered
      */
     _lastPasswordRecovery?: number;
-    /**
-     * Roles of the user
-     */
-    _roles: string[];
-    /**
-     * Groups for a user
-     */
-    _groups: string[];
-    /**
-     * Idents used by the user
-     * @SchemaIgnore
-     */
-    _idents: ModelMappers<Ident, "_user", "_type" | "uuid" | "email">;
     /**
      * Define the user avatar if exists
      */
@@ -49,7 +37,7 @@ export declare class User extends OwnerModel {
      * Return user email if known or guessable
      * @returns
      */
-    getEmail(): string | null;
+    getEmail(): string | undefined;
     /**
      * Return displayable public entry
      * @returns
@@ -58,14 +46,42 @@ export declare class User extends OwnerModel {
     getGroups(): string[];
     getRoles(): string[];
     getDisplayName(): string;
-    getIdents(): ModelMappers<Ident, "_user", "_type" | "uuid" | "email">;
-    addRole(role: string): void;
-    hasRole(role: string): boolean;
-    removeRole(role: string): void;
-    addGroup(group: string): void;
-    inGroup(group: string): boolean;
-    removeGroup(group: string): void;
+    getIdents(): ModelsMapped<Ident, "_type" | "uuid" | "email">;
     lastPasswordRecoveryBefore(timestamp: number): boolean;
     getPassword(): string;
     setPassword(password: string): void;
+    canAct(ctx: OperationContext<any, any>, _action: string): Promise<string | boolean>;
+}
+/**
+ * Simple user offers groups and roles management
+ *
+ * Groups and roles are defined just as string, no
+ * models
+ */
+export declare class SimpleUser extends User {
+    /**
+     * Groups for a user
+     */
+    _groups: string[];
+    /**
+     * Roles of the user
+     */
+    _roles: string[];
+    /**
+     * Normal ident
+     */
+    _idents: ModelsMapped<Ident, "_type" | "uuid" | "email">;
+    /**
+     * Return idents
+     * @returns
+     */
+    getIdents(): readonly import("./relations").ModelMapLoader<Ident, "uuid" | "email" | "_type">[];
+    addGroup(group: string): void;
+    inGroup(group: string): boolean;
+    removeGroup(group: string): void;
+    getGroups(): string[];
+    getRoles(): string[];
+    addRole(role: string): void;
+    hasRole(role: string): boolean;
+    removeRole(role: string): void;
 }

package/lib/models/user.js

@@ -1,43 +1,25 @@
-import { OwnerModel } from "./ownermodel.js";
+import { CoreModel } from "./coremodel.js";
 /**
  * First basic model for User
  * @class
  * @WebdaModel
  */
-export class User extends OwnerModel {
+export class User extends CoreModel {
     constructor() {
         super(...arguments);
         /**
          * Last time the password was recovered
          */
         this._lastPasswordRecovery = 0;
-        /**
-         * Roles of the user
-         */
-        this._roles = [];
-        /**
-         * Groups for a user
-         */
-        this._groups = [];
-        /**
-         * Idents used by the user
-         * @SchemaIgnore
-         */
-        this._idents = [];
     }
     /**
      * Return user email if known or guessable
      * @returns
      */
     getEmail() {
-        if (this.email === undefined) {
-            (this._idents || []).some(i => {
-                if (i.email) {
-                    this.email = i.email;
-                }
-            });
-            this.email ?? (this.email = null);
-        }
+        this.email ?? (this.email = this.getIdents().find(i => {
+            return i.email;
+        })?.email);
         return this.email;
     }
     /**
@@ -45,39 +27,70 @@ export class User extends OwnerModel {
      * @returns
      */
     toPublicEntry() {
-        return {
+        const res = {
             displayName: this.displayName,
             uuid: this.getUuid(),
-            avatar: this._avatar
+            avatar: this._avatar,
+            email: this.getEmail()
         };
+        return res;
     }
     getGroups() {
-        return this._groups;
+        return [];
     }
     getRoles() {
-        return this._roles;
+        return [];
     }
     getDisplayName() {
         return this.displayName;
     }
     getIdents() {
-        return this._idents;
+        return [];
     }
-    addRole(role) {
-        if (this.hasRole(role)) {
-            return;
-        }
-        this._roles.push(role);
+    lastPasswordRecoveryBefore(timestamp) {
+        return this._lastPasswordRecovery < timestamp;
     }
-    hasRole(role) {
-        return this._roles.indexOf(role) >= 0;
+    getPassword() {
+        return this.__password;
     }
-    removeRole(role) {
-        let ind = this._roles.indexOf(role);
-        if (ind < 0) {
-            return;
+    setPassword(password) {
+        this.__password = password;
+    }
+    async canAct(ctx, _action) {
+        if (!ctx.getCurrentUserId() || ctx.getCurrentUserId() !== this.getUuid()) {
+            return "You can't act on this user";
         }
-        this._roles.splice(ind, 1);
+        return true;
+    }
+}
+/**
+ * Simple user offers groups and roles management
+ *
+ * Groups and roles are defined just as string, no
+ * models
+ */
+export class SimpleUser extends User {
+    constructor() {
+        super(...arguments);
+        /**
+         * Groups for a user
+         */
+        this._groups = [];
+        /**
+         * Roles of the user
+         */
+        this._roles = [];
+        /**
+         * Normal ident
+         */
+        this._idents = [];
+    }
+    /**
+     * Return idents
+     * @returns
+     */
+    getIdents() {
+        return this._idents;
     }
     addGroup(group) {
         if (this.inGroup(group)) {
@@ -86,10 +99,10 @@ export class User extends OwnerModel {
         this._groups.push(group);
     }
     inGroup(group) {
-        if (group === "all" || group === this.uuid) {
+        if (group === "all" || group === this.getUuid()) {
             return true;
         }
-        return this._groups.indexOf(group) >= 0;
+        return this._groups.includes(group);
     }
     removeGroup(group) {
         let ind = this._groups.indexOf(group);
@@ -98,14 +111,27 @@ export class User extends OwnerModel {
         }
         this._groups.splice(ind, 1);
     }
-    lastPasswordRecoveryBefore(timestamp) {
-        return this._lastPasswordRecovery < timestamp;
+    getGroups() {
+        return this._groups;
     }
-    getPassword() {
-        return this.__password;
+    getRoles() {
+        return this._roles;
     }
-    setPassword(password) {
-        this.__password = password;
+    addRole(role) {
+        if (this.hasRole(role)) {
+            return;
+        }
+        this._roles.push(role);
+    }
+    hasRole(role) {
+        return this._roles.indexOf(role) >= 0;
+    }
+    removeRole(role) {
+        let ind = this._roles.indexOf(role);
+        if (ind < 0) {
+            return;
+        }
+        this._roles.splice(ind, 1);
     }
 }
 //# sourceMappingURL=user.js.map

package/lib/models/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;;GAIG;AACH,MAAM,OAAO,IAAK,SAAQ,UAAU;IAApC;;QAUE;;WAEG;QACH,0BAAqB,GAAY,CAAC,CAAC;QACnC;;WAEG;QACH,WAAM,GAAa,EAAE,CAAC;QACtB;;WAEG;QACH,YAAO,GAAa,EAAE,CAAC;QACvB;;;WAGG;QACH,YAAO,GAA6D,EAAE,CAAC;IA6GzE,CAAC;IAhGC;;;OAGG;IACH,QAAQ;QACN,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC5B,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gBAC5B,IAAI,CAAC,CAAC,KAAK,EAAE;oBACX,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;iBACtB;YACH,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,KAAK,KAAV,IAAI,CAAC,KAAK,GAAK,IAAI,EAAC;SACrB;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;YACpB,MAAM,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtB,OAAO;SACR;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,IAAY;QACrB,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,GAAG,GAAG,CAAC,EAAE;YACX,OAAO;SACR;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACvB,OAAO;SACR;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,KAAa;QACnB,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,IAAI,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,GAAG,GAAG,CAAC,EAAE;YACX,OAAO;SACR;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,0BAA0B,CAAC,SAAiB;QAC1C,OAAO,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAChD,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"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"}

package/lib/models/user.spec.js

@@ -6,10 +6,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { suite, test } from "@testdeck/mocha";
 import * as assert from "assert";
-import { User } from "./user.js";
+import { SimpleUser, User } from "./user.js";
 let UserTest = class UserTest {
     groupManagement() {
-        let user = new User();
+        let user = new SimpleUser();
         user.addGroup("test");
         assert.strictEqual(user.inGroup("test"), true);
         user.addGroup("test");
@@ -20,7 +20,7 @@ let UserTest = class UserTest {
         user.removeGroup("unknown");
     }
     roleManagement() {
-        let user = new User();
+        let user = new SimpleUser();
         user.addRole("test");
         assert.strictEqual(user.hasRole("test"), true);
         user.addRole("test");
@@ -29,6 +29,10 @@ let UserTest = class UserTest {
         assert.strictEqual(user.hasRole("test"), false);
         user.removeRole("unknown");
     }
+    userCov() {
+        const user = new User();
+        assert.deepStrictEqual(user.getRoles(), []);
+    }
     password() {
         let user = new User();
         user.setPassword("bouzouf");
@@ -38,13 +42,26 @@ let UserTest = class UserTest {
         assert.deepStrictEqual(user.getIdents(), []);
     }
     emailGetter() {
-        let user = new User();
+        let user = new SimpleUser();
+        assert.strictEqual(user.getEmail(), undefined);
+        assert.deepStrictEqual(user.toPublicEntry(), {
+            avatar: undefined,
+            displayName: undefined,
+            uuid: undefined,
+            email: undefined
+        });
         // @ts-ignore
         user.load({ _idents: [{}, { email: "testIdent@test.com" }] }, true);
         assert.strictEqual(user.getEmail(), "testIdent@test.com");
         user.load({ email: "test@test.com", displayName: "Top" });
         assert.strictEqual(user.getEmail(), "test@test.com");
         assert.strictEqual(user.getDisplayName(), "Top");
+        assert.deepStrictEqual(user.toPublicEntry(), {
+            avatar: undefined,
+            displayName: "Top",
+            email: "test@test.com",
+            uuid: user.getUuid()
+        });
     }
 };
 __decorate([
@@ -53,6 +70,9 @@ __decorate([
 __decorate([
     test("Verify roles in user")
 ], UserTest.prototype, "roleManagement", null);
+__decorate([
+    test
+], UserTest.prototype, "userCov", null);
 __decorate([
     test
 ], UserTest.prototype, "password", null);

package/lib/models/user.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.spec.js","sourceRoot":"","sources":["../../src/models/user.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user.spec.js","sourceRoot":"","sources":["../../src/models/user.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAG1C,IAAM,QAAQ,GAAd,MAAM,QAAQ;IACmB,eAAe;QAC5C,IAAI,IAAI,GAAe,IAAI,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAE6B,cAAc;QAC1C,IAAI,IAAI,GAAe,IAAI,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAGD,OAAO;QACL,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC;IAGD,QAAQ;QACN,IAAI,IAAI,GAAS,IAAI,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGD,MAAM;QACJ,IAAI,IAAI,GAAS,IAAI,IAAI,EAAE,CAAC;QAC5B,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGD,WAAW;QACT,IAAI,IAAI,GAAe,IAAI,UAAU,EAAE,CAAC;QACxC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;QAC/C,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE;YAC3C,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,SAAS;YACtB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QACH,aAAa;QACb,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,oBAAoB,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;QACrD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,CAAC,CAAC;QACjD,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE;YAC3C,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,KAAK;YAClB,KAAK,EAAE,eAAe;YACtB,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;SACrB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhEgC;IAA9B,IAAI,CAAC,uBAAuB,CAAC;+CAU7B;AAE6B;IAA7B,IAAI,CAAC,sBAAsB,CAAC;8CAS5B;AAGD;IADC,IAAI;uCAIJ;AAGD;IADC,IAAI;wCAIJ;AAGD;IADC,IAAI;sCAIJ;AAGD;IADC,IAAI;2CAsBJ;AAhEG,QAAQ;IADb,KAAK;GACA,QAAQ,CAiEb"}

package/lib/queues/memoryqueue.spec.js

@@ -33,8 +33,9 @@ let MemoryQueueTest = MemoryQueueTest_1 = class MemoryQueueTest extends QueueTes
                 throw Error();
             case 4:
                 // An error occured it should double the pause
+                MemoryQueueTest_1.failedIterations.push(
                 // @ts-ignore
-                MemoryQueueTest_1.failedIterations.push(MemoryQueueTest_1.queue.failedIterations);
+                MemoryQueueTest_1.queue.failedIterations);
                 return Promise.resolve([
                     {
                         ReceiptHandle: "msg2",
@@ -43,8 +44,9 @@ let MemoryQueueTest = MemoryQueueTest_1 = class MemoryQueueTest extends QueueTes
                 ]);
             case 5:
                 // Error on callback dont generate a double delay
+                MemoryQueueTest_1.failedIterations.push(
                 // @ts-ignore
-                MemoryQueueTest_1.failedIterations.push(MemoryQueueTest_1.queue.failedIterations);
+                MemoryQueueTest_1.queue.failedIterations);
                 MemoryQueueTest_1.resolve(MemoryQueueTest_1.workerPromise.cancel());
                 return [];
         }
@@ -107,7 +109,9 @@ let MemoryQueueTest = MemoryQueueTest_1 = class MemoryQueueTest extends QueueTes
         let op = 0;
         const run = async (parallel) => {
             await new Promise(resolve => {
-                let queue = new MemoryQueue(this.webda, "q", { workerParallelism: parallel });
+                let queue = new MemoryQueue(this.webda, "q", {
+                    workerParallelism: parallel
+                });
                 queue.initMetrics();
                 MemoryQueueTest_1.queue = queue;
                 MemoryQueueTest_1.resolve = resolve;
@@ -139,7 +143,7 @@ let MemoryQueueTest = MemoryQueueTest_1 = class MemoryQueueTest extends QueueTes
         assert.strictEqual(op, 2, 'It should have been run in parallel so op=2 as *2 will happen after =1"');
     }
     async basic() {
-        let queue = this.getService("memoryqueue");
+        let queue = this.getService("MemoryQueue");
         // For coverage
         assert.strictEqual(queue.getParameters().expire, 1000, "1s should be convert to ms");
         queue.getParameters().expire = undefined;
@@ -153,7 +157,7 @@ let MemoryQueueTest = MemoryQueueTest_1 = class MemoryQueueTest extends QueueTes
         return this.simple(queue);
     }
     async uuid() {
-        let queue = this.getService("memoryqueue");
+        let queue = this.getService("MemoryQueue");
         let first = true;
         let callCount = 0;
         // @ts-ignore

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

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

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,7 +1,7 @@
 import { JSONSchema7 } from "json-schema";
 import { OpenAPIV3 } from "openapi-types";
 import { Core } from "./core.js";
-import { Context } from "./utils/context.js";
+import { WebContext } from "./utils/context.js";
 import { HttpMethodType } from "./utils/httpcontext.js";
 type RecursivePartial<T> = {
     [P in keyof T]?: RecursivePartial<T[P]>;
@@ -52,10 +52,6 @@ export interface RouteInfo {
      * Method name on the executor
      */
     _method?: string | Function;
-    /**
-     * Allow path in path variable
-     */
-    allowPath?: boolean;
     /**
      * OpenAPI definition
      */
@@ -64,9 +60,22 @@ export interface RouteInfo {
      * URI Template parser
      */
     _uriTemplateParse?: {
-        fromUri: (uri: string) => any;
+        fromUri: (uri: string, options?: {
+            strict: boolean;
+        }) => any;
         varNames: any;
     };
+    /**
+     * Query parameters to extract
+     */
+    _queryParams?: {
+        name: string;
+        required: boolean;
+    }[];
+    /**
+     * Catch all parameter
+     */
+    _queryCatchAll?: string;
     /**
      * Hash
      */
@@ -119,7 +128,7 @@ export declare class Router {
     /**
      * @hidden
      */
-    protected initURITemplates(config: any): void;
+    protected initURITemplates(config: Map<string, RouteInfo[]>): void;
     /**
      * Get all method for a specific url
      * @param config
@@ -130,7 +139,7 @@ export declare class Router {
     /**
      * Get the route from a method / url
      */
-    getRouteFromUrl(ctx: Context, method: HttpMethodType, url: string): any;
+    getRouteFromUrl(ctx: WebContext, method: HttpMethodType, url: string): any;
     protected getOpenAPISchema(schema: any): any;
     /**
      * Add all known routes to paths