@appsemble/node-utils 0.20.13 → 0.20.14

package/interceptors.test.ts

@@ -1,10 +1,9 @@
-import { install, InstalledClock } from '@sinonjs/fake-timers';
 import axios, { AxiosInstance } from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 import { highlight } from 'cli-highlight';
 import FormData from 'form-data';
 
-import { configureAxios, formData, logger, requestLogger, responseLogger } from '.';
+import { configureAxios, formData, logger, requestLogger, responseLogger } from './index.js';
 
 function h(content: string): string {
   return highlight(content, { language: 'http' });
@@ -12,16 +11,11 @@ function h(content: string): string {
 
 let instance: AxiosInstance;
 let mock: MockAdapter;
-let clock: InstalledClock;
 
-jest.mock('os');
+import.meta.jest.mock('os');
 
 beforeEach(() => {
-  clock = install();
-});
-
-afterEach(() => {
-  clock.uninstall();
+  import.meta.jest.useFakeTimers({ now: 0 });
 });
 
 describe('formData', () => {
@@ -65,7 +59,7 @@ describe('requestLogger', () => {
   });
 
   it('should log requests', async () => {
-    jest.spyOn(logger, 'verbose');
+    import.meta.jest.spyOn(logger, 'verbose');
     await instance.get('/');
     expect(logger.verbose).toHaveBeenCalledWith(`> 0 ${h('GET / HTTP/1.1')}`);
   });
@@ -80,7 +74,7 @@ describe('responseLogger', () => {
   });
 
   it('should log responses', async () => {
-    jest.spyOn(logger, 'verbose');
+    import.meta.jest.spyOn(logger, 'verbose');
     await instance.get('/');
     expect(logger.verbose).toHaveBeenCalledWith(expect.any(String));
   });
@@ -88,8 +82,8 @@ describe('responseLogger', () => {
 
 describe('configureAxios', () => {
   beforeEach(() => {
-    jest.spyOn(axios.interceptors.request, 'use').mockImplementation();
-    jest.spyOn(axios.interceptors.response, 'use').mockImplementation();
+    import.meta.jest.spyOn(axios.interceptors.request, 'use').mockImplementation();
+    import.meta.jest.spyOn(axios.interceptors.response, 'use').mockImplementation();
   });
 
   it('should set the correct user agent', () => {

package/interceptors.ts

@@ -4,7 +4,7 @@ import axios, { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { highlight } from 'cli-highlight';
 import FormData from 'form-data';
 
-import { logger } from './logger';
+import { logger } from './logger.js';
 
 /**
  * This is used to set a request id, so the request and response can be matched in the logs.

package/jest.config.js

@@ -1 +1,3 @@
-module.exports = require('../../config/jest/config')(__dirname);
+import { createJestConfig } from '../../config/jest/config.js';
+
+export default createJestConfig(import.meta);

package/jest.setup.js

@@ -1,9 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 // Importing a module here will break mocks for that module. Only add imports from `./src/*` here
 // that are strictly necessary.
-const logger_1 = require("./logger");
-const testFixtures_1 = require("./testFixtures");
-(0, testFixtures_1.setFixtureBase)(__dirname);
-(0, logger_1.setLogLevel)(0);
+import { setLogLevel } from './logger.js';
+import { setFixtureBase } from './testFixtures.js';
+setFixtureBase(import.meta);
+setLogLevel(0);
 //# sourceMappingURL=jest.setup.js.map

package/jest.setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"jest.setup.js","sourceRoot":"","sources":["jest.setup.ts"],"names":[],"mappings":";;AAAA,iGAAiG;AACjG,+BAA+B;AAC/B,qCAAuC;AACvC,iDAAgD;AAEhD,IAAA,6BAAc,EAAC,SAAS,CAAC,CAAC;AAC1B,IAAA,oBAAW,EAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"jest.setup.js","sourceRoot":"","sources":["jest.setup.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,+BAA+B;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC5B,WAAW,CAAC,CAAC,CAAC,CAAC"}

package/jest.setup.ts

@@ -1,7 +1,7 @@
 // Importing a module here will break mocks for that module. Only add imports from `./src/*` here
 // that are strictly necessary.
-import { setLogLevel } from './logger';
-import { setFixtureBase } from './testFixtures';
+import { setLogLevel } from './logger.js';
+import { setFixtureBase } from './testFixtures.js';
 
-setFixtureBase(__dirname);
+setFixtureBase(import.meta);
 setLogLevel(0);

package/logger.js

@@ -1,15 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureLogger = exports.setLogLevel = exports.logger = void 0;
-const os_1 = require("os");
-const util_1 = require("util");
-const axios_1 = __importDefault(require("axios"));
-const chalk_1 = __importDefault(require("chalk"));
-const cli_highlight_1 = require("cli-highlight");
-const winston_1 = __importDefault(require("winston"));
+import { EOL } from 'os';
+import { inspect } from 'util';
+import axios from 'axios';
+import chalk from 'chalk';
+import { highlight } from 'cli-highlight';
+import winston from 'winston';
 const levels = ['crit', 'error', 'warn', 'info', 'verbose', 'silly'];
 const DEFAULT_LEVEL = levels.indexOf('info');
 const padding = Math.max(...levels.map(({ length }) => length));
@@ -20,18 +14,18 @@ function httpErrorToString(error) {
     var _a, _b, _c;
     const { config, request, response } = error;
     return [
-        chalk_1.default.blue.bold('Request:'),
-        (0, cli_highlight_1.highlight)([
-            `${config.method.toUpperCase()} ${axios_1.default.getUri(config)} HTTP/${(_b = (_a = request.res) === null || _a === void 0 ? void 0 : _a.httpVersion) !== null && _b !== void 0 ? _b : '1.1'}`,
+        chalk.blue.bold('Request:'),
+        highlight([
+            `${config.method.toUpperCase()} ${axios.getUri(config)} HTTP/${(_b = (_a = request.res) === null || _a === void 0 ? void 0 : _a.httpVersion) !== null && _b !== void 0 ? _b : '1.1'}`,
             ...Object.entries(config.headers)
                 .map(([key, value]) => [headerCase(key), value])
                 .map(([key, value]) => `${key}: ${key === 'Authorization' ? 'xxxxxxxxxx' : value}`)
                 .sort(),
-        ].join(os_1.EOL), { language: 'http', ignoreIllegals: true }),
+        ].join(EOL), { language: 'http', ignoreIllegals: true }),
         '',
-        chalk_1.default.blue.bold('Response:'),
+        chalk.blue.bold('Response:'),
         response
-            ? (0, cli_highlight_1.highlight)([
+            ? highlight([
                 `HTTP/${(_c = request.res) === null || _c === void 0 ? void 0 : _c.httpVersion} ${response.status} ${response.statusText}`,
                 ...Object.entries(response.headers)
                     .map(([key, value]) => `${headerCase(key)}: ${value}`)
@@ -40,13 +34,13 @@ function httpErrorToString(error) {
                 response.data instanceof Object
                     ? JSON.stringify(response.data, null, 2)
                     : response.data,
-            ].join(os_1.EOL), { language: 'http', ignoreIllegals: true })
-            : chalk_1.default.red.bold('No response from server'),
-    ].join(os_1.EOL);
+            ].join(EOL), { language: 'http', ignoreIllegals: true })
+            : chalk.red.bold('No response from server'),
+    ].join(EOL);
 }
 function toString(info) {
     if (info instanceof Error) {
-        if (axios_1.default.isAxiosError(info)) {
+        if (axios.isAxiosError(info)) {
             return httpErrorToString(info);
         }
         return info.stack;
@@ -54,34 +48,33 @@ function toString(info) {
     if (typeof info.message === 'string') {
         return info.message;
     }
-    return (0, util_1.inspect)(info.message, { colors: true });
+    return inspect(info.message, { colors: true });
 }
 /**
  * The default logger for NodeJS Appsemble projects.
  */
-exports.logger = winston_1.default.createLogger({
+export const logger = winston.createLogger({
     level: levels[DEFAULT_LEVEL],
     levels: Object.fromEntries(levels.map((level, index) => [level, index])),
-    format: winston_1.default.format.combine(winston_1.default.format((info) => ({
+    format: winston.format.combine(winston.format((info) => ({
         ...info,
         lines: toString(info)
             .split(/\r?\n/)
             .map((line) => `${''.padEnd(padding - info.level.length)}${line}`),
-    }))(), winston_1.default.format.colorize(), winston_1.default.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston_1.default.format.printf(({ level, lines, timestamp }) => lines.map((line) => `${timestamp} [${level}]: ${line}`).join(os_1.EOL))),
-    transports: [new winston_1.default.transports.Console()],
+    }))(), winston.format.colorize(), winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston.format.printf(({ level, lines, timestamp }) => lines.map((line) => `${timestamp} [${level}]: ${line}`).join(EOL))),
+    transports: [new winston.transports.Console()],
 });
 /**
  * Set the logging level using a string or numeric value.
  *
  * @param level The logger level to set.
  */
-function setLogLevel(level = DEFAULT_LEVEL) {
-    exports.logger.level = Number.isNaN(Number(level))
+export function setLogLevel(level = DEFAULT_LEVEL) {
+    logger.level = Number.isNaN(Number(level))
         ? level
         : levels[Math.min(Math.max(level, 0), levels.length - 1)];
-    exports.logger.silly(`Logging level set to ${exports.logger.level}`);
+    logger.silly(`Logging level set to ${logger.level}`);
 }
-exports.setLogLevel = setLogLevel;
 /**
  * Configure logging using named quiet and verbose parameters.
  *
@@ -89,14 +82,13 @@ exports.setLogLevel = setLogLevel;
  *
  * @param argv The processed command line arguments.
  */
-function configureLogger({ quiet = 0, verbose = 0 }) {
+export function configureLogger({ quiet = 0, verbose = 0 }) {
     process.on('warning', (warning) => {
-        exports.logger.warn(warning);
+        logger.warn(warning);
     });
     process.on('unhandledRejection', (error) => {
-        exports.logger.error(error);
+        logger.error(error);
     });
     setLogLevel(DEFAULT_LEVEL + verbose - quiet);
 }
-exports.configureLogger = configureLogger;
 //# sourceMappingURL=logger.js.map

package/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,KAAqB,MAAM,OAAO,CAAC;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,OAAO,MAAM,SAAS,CAAC;AAc9B,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAU,CAAC;AAC9E,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AAEhE,SAAS,UAAU,CAAC,MAAc;IAChC,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAiB;;IAC1C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC5C,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;QAC3B,SAAS,CACP;YACE,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,SACpD,MAAA,MAAA,OAAO,CAAC,GAAG,0CAAE,WAAW,mCAAI,KAC9B,EAAE;YACF,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;iBAC9B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;iBAC/C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,GAAG,KAAK,eAAe,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;iBAClF,IAAI,EAAE;SACV,CAAC,IAAI,CAAC,GAAG,CAAC,EACX,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,CAC3C;QACD,EAAE;QACF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;QAC5B,QAAQ;YACN,CAAC,CAAC,SAAS,CACP;gBACE,QAAQ,MAAA,OAAO,CAAC,GAAG,0CAAE,WAAW,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE;gBAC5E,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;qBAChC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC;qBACrD,IAAI,EAAE;gBACT,EAAE;gBACF,QAAQ,CAAC,IAAI,YAAY,MAAM;oBAC7B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBACxC,CAAC,CAAC,QAAQ,CAAC,IAAI;aAClB,CAAC,IAAI,CAAC,GAAG,CAAC,EACX,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,CAC3C;YACH,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC;KAC9C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,SAAS,QAAQ,CAAC,IAAuB;IACvC,IAAI,IAAI,YAAY,KAAK,EAAE;QACzB,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YAC5B,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;KACnB;IACD,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC;KACrB;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AACjD,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACxE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAC5B,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACxB,GAAG,IAAI;QACP,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC;aAClB,KAAK,CAAC,OAAO,CAAC;aACd,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;KACrE,CAAC,CAAC,EAAE,EACL,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,EAC3D,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,CACpD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,SAAS,KAAK,KAAK,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAC1E,CACF;IACD,UAAU,EAAE,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;CAC/C,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,QAAyB,aAAa;IAChE,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC,CAAE,KAAgB;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAe,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,CAAC,KAAK,CAAC,wBAAwB,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;AACvD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAyB;IAC/E,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,WAAW,CAAC,aAAa,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC;AAC/C,CAAC"}

package/logger.test.js

@@ -1,38 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("./logger");
+import { configureLogger, logger, setLogLevel } from './logger.js';
 describe('setLogLevel', () => {
     afterEach(() => {
-        (0, logger_1.setLogLevel)();
+        setLogLevel();
     });
     it('should set the level of the exported logger based on a string', () => {
-        (0, logger_1.setLogLevel)('verbose');
-        expect(logger_1.logger.level).toBe('verbose');
+        setLogLevel('verbose');
+        expect(logger.level).toBe('verbose');
     });
     it('should set the level of the exported logger based on a number', () => {
-        (0, logger_1.setLogLevel)(1);
-        expect(logger_1.logger.level).toBe('error');
+        setLogLevel(1);
+        expect(logger.level).toBe('error');
     });
     it('should set the level of the exported logger based on a numeric string', () => {
-        (0, logger_1.setLogLevel)('2');
-        expect(logger_1.logger.level).toBe('warn');
+        setLogLevel('2');
+        expect(logger.level).toBe('warn');
     });
 });
 describe('configureLogger', () => {
     afterEach(() => {
-        (0, logger_1.setLogLevel)();
+        setLogLevel();
     });
     it('should configure a log level based on the quiet count of the argv', () => {
-        (0, logger_1.configureLogger)({ quiet: 1 });
-        expect(logger_1.logger.level).toBe('warn');
+        configureLogger({ quiet: 1 });
+        expect(logger.level).toBe('warn');
     });
     it('should configure a log level based on the verbose count of the argv', () => {
-        (0, logger_1.configureLogger)({ verbose: 1 });
-        expect(logger_1.logger.level).toBe('verbose');
+        configureLogger({ verbose: 1 });
+        expect(logger.level).toBe('verbose');
     });
     it('should configure a log level based on the combined quiet and verbose count', () => {
-        (0, logger_1.configureLogger)({ quiet: 1, verbose: 1 });
-        expect(logger_1.logger.level).toBe('info');
+        configureLogger({ quiet: 1, verbose: 1 });
+        expect(logger.level).toBe('info');
     });
 });
 //# sourceMappingURL=logger.test.js.map

package/logger.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["logger.test.ts"],"names":[],"mappings":";;AAAA,qCAAgE;AAEhE,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,SAAS,CAAC,GAAG,EAAE;QACb,IAAA,oBAAW,GAAE,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,IAAA,oBAAW,EAAC,SAAS,CAAC,CAAC;QACvB,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,IAAA,oBAAW,EAAC,CAAC,CAAC,CAAC;QACf,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;QACjB,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,SAAS,CAAC,GAAG,EAAE;QACb,IAAA,oBAAW,GAAE,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,IAAA,wBAAe,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,IAAA,wBAAe,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,IAAA,wBAAe,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAC1C,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["logger.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEnE,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,WAAW,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,WAAW,CAAC,CAAC,CAAC,CAAC;QACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,WAAW,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/logger.test.ts

@@ -1,4 +1,4 @@
-import { configureLogger, logger, setLogLevel } from './logger';
+import { configureLogger, logger, setLogLevel } from './logger.js';
 
 describe('setLogLevel', () => {
   afterEach(() => {

package/loggerMiddleware.js

@@ -1,11 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loggerMiddleware = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const logger_1 = require("./logger");
+import chalk from 'chalk';
+import { logger } from './logger.js';
 function rangeFormat(value, map) {
     return Object.entries(map).find(([v]) => v === 'default' || value < Number(v))[1];
 }
@@ -14,12 +8,12 @@ function rangeFormat(value, map) {
  *
  * @returns Koa middleware for logging requests using the Appsemble logger.
  */
-function loggerMiddleware() {
+export function loggerMiddleware() {
     return (ctx, next) => {
         const { href, res } = ctx;
         const start = Date.now();
-        const method = chalk_1.default.bold(ctx.method);
-        logger_1.logger.info(`${method} ${href} — ${chalk_1.default.white(ctx.ip)}`);
+        const method = chalk.bold(ctx.method);
+        logger.info(`${method} ${href} — ${chalk.white(ctx.ip)}`);
         function logResponse() {
             res.removeListener('finish', logResponse);
             // eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -28,16 +22,16 @@ function loggerMiddleware() {
             const s = `${status} ${message}`;
             const duration = Date.now() - start;
             const formatDuration = rangeFormat(duration, {
-                100: chalk_1.default.green,
-                1000: chalk_1.default.yellow,
-                default: chalk_1.default.red,
+                100: chalk.green,
+                1000: chalk.yellow,
+                default: chalk.red,
             });
             const formatStatus = rangeFormat(status, {
-                200: chalk_1.default.red,
-                300: chalk_1.default.green,
-                400: chalk_1.default.cyan,
-                500: chalk_1.default.yellow,
-                default: chalk_1.default.red,
+                200: chalk.red,
+                300: chalk.green,
+                400: chalk.cyan,
+                500: chalk.yellow,
+                default: chalk.red,
             });
             const level = rangeFormat(status, {
                 200: 'error',
@@ -45,23 +39,22 @@ function loggerMiddleware() {
                 500: 'warn',
                 default: 'error',
             });
-            logger_1.logger.log(level, `${method} ${href} ${formatStatus(location ? `${s} → ${location}` : s)} ${formatDuration(`${duration}ms`)}`);
+            logger.log(level, `${method} ${href} ${formatStatus(location ? `${s} → ${location}` : s)} ${formatDuration(`${duration}ms`)}`);
         }
         function logCancel() {
             res.removeListener('finish', logResponse);
             res.removeListener('close', logCancel);
             const duration = Date.now() - start;
             const formatDuration = rangeFormat(duration, {
-                100: chalk_1.default.green,
-                1000: chalk_1.default.yellow,
-                default: chalk_1.default.red,
+                100: chalk.green,
+                1000: chalk.yellow,
+                default: chalk.red,
             });
-            logger_1.logger.warn(`${method} ${href} ${chalk_1.default.grey('Cancelled')} ${formatDuration(`${duration}ms`)}`);
+            logger.warn(`${method} ${href} ${chalk.grey('Cancelled')} ${formatDuration(`${duration}ms`)}`);
         }
         res.once('finish', logResponse);
         res.once('close', logCancel);
         return next();
     };
 }
-exports.loggerMiddleware = loggerMiddleware;
 //# sourceMappingURL=loggerMiddleware.js.map

package/loggerMiddleware.js.map

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

package/loggerMiddleware.test.js

@@ -1,14 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fake_timers_1 = require("@sinonjs/fake-timers");
-const axios_test_instance_1 = require("axios-test-instance");
-const chalk_1 = __importDefault(require("chalk"));
-const koa_1 = __importDefault(require("koa"));
-const logger_1 = require("./logger");
-const loggerMiddleware_1 = require("./loggerMiddleware");
+import { request, setTestApp } from 'axios-test-instance';
+import chalk from 'chalk';
+import Koa from 'koa';
+import { logger } from './logger.js';
+import { loggerMiddleware } from './loggerMiddleware.js';
 class TestError extends Error {
     constructor(message) {
         super(message);
@@ -16,12 +10,11 @@ class TestError extends Error {
     }
 }
 let app;
-let clock;
 beforeEach(async () => {
-    jest.spyOn(logger_1.logger, 'info').mockImplementation(() => logger_1.logger);
-    jest.spyOn(logger_1.logger, 'log').mockImplementation(() => logger_1.logger);
-    clock = (0, fake_timers_1.install)();
-    app = new koa_1.default();
+    import.meta.jest.spyOn(logger, 'info').mockImplementation(() => logger);
+    import.meta.jest.spyOn(logger, 'log').mockImplementation(() => logger);
+    import.meta.jest.useFakeTimers({ now: 0 });
+    app = new Koa();
     app.use(async (ctx, next) => {
         Object.defineProperty(ctx.request, 'origin', {
             value: 'https://example.com:1337',
@@ -36,95 +29,92 @@ beforeEach(async () => {
             ctx.status = 400;
         }
     });
-    app.use((0, loggerMiddleware_1.loggerMiddleware)());
+    app.use(loggerMiddleware());
     app.silent = true;
-    axios_test_instance_1.request.defaults.maxRedirects = 0;
-    await (0, axios_test_instance_1.setTestApp)(app);
-});
-afterEach(() => {
-    clock.uninstall();
+    request.defaults.maxRedirects = 0;
+    await setTestApp(app);
 });
 it('should log requests', async () => {
-    await axios_test_instance_1.request.get('/pizza');
-    expect(logger_1.logger.info).toHaveBeenCalledWith(`${chalk_1.default.bold('GET')} https://example.com:1337/pizza — ${chalk_1.default.white('127.0.0.1')}`);
+    await request.get('/pizza');
+    expect(logger.info).toHaveBeenCalledWith(`${chalk.bold('GET')} https://example.com:1337/pizza — ${chalk.white('127.0.0.1')}`);
 });
 it('should log success responses as info', async () => {
     app.use((ctx) => {
-        clock.tick(1);
+        import.meta.jest.advanceTimersByTime(1);
         ctx.status = 200;
     });
-    await axios_test_instance_1.request.get('/fries');
-    expect(logger_1.logger.log).toHaveBeenCalledWith('info', `${chalk_1.default.bold('GET')} https://example.com:1337/fries ${chalk_1.default.green('200 OK')} ${chalk_1.default.green('1ms')}`);
+    await request.get('/fries');
+    expect(logger.log).toHaveBeenCalledWith('info', `${chalk.bold('GET')} https://example.com:1337/fries ${chalk.green('200 OK')} ${chalk.green('1ms')}`);
 });
 it('should log redirect responses as info', async () => {
     app.use((ctx) => {
-        clock.tick(33);
+        import.meta.jest.advanceTimersByTime(33);
         ctx.redirect('/');
     });
-    await axios_test_instance_1.request.get('/fries');
-    expect(logger_1.logger.log).toHaveBeenCalledWith('info', `${chalk_1.default.bold('GET')} https://example.com:1337/fries ${chalk_1.default.cyan('302 Found → /')} ${chalk_1.default.green('33ms')}`);
+    await request.get('/fries');
+    expect(logger.log).toHaveBeenCalledWith('info', `${chalk.bold('GET')} https://example.com:1337/fries ${chalk.cyan('302 Found → /')} ${chalk.green('33ms')}`);
 });
 it('should log bad responses as warn', async () => {
     app.use((ctx) => {
-        clock.tick(3);
+        import.meta.jest.advanceTimersByTime(3);
         ctx.status = 400;
     });
-    await axios_test_instance_1.request.get('/burrito');
-    expect(logger_1.logger.log).toHaveBeenCalledWith('warn', `${chalk_1.default.bold('GET')} https://example.com:1337/burrito ${chalk_1.default.yellow('400 Bad Request')} ${chalk_1.default.green('3ms')}`);
+    await request.get('/burrito');
+    expect(logger.log).toHaveBeenCalledWith('warn', `${chalk.bold('GET')} https://example.com:1337/burrito ${chalk.yellow('400 Bad Request')} ${chalk.green('3ms')}`);
 });
 it('should log error responses as error', async () => {
     app.use((ctx) => {
-        clock.tick(53);
+        import.meta.jest.advanceTimersByTime(53);
         ctx.status = 503;
     });
-    await axios_test_instance_1.request.get('/wrap');
-    expect(logger_1.logger.log).toHaveBeenCalledWith('error', `${chalk_1.default.bold('GET')} https://example.com:1337/wrap ${chalk_1.default.red('503 Service Unavailable')} ${chalk_1.default.green('53ms')}`);
+    await request.get('/wrap');
+    expect(logger.log).toHaveBeenCalledWith('error', `${chalk.bold('GET')} https://example.com:1337/wrap ${chalk.red('503 Service Unavailable')} ${chalk.green('53ms')}`);
 });
 it('should log long request lengths yellow', async () => {
     app.use((ctx) => {
-        clock.tick(400);
+        import.meta.jest.advanceTimersByTime(400);
         ctx.status = 200;
     });
-    await axios_test_instance_1.request.get('/banana');
-    expect(logger_1.logger.log).toHaveBeenCalledWith('info', `${chalk_1.default.bold('GET')} https://example.com:1337/banana ${chalk_1.default.green('200 OK')} ${chalk_1.default.yellow('400ms')}`);
+    await request.get('/banana');
+    expect(logger.log).toHaveBeenCalledWith('info', `${chalk.bold('GET')} https://example.com:1337/banana ${chalk.green('200 OK')} ${chalk.yellow('400ms')}`);
 });
 it('should log extremely long request lengths red', async () => {
     app.use((ctx) => {
-        clock.tick(1337);
+        import.meta.jest.advanceTimersByTime(1337);
         ctx.status = 200;
     });
-    await axios_test_instance_1.request.get('/pepperoni');
-    expect(logger_1.logger.log).toHaveBeenCalledWith('info', `${chalk_1.default.bold('GET')} https://example.com:1337/pepperoni ${chalk_1.default.green('200 OK')} ${chalk_1.default.red('1337ms')}`);
+    await request.get('/pepperoni');
+    expect(logger.log).toHaveBeenCalledWith('info', `${chalk.bold('GET')} https://example.com:1337/pepperoni ${chalk.green('200 OK')} ${chalk.red('1337ms')}`);
 });
 it('should log errors as internal server errors and rethrow', async () => {
-    const spy = jest.fn();
+    const spy = import.meta.jest.fn();
     const error = new Error('fail');
     let context;
     app.on('error', spy);
     app.use((ctx) => {
-        clock.tick(86);
+        import.meta.jest.advanceTimersByTime(86);
         context = ctx;
         throw error;
     });
-    await axios_test_instance_1.request.get('/taco');
+    await request.get('/taco');
     expect(spy).toHaveBeenCalledWith(error, context);
-    expect(logger_1.logger.log).toHaveBeenCalledWith('error', `${chalk_1.default.bold('GET')} https://example.com:1337/taco ${chalk_1.default.red('500 Internal Server Error')} ${chalk_1.default.green('86ms')}`);
+    expect(logger.log).toHaveBeenCalledWith('error', `${chalk.bold('GET')} https://example.com:1337/taco ${chalk.red('500 Internal Server Error')} ${chalk.green('86ms')}`);
 });
 it('should append the response length if it is defined', async () => {
     app.use((ctx) => {
-        clock.tick(1);
+        import.meta.jest.advanceTimersByTime(1);
         ctx.status = 200;
         ctx.body = '{}';
     });
-    await axios_test_instance_1.request.get('/fries');
-    expect(logger_1.logger.log).toHaveBeenCalledWith('info', `${chalk_1.default.bold('GET')} https://example.com:1337/fries ${chalk_1.default.green('200 OK')} ${chalk_1.default.green('1ms')}`);
+    await request.get('/fries');
+    expect(logger.log).toHaveBeenCalledWith('info', `${chalk.bold('GET')} https://example.com:1337/fries ${chalk.green('200 OK')} ${chalk.green('1ms')}`);
 });
 it('should log handled errors correctly', async () => {
     app.use(() => {
-        clock.tick(15);
+        import.meta.jest.advanceTimersByTime(15);
         throw new TestError();
     });
-    await axios_test_instance_1.request.get('potatoes');
-    expect(logger_1.logger.log).toHaveBeenCalledWith('warn', `${chalk_1.default.bold('GET')} https://example.com:1337/potatoes ${chalk_1.default.yellow('400 Bad Request')} ${chalk_1.default.green('15ms')}`);
+    await request.get('potatoes');
+    expect(logger.log).toHaveBeenCalledWith('warn', `${chalk.bold('GET')} https://example.com:1337/potatoes ${chalk.yellow('400 Bad Request')} ${chalk.green('15ms')}`);
 });
 //# sourceMappingURL=loggerMiddleware.test.js.map