@webda/core 2.0.0-beta.3 → 2.1.0

package/lib/utils/waiter.spec.js

@@ -1,115 +1,98 @@
-"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 logger_1 = require("./logger");
-const waiter_1 = require("./waiter");
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import * as sinon from "sinon";
+import { Logger } from "./logger.js";
+import { CancelableLoopPromise, CancelablePromise, WaitDelayerFactories, WaitExponentialDelay, WaitFor, WaitLinearDelay } from "./waiter.js";
 let WaiterTest = class WaiterTest {
-    cancellablePromise() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let promise = new waiter_1.CancelablePromise();
-            yield promise.cancel();
-            yield assert.rejects(() => promise, /Cancelled/);
-            let callback = false;
-            promise = new waiter_1.CancelablePromise(() => { }, () => __awaiter(this, void 0, void 0, function* () {
-                callback = true;
-            }));
-            yield promise.cancel();
-            yield assert.rejects(() => promise, /Cancelled/);
-            assert.strictEqual(callback, true);
+    async cancellablePromise() {
+        let promise = new CancelablePromise();
+        await promise.cancel();
+        await assert.rejects(() => promise, /Cancelled/);
+        let callback = false;
+        promise = new CancelablePromise(() => { }, async () => {
+            callback = true;
         });
+        await promise.cancel();
+        await assert.rejects(() => promise, /Cancelled/);
+        assert.strictEqual(callback, true);
     }
-    testWaitFor() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let logger = new logger_1.Logger(undefined, undefined);
-            let consoleSpy = sinon.stub(logger, "log");
-            sinon.stub(logger, "logProgressStart");
-            sinon.stub(logger, "logProgressUpdate");
-            waiter_1.WaitDelayerFactories.registerFactory("static", () => {
-                return t => t;
-            });
-            try {
-                yield assert.rejects(() => __awaiter(this, void 0, void 0, function* () { return yield (0, waiter_1.WaitFor)(() => __awaiter(this, void 0, void 0, function* () { return false; }), 3, "title", logger, (0, waiter_1.WaitExponentialDelay)(1)); }), /Timeout while waiting for title/g);
-                assert.strictEqual(consoleSpy.callCount, 3);
-                assert.strictEqual(consoleSpy.calledWith("DEBUG", "[1/3]", "title"), true);
-                assert.strictEqual(consoleSpy.calledWith("DEBUG", "[2/3]", "title"), true);
-                assert.strictEqual(consoleSpy.calledWith("DEBUG", "[3/3]", "title"), true);
-                consoleSpy.resetHistory();
-                let res = yield (0, waiter_1.WaitFor)((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                    if (consoleSpy.callCount === 2) {
-                        resolve({ myobject: "test" });
-                        return true;
-                    }
-                }), 3, "title", logger, (0, waiter_1.WaitLinearDelay)(1));
-                assert.strictEqual(consoleSpy.callCount, 2);
-                assert.strictEqual(consoleSpy.calledWith("DEBUG", "[1/3]", "title"), true);
-                assert.strictEqual(consoleSpy.calledWith("DEBUG", "[2/3]", "title"), true);
-                assert.strictEqual(consoleSpy.calledWith("DEBUG", "[3/3]", "title"), false);
-                assert.deepStrictEqual(res, { myobject: "test" });
-                let time = Date.now();
-                consoleSpy.resetHistory();
-                yield (0, waiter_1.WaitFor)((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                    if (consoleSpy.callCount === 3) {
-                        resolve({ myobject: "test" });
-                        return true;
-                    }
-                }), 3, "title", logger);
-                let elapsed = Date.now() - time;
-                assert.strictEqual(elapsed > 2500 && elapsed < 3500, true, `Should have a duration close to 3 seconds, got: ${elapsed}ms`);
-                // COV test
-                yield (0, waiter_1.WaitFor)((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                    resolve();
+    async testWaitFor() {
+        let logger = new Logger(undefined, undefined);
+        let consoleSpy = sinon.stub(logger, "log");
+        sinon.stub(logger, "logProgressStart");
+        sinon.stub(logger, "logProgressUpdate");
+        WaitDelayerFactories.registerFactory("static", () => {
+            return t => t;
+        });
+        try {
+            await assert.rejects(async () => await WaitFor(async () => false, 3, "title", logger, WaitExponentialDelay(1)), /Timeout while waiting for title/g);
+            assert.strictEqual(consoleSpy.callCount, 3);
+            assert.strictEqual(consoleSpy.calledWith("DEBUG", "[1/3]", "title"), true);
+            assert.strictEqual(consoleSpy.calledWith("DEBUG", "[2/3]", "title"), true);
+            assert.strictEqual(consoleSpy.calledWith("DEBUG", "[3/3]", "title"), true);
+            consoleSpy.resetHistory();
+            let res = await WaitFor(async (resolve, reject) => {
+                if (consoleSpy.callCount === 2) {
+                    resolve({ myobject: "test" });
                     return true;
-                }), 3);
-                yield (0, waiter_1.WaitFor)((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                    resolve();
+                }
+            }, 3, "title", logger, WaitLinearDelay(1));
+            assert.strictEqual(consoleSpy.callCount, 2);
+            assert.strictEqual(consoleSpy.calledWith("DEBUG", "[1/3]", "title"), true);
+            assert.strictEqual(consoleSpy.calledWith("DEBUG", "[2/3]", "title"), true);
+            assert.strictEqual(consoleSpy.calledWith("DEBUG", "[3/3]", "title"), false);
+            assert.deepStrictEqual(res, { myobject: "test" });
+            let time = Date.now();
+            consoleSpy.resetHistory();
+            await WaitFor(async (resolve, reject) => {
+                if (consoleSpy.callCount === 3) {
+                    resolve({ myobject: "test" });
                     return true;
-                }), 3, "title");
-            }
-            finally {
-                consoleSpy.restore();
-            }
-        });
-    }
-    loopPromise() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let i = 0;
-            yield new waiter_1.CancelableLoopPromise((canceller) => __awaiter(this, void 0, void 0, function* () {
-                i++;
-                if (i > 10) {
-                    yield canceller();
                 }
-            }), () => __awaiter(this, void 0, void 0, function* () { }));
-            assert.strictEqual(i, 11);
-        });
+            }, 3, "title", logger);
+            let elapsed = Date.now() - time;
+            assert.strictEqual(elapsed > 2500 && elapsed < 3500, true, `Should have a duration close to 3 seconds, got: ${elapsed}ms`);
+            // COV test
+            await WaitFor(async (resolve, reject) => {
+                resolve();
+                return true;
+            }, 3);
+            await WaitFor(async (resolve, reject) => {
+                resolve();
+                return true;
+            }, 3, "title");
+        }
+        finally {
+            consoleSpy.restore();
+        }
+    }
+    async loopPromise() {
+        let i = 0;
+        await new CancelableLoopPromise(async (canceller) => {
+            i++;
+            if (i > 10) {
+                await canceller();
+            }
+        }, async () => { });
+        assert.strictEqual(i, 11);
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], WaiterTest.prototype, "cancellablePromise", null);
 __decorate([
-    mocha_1.test
+    test
 ], WaiterTest.prototype, "testWaitFor", null);
 __decorate([
-    mocha_1.test
+    test
 ], WaiterTest.prototype, "loopPromise", null);
 WaiterTest = __decorate([
-    mocha_1.suite
+    suite
 ], WaiterTest);
 //# sourceMappingURL=waiter.spec.js.map

package/lib/utils/waiter.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"waiter.spec.js","sourceRoot":"","sources":["../../src/utils/waiter.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"waiter.spec.js","sourceRoot":"","sources":["../../src/utils/waiter.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACpB,OAAO,EACP,eAAe,EAChB,MAAM,UAAU,CAAC;AAGlB,IAAM,UAAU,GAAhB,MAAM,UAAU;IAEd,KAAK,CAAC,kBAAkB;QACtB,IAAI,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACtC,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACjD,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,OAAO,GAAG,IAAI,iBAAiB,CAC7B,GAAG,EAAE,GAAE,CAAC,EACR,KAAK,IAAI,EAAE;YACT,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC,CACF,CAAC;QACF,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACjD,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAGD,KAAK,CAAC,WAAW;QACf,IAAI,MAAM,GAAG,IAAI,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC9C,IAAI,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;QACxC,oBAAoB,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE;YAClD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,IAAI;YACF,MAAM,MAAM,CAAC,OAAO,CAClB,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,EACzF,kCAAkC,CACnC,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAC5C,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3E,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3E,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3E,UAAU,CAAC,YAAY,EAAE,CAAC;YAC1B,IAAI,GAAG,GAAG,MAAM,OAAO,CACrB,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACxB,IAAI,UAAU,CAAC,SAAS,KAAK,CAAC,EAAE;oBAC9B,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC9B,OAAO,IAAI,CAAC;iBACb;YACH,CAAC,EACD,CAAC,EACD,OAAO,EACP,MAAM,EACN,eAAe,CAAC,CAAC,CAAC,CACnB,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAC5C,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3E,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3E,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;YAC5E,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAClD,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACtB,UAAU,CAAC,YAAY,EAAE,CAAC;YAC1B,MAAM,OAAO,CACX,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACxB,IAAI,UAAU,CAAC,SAAS,KAAK,CAAC,EAAE;oBAC9B,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC9B,OAAO,IAAI,CAAC;iBACb;YACH,CAAC,EACD,CAAC,EACD,OAAO,EACP,MAAM,CACP,CAAC;YACF,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAChC,MAAM,CAAC,WAAW,CAChB,OAAO,GAAG,IAAI,IAAI,OAAO,GAAG,IAAI,EAChC,IAAI,EACJ,mDAAmD,OAAO,IAAI,CAC/D,CAAC;YACF,WAAW;YACX,MAAM,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACtC,OAAO,EAAE,CAAC;gBACV,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,CAAC,CAAC,CAAC;YACN,MAAM,OAAO,CACX,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACxB,OAAO,EAAE,CAAC;gBACV,OAAO,IAAI,CAAC;YACd,CAAC,EACD,CAAC,EACD,OAAO,CACR,CAAC;SACH;gBAAS;YACR,UAAU,CAAC,OAAO,EAAE,CAAC;SACtB;IACH,CAAC;IAGD,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,MAAM,IAAI,qBAAqB,CAC7B,KAAK,EAAC,SAAS,EAAC,EAAE;YAChB,CAAC,EAAE,CAAC;YACJ,IAAI,CAAC,GAAG,EAAE,EAAE;gBACV,MAAM,SAAS,EAAE,CAAC;aACnB;QACH,CAAC,EACD,KAAK,IAAI,EAAE,GAAE,CAAC,CACf,CAAC;QACF,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAvGC;IADC,IAAI;oDAeJ;AAGD;IADC,IAAI;6CAuEJ;AAGD;IADC,IAAI;6CAaJ;AAxGG,UAAU;IADf,KAAK;GACA,UAAU,CAyGf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/core",
-  "version": "2.0.0-beta.3",
+  "version": "2.1.0",
   "description": "Expose API with Lambda",
   "keywords": [
     "aws",
@@ -12,16 +12,17 @@
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc",
+    "build": "tsc-esm",
+    "build:module": "webda build",
     "grammar": "antlr4ts -visitor src/stores/webdaql/WebdaQLLexer.g4 src/stores/webdaql/WebdaQLParser.g4 && yarn run lint:fix",
     "pretest": "npm run build",
     "lint": "prettier --check src/**/*",
     "lint:fix": "prettier --write src/**/*",
-    "test": "nyc mocha --recursive --exit --timeout=30000 -r ../../node_modules/ts-node/register src/**/*.spec.ts src/*.spec.ts src/**/**/*.spec.ts"
+    "test": "c8 mocha --recursive --exit --timeout=30000 src/**/*.spec.ts src/*.spec.ts src/**/**/*.spec.ts"
   },
   "dependencies": {
     "@types/json-schema": "^7.0.8",
-    "@webda/workout": "^2.0.0-beta.3",
+    "@webda/workout": "^2.1.0",
     "accept-language": "^3.0.18",
     "ajv": "^8.6.2",
     "ajv-formats": "^2.1.1",
@@ -30,7 +31,7 @@
     "cookie": "^0.5.0",
     "dateformat": "^5.0.3",
     "deepmerge-ts": "^4.0.3",
-    "email-templates": "^9.0.0",
+    "email-templates": "^10.0.1",
     "fs-finder": "^1.8.1",
     "glob": "^8.0.1",
     "global": "^4.4.0",
@@ -54,15 +55,15 @@
     "yaml": "^2.0.0"
   },
   "devDependencies": {
-    "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@testdeck/mocha": "^0.2.0",
-    "@types/node": "14.0.0",
+    "@types/node": "14.6.0",
     "@types/nodemailer": "^6.4.4",
+    "@webda/tsc-esm": "^1.0.1",
     "antlr4ts-cli": "^0.5.0-alpha.4",
     "axios": "^0.27.2",
+    "c8": "^7.11.3",
     "fs-extra": "^10.0.0",
     "mocha": "^10.0.0",
-    "nyc": "^15.1.0",
     "prettier": "^2.3.2",
     "sinon": "^14.0.0",
     "source-map-support": "^0.5.19",
@@ -74,8 +75,7 @@
     "test",
     "webda.module.json"
   ],
-  "nyc": {
-    "extends": "@istanbuljs/nyc-config-typescript",
+  "c8": {
     "report-dir": "./reports",
     "reporter": [
       "html",
@@ -87,8 +87,9 @@
       "src/test.ts",
       "**/*.spec.ts",
       "test/**/*",
-      "src/stores/webdaql/WebdaQL*.ts"
-    ]
+      "*/stores/webdaql/WebdaQL*"
+    ],
+    "excludeNodeModules": true
   },
   "homepage": "https://webda.io",
   "publishConfig": {
@@ -97,5 +98,9 @@
   "webda": {
     "namespace": "Webda"
   },
-  "gitHead": "f95827566d42d22c32aed524b74d0446fff66ed4"
+  "type": "module",
+  "engines": {
+    "node": ">=14.6.0"
+  },
+  "gitHead": "d9e2440a4001c1405132260d221c7ad74fe06bc9"
 }

package/test/config-invitation.json

@@ -1,8 +1,6 @@
 {
   "version": 2,
-  "parameters": {
-    "sessionSecret": "Lp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5EN"
-  },
+  "parameters": {},
   "module": {},
   "services": {
     "Authentication": {

package/test/config.json

@@ -9,8 +9,7 @@
     "region": "us-east-1",
     "website": ["test.webda.io", "test2.webda.io"],
     "csrfOrigins": ["^accounts\\.google\\.\\w{2,}$", "www\\.facebook\\.com"],
-    "locales": ["es-ES", "en", "fr-FR"],
-    "sessionSecret": "Lp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5EN"
+    "locales": ["es-ES", "en", "fr-FR"]
   },
   "cachedModules": {
     "schemas": {

package/test/config.old.json

@@ -3,8 +3,7 @@
     "global": {
       "params": {
         "TEST": "Global",
-        "region": "us-east-1",
-        "sessionSecret": "Lp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5ENLp4B72FPU5n6q4EpVRGyPFnZp5cgLRPScVWixW52Yq84hD4MmnfVfgxKQ5EN"
+        "region": "us-east-1"
       },
       "locales": ["es-ES", "en-GB", "fr-FR"],
       "moddas": {

package/test/moddas/annotatedservice.js

@@ -1,16 +1,17 @@
-const Webda = require("../../src/index");
+import { Bean, Store } from "@webda/core";
 
-@Webda.Bean
-class AnnotedService extends Webda.Store {
+@Bean
+export class AnnotedService extends Store {
   constructor(webda, name, params) {
     super(webda, name, params);
     webda.registerRequestFilter(this);
     if (this.parameters.brokenConstructor) throw Error();
   }
 
-  init() {
+  async init() {
     if (this.parameters.brokenInit) throw Error();
     this.addRoute("/broken/{type}", ["GET"], this._brokenRoute);
+    return this;
   }
 
   @Webda.Route("/route1")
@@ -20,4 +21,3 @@ class AnnotedService extends Webda.Store {
   _default(ctx) {}
 }
 
-module.exports = AnnotedService;

package/test/moddas/debugmailer.js

@@ -1,6 +1,6 @@
-const Webda = require("../../src/index");
+import { Service } from "@webda/core";
 
-class DebugMailer extends Webda.Service {
+export class DebugMailer extends Service {
   constructor(webda, name, params) {
     super(webda, name, params);
     this.sent = [];
@@ -11,4 +11,3 @@ class DebugMailer extends Webda.Service {
   }
 }
 
-module.exports = DebugMailer;

package/test/moddas/fakeservice.js

@@ -1,5 +1,4 @@
-const Webda = require("../../src/index");
+import { Service } from "@webda/core";
 
-class FakeService extends Webda.Service {}
+export class FakeService extends Service {}
 
-module.exports = FakeService;

package/test/moddas/voidstore.js

@@ -1,6 +1,6 @@
-const Webda = require("../../src/index");
+import { Store, StoreParameters } from "@webda/core";
 
-class VoidStore extends Webda.Store {
+export class VoidStore extends Store {
   constructor(webda, name, params) {
     super(webda, name, params);
     webda.registerCORSFilter(this);
@@ -15,6 +15,10 @@ class VoidStore extends Webda.Store {
     this.addRoute("/urltemplate/callback{?code}", ["GET"], this._query);
   }
 
+  loadParameters(params) {
+    return new StoreParameters(params, this);
+  }
+
   _template() {}
 
   _default(ctx) {}
@@ -60,5 +64,3 @@ class VoidStore extends Webda.Store {
     return Promise.resolve({});
   }
 }
-
-module.exports = VoidStore;

package/test/models/ident.js

@@ -1,11 +1,9 @@
-"use strict";
-
-const WebdaIdent = require("../../src/index").Ident;
+import { Ident as WebdaIdent } from "@webda/core";
 
 /**
  * @class
  */
-class Ident extends WebdaIdent {
+export class Ident extends WebdaIdent {
   static getActions() {
     return {
       plop: {},
@@ -34,5 +32,3 @@ class Ident extends WebdaIdent {
     return Promise.resolve();
   }
 }
-
-module.exports = Ident;

package/test/models/task.js

@@ -1,11 +1,9 @@
-"use strict";
-const Webda = require("../../src/index");
-const OwnerModel = Webda.OwnerModel;
+import { OwnerModel } from "@webda/core";
 
 /**
  * @class
  */
-class Task extends OwnerModel {
+export class Task extends OwnerModel {
   static getActions() {
     return {
       actionable: {
@@ -41,6 +39,4 @@ class Task extends OwnerModel {
     }
     return super.toJSON();
   }
-}
-
-module.exports = Task;
+}

package/test/package.json

@@ -1,3 +1,4 @@
 {
-  "version": "1.1.0"
+  "version": "1.1.0",
+  "type": "module"
 }