@villedemontreal/correlation-id 5.3.6 → 5.3.7

package/dist/config/configs.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Configurations for the application.
+ */
+declare class Configs {
+    /**
+     * Absolute path to the root of the project.
+     */
+    root: string;
+    /**
+     * Absolute path to a directory to use for tests.
+     */
+    dataDirPath: string;
+    constructor();
+}
+export declare const configs: Configs;
+export {};

package/dist/config/configs.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configs = void 0;
+const path = require("path");
+/**
+ * Configurations for the application.
+ */
+class Configs {
+    constructor() {
+        this.root = path.normalize(`${__dirname}/..`);
+        this.dataDirPath = `${this.root}/test-data`;
+    }
+}
+exports.configs = new Configs();
+//# sourceMappingURL=configs.js.map

package/dist/config/configs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../config/configs.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B;;GAEG;AACH,MAAM,OAAO;IAWX;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,SAAS,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,WAAW,GAAG,GAAG,IAAI,CAAC,IAAI,YAAY,CAAC;IAC9C,CAAC;CACF;AAEY,QAAA,OAAO,GAAY,IAAI,OAAO,EAAE,CAAC"}

package/dist/scripts/index.d.ts

@@ -0,0 +1,2 @@
+export { LintScript } from './lint';
+export { LintFixScript } from './lintFix';

package/dist/scripts/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LintFixScript = exports.LintScript = void 0;
+// ==========================================
+// All scripts must be included here!
+//
+// The scripting library uses this index to quickly
+// find all the scripts available in the application.
+// ==========================================
+var lint_1 = require("./lint");
+Object.defineProperty(exports, "LintScript", { enumerable: true, get: function () { return lint_1.LintScript; } });
+var lintFix_1 = require("./lintFix");
+Object.defineProperty(exports, "LintFixScript", { enumerable: true, get: function () { return lintFix_1.LintFixScript; } });
+//# sourceMappingURL=index.js.map

package/dist/scripts/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../scripts/index.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,qCAAqC;AACrC,EAAE;AACF,mDAAmD;AACnD,qDAAqD;AACrD,6CAA6C;AAC7C,+BAAoC;AAA3B,kGAAA,UAAU,OAAA;AACnB,qCAA0C;AAAjC,wGAAA,aAAa,OAAA"}

package/dist/scripts/lint.d.ts

@@ -0,0 +1,6 @@
+import { ScriptBase } from '@villedemontreal/scripting/dist/src';
+export declare class LintScript extends ScriptBase {
+    get name(): string;
+    get description(): string;
+    protected main(): Promise<void>;
+}

package/dist/scripts/lint.js

@@ -0,0 +1,31 @@
+"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.LintScript = void 0;
+const src_1 = require("@villedemontreal/scripting/dist/src");
+const path_1 = require("path");
+const configs_1 = require("../config/configs");
+class LintScript extends src_1.ScriptBase {
+    get name() {
+        return 'lint';
+    }
+    get description() {
+        return `Run the ESLint validation (including ESLint and Prettier rules).`;
+    }
+    main() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const projectRoot = (0, path_1.resolve)(`${configs_1.configs.root}/..`);
+            yield this.invokeShellCommand(`${projectRoot}/node_modules/.bin/eslint`, [projectRoot]);
+        });
+    }
+}
+exports.LintScript = LintScript;
+//# sourceMappingURL=lint.js.map

package/dist/scripts/lint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../scripts/lint.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAiE;AACjE,+BAA+B;AAC/B,+CAA4C;AAC5C,MAAa,UAAW,SAAQ,gBAAU;IACxC,IAAI,IAAI;QACN,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,kEAAkE,CAAC;IAC5E,CAAC;IAEe,IAAI;;YAClB,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,GAAG,iBAAO,CAAC,IAAI,KAAK,CAAC,CAAC;YAClD,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,WAAW,2BAA2B,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAC1F,CAAC;KAAA;CACF;AAbD,gCAaC"}

package/dist/scripts/lintFix.d.ts

@@ -0,0 +1,6 @@
+import { ScriptBase } from '@villedemontreal/scripting/dist/src';
+export declare class LintFixScript extends ScriptBase {
+    get name(): string;
+    get description(): string;
+    protected main(): Promise<void>;
+}

package/dist/scripts/lintFix.js

@@ -0,0 +1,40 @@
+"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.LintFixScript = void 0;
+const src_1 = require("@villedemontreal/scripting/dist/src");
+const path_1 = require("path");
+const configs_1 = require("../config/configs");
+class LintFixScript extends src_1.ScriptBase {
+    get name() {
+        return 'lint-fix';
+    }
+    get description() {
+        return `Fix the code using ESLint and Prettier rules).`;
+    }
+    main() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const projectRoot = (0, path_1.resolve)(`${configs_1.configs.root}/..`);
+            this.logger.info(`Fixing using Prettier rules`);
+            yield this.invokeShellCommand(`${projectRoot}/node_modules/.bin/prettier`, [
+                '--write',
+                projectRoot,
+            ]);
+            this.logger.info(`Fixing using ESLint rules`);
+            yield this.invokeShellCommand(`${projectRoot}/node_modules/.bin/eslint`, [
+                '--fix',
+                projectRoot,
+            ]);
+        });
+    }
+}
+exports.LintFixScript = LintFixScript;
+//# sourceMappingURL=lintFix.js.map

package/dist/scripts/lintFix.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lintFix.js","sourceRoot":"","sources":["../../scripts/lintFix.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAiE;AACjE,+BAA+B;AAC/B,+CAA4C;AAE5C,MAAa,aAAc,SAAQ,gBAAU;IAC3C,IAAI,IAAI;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,gDAAgD,CAAC;IAC1D,CAAC;IAEe,IAAI;;YAClB,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,GAAG,iBAAO,CAAC,IAAI,KAAK,CAAC,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAChD,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,WAAW,6BAA6B,EAAE;gBACzE,SAAS;gBACT,WAAW;aACZ,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,WAAW,2BAA2B,EAAE;gBACvE,OAAO;gBACP,WAAW;aACZ,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AAvBD,sCAuBC"}

package/dist/src/config/configs.d.ts

@@ -13,4 +13,4 @@ export declare class Configs {
      */
     get loggerCreator(): (name: string) => ILogger;
 }
-export declare let configs: Configs;
+export declare const configs: Configs;

package/dist/src/config/configs.js.map

@@ -1 +1 @@
-{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../src/config/configs.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,OAAO;IAGlB;;OAEG;IACI,gBAAgB,CAAC,aAAwC;QAC9D,IAAI,CAAC,gBAAgB,GAAG,aAAa,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,IAAI,aAAa;QACf,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,gGAAgG,CAAC,CAAC;SACnH;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;CACF;AAnBD,0BAmBC;AACU,QAAA,OAAO,GAAY,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../src/config/configs.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,OAAO;IAGlB;;OAEG;IACI,gBAAgB,CAAC,aAAwC;QAC9D,IAAI,CAAC,gBAAgB,GAAG,aAAa,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,IAAI,aAAa;QACf,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;SACH;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;CACF;AArBD,0BAqBC;AACY,QAAA,OAAO,GAAY,IAAI,OAAO,EAAE,CAAC"}

package/dist/src/config/constants.d.ts

@@ -24,4 +24,4 @@ export declare class Constants {
         cidNew: string;
     };
 }
-export declare let constants: Constants;
+export declare const constants: Constants;

package/dist/src/config/constants.js

@@ -18,7 +18,7 @@ class Constants {
     get requestExtraVariables() {
         return {
             cidReceivedInRequest: '_cidReceivedInRequest',
-            cidNew: '_cidNew'
+            cidNew: '_cidNew',
         };
     }
 }

package/dist/src/config/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/config/constants.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAChD,6BAA6B;AAE7B;;GAEG;AACH,MAAa,SAAS;IAgBpB;QACE,oCAAoC;QACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,WAAW,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,oBAAO,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,IAAI,qBAAqB;QACvB,OAAO;YACL,oBAAoB,EAAE,uBAAuB;YAC7C,MAAM,EAAE,SAAS;SAClB,CAAC;IACJ,CAAC;CACF;AA/BD,8BA+BC;AAEU,QAAA,SAAS,GAAc,IAAI,SAAS,EAAE,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/config/constants.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAChD,6BAA6B;AAE7B;;GAEG;AACH,MAAa,SAAS;IAgBpB;QACE,oCAAoC;QACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,WAAW,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,oBAAO,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,IAAI,qBAAqB;QACvB,OAAO;YACL,oBAAoB,EAAE,uBAAuB;YAC7C,MAAM,EAAE,SAAS;SAClB,CAAC;IACJ,CAAC;CACF;AA/BD,8BA+BC;AAEY,QAAA,SAAS,GAAc,IAAI,SAAS,EAAE,CAAC"}

package/dist/src/config/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/config/init.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AAEpC,IAAI,WAAW,GAAY,KAAK,CAAC;AAEjC;;GAEG;AACH,SAAgB,IAAI,CAAC,aAAwC;IAC3D,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,iBAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAExC,6CAA6C;IAC7C,uCAAuC;IACvC,4CAA4C;IAC5C,6CAA6C;IAC7C,WAAW,GAAG,IAAI,CAAC;AACrB,CAAC;AAXD,oBAWC;AAED;;;;;;;;GAQG;AACH,SAAgB,QAAQ;IACtB,OAAO,WAAW,CAAC;AACrB,CAAC;AAFD,4BAEC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/config/init.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AAEpC,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB;;GAEG;AACH,SAAgB,IAAI,CAAC,aAAwC;IAC3D,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IACD,iBAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAExC,6CAA6C;IAC7C,uCAAuC;IACvC,4CAA4C;IAC5C,6CAA6C;IAC7C,WAAW,GAAG,IAAI,CAAC;AACrB,CAAC;AAXD,oBAWC;AAED;;;;;;;;GAQG;AACH,SAAgB,QAAQ;IACtB,OAAO,WAAW,CAAC;AACrB,CAAC;AAFD,4BAEC"}

package/dist/src/middleware/correlationIdMiddleware.d.ts

@@ -5,4 +5,4 @@ import * as express from 'express';
  * @param filter a filter which is going to be called with the request to see if a
  * colleration id scope must be managed or not.
  */
-export declare let createCorrelationIdMiddleware: (filter?: (req: express.Request) => boolean) => (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+export declare const createCorrelationIdMiddleware: (filter?: (req: express.Request) => boolean) => (req: express.Request, res: express.Response, next: express.NextFunction) => void;

package/dist/src/middleware/correlationIdMiddleware.js

@@ -10,7 +10,7 @@ const correlationIdService_1 = require("../services/correlationIdService");
  * @param filter a filter which is going to be called with the request to see if a
  * colleration id scope must be managed or not.
  */
-let createCorrelationIdMiddleware = (filter) => {
+const createCorrelationIdMiddleware = (filter) => {
     const correlationIdMiddleware = (req, res, next) => {
         if (filter && !filter(req)) {
             next();

package/dist/src/middleware/correlationIdMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"correlationIdMiddleware.js","sourceRoot":"","sources":["../../../src/middleware/correlationIdMiddleware.ts"],"names":[],"mappings":";;;AACA,uEAA6D;AAC7D,mDAAgD;AAChD,2EAAwE;AAExE;;;;;GAKG;AACI,IAAI,6BAA6B,GAAG,CACzC,MAA0C,EAC2C,EAAE;IACvF,MAAM,uBAAuB,GAAG,CAC9B,GAAoB,EACpB,GAAqB,EACrB,IAA0B,EACpB,EAAE;QACR,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,EAAE,CAAC;SACR;aAAM;YACL,6CAA6C;YAC7C,kDAAkD;YAClD,oDAAoD;YACpD,EAAE;YACF,kCAAkC;YAClC,6CAA6C;YAC7C,IAAI,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,kCAAqB,CAAC,gBAAgB,CAAC,CAAC;YACpE,IAAI,CAAC,aAAa,EAAE;gBAClB,aAAa,GAAG,2CAAoB,CAAC,WAAW,EAAE,CAAC;gBACnD,GAAG,CAAC,qBAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;aAC7D;iBAAM;gBACL,GAAG,CAAC,qBAAS,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,aAAa,CAAC;aAC3E;YACD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;gBACpB,GAAG,CAAC,GAAG,CAAC,kCAAqB,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;aAChE;YACD,2CAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAClD;IACH,CAAC,CAAC;IAEF,OAAO,uBAAuB,CAAC;AACjC,CAAC,CAAC;AAhCS,QAAA,6BAA6B,iCAgCtC"}
+{"version":3,"file":"correlationIdMiddleware.js","sourceRoot":"","sources":["../../../src/middleware/correlationIdMiddleware.ts"],"names":[],"mappings":";;;AACA,uEAA6D;AAC7D,mDAAgD;AAChD,2EAAwE;AAExE;;;;;GAKG;AACI,MAAM,6BAA6B,GAAG,CAC3C,MAA0C,EAC2C,EAAE;IACvF,MAAM,uBAAuB,GAAG,CAC9B,GAAoB,EACpB,GAAqB,EACrB,IAA0B,EACpB,EAAE;QACR,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,EAAE,CAAC;SACR;aAAM;YACL,6CAA6C;YAC7C,kDAAkD;YAClD,oDAAoD;YACpD,EAAE;YACF,kCAAkC;YAClC,6CAA6C;YAC7C,IAAI,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,kCAAqB,CAAC,gBAAgB,CAAC,CAAC;YACpE,IAAI,CAAC,aAAa,EAAE;gBAClB,aAAa,GAAG,2CAAoB,CAAC,WAAW,EAAE,CAAC;gBACnD,GAAG,CAAC,qBAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;aAC7D;iBAAM;gBACL,GAAG,CAAC,qBAAS,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,aAAa,CAAC;aAC3E;YACD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;gBACpB,GAAG,CAAC,GAAG,CAAC,kCAAqB,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;aAChE;YACD,2CAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAClD;IACH,CAAC,CAAC;IAEF,OAAO,uBAAuB,CAAC;AACjC,CAAC,CAAC;AAhCW,QAAA,6BAA6B,iCAgCxC"}

package/dist/src/middleware/correlationIdMiddleware.test.js

@@ -1,4 +1,13 @@
 "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 });
 const chai_1 = require("chai");
 const express = require("express");
@@ -8,7 +17,7 @@ const correlationIdService_1 = require("../services/correlationIdService");
 const testingConfigurations_1 = require("../utils/testingConfigurations");
 const correlationIdMiddleware_1 = require("./correlationIdMiddleware");
 function delay(millis) {
-    return new Promise(resolve => setTimeout(() => {
+    return new Promise((resolve) => setTimeout(() => {
         resolve();
     }, millis));
 }
@@ -22,7 +31,7 @@ const uuidMatcher = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{1
 // ==========================================
 // tslint:disable-next-line: max-func-body-length
 describe('Correlation ID Middleware', () => {
-    it('should generate correlation id if it doesnt exists', async () => {
+    it('should generate correlation id if it doesnt exists', () => __awaiter(void 0, void 0, void 0, function* () {
         const app = express();
         app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
         app.get('/', (req, res) => {
@@ -30,11 +39,9 @@ describe('Correlation ID Middleware', () => {
             chai_1.assert.match(actual, uuidMatcher);
             res.end();
         });
-        await request(app)
-            .get('/')
-            .send();
-    });
-    it('should get correlation id from incoming request', async () => {
+        yield request(app).get('/').send();
+    }));
+    it('should get correlation id from incoming request', () => __awaiter(void 0, void 0, void 0, function* () {
         const testId = 'correlation-id-123';
         const app = express();
         app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
@@ -43,43 +50,37 @@ describe('Correlation ID Middleware', () => {
             chai_1.assert.strictEqual(actual, testId, 'getId() should return id from x-correlation-id header of inbound request');
             res.end();
         });
-        await request(app)
-            .get('/')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
-    });
-    it('should maintain correlation id with async callbacks', async () => {
+        yield request(app).get('/').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
+    }));
+    it('should maintain correlation id with async callbacks', () => __awaiter(void 0, void 0, void 0, function* () {
         const testId = 'correlation-id-123';
         let actual = '';
         let actual2 = '';
         const app = express();
         app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
-        app.get('/', async (req, res, next) => {
+        app.get('/', (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
             actual = correlationIdService_1.correlationIdService.getId();
             setTimeout(() => {
                 actual2 = correlationIdService_1.correlationIdService.getId();
                 res.end();
             }, 250);
-        });
+        }));
         chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
-        await request(app)
-            .get('/')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
+        yield request(app).get('/').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
         chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
         chai_1.assert.strictEqual(actual, testId, 'getId() should return id from x-correlation-id header of inbound request');
         chai_1.assert.strictEqual(actual2, testId, 'getId() should return id from x-correlation-id header of inbound request');
-    });
-    it('should maintain correlation id with async/await operations', async () => {
+    }));
+    it('should maintain correlation id with async/await operations', () => __awaiter(void 0, void 0, void 0, function* () {
         const testId = 'correlation-id-123';
         let actual = '';
         let actual2 = '';
         const app = express();
         app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
-        app.get('/', async (req, res, next) => {
+        app.get('/', (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 actual = correlationIdService_1.correlationIdService.getId();
-                await delay(250);
+                yield delay(250);
                 actual2 = correlationIdService_1.correlationIdService.getId();
             }
             catch (e) {
@@ -88,17 +89,14 @@ describe('Correlation ID Middleware', () => {
             finally {
                 res.end();
             }
-        });
+        }));
         chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
-        await request(app)
-            .get('/')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
+        yield request(app).get('/').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
         chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
         chai_1.assert.strictEqual(actual, testId, 'getId() should return id from x-correlation-id header of inbound request');
         chai_1.assert.strictEqual(actual2, testId, 'getId() should return id from x-correlation-id header of inbound request');
-    });
-    it('should keep correlation ids in nested requests', async () => {
+    }));
+    it('should keep correlation ids in nested requests', () => __awaiter(void 0, void 0, void 0, function* () {
         const testId = 'correlation-id-123';
         const testId2 = 'correlation-id-456';
         let actual = '';
@@ -108,15 +106,12 @@ describe('Correlation ID Middleware', () => {
         let actual5 = '';
         const app = express();
         app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
-        app.get('/', async (req, res, next) => {
+        app.get('/', (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 actual = correlationIdService_1.correlationIdService.getId();
-                await delay(250);
+                yield delay(250);
                 actual2 = correlationIdService_1.correlationIdService.getId();
-                await request(app)
-                    .get('/foo')
-                    .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId2)
-                    .send();
+                yield request(app).get('/foo').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId2).send();
                 actual3 = correlationIdService_1.correlationIdService.getId();
             }
             catch (e) {
@@ -125,11 +120,11 @@ describe('Correlation ID Middleware', () => {
             finally {
                 res.end();
             }
-        });
-        app.get('/foo', async (req, res, next) => {
+        }));
+        app.get('/foo', (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 actual4 = correlationIdService_1.correlationIdService.getId();
-                await delay(250);
+                yield delay(250);
                 actual5 = correlationIdService_1.correlationIdService.getId();
             }
             catch (e) {
@@ -138,85 +133,81 @@ describe('Correlation ID Middleware', () => {
             finally {
                 res.end();
             }
-        });
+        }));
         chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
-        await request(app)
-            .get('/')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
+        yield request(app).get('/').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
         chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
         chai_1.assert.strictEqual(actual, testId, 'getId() should return id from x-correlation-id header of inbound request');
         chai_1.assert.strictEqual(actual2, testId, 'getId() should return id from x-correlation-id header of inbound request');
         chai_1.assert.strictEqual(actual3, testId, 'getId() should return id from x-correlation-id header of inbound request');
         chai_1.assert.strictEqual(actual4, testId2, 'getId() should return id from x-correlation-id header of inbound request');
         chai_1.assert.strictEqual(actual5, testId2, 'getId() should return id from x-correlation-id header of inbound request');
-    });
+    }));
     // tslint:disable: no-console
-    it('should keep correlation ids separated in parallel requests', async function () {
-        this.timeout(5000);
-        const testId = 'correlation-id-123';
-        const testId2 = 'correlation-id-456';
-        let actual = '';
-        let actual2 = '';
-        let actual4 = '';
-        let actual5 = '';
-        let unlock;
-        const lock = new Promise(async (resolve, reject) => {
-            unlock = resolve;
-        });
-        const app = express();
-        app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
-        app.get('/', async (req, res, next) => {
-            try {
-                actual = correlationIdService_1.correlationIdService.getId();
-                console.log('start of req1', actual);
-                await lock;
-                actual2 = correlationIdService_1.correlationIdService.getId();
-                console.log('end of req1', actual2);
-            }
-            catch (e) {
-                next(e);
-            }
-            finally {
-                res.end();
-            }
-        });
-        app.get('/foo', async (req, res, next) => {
-            try {
-                actual4 = correlationIdService_1.correlationIdService.getId();
-                console.log('start of req2', actual4);
-                unlock();
-                await this.timeout(200);
-                actual5 = correlationIdService_1.correlationIdService.getId();
-                console.log('end of req2', actual5);
-            }
-            catch (e) {
-                next(e);
-            }
-            finally {
-                res.end();
-            }
+    it('should keep correlation ids separated in parallel requests', function () {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.timeout(5000);
+            const testId = 'correlation-id-123';
+            const testId2 = 'correlation-id-456';
+            let actual = '';
+            let actual2 = '';
+            let actual4 = '';
+            let actual5 = '';
+            let unlock;
+            const lock = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                unlock = resolve;
+            }));
+            const app = express();
+            app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
+            app.get('/', (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    actual = correlationIdService_1.correlationIdService.getId();
+                    console.log('start of req1', actual);
+                    yield lock;
+                    actual2 = correlationIdService_1.correlationIdService.getId();
+                    console.log('end of req1', actual2);
+                }
+                catch (e) {
+                    next(e);
+                }
+                finally {
+                    res.end();
+                }
+            }));
+            app.get('/foo', (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    actual4 = correlationIdService_1.correlationIdService.getId();
+                    console.log('start of req2', actual4);
+                    unlock();
+                    yield this.timeout(200);
+                    actual5 = correlationIdService_1.correlationIdService.getId();
+                    console.log('end of req2', actual5);
+                }
+                catch (e) {
+                    next(e);
+                }
+                finally {
+                    res.end();
+                }
+            }));
+            console.log('send req1');
+            chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
+            const req1 = request(app).get('/').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
+            console.log('send req2');
+            chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
+            const req2 = request(app)
+                .get('/foo')
+                .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId2)
+                .send();
+            yield Promise.all([req1, req2]);
+            chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
+            chai_1.assert.strictEqual(actual, testId, 'getId() should return id from x-correlation-id header of inbound request');
+            chai_1.assert.strictEqual(actual2, testId, 'getId() should return id from x-correlation-id header of inbound request');
+            chai_1.assert.strictEqual(actual4, testId2, 'getId() should return id from x-correlation-id header of inbound request');
+            chai_1.assert.strictEqual(actual5, testId2, 'getId() should return id from x-correlation-id header of inbound request');
         });
-        console.log('send req1');
-        chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
-        const req1 = request(app)
-            .get('/')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
-        console.log('send req2');
-        chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
-        const req2 = request(app)
-            .get('/foo')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId2)
-            .send();
-        await Promise.all([req1, req2]);
-        chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
-        chai_1.assert.strictEqual(actual, testId, 'getId() should return id from x-correlation-id header of inbound request');
-        chai_1.assert.strictEqual(actual2, testId, 'getId() should return id from x-correlation-id header of inbound request');
-        chai_1.assert.strictEqual(actual4, testId2, 'getId() should return id from x-correlation-id header of inbound request');
-        chai_1.assert.strictEqual(actual5, testId2, 'getId() should return id from x-correlation-id header of inbound request');
     });
-    it('should work with operations causing errors', async () => {
+    it('should work with operations causing errors', () => __awaiter(void 0, void 0, void 0, function* () {
         const testId = 'correlation-id-123';
         let actual = '';
         const app = express();
@@ -226,15 +217,15 @@ describe('Correlation ID Middleware', () => {
             throw new Error('some error');
         });
         chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
-        const result = await request(app)
+        const result = yield request(app)
             .get('/')
             .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
             .send();
         chai_1.assert.strictEqual(result.status, 500);
         chai_1.assert.isUndefined(correlationIdService_1.correlationIdService.getId());
         chai_1.assert.strictEqual(actual, testId, 'getId() should return id from x-correlation-id header of inbound request');
-    });
-    it('a filter can be specified', async () => {
+    }));
+    it('a filter can be specified', () => __awaiter(void 0, void 0, void 0, function* () {
         const testId = 'correlation-id-123';
         const filter = (req) => {
             if (req.path.startsWith('/ok/')) {
@@ -259,20 +250,11 @@ describe('Correlation ID Middleware', () => {
             chai_1.assert.isUndefined(actual);
             res.end();
         });
-        await request(app)
-            .get('/ok/1')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
-        await request(app)
-            .get('/ok/2')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
-        await request(app)
-            .get('/notok/1')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
-    });
-    it('getCidInfo() cid received', async () => {
+        yield request(app).get('/ok/1').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
+        yield request(app).get('/ok/2').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
+        yield request(app).get('/notok/1').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
+    }));
+    it('getCidInfo() cid received', () => __awaiter(void 0, void 0, void 0, function* () {
         const testId = 'correlation-id-123';
         const app = express();
         app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
@@ -283,12 +265,9 @@ describe('Correlation ID Middleware', () => {
             chai_1.assert.isUndefined(info.generated);
             res.end();
         });
-        await request(app)
-            .get('/')
-            .set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId)
-            .send();
-    });
-    it('getCidInfo() cid generated', async () => {
+        yield request(app).get('/').set(http_header_fields_typed_1.default.X_CORRELATION_ID, testId).send();
+    }));
+    it('getCidInfo() cid generated', () => __awaiter(void 0, void 0, void 0, function* () {
         const app = express();
         app.use((0, correlationIdMiddleware_1.createCorrelationIdMiddleware)());
         app.get('/', (req, res) => {
@@ -298,9 +277,7 @@ describe('Correlation ID Middleware', () => {
             chai_1.assert.isUndefined(info.receivedInRequest);
             res.end();
         });
-        await request(app)
-            .get('/')
-            .send();
-    });
+        yield request(app).get('/').send();
+    }));
 });
 //# sourceMappingURL=correlationIdMiddleware.test.js.map