@webda/core 2.0.0-beta.3 → 2.0.0

package/lib/core.spec.js

@@ -1,317 +1,277 @@
-"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 assert = require("assert");
-const mocha_1 = require("@testdeck/mocha");
-const path = require("path");
-const core_1 = require("./core");
-const index_1 = require("./index");
-const store_1 = require("./stores/store");
-const test_1 = require("./test");
-const context_1 = require("./utils/context");
-const httpcontext_1 = require("./utils/httpcontext");
-const sinon = require("sinon");
+import { suite, test } from "@testdeck/mocha";
+import * as assert from "assert";
+import * as path from "path";
+import * as sinon from "sinon";
+import { Core, OriginFilter, WebdaError, WebsiteOriginFilter } from "./core.js";
+import { Bean, ConsoleLoggerService, Route, Service } from "./index.js";
+import { Store } from "./stores/store.js";
+import { TestApplication, WebdaTest } from "./test.js";
+import { Context } from "./utils/context.js";
+import { getCommonJS } from "./utils/esm.js";
+import { HttpContext } from "./utils/httpcontext.js";
+import { JSONUtils } from "./utils/serializers.js";
+const { __dirname } = getCommonJS(import.meta.url);
 class BadService {
     constructor() {
         throw new Error();
     }
 }
-let ExceptionExecutor = class ExceptionExecutor extends index_1.Service {
-    _brokenRoute(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (ctx.parameters.type === "401") {
-                throw 401;
-            }
-            else if (ctx.parameters.type === "Error") {
-                throw new Error();
-            }
-        });
+let ExceptionExecutor = class ExceptionExecutor extends Service {
+    async _brokenRoute(ctx) {
+        if (ctx.parameters.type === "401") {
+            throw 401;
+        }
+        else if (ctx.parameters.type === "Error") {
+            throw new Error();
+        }
     }
-    onString(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            ctx.write("CodeCoverage");
-        });
+    async onString(ctx) {
+        ctx.write("CodeCoverage");
     }
-    onPostString(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            ctx.write("CodeCoveragePOST");
-        });
+    async onPostString(ctx) {
+        ctx.write("CodeCoveragePOST");
     }
 };
 __decorate([
-    (0, index_1.Route)("/route/broken/{type}")
+    Route("/route/broken/{type}")
 ], ExceptionExecutor.prototype, "_brokenRoute", null);
 __decorate([
-    (0, index_1.Route)("/route/string")
+    Route("/route/string")
 ], ExceptionExecutor.prototype, "onString", null);
 __decorate([
-    (0, index_1.Route)("/route/string", ["POST"])
+    Route("/route/string", ["POST"])
 ], ExceptionExecutor.prototype, "onPostString", null);
 ExceptionExecutor = __decorate([
-    index_1.Bean
+    Bean
 ], ExceptionExecutor);
-class ImplicitBean extends index_1.Service {
-    whynot() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-}
+/**
+ * ImplicitBean are not permitted anymore so just adding the @Bean
+ */
+let ImplicitBean = class ImplicitBean extends Service {
+    async whynot() { }
+};
 __decorate([
-    (0, index_1.Route)("/whynot")
+    Route("/whynot")
 ], ImplicitBean.prototype, "whynot", null);
-let CSRFTest = class CSRFTest extends test_1.WebdaTest {
-    checkRequest(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
-            return this.webda.checkCORSRequest(ctx);
-        });
-    }
-    before() {
-        const _super = Object.create(null, {
-            before: { get: () => super.before }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.before.call(this);
-            this.ctx = yield this.newContext();
-        });
-    }
-    csrfRegExp() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.webda.getConfiguration().parameters.website = "http://localhost:18181";
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("accounts.google.fr", "GET", "/", "https", 443));
-            assert.strictEqual(yield this.checkRequest(this.ctx), true);
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("accounts.google.com", "GET", "/", "https", 443));
-            assert.strictEqual(yield this.checkRequest(this.ctx), true);
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("accounts.google.fr.loopingz.com", "GET", "/", "https", 443));
-            assert.strictEqual(yield this.checkRequest(this.ctx), false);
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("www.facebook.com", "GET", "/", "https", 443));
-            assert.strictEqual(yield this.checkRequest(this.ctx), true);
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("www.facebook.com.eu", "GET", "/", "https", 443));
-            assert.strictEqual(yield this.checkRequest(this.ctx), false);
-        });
-    }
-    checkWebdaRequest() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let calls = 0;
-            this.webda.registerRequestFilter({
-                checkRequest: () => __awaiter(this, void 0, void 0, function* () {
-                    calls++;
-                    return true;
-                })
-            });
-            // @ts-ignore
-            yield this.webda.checkRequest(this.ctx);
-            this.ctx.getHttpContext().method = "OPTIONS";
-            // @ts-ignore
-            yield this.webda.checkRequest(this.ctx);
-            assert.strictEqual(calls, 1);
+ImplicitBean = __decorate([
+    Bean
+], ImplicitBean);
+let CSRFTest = class CSRFTest extends WebdaTest {
+    async checkRequest(ctx) {
+        // @ts-ignore
+        return this.webda.checkCORSRequest(ctx);
+    }
+    async before() {
+        await super.before();
+        this.ctx = await this.newContext();
+    }
+    async csrfRegExp() {
+        this.webda.getConfiguration().parameters.website = "http://localhost:18181";
+        this.ctx.setHttpContext(new HttpContext("accounts.google.fr", "GET", "/", "https", 443));
+        assert.strictEqual(await this.checkRequest(this.ctx), true);
+        this.ctx.setHttpContext(new HttpContext("accounts.google.com", "GET", "/", "https", 443));
+        assert.strictEqual(await this.checkRequest(this.ctx), true);
+        this.ctx.setHttpContext(new HttpContext("accounts.google.fr.loopingz.com", "GET", "/", "https", 443));
+        assert.strictEqual(await this.checkRequest(this.ctx), false);
+        this.ctx.setHttpContext(new HttpContext("www.facebook.com", "GET", "/", "https", 443));
+        assert.strictEqual(await this.checkRequest(this.ctx), true);
+        this.ctx.setHttpContext(new HttpContext("www.facebook.com.eu", "GET", "/", "https", 443));
+        assert.strictEqual(await this.checkRequest(this.ctx), false);
+    }
+    async checkWebdaRequest() {
+        let calls = 0;
+        this.webda.registerRequestFilter({
+            checkRequest: async () => {
+                calls++;
+                return true;
+            }
         });
+        // @ts-ignore
+        await this.webda.checkRequest(this.ctx);
+        this.ctx.getHttpContext().method = "OPTIONS";
+        // @ts-ignore
+        await this.webda.checkRequest(this.ctx);
+        assert.strictEqual(calls, 1);
     }
     getApiUrl() {
         assert.strictEqual(this.webda.getApiUrl("/plop"), "http://localhost:18080/plop");
         assert.strictEqual(this.webda.getApiUrl("plop"), "http://localhost:18080/plop");
     }
-    websiteString() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.filter = new core_1.WebsiteOriginFilter("http://localhost:18181");
-            // Exact match
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost:18181", "GET", "/", "http", 80));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), true);
-            // Bad protocol
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost:18181", "GET", "/", "https", 443));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), false);
-            // Bad port
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost:18181", "GET", "/", "http", 18182));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), false);
-            // Bad host
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost2:18181", "GET", "/", "http", 18181));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), false);
-        });
-    }
-    websiteArray() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.filter = new core_1.WebsiteOriginFilter(["http://localhost:18181", "http://localhost2:18181"]);
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost", "GET", "/", "http", 18181));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), true);
-            // Just host headers
-            this.webda.getConfiguration().parameters.website = ["http://localhost:18181", "http://localhost2:18181"];
-            // First host
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost", "GET", "/", "http", 18181));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), true);
-            // Second host
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost2", "GET", "/", "http", 18181));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), true);
-            // Bad port
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost", "GET", "/", "http", 18182));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), false);
-            // Bad host
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost3", "GET", "/", "http", 18181));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), false);
-        });
-    }
-    originFilter() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let filter = new core_1.OriginFilter(["https://localhost3"]);
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost3", "GET", "/", "https", 443));
-            assert.strictEqual(yield filter.checkRequest(this.ctx), true);
-        });
-    }
-    websiteObject() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Use object
-            this.filter = new core_1.WebsiteOriginFilter({
-                url: "localhost:18181"
-            });
-            // Good host
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost", "GET", "/", "http", 18181));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), true);
-            // Bad host
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost2", "GET", "/", "http", 18181));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), false);
-            // Bad port
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("localhost", "GET", "/", "http", 18182));
-            assert.strictEqual(yield this.filter.checkRequest(this.ctx), false);
-        });
-    }
-    csrfConditionalFilter() {
-        return __awaiter(this, void 0, void 0, function* () {
-            /*
-              , "http://localhost:18182", {
-                url: "localhost:18181"
-              }
-             */
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("csrf.com", "GET", "/bouzouf/route", "https", 443));
-            assert.strictEqual(yield this.checkRequest(this.ctx), true);
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("csrf.com", "GET", "/bouzouf2/route", "https", 443));
-            assert.strictEqual(yield this.checkRequest(this.ctx), false);
-            this.ctx.setHttpContext(new httpcontext_1.HttpContext("csrfs.com", "GET", "/bouzouf/route", "https", 443));
-            assert.strictEqual(yield this.checkRequest(this.ctx), false);
+    async websiteString() {
+        this.filter = new WebsiteOriginFilter("http://localhost:18181");
+        // Exact match
+        this.ctx.setHttpContext(new HttpContext("localhost:18181", "GET", "/", "http", 80));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), true);
+        // Bad protocol
+        this.ctx.setHttpContext(new HttpContext("localhost:18181", "GET", "/", "https", 443));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), false);
+        // Bad port
+        this.ctx.setHttpContext(new HttpContext("localhost:18181", "GET", "/", "http", 18182));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), false);
+        // Bad host
+        this.ctx.setHttpContext(new HttpContext("localhost2:18181", "GET", "/", "http", 18181));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), false);
+    }
+    async websiteArray() {
+        this.filter = new WebsiteOriginFilter(["http://localhost:18181", "http://localhost2:18181"]);
+        this.ctx.setHttpContext(new HttpContext("localhost", "GET", "/", "http", 18181));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), true);
+        // Just host headers
+        this.webda.getConfiguration().parameters.website = ["http://localhost:18181", "http://localhost2:18181"];
+        // First host
+        this.ctx.setHttpContext(new HttpContext("localhost", "GET", "/", "http", 18181));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), true);
+        // Second host
+        this.ctx.setHttpContext(new HttpContext("localhost2", "GET", "/", "http", 18181));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), true);
+        // Bad port
+        this.ctx.setHttpContext(new HttpContext("localhost", "GET", "/", "http", 18182));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), false);
+        // Bad host
+        this.ctx.setHttpContext(new HttpContext("localhost3", "GET", "/", "http", 18181));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), false);
+    }
+    async originFilter() {
+        let filter = new OriginFilter(["https://localhost3"]);
+        this.ctx.setHttpContext(new HttpContext("localhost3", "GET", "/", "https", 443));
+        assert.strictEqual(await filter.checkRequest(this.ctx), true);
+    }
+    async websiteObject() {
+        // Use object
+        this.filter = new WebsiteOriginFilter({
+            url: "localhost:18181"
         });
+        // Good host
+        this.ctx.setHttpContext(new HttpContext("localhost", "GET", "/", "http", 18181));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), true);
+        // Bad host
+        this.ctx.setHttpContext(new HttpContext("localhost2", "GET", "/", "http", 18181));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), false);
+        // Bad port
+        this.ctx.setHttpContext(new HttpContext("localhost", "GET", "/", "http", 18182));
+        assert.strictEqual(await this.filter.checkRequest(this.ctx), false);
+    }
+    async csrfConditionalFilter() {
+        /*
+          , "http://localhost:18182", {
+            url: "localhost:18181"
+          }
+         */
+        this.ctx.setHttpContext(new HttpContext("csrf.com", "GET", "/bouzouf/route", "https", 443));
+        assert.strictEqual(await this.checkRequest(this.ctx), true);
+        this.ctx.setHttpContext(new HttpContext("csrf.com", "GET", "/bouzouf2/route", "https", 443));
+        assert.strictEqual(await this.checkRequest(this.ctx), false);
+        this.ctx.setHttpContext(new HttpContext("csrfs.com", "GET", "/bouzouf/route", "https", 443));
+        assert.strictEqual(await this.checkRequest(this.ctx), false);
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], CSRFTest.prototype, "csrfRegExp", null);
 __decorate([
-    mocha_1.test
+    test
 ], CSRFTest.prototype, "checkWebdaRequest", null);
 __decorate([
-    mocha_1.test
+    test
 ], CSRFTest.prototype, "getApiUrl", null);
 __decorate([
-    mocha_1.test
+    test
 ], CSRFTest.prototype, "websiteString", null);
 __decorate([
-    mocha_1.test
+    test
 ], CSRFTest.prototype, "websiteArray", null);
 __decorate([
-    mocha_1.test
+    test
 ], CSRFTest.prototype, "originFilter", null);
 __decorate([
-    mocha_1.test
+    test
 ], CSRFTest.prototype, "websiteObject", null);
 __decorate([
-    mocha_1.test
+    test
 ], CSRFTest.prototype, "csrfConditionalFilter", null);
 CSRFTest = __decorate([
-    mocha_1.suite
+    suite
 ], CSRFTest);
-let CoreTest = class CoreTest extends test_1.WebdaTest {
-    before() {
-        const _super = Object.create(null, {
-            before: { get: () => super.before }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.before.call(this);
-            this.ctx = yield this.newContext({});
+let CoreTest = class CoreTest extends WebdaTest {
+    async before() {
+        await super.before();
+        this.ctx = await this.newContext({});
+    }
+    async exportOpenAPI() {
+        let app = new TestApplication(path.join(__dirname, "..", "..", "..", "sample-app"));
+        await app.load();
+        let webda = new Core(app);
+        // @ts-ignore
+        webda.services["ConsoleLogger"] = new ConsoleLoggerService(webda, "ConsoleLogger", {});
+        await webda.init();
+        let openapi = webda.exportOpenAPI();
+        assert.notStrictEqual(openapi.paths["/contacts"], undefined);
+        assert.notStrictEqual(openapi.paths["/contacts/{uuid}"], undefined);
+        app.addModel("webda/anotherContext", Context);
+        app.getConfiguration().openapi = {
+            tags: [{ name: "Zzzz" }, { name: "Aaaaa" }]
+        };
+        app.getPackageDescription = () => ({
+            license: "GPL",
+            author: {
+                name: "Test"
+            }
         });
-    }
-    exportOpenAPI() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let app = new test_1.TestApplication(path.join(__dirname, "..", "..", "..", "sample-app"));
-            yield app.load();
-            let webda = new core_1.Core(app);
-            // @ts-ignore
-            webda.services["ConsoleLogger"] = new index_1.ConsoleLoggerService(webda, "ConsoleLogger", {});
-            yield webda.init();
-            webda.reinitResolvedRoutes();
-            let openapi = webda.exportOpenAPI();
-            assert.notStrictEqual(openapi.paths["/contacts"], undefined);
-            assert.notStrictEqual(openapi.paths["/contacts/{uuid}"], undefined);
-            app.addModel("webda/anotherContext", context_1.Context);
-            app.getConfiguration().openapi = {
-                tags: [{ name: "Zzzz" }, { name: "Aaaaa" }]
+        app.getSchema = type => {
+            let res = {
+                definitions: {},
+                properties: {},
+                title: type
             };
-            app.getPackageDescription = () => ({
-                license: "GPL",
-                author: {
-                    name: "Test"
-                }
-            });
-            app.getSchema = type => {
-                let res = {
-                    definitions: {},
-                    properties: {},
-                    title: type
-                };
-                res.definitions[`other$${type}`] = {
-                    description: `Fake ${type}`
-                };
-                return res;
+            res.definitions[`other$${type}`] = {
+                description: `Fake ${type}`
             };
-            openapi = webda.exportOpenAPI();
-            assert.strictEqual(openapi.info.contact.name, "Test");
-            assert.strictEqual(openapi.info.license.name, "GPL");
-            assert.deepStrictEqual(openapi.tags, [{ name: "Aaaaa" }, { name: "contacts" }, { name: "Zzzz" }]);
-            // @ts-ignore
-            assert.ok(Object.keys(openapi.definitions).length > 10);
-            app.getPackageDescription = () => ({
-                license: {
-                    name: "GPL"
-                },
-                author: "Test"
-            });
-            openapi = webda.exportOpenAPI();
-            assert.strictEqual(openapi.info.contact.name, "Test");
+            return res;
+        };
+        openapi = webda.exportOpenAPI();
+        assert.strictEqual(openapi.info.contact.name, "Test");
+        assert.strictEqual(openapi.info.license.name, "GPL");
+        assert.deepStrictEqual(openapi.tags, [
+            { name: "Aaaaa" },
+            { name: "contacts" },
+            { name: "ExceptionExecutor" },
+            { name: "ImplicitBean" },
+            { name: "Zzzz" }
+        ]);
+        assert.ok(Object.keys(openapi.components.schemas).length > 10);
+        app.getPackageDescription = () => ({
+            license: {
+                name: "GPL"
+            },
+            author: "Test"
         });
+        openapi = webda.exportOpenAPI();
+        assert.strictEqual(openapi.info.contact.name, "Test");
     }
-    getStringRoute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let ctx = yield this.newContext();
-            let exec = this.getExecutor(ctx, "test.webda.io", "GET", "/route/string");
-            exec.execute(ctx);
-            assert.strictEqual(ctx.getResponseBody(), "CodeCoverage");
-        });
+    async getStringRoute() {
+        let ctx = await this.newContext();
+        let exec = this.getExecutor(ctx, "test.webda.io", "GET", "/route/string");
+        exec.execute(ctx);
+        assert.strictEqual(ctx.getResponseBody(), "CodeCoverage");
     }
-    getStringPostRoute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let ctx = yield this.newContext();
-            let exec = this.getExecutor(ctx, "test.webda.io", "POST", "/route/string");
-            exec.execute(ctx);
-            assert.strictEqual(ctx.getResponseBody(), "CodeCoveragePOST");
-        });
+    async getStringPostRoute() {
+        let ctx = await this.newContext();
+        let exec = this.getExecutor(ctx, "test.webda.io", "POST", "/route/string");
+        exec.execute(ctx);
+        assert.strictEqual(ctx.getResponseBody(), "CodeCoveragePOST");
     }
     getServiceSample() {
         assert.notStrictEqual(null, this.webda.getService("Authentication"));
     }
-    registry() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.webda.getRegistry().put("test", { anyData: "plop" });
-            assert.strictEqual((yield this.webda.getRegistry().get("test")).anyData, "plop");
-        });
+    async registry() {
+        await this.webda.getRegistry().put("test", { anyData: "plop" });
+        assert.strictEqual((await this.webda.getRegistry().get("test")).anyData, "plop");
     }
     getServicesImplementations() {
         let moddas = this.webda.getServicesOfType();
@@ -319,17 +279,19 @@ let CoreTest = class CoreTest extends test_1.WebdaTest {
     }
     getStores() {
         let moddas = this.webda.getStores();
-        assert.strictEqual(Object.keys(moddas).length, 8);
+        assert.strictEqual(Object.keys(moddas).length, 7);
     }
     getServicesImplementationsWithType() {
-        let stores = this.webda.getServicesOfType(store_1.Store);
-        assert.strictEqual(Object.keys(stores).length, 8);
+        let stores = this.webda.getServicesOfType(Store);
+        assert.strictEqual(Object.keys(stores).length, 7);
     }
     getVersion() {
-        assert.strictEqual(this.webda.getVersion(), require("../package.json").version);
+        assert.strictEqual(this.webda.getVersion(), JSONUtils.loadFile("package.json").version);
     }
     knownPage() {
         let executor = this.getExecutor(this.ctx, "test.webda.io", "GET", "/");
+        // @ts-ignore
+        console.log(Object.keys(this.webda.getRouter().routes));
         assert.notStrictEqual(executor, undefined);
         assert.strictEqual(this.ctx.getParameters()["TEST_ADD"], undefined);
         let service = this.ctx.getExecutor();
@@ -395,95 +357,85 @@ let CoreTest = class CoreTest extends test_1.WebdaTest {
         this.webda.isDebug(); // Just for CodeCoverage
         assert.strictEqual(JSON.parse(this.webda.toPublicJSON(obj))._title, undefined);
     }
-    updateConfiguration() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let service = this.webda.getService("Authentication");
-            assert.strictEqual(service.getParameters().password.regexp, ".{8,}");
-            assert.strictEqual(service.getParameters().email.mailer, "DefinedMailer");
-            yield this.webda.reinit({
-                "Authentication.password.regexp": ".{12,}"
-            });
-            let newService = this.webda.getService("Authentication");
-            assert.strictEqual(newService.getParameters().password.regexp, ".{12,}");
-            assert.strictEqual(newService.getParameters().email.mailer, "DefinedMailer");
-            yield assert.rejects(() => this.webda.reinit({
-                "Bouzouf.plop": "Testor"
-            }), Error);
-            yield assert.rejects(() => this.webda.reinit({
-                "$.Bouzouf": {
-                    Testor: "plop"
-                }
-            }), /Configuration is not designed to add dynamically services/);
+    async updateConfiguration() {
+        let service = this.webda.getService("Authentication");
+        assert.strictEqual(service.getParameters().password.regexp, ".{8,}");
+        assert.strictEqual(service.getParameters().email.mailer, "DefinedMailer");
+        await this.webda.reinit({
+            "Authentication.password.regexp": ".{12,}"
         });
+        let newService = this.webda.getService("Authentication");
+        assert.strictEqual(newService.getParameters().password.regexp, ".{12,}");
+        assert.strictEqual(newService.getParameters().email.mailer, "DefinedMailer");
+        await assert.rejects(() => this.webda.reinit({
+            "Bouzouf.plop": "Testor"
+        }), Error);
+        await assert.rejects(() => this.webda.reinit({
+            "$.Bouzouf": {
+                Testor: "plop"
+            }
+        }), /Configuration is not designed to add dynamically services/);
     }
     assertInitError(service, msg) {
         let serviceBean = this.webda.getService(service);
         assert.notStrictEqual(serviceBean._initException, undefined, `${service} should have failed init with ${msg}`);
         assert.strictEqual(serviceBean._initException.message.indexOf(msg) >= 0, true);
     }
-    errorChecks() {
-        return __awaiter(this, void 0, void 0, function* () {
-            assert.throws(this.webda.getModel.bind(this.webda), "test");
-            assert.throws(this.webda.getModel.bind(this.webda, "Ghost"), Error);
-            assert.strictEqual(this.webda.getService("Ghost"), undefined);
-            assert.strictEqual(this.webda.getService(), undefined);
-            // @ts-ignore
-            this.webda._currentExecutor = {
-                session: "test"
-            };
-            let local = this.webda.getConfiguration().parameters.locales;
-            this.webda.getConfiguration().parameters.locales = undefined;
-            assert.strictEqual(this.webda.getLocales().indexOf("en-GB"), 0);
-            this.webda.getConfiguration().parameters.locales = local;
-            assert.strictEqual(this.webda.getService("plop"), undefined);
-            assert.strictEqual(JSON.stringify(this.webda.getModels()), "{}");
-            process.env.WEBDA_CONFIG = __dirname + "/../test/config.broken.json";
-            // assertInitError("ConfigurationService", "Need a source for");
-            // assertInitError("ConfigurationServiceBadSource", "Need a valid service");
-            // assertInitError("ConfigurationServiceBadSourceNoId", "Need a valid source");
-            // assertInitError("ConfigurationServiceBadSourceWithId", "is not implementing ConfigurationProvider interface");
-            let err = new core_1.WebdaError("CODE", "");
-            assert.strictEqual(err.getCode(), "CODE");
-        });
-    }
-    autoConnectFailure() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let app = new test_1.TestApplication(__dirname + "/../test/config.broken.json");
-            yield app.load();
-            let core = new core_1.Core(app);
-            yield core.init();
-            core.getServices()["implicitbean"].resolve = () => {
-                throw new Error();
-            };
-            // @ts-ignore
-            core.autoConnectServices();
-            core.getServices()["implicitbean"].resolve = undefined;
-            // @ts-ignore
-            core.autoConnectServices();
-        });
-    }
-    cov() {
-        return __awaiter(this, void 0, void 0, function* () {
-            //assert.deepStrictEqual(this.webda.getDeployers(), {});
-            this.webda.getUuid();
-            this.webda.getInstanceId();
-            // a8b7f4a4-62aa-4b2a-b6a8-0ffdc0d82c96
-            assert.ok(/[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.exec(this.webda.getUuid()) !== null);
-            assert.ok(/[0-9a-f]{32}/.exec(this.webda.getUuid("hex")) !== null);
-            assert.ok(/[0-9a-zA-Z\-_]{22}/.exec(this.webda.getUuid("base64")) !== null);
-        });
-    }
-    listenersTest() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let stub = sinon.stub();
-            let stub2 = sinon.stub().callsFake(() => __awaiter(this, void 0, void 0, function* () { }));
-            this.webda.on("Test", stub);
-            this.webda.on("Test", stub2);
-            // @ts-ignore
-            yield this.webda.emitSync("Test");
-            assert.strictEqual(stub.callCount, 1);
-            assert.strictEqual(stub2.callCount, 1);
-        });
+    async errorChecks() {
+        assert.throws(this.webda.getModel.bind(this.webda), "test");
+        assert.throws(this.webda.getModel.bind(this.webda, "Ghost"), Error);
+        assert.strictEqual(this.webda.getService("Ghost"), undefined);
+        assert.strictEqual(this.webda.getService(), undefined);
+        // @ts-ignore
+        this.webda._currentExecutor = {
+            session: "test"
+        };
+        let local = this.webda.getConfiguration().parameters.locales;
+        this.webda.getConfiguration().parameters.locales = undefined;
+        assert.strictEqual(this.webda.getLocales().indexOf("en-GB"), 0);
+        this.webda.getConfiguration().parameters.locales = local;
+        assert.strictEqual(this.webda.getService("plop"), undefined);
+        assert.strictEqual(JSON.stringify(this.webda.getModels()), "{}");
+        process.env.WEBDA_CONFIG = __dirname + "/../test/config.broken.json";
+        // assertInitError("ConfigurationService", "Need a source for");
+        // assertInitError("ConfigurationServiceBadSource", "Need a valid service");
+        // assertInitError("ConfigurationServiceBadSourceNoId", "Need a valid source");
+        // assertInitError("ConfigurationServiceBadSourceWithId", "is not implementing ConfigurationProvider interface");
+        let err = new WebdaError("CODE", "");
+        assert.strictEqual(err.getCode(), "CODE");
+    }
+    async autoConnectFailure() {
+        let app = new TestApplication(__dirname + "/../test/config.broken.json");
+        await app.load();
+        let core = new Core(app);
+        await core.init();
+        core.getServices()["implicitbean"].resolve = () => {
+            throw new Error();
+        };
+        // @ts-ignore
+        core.autoConnectServices();
+        core.getServices()["implicitbean"].resolve = undefined;
+        // @ts-ignore
+        core.autoConnectServices();
+    }
+    async cov() {
+        //assert.deepStrictEqual(this.webda.getDeployers(), {});
+        this.webda.getUuid();
+        this.webda.getInstanceId();
+        // a8b7f4a4-62aa-4b2a-b6a8-0ffdc0d82c96
+        assert.ok(/[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.exec(this.webda.getUuid()) !== null);
+        assert.ok(/[0-9a-f]{32}/.exec(this.webda.getUuid("hex")) !== null);
+        assert.ok(/[0-9a-zA-Z\-_]{22}/.exec(this.webda.getUuid("base64")) !== null);
+    }
+    async listenersTest() {
+        let stub = sinon.stub();
+        let stub2 = sinon.stub().callsFake(async () => { });
+        this.webda.on("Test", stub);
+        this.webda.on("Test", stub2);
+        // @ts-ignore
+        await this.webda.emitSync("Test");
+        assert.strictEqual(stub.callCount, 1);
+        assert.strictEqual(stub2.callCount, 1);
     }
     createServices() {
         this.webda.getApplication();
@@ -501,132 +453,106 @@ let CoreTest = class CoreTest extends test_1.WebdaTest {
         };
         method();
     }
-    badInit() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let service = this.webda.getService("definedmailer");
-            service.init = () => __awaiter(this, void 0, void 0, function* () {
-                throw new Error("Not happy");
-            });
-            service.reinit = () => __awaiter(this, void 0, void 0, function* () {
-                throw new Error("Not happy");
-            });
-            // @ts-ignore
-            yield this.webda.initService("definedmailer");
-            assert.notStrictEqual(service._initException, undefined);
-            // @ts-ignore
-            yield this.webda.reinitService("definedmailer");
-        });
-    }
-    sandbox() {
-        const code = `let protected = false;
-    let json = require('jsonpath');
-    try { 
-      require('net'); 
-    } catch (err) { 
-      protected = err.message === "not allowed"
-    }
-    module.exports = function() { return protected }`;
-        assert.strictEqual(this.webda.sandbox(code, {
-            require: function (mod) {
-                // We need to add more control here
-                if (mod === "net") {
-                    throw Error("not allowed");
-                }
-                // if the module is okay to load, load it:
-                return require.apply(this, arguments);
-            }
-        }), true);
-        assert.throws(() => this.webda.sandbox(code), /not allowed/);
+    async badInit() {
+        let service = this.webda.getService("definedmailer");
+        service.init = async () => {
+            throw new Error("Not happy");
+        };
+        service.reinit = async () => {
+            throw new Error("Not happy");
+        };
+        // @ts-ignore
+        await this.webda.initService("definedmailer");
+        assert.notStrictEqual(service._initException, undefined);
+        // @ts-ignore
+        await this.webda.reinitService("definedmailer");
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "exportOpenAPI", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "getStringRoute", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "getStringPostRoute", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "getServiceSample", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "registry", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "getServicesImplementations", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "getStores", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "getServicesImplementationsWithType", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "getVersion", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "knownPage", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "knownPageMultipleMethod", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "knownPageUnknownMethod", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "unknownPage", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "knownTemplatePage", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "slashInQueryString", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "slashInPath", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "me", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "covValidateSchema", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "covGetModules", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "covRemoveRoute", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "toPublicJson", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "updateConfiguration", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "errorChecks", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "autoConnectFailure", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "cov", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "listenersTest", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "createServices", null);
 __decorate([
-    mocha_1.test
+    test
 ], CoreTest.prototype, "badInit", null);
-__decorate([
-    mocha_1.test
-], CoreTest.prototype, "sandbox", null);
 CoreTest = __decorate([
-    mocha_1.suite
+    suite
 ], CoreTest);
 //# sourceMappingURL=core.spec.js.map