@webda/core 2.0.0-beta.2 → 2.0.1

package/lib/services/service.js

@@ -1,16 +1,5 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Service = exports.ServiceParameters = exports.Inject = void 0;
-const events = require("events");
+import { deepmerge } from "deepmerge-ts";
+import * as events from "events";
 /**
  * Represent a Inject annotation
  *
@@ -80,7 +69,7 @@ class Injector {
  *
  * Might consider to split into two annotations
  */
-function Inject(parameterOrName, defaultValue, optional) {
+export function Inject(parameterOrName, defaultValue, optional) {
     return function (target, propertyName) {
         target.Injectors = target.Injectors || [];
         if (typeof defaultValue === "boolean") {
@@ -91,11 +80,24 @@ function Inject(parameterOrName, defaultValue, optional) {
         }
     };
 }
-exports.Inject = Inject;
+// @Route to declare route on Bean
+export function Route(route, methods = ["GET"], allowPath = false, openapi = {}) {
+    return function (target, executor) {
+        var _a, _b;
+        (_a = target.constructor).routes ?? (_a.routes = {});
+        (_b = target.constructor.routes)[route] ?? (_b[route] = []);
+        target.constructor.routes[route].push({
+            methods: Array.isArray(methods) ? methods : [methods],
+            executor,
+            allowPath,
+            openapi
+        });
+    };
+}
 /**
  * Interface to specify the Service parameters
  */
-class ServiceParameters {
+export class ServiceParameters {
     /**
      * Copy all parameters into the object by default
      *
@@ -105,7 +107,6 @@ class ServiceParameters {
         Object.assign(this, params);
     }
 }
-exports.ServiceParameters = ServiceParameters;
 /**
  * Use this object for representing a service in the application
  * A Service is a singleton in the application, that is init after all others services are created
@@ -173,7 +174,27 @@ class Service extends events.EventEmitter {
         // We wait for all services to be created before calling computeParameters
         this.computeParameters();
         this.initRoutes();
-        this._webda.initBeanRoutes(this);
+        return this;
+    }
+    /**
+     * Return the full path url based on parameters
+     *
+     * @param url relative url to service
+     * @param _methods in case we need filtering (like Store)
+     * @returns absolute url or undefined if need to skip the Route
+     */
+    getUrl(url, _methods) {
+        // If url is absolute
+        if (url.startsWith("/")) {
+            return url;
+        }
+        if (!this.parameters.url) {
+            return undefined;
+        }
+        if (url.startsWith(".")) {
+            return this.parameters.url + url.substring(1);
+        }
+        return url;
     }
     /**
      * Add a route dynamicaly
@@ -183,26 +204,38 @@ class Service extends events.EventEmitter {
      * @param {Function} executer Method to execute for this route
      */
     addRoute(url, methods, executer, openapi = {}, allowPath = false, override = false) {
-        let info = {};
-        info._method = executer;
-        info.method = methods;
-        info.executor = this._name;
-        info.allowPath = allowPath;
-        info.openapi = openapi;
-        this._webda.addRoute(url, {
+        let finalUrl = this.getUrl(url, methods);
+        if (!finalUrl) {
+            return;
+        }
+        this._webda.addRoute(finalUrl, {
             _method: executer,
             executor: this._name,
             allowPath,
-            openapi,
+            openapi: deepmerge(openapi, this.parameters.openapi || {}),
             methods,
             override
         });
     }
+    /**
+     * Return variables for replacement in openapi
+     * @returns
+     */
+    getOpenApiReplacements() {
+        return {};
+    }
     /**
      * Init the routes
      */
     initRoutes() {
-        // Can be overriden by subclasses if needed
+        // @ts-ignore
+        let routes = this.constructor.routes || {};
+        for (let j in routes) {
+            this.log("TRACE", "Adding route", j, "for bean", this.getName());
+            routes[j].forEach(route => {
+                this.addRoute(j, route.methods, this[route.executor], route.openapi, route.allowPath || false);
+            });
+        }
     }
     /**
      * Convert an object to JSON using the Webda json filter
@@ -220,21 +253,18 @@ class Service extends events.EventEmitter {
      * @param config for the host so you can add your own route here
      * @abstract
      */
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Can be overriden by subclasses if needed
-        });
+    async init() {
+        // Can be overriden by subclasses if needed
+        return this;
     }
     /**
      *
      * @param config new parameters for the service
      */
-    reinit(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.parameters = this.loadParameters(config);
-            this.computeParameters();
-            return this.init();
-        });
+    async reinit(config) {
+        this.parameters = this.loadParameters(config);
+        this.computeParameters();
+        return this.init();
     }
     /**
      * Display a message if the listener takes too long
@@ -250,7 +280,7 @@ class Service extends events.EventEmitter {
      * Emit the event with data and wait for Promise to finish if listener returned a Promise
      */
     emitSync(event, data) {
-        var promises = [];
+        let promises = [];
         for (let listener of this.listeners(event)) {
             let start = Date.now();
             let result = listener(data);
@@ -342,5 +372,5 @@ class Service extends events.EventEmitter {
         this.logger.log(level, `[${this._name}]`, ...args);
     }
 }
-exports.Service = Service;
+export { Service };
 //# sourceMappingURL=service.js.map

package/lib/services/service.js.map

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

package/lib/services/service.spec.js

@@ -1,70 +1,55 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const mocha_1 = require("@testdeck/mocha");
-const assert = require("assert");
-const sinon = require("sinon");
-const __1 = require("..");
-const test_1 = require("../test");
-const service_1 = require("./service");
-class FakeServiceParameters extends service_1.ServiceParameters {
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import * as sinon from "sinon";
+import { Inject, Service } from "...js";
+import { WebdaTest } from "../test.js";
+import { ServiceParameters } from "./service.js";
+class FakeServiceParameters extends ServiceParameters {
 }
-class FakeService extends __1.Service {
+class FakeService extends Service {
 }
 __decorate([
-    (0, __1.Inject)("Authentication2", true)
+    Inject("Authentication2", true)
 ], FakeService.prototype, "serv", void 0);
 __decorate([
-    (0, __1.Inject)("bean", "Authentication", true)
+    Inject("bean", "Authentication", true)
 ], FakeService.prototype, "serv2", void 0);
 __decorate([
-    (0, __1.Inject)("params:bean", undefined, true)
+    Inject("params:bean", undefined, true)
 ], FakeService.prototype, "serv3", void 0);
 __decorate([
-    (0, __1.Inject)("params:bean", undefined, false)
+    Inject("params:bean", undefined, false)
 ], FakeService.prototype, "serv4", void 0);
-class FakeService2 extends __1.Service {
+class FakeService2 extends Service {
 }
 __decorate([
-    (0, __1.Inject)("Authentication2")
+    Inject("Authentication2")
 ], FakeService2.prototype, "serv", void 0);
-let ServiceTest = class ServiceTest extends test_1.WebdaTest {
-    injector() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let service = new FakeService(this.webda, "plop");
-            assert.throws(() => service.resolve(), /Injector did not found bean 'undefined'\(parameter:bean\) for 'plop'/);
-            service = new FakeService(this.webda, "plop", { bean: "Authentication" });
-            service.resolve();
-            assert.strictEqual(service.serv, undefined);
-            assert.throws(() => new FakeService2(this.webda, "kf").resolve(), /Injector did not found bean 'Authentication2' for 'kf'/);
-        });
+let ServiceTest = class ServiceTest extends WebdaTest {
+    async injector() {
+        let service = new FakeService(this.webda, "plop");
+        assert.throws(() => service.resolve(), /Injector did not found bean 'undefined'\(parameter:bean\) for 'plop'/);
+        service = new FakeService(this.webda, "plop", { bean: "Authentication" });
+        service.resolve();
+        assert.strictEqual(service.serv, undefined);
+        assert.throws(() => new FakeService2(this.webda, "kf").resolve(), /Injector did not found bean 'Authentication2' for 'kf'/);
     }
-    clean() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let service = new FakeService(this.webda, "plop");
-            // @ts-ignore
-            const origin = global.it;
-            // @ts-ignore
-            global.it = undefined;
-            assert.rejects(() => service.__clean(), /Only for test purpose/);
-            // @ts-ignore
-            global.it = origin;
-            yield service.__clean();
-        });
+    async clean() {
+        let service = new FakeService(this.webda, "plop");
+        // @ts-ignore
+        const origin = global.it;
+        // @ts-ignore
+        global.it = undefined;
+        assert.rejects(() => service.__clean(), /Only for test purpose/);
+        // @ts-ignore
+        global.it = origin;
+        await service.__clean();
     }
     toPublicJSON() {
         let service = new FakeService(this.webda, "plop", {});
@@ -80,43 +65,53 @@ let ServiceTest = class ServiceTest extends test_1.WebdaTest {
         let service = new FakeService(this.webda, "plop", { type: "FakeService" });
         assert.strictEqual(service.toString(), "FakeService[plop]");
     }
+    getUrl() {
+        let service = new FakeService(this.webda, "plop", { type: "FakeService" });
+        assert.strictEqual(service.getUrl("/plop", ["GET"]), "/plop");
+        assert.strictEqual(service.getUrl("./plop", ["GET"]), undefined);
+        assert.strictEqual(service.getUrl("plop", ["GET"]), undefined);
+        service.getParameters().url = "/re";
+        assert.strictEqual(service.getUrl("./plop", ["GET"]), "/re/plop");
+        assert.strictEqual(service.getUrl("plop", ["GET"]), "plop");
+    }
     /**
      * Ensure a message is displayed if listener is long
      * Ensure error in listener are catched
      */
-    longListener() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let service = new FakeService(this.webda, "plop", {});
-            let logs = [];
-            service.log = (...args) => {
-                logs.push(args);
-            };
-            service.on("test", () => __awaiter(this, void 0, void 0, function* () {
-                yield new Promise(resolve => setTimeout(resolve, 140));
-                throw new Error("My error");
-            }));
-            yield service.emitSync("test", undefined);
-            assert.strictEqual(logs.length, 2);
-            assert.deepStrictEqual(logs.map(l => `${l[0]}_${l[1]}`), ["ERROR_Listener error", "INFO_Long listener"]);
+    async longListener() {
+        let service = new FakeService(this.webda, "plop", {});
+        let logs = [];
+        service.log = (...args) => {
+            logs.push(args);
+        };
+        service.on("test", async () => {
+            await new Promise(resolve => setTimeout(resolve, 140));
+            throw new Error("My error");
         });
+        await service.emitSync("test", undefined);
+        assert.strictEqual(logs.length, 2);
+        assert.deepStrictEqual(logs.map(l => `${l[0]}_${l[1]}`), ["ERROR_Listener error", "INFO_Long listener"]);
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], ServiceTest.prototype, "injector", null);
 __decorate([
-    mocha_1.test
+    test
 ], ServiceTest.prototype, "clean", null);
 __decorate([
-    mocha_1.test
+    test
 ], ServiceTest.prototype, "toPublicJSON", null);
 __decorate([
-    mocha_1.test
+    test
 ], ServiceTest.prototype, "toStringMethod", null);
 __decorate([
-    mocha_1.test
+    test
+], ServiceTest.prototype, "getUrl", null);
+__decorate([
+    test
 ], ServiceTest.prototype, "longListener", null);
 ServiceTest = __decorate([
-    mocha_1.suite
+    suite
 ], ServiceTest);
 //# sourceMappingURL=service.spec.js.map

package/lib/services/service.spec.js.map

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

package/lib/services/version.d.ts

@@ -1,4 +1,4 @@
-import { Context, Service, ServiceParameters } from "..";
+import { Context, Service, ServiceParameters } from "../index.js";
 /**
  * Version parameters
  */

package/lib/services/version.js

@@ -1,18 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersionService = exports.VersionServiceParameters = void 0;
-const __1 = require("..");
+import { Service, ServiceParameters } from "../index.js";
 /**
  * Version parameters
  */
-class VersionServiceParameters extends __1.ServiceParameters {
+export class VersionServiceParameters extends ServiceParameters {
 }
-exports.VersionServiceParameters = VersionServiceParameters;
 /**
  * Display the version of the app on a route
  * @WebdaModda VersionService
  */
-class VersionService extends __1.Service {
+export class VersionService extends Service {
     /**
      * @inheritdoc
      */
@@ -38,5 +34,4 @@ class VersionService extends __1.Service {
         ctx.write(this.parameters.version);
     }
 }
-exports.VersionService = VersionService;
 //# sourceMappingURL=version.js.map

package/lib/services/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/services/version.ts"],"names":[],"mappings":";;;AAAA,0BAAyD;AAEzD;;GAEG;AACH,MAAa,wBAAyB,SAAQ,qBAAiB;CAS9D;AATD,4DASC;AAED;;;GAGG;AACH,MAAa,cAA8E,SAAQ,WAAU;IAC3G;;OAEG;IACH,UAAU;QACR,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,cAAc,EAAE,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC;QACpG,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,UAAU,CAAC;QACtC,OAAO,IAAI,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,GAAY;QAClB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;CACF;AA3BD,wCA2BC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/services/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE/D;;GAEG;AACH,MAAM,OAAO,wBAAyB,SAAQ,iBAAiB;CAS9D;AAED;;;GAGG;AACH,MAAM,OAAO,cAA8E,SAAQ,OAAU;IAC3G;;OAEG;IACH,UAAU;QACR,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,cAAc,EAAE,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC;QACpG,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,UAAU,CAAC;QACtC,OAAO,IAAI,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,GAAY;QAClB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;CACF"}

package/lib/services/version.spec.js

@@ -1,37 +1,24 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const mocha_1 = require("@testdeck/mocha");
-const assert = require("assert");
-const test_1 = require("../test");
-let VersionTest = class VersionTest extends test_1.WebdaTest {
-    normal() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let ctx = yield this.newContext();
-            yield this.getExecutor(ctx, "webda.io", "GET", "/version").execute(ctx);
-            // Version within package.json of test/ folder
-            assert.strictEqual(ctx.getResponseBody(), "1.1.0");
-        });
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import { WebdaTest } from "../test.js";
+let VersionTest = class VersionTest extends WebdaTest {
+    async normal() {
+        let ctx = await this.newContext();
+        await this.getExecutor(ctx, "webda.io", "GET", "/version").execute(ctx);
+        // Version within package.json of test/ folder
+        assert.strictEqual(ctx.getResponseBody(), "1.1.0");
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], VersionTest.prototype, "normal", null);
 VersionTest = __decorate([
-    mocha_1.suite
+    suite
 ], VersionTest);
 //# sourceMappingURL=version.spec.js.map

package/lib/services/version.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.spec.js","sourceRoot":"","sources":["../../src/services/version.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,iCAAiC;AACjC,kCAAoC;AAGpC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,gBAAS;IAE3B,MAAM;;YACV,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxE,8CAA8C;YAC9C,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC;KAAA;CACF,CAAA;AANC;IADC,YAAI;yCAMJ;AAPG,WAAW;IADhB,aAAK;GACA,WAAW,CAQhB"}
+{"version":3,"file":"version.spec.js","sourceRoot":"","sources":["../../src/services/version.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,SAAS;IAEjC,KAAK,CAAC,MAAM;QACV,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxE,8CAA8C;QAC9C,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;CACF,CAAA;AANC;IADC,IAAI;yCAMJ;AAPG,WAAW;IADhB,KAAK;GACA,WAAW,CAQhB"}

package/lib/stores/aggregator.d.ts

@@ -1,5 +1,5 @@
-import { CoreModel } from "../models/coremodel";
-import MapperService, { MapperParameters, MapUpdates } from "./mapper";
+import { CoreModel } from "../models/coremodel.js";
+import MapperService, { MapperParameters, MapUpdates } from "./mapper.js";
 export declare class AggregatorParameters extends MapperParameters {
     /**
      * @default index
@@ -20,7 +20,7 @@ export default class AggregatorService<T extends AggregatorParameters = Aggregat
      *
      * @inheritdoc
      */
-    init(): Promise<void>;
+    init(): Promise<this>;
     /**
      * @override
      */