slonik-interceptor-query-logging 1.4.7 → 40.2.5

package/CHANGELOG.md

@@ -0,0 +1,40 @@
+# slonik-interceptor-query-logging
+
+## 40.2.5
+
+### Patch Changes
+
+- [`ef802a9`](https://github.com/gajus/slonik/commit/ef802a91be2bc6e69b077c544cc7f9e5a2687433) Thanks [@gajus](https://github.com/gajus)! - force patch bump
+
+- Updated dependencies [[`ef802a9`](https://github.com/gajus/slonik/commit/ef802a91be2bc6e69b077c544cc7f9e5a2687433)]:
+  - slonik@40.2.5
+
+## 40.2.4
+
+### Patch Changes
+
+- [`c1064fc`](https://github.com/gajus/slonik/commit/c1064fc3f21f839effc1687737942332a7c05b0d) Thanks [@gajus](https://github.com/gajus)! - update access
+
+- Updated dependencies [[`c1064fc`](https://github.com/gajus/slonik/commit/c1064fc3f21f839effc1687737942332a7c05b0d)]:
+  - slonik@40.2.4
+
+## 40.2.3
+
+### Patch Changes
+
+- [#577](https://github.com/gajus/slonik/pull/577) [`4007ab7`](https://github.com/gajus/slonik/commit/4007ab7e07d5b71e8f41e145584979fa36885275) Thanks [@gajus](https://github.com/gajus)! - abstract packages using internal modules
+
+- [#579](https://github.com/gajus/slonik/pull/579) [`2779fd1`](https://github.com/gajus/slonik/commit/2779fd15ddae35b9830f4c156648e444cd793f13) Thanks [@gajus](https://github.com/gajus)! - add slonik-sql-tag-raw
+
+- Updated dependencies [[`4007ab7`](https://github.com/gajus/slonik/commit/4007ab7e07d5b71e8f41e145584979fa36885275), [`2779fd1`](https://github.com/gajus/slonik/commit/2779fd15ddae35b9830f4c156648e444cd793f13)]:
+  - slonik@40.2.3
+
+## 2.0.0
+
+### Major Changes
+
+- [#575](https://github.com/gajus/slonik/pull/575) [`050cd78`](https://github.com/gajus/slonik/commit/050cd788a77b6ce5e410c0985d01a09733f994bd) Thanks [@gajus](https://github.com/gajus)! - Increase minimum supported node.js version
+
+### Minor Changes
+
+- [#575](https://github.com/gajus/slonik/pull/575) [`050cd78`](https://github.com/gajus/slonik/commit/050cd788a77b6ce5e410c0985d01a09733f994bd) Thanks [@gajus](https://github.com/gajus)! - Adding interceptors to the monorepo.

package/README.md

@@ -1,7 +1,5 @@
 # slonik-interceptor-query-logging
 
-[![Travis build status](http://img.shields.io/travis/gajus/slonik-interceptor-query-logging/master.svg?style=flat-square)](https://travis-ci.com/github/gajus/slonik-interceptor-query-logging)
-[![Coveralls](https://img.shields.io/coveralls/gajus/slonik-interceptor-query-logging.svg?style=flat-square)](https://coveralls.io/github/gajus/slonik-interceptor-query-logging)
 [![NPM version](http://img.shields.io/npm/v/slonik-interceptor-query-logging.svg?style=flat-square)](https://www.npmjs.org/package/slonik-interceptor-query-logging)
 [![Canonical Code Style](https://img.shields.io/badge/code%20style-canonical-blue.svg?style=flat-square)](https://github.com/gajus/canonical)
 [![Twitter Follow](https://img.shields.io/twitter/follow/kuizinas.svg?style=social&label=Follow)](https://twitter.com/kuizinas)

package/dist/{src/factories → factories}/createQueryLoggingInterceptor.d.ts

@@ -1,9 +1,10 @@
-import type { Interceptor } from 'slonik';
+import { type Interceptor } from 'slonik';
 /**
  * @property logValues Dictates whether to include parameter values used to execute the query. (default: true)
  */
-declare type UserConfigurationType = {
+type UserConfigurationType = {
     logValues: boolean;
 };
-export declare const createQueryLoggingInterceptor: (userConfiguration?: UserConfigurationType | undefined) => Interceptor;
+export declare const createQueryLoggingInterceptor: (userConfiguration?: UserConfigurationType) => Interceptor;
 export {};
+//# sourceMappingURL=createQueryLoggingInterceptor.d.ts.map

package/dist/factories/createQueryLoggingInterceptor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createQueryLoggingInterceptor.d.ts","sourceRoot":"","sources":["../../src/factories/createQueryLoggingInterceptor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C;;GAEG;AACH,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAgBF,eAAO,MAAM,6BAA6B,uBACpB,qBAAqB,KACxC,WAgGF,CAAC"}

package/dist/{src/factories → factories}/createQueryLoggingInterceptor.js

@@ -4,11 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createQueryLoggingInterceptor = void 0;
+const getAutoExplainPayload_1 = require("../utilities/getAutoExplainPayload");
+const isAutoExplainJsonMessage_1 = require("../utilities/isAutoExplainJsonMessage");
 const pretty_ms_1 = __importDefault(require("pretty-ms"));
 const serialize_error_1 = require("serialize-error");
-const utilities_1 = require("../utilities");
 const stringifyCallSite = (callSite) => {
-    return (callSite.fileName || '') + ':' + callSite.lineNumber + ':' + callSite.columnNumber;
+    return ((callSite.fileName || '') +
+        ':' +
+        callSite.lineNumber +
+        ':' +
+        callSite.columnNumber);
 };
 const defaultConfiguration = {
     logValues: true,
@@ -28,14 +33,15 @@ const createQueryLoggingInterceptor = (userConfiguration) => {
                 if (!notice.message) {
                     continue;
                 }
-                if ((0, utilities_1.isAutoExplainJsonMessage)(notice.message)) {
+                if ((0, isAutoExplainJsonMessage_1.isAutoExplainJsonMessage)(notice.message)) {
                     context.log.info({
-                        autoExplain: (0, utilities_1.getAutoExplainPayload)(notice.message),
+                        autoExplain: (0, getAutoExplainPayload_1.getAutoExplainPayload)(notice.message),
                     }, 'auto explain');
                 }
             }
             context.log.debug({
-                executionTime: (0, pretty_ms_1.default)(Number(process.hrtime.bigint() - BigInt(context.queryInputTime)) / 1000000),
+                executionTime: (0, pretty_ms_1.default)(Number(process.hrtime.bigint() - BigInt(context.queryInputTime)) /
+                    1000000),
                 rowCount,
             }, 'query execution result');
             return null;
@@ -46,7 +52,9 @@ const createQueryLoggingInterceptor = (userConfiguration) => {
                 stackTrace = [];
                 for (const callSite of context.stackTrace) {
                     // Hide the internal call sites.
-                    if (callSite.fileName !== null && !callSite.fileName.includes('slonik') && !callSite.fileName.includes('next_tick')) {
+                    if (callSite.fileName !== null &&
+                        !callSite.fileName.includes('node_modules/slonik/') &&
+                        !callSite.fileName.includes('next_tick')) {
                         stackTrace.push(stringifyCallSite(callSite));
                     }
                 }
@@ -79,3 +87,4 @@ const createQueryLoggingInterceptor = (userConfiguration) => {
     };
 };
 exports.createQueryLoggingInterceptor = createQueryLoggingInterceptor;
+//# sourceMappingURL=createQueryLoggingInterceptor.js.map

package/dist/factories/createQueryLoggingInterceptor.js.map

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

package/dist/index.d.ts

@@ -0,0 +1,2 @@
+export { createQueryLoggingInterceptor } from './factories/createQueryLoggingInterceptor';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC"}

package/dist/{src/factories/index.js → index.js}

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createQueryLoggingInterceptor = void 0;
-var createQueryLoggingInterceptor_1 = require("./createQueryLoggingInterceptor");
+var createQueryLoggingInterceptor_1 = require("./factories/createQueryLoggingInterceptor");
 Object.defineProperty(exports, "createQueryLoggingInterceptor", { enumerable: true, get: function () { return createQueryLoggingInterceptor_1.createQueryLoggingInterceptor; } });
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,2FAA0F;AAAjF,8IAAA,6BAA6B,OAAA"}

package/dist/{src/utilities → utilities}/getAutoExplainPayload.d.ts

@@ -1 +1,2 @@
 export declare const getAutoExplainPayload: (noticeMessage: string) => any;
+//# sourceMappingURL=getAutoExplainPayload.d.ts.map

package/dist/utilities/getAutoExplainPayload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAutoExplainPayload.d.ts","sourceRoot":"","sources":["../../src/utilities/getAutoExplainPayload.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,kBAAmB,MAAM,QAc1D,CAAC"}

package/dist/{src/utilities → utilities}/getAutoExplainPayload.js

@@ -13,3 +13,4 @@ const getAutoExplainPayload = (noticeMessage) => {
     return matches[0];
 };
 exports.getAutoExplainPayload = getAutoExplainPayload;
+//# sourceMappingURL=getAutoExplainPayload.js.map

package/dist/utilities/getAutoExplainPayload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAutoExplainPayload.js","sourceRoot":"","sources":["../../src/utilities/getAutoExplainPayload.ts"],"names":[],"mappings":";;;AAAA,2CAAyC;AAElC,MAAM,qBAAqB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAC7D,MAAM,OAAO,GAAG,IAAA,wBAAW,EAAC,aAAa,CAAC,CAAC;IAE3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;KACH;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;KACpE;IAED,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC;AAdW,QAAA,qBAAqB,yBAchC"}

package/dist/utilities/getAutoExplainPayload.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=getAutoExplainPayload.test.d.ts.map

package/dist/utilities/getAutoExplainPayload.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAutoExplainPayload.test.d.ts","sourceRoot":"","sources":["../../src/utilities/getAutoExplainPayload.test.ts"],"names":[],"mappings":""}

package/dist/utilities/getAutoExplainPayload.test.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getAutoExplainPayload_1 = require("./getAutoExplainPayload");
+const ava_1 = __importDefault(require("ava"));
+(0, ava_1.default)('extracts JSON from the message', (t) => {
+    t.deepEqual((0, getAutoExplainPayload_1.getAutoExplainPayload)('duration: {"foo":"bar"}'), {
+        foo: 'bar',
+    });
+});
+(0, ava_1.default)('throws an error if payload is not found', (t) => {
+    t.throws(() => {
+        (0, getAutoExplainPayload_1.getAutoExplainPayload)('duration:');
+    }, {
+        message: 'Notice message does not contain a recognizable JSON payload.',
+    });
+});
+(0, ava_1.default)('throws an error if multiple payloads are found', (t) => {
+    t.throws(() => {
+        (0, getAutoExplainPayload_1.getAutoExplainPayload)('duration: {"foo":"bar"} {"foo":"bar"}');
+    }, {
+        message: 'Notice message contains multiple JSON payloads.',
+    });
+});
+//# sourceMappingURL=getAutoExplainPayload.test.js.map

package/dist/utilities/getAutoExplainPayload.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAutoExplainPayload.test.js","sourceRoot":"","sources":["../../src/utilities/getAutoExplainPayload.test.ts"],"names":[],"mappings":";;;;;AAAA,mEAAgE;AAChE,8CAAuB;AAEvB,IAAA,aAAI,EAAC,gCAAgC,EAAE,CAAC,CAAC,EAAE,EAAE;IAC3C,CAAC,CAAC,SAAS,CAAC,IAAA,6CAAqB,EAAC,yBAAyB,CAAC,EAAE;QAC5D,GAAG,EAAE,KAAK;KACX,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,yCAAyC,EAAE,CAAC,CAAC,EAAE,EAAE;IACpD,CAAC,CAAC,MAAM,CACN,GAAG,EAAE;QACH,IAAA,6CAAqB,EAAC,WAAW,CAAC,CAAC;IACrC,CAAC,EACD;QACE,OAAO,EAAE,8DAA8D;KACxE,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,gDAAgD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC3D,CAAC,CAAC,MAAM,CACN,GAAG,EAAE;QACH,IAAA,6CAAqB,EAAC,uCAAuC,CAAC,CAAC;IACjE,CAAC,EACD;QACE,OAAO,EAAE,iDAAiD;KAC3D,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/{src/utilities → utilities}/isAutoExplainJsonMessage.d.ts

@@ -1 +1,2 @@
 export declare const isAutoExplainJsonMessage: (noticeMessage: string) => boolean;
+//# sourceMappingURL=isAutoExplainJsonMessage.d.ts.map

package/dist/utilities/isAutoExplainJsonMessage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isAutoExplainJsonMessage.d.ts","sourceRoot":"","sources":["../../src/utilities/isAutoExplainJsonMessage.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB,kBAAmB,MAAM,KAAG,OAIhE,CAAC"}

package/dist/{src/utilities → utilities}/isAutoExplainJsonMessage.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAutoExplainJsonMessage = void 0;
 const isAutoExplainJsonMessage = (noticeMessage) => {
-    return noticeMessage.trim().startsWith('duration:') && noticeMessage.includes('{');
+    return (noticeMessage.trim().startsWith('duration:') && noticeMessage.includes('{'));
 };
 exports.isAutoExplainJsonMessage = isAutoExplainJsonMessage;
+//# sourceMappingURL=isAutoExplainJsonMessage.js.map

package/dist/utilities/isAutoExplainJsonMessage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isAutoExplainJsonMessage.js","sourceRoot":"","sources":["../../src/utilities/isAutoExplainJsonMessage.ts"],"names":[],"mappings":";;;AAAO,MAAM,wBAAwB,GAAG,CAAC,aAAqB,EAAW,EAAE;IACzE,OAAO,CACL,aAAa,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAC5E,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,wBAAwB,4BAInC"}

package/dist/utilities/isAutoExplainJsonMessage.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=isAutoExplainJsonMessage.test.d.ts.map

package/dist/utilities/isAutoExplainJsonMessage.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isAutoExplainJsonMessage.test.d.ts","sourceRoot":"","sources":["../../src/utilities/isAutoExplainJsonMessage.test.ts"],"names":[],"mappings":""}

package/dist/utilities/isAutoExplainJsonMessage.test.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const isAutoExplainJsonMessage_1 = require("./isAutoExplainJsonMessage");
+const ava_1 = __importDefault(require("ava"));
+(0, ava_1.default)('recognizes notice containing JSON', (t) => {
+    t.true((0, isAutoExplainJsonMessage_1.isAutoExplainJsonMessage)('duration: {}'));
+});
+//# sourceMappingURL=isAutoExplainJsonMessage.test.js.map

package/dist/utilities/isAutoExplainJsonMessage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isAutoExplainJsonMessage.test.js","sourceRoot":"","sources":["../../src/utilities/isAutoExplainJsonMessage.test.ts"],"names":[],"mappings":";;;;;AAAA,yEAAsE;AACtE,8CAAuB;AAEvB,IAAA,aAAI,EAAC,mCAAmC,EAAE,CAAC,CAAC,EAAE,EAAE;IAC9C,CAAC,CAAC,IAAI,CAAC,IAAA,mDAAwB,EAAC,cAAc,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC"}

package/package.json

@@ -9,7 +9,7 @@
       "ts"
     ],
     "files": [
-      "test/slonik-interceptor-query-logging/**/*"
+      "src/**/*.test.ts"
     ],
     "require": [
       "ts-node/register/transpile-only"
@@ -22,30 +22,15 @@
   },
   "description": "Logs Slonik queries.",
   "devDependencies": {
-    "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "ava": "^3.15.0",
-    "babel-plugin-istanbul": "^6.1.1",
-    "babel-plugin-macros": "^3.1.0",
-    "babel-plugin-transform-export-default-name": "^2.1.0",
-    "coveralls": "^3.1.1",
-    "del-cli": "^4.0.1",
-    "eslint": "^8.4.1",
-    "eslint-config-canonical": "^32.46.0",
-    "husky": "^7.0.4",
-    "inline-loops.macro": "^1.2.2",
-    "nyc": "^15.1.0",
-    "semantic-release": "^18.0.1",
-    "sinon": "^12.0.1",
+    "ava": "^5.3.1",
+    "eslint": "^8.57.0",
+    "eslint-config-canonical": "^42.8.1",
+    "slonik": "^40.2.5",
     "ts-node": "^10.4.0",
     "typescript": "^4.5.3"
   },
   "engines": {
-    "node": ">=8.0"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run lint && npm run test && npm run build"
-    }
+    "node": ">=18"
   },
   "keywords": [
     "postgresql",
@@ -53,20 +38,20 @@
     "logging"
   ],
   "license": "BSD-3-Clause",
-  "main": "./dist/src/index.js",
+  "main": "./dist/index.js",
   "name": "slonik-interceptor-query-logging",
   "peerDependencies": {
-    "slonik": ">=27.0.0"
+    "slonik": ">=40.2.5"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/gajus/slonik-interceptor-query-logging"
+    "url": "https://github.com/gajus/slonik"
   },
   "scripts": {
-    "build": "del-cli ./dist && tsc",
-    "lint": "eslint ./src ./test && tsc --noEmit",
-    "test": "NODE_ENV=test nyc ava --verbose --serial"
+    "build": "rm -fr ./dist && tsc",
+    "lint": "eslint ./src && tsc --noEmit",
+    "test": "ava --verbose --serial"
   },
-  "typings": "./dist/src/index.d.ts",
-  "version": "1.4.7"
+  "typings": "./dist/index.d.ts",
+  "version": "40.2.5"
 }

package/src/.eslintrc

@@ -0,0 +1,26 @@
+{
+  "extends": "canonical/auto",
+  "ignorePatterns": [
+    "dist",
+    "package-lock.json"
+  ],
+  "overrides": [
+    {
+      "files": "*.ts",
+      "rules": {
+        "import/no-cycle": 0,
+        "no-restricted-imports": ["error", "pg"]
+      }
+    },
+    {
+      "files": ["*.test.ts", "**/*.test/*"],
+      "extends": "canonical/ava",
+      "rules": {
+        "@typescript-eslint/no-explicit-any": 0,
+        "@typescript-eslint/no-unused-expressions": 0,
+        "ava/no-ignored-test-files": 0
+      }
+    }
+  ],
+  "root": true
+}

package/src/factories/createQueryLoggingInterceptor.ts

@@ -1,31 +1,33 @@
+import { getAutoExplainPayload } from '../utilities/getAutoExplainPayload';
+import { isAutoExplainJsonMessage } from '../utilities/isAutoExplainJsonMessage';
 import prettyMs from 'pretty-ms';
-import {
-  serializeError,
-} from 'serialize-error';
-import type {
-  Interceptor,
-} from 'slonik';
-import {
-  getAutoExplainPayload,
-  isAutoExplainJsonMessage,
-} from '../utilities';
+import { serializeError } from 'serialize-error';
+import { type Interceptor } from 'slonik';
 
 /**
  * @property logValues Dictates whether to include parameter values used to execute the query. (default: true)
  */
 type UserConfigurationType = {
-  logValues: boolean,
+  logValues: boolean;
 };
 
 const stringifyCallSite = (callSite) => {
-  return (callSite.fileName || '') + ':' + callSite.lineNumber + ':' + callSite.columnNumber;
+  return (
+    (callSite.fileName || '') +
+    ':' +
+    callSite.lineNumber +
+    ':' +
+    callSite.columnNumber
+  );
 };
 
 const defaultConfiguration = {
   logValues: true,
 };
 
-export const createQueryLoggingInterceptor = (userConfiguration?: UserConfigurationType): Interceptor => {
+export const createQueryLoggingInterceptor = (
+  userConfiguration?: UserConfigurationType,
+): Interceptor => {
   const configuration = {
     ...defaultConfiguration,
     ...userConfiguration,
@@ -45,16 +47,25 @@ export const createQueryLoggingInterceptor = (userConfiguration?: UserConfigurat
         }
 
         if (isAutoExplainJsonMessage(notice.message)) {
-          context.log.info({
-            autoExplain: getAutoExplainPayload(notice.message),
-          }, 'auto explain');
+          context.log.info(
+            {
+              autoExplain: getAutoExplainPayload(notice.message),
+            },
+            'auto explain',
+          );
         }
       }
 
-      context.log.debug({
-        executionTime: prettyMs(Number(process.hrtime.bigint() - BigInt(context.queryInputTime)) / 1_000_000),
-        rowCount,
-      }, 'query execution result');
+      context.log.debug(
+        {
+          executionTime: prettyMs(
+            Number(process.hrtime.bigint() - BigInt(context.queryInputTime)) /
+              1_000_000,
+          ),
+          rowCount,
+        },
+        'query execution result',
+      );
 
       return null;
     },
@@ -66,7 +77,11 @@ export const createQueryLoggingInterceptor = (userConfiguration?: UserConfigurat
 
         for (const callSite of context.stackTrace) {
           // Hide the internal call sites.
-          if (callSite.fileName !== null && !callSite.fileName.includes('slonik') && !callSite.fileName.includes('next_tick')) {
+          if (
+            callSite.fileName !== null &&
+            !callSite.fileName.includes('node_modules/slonik/') &&
+            !callSite.fileName.includes('next_tick')
+          ) {
             stackTrace.push(stringifyCallSite(callSite));
           }
         }
@@ -86,18 +101,24 @@ export const createQueryLoggingInterceptor = (userConfiguration?: UserConfigurat
         }
       }
 
-      context.log.debug({
-        sql: query.sql,
-        stackTrace,
-        values,
-      }, 'executing query');
+      context.log.debug(
+        {
+          sql: query.sql,
+          stackTrace,
+          values,
+        },
+        'executing query',
+      );
 
       return null;
     },
     queryExecutionError: (context, query, error) => {
-      context.log.error({
-        error: serializeError(error),
-      }, 'query execution produced an error');
+      context.log.error(
+        {
+          error: serializeError(error),
+        },
+        'query execution produced an error',
+      );
 
       return null;
     },

package/src/index.ts

@@ -1,5 +1 @@
-// @flow
-
-export {
-  createQueryLoggingInterceptor,
-} from './factories';
+export { createQueryLoggingInterceptor } from './factories/createQueryLoggingInterceptor';

package/src/utilities/getAutoExplainPayload.test.ts

@@ -0,0 +1,30 @@
+import { getAutoExplainPayload } from './getAutoExplainPayload';
+import test from 'ava';
+
+test('extracts JSON from the message', (t) => {
+  t.deepEqual(getAutoExplainPayload('duration: {"foo":"bar"}'), {
+    foo: 'bar',
+  });
+});
+
+test('throws an error if payload is not found', (t) => {
+  t.throws(
+    () => {
+      getAutoExplainPayload('duration:');
+    },
+    {
+      message: 'Notice message does not contain a recognizable JSON payload.',
+    },
+  );
+});
+
+test('throws an error if multiple payloads are found', (t) => {
+  t.throws(
+    () => {
+      getAutoExplainPayload('duration: {"foo":"bar"} {"foo":"bar"}');
+    },
+    {
+      message: 'Notice message contains multiple JSON payloads.',
+    },
+  );
+});

package/src/utilities/getAutoExplainPayload.ts

@@ -1,12 +1,12 @@
-import {
-  extractJson,
-} from 'crack-json';
+import { extractJson } from 'crack-json';
 
 export const getAutoExplainPayload = (noticeMessage: string) => {
   const matches = extractJson(noticeMessage);
 
   if (matches.length === 0) {
-    throw new Error('Notice message does not contain a recognizable JSON payload.');
+    throw new Error(
+      'Notice message does not contain a recognizable JSON payload.',
+    );
   }
 
   if (matches.length > 1) {

package/src/utilities/isAutoExplainJsonMessage.test.ts

@@ -0,0 +1,6 @@
+import { isAutoExplainJsonMessage } from './isAutoExplainJsonMessage';
+import test from 'ava';
+
+test('recognizes notice containing JSON', (t) => {
+  t.true(isAutoExplainJsonMessage('duration: {}'));
+});

package/src/utilities/isAutoExplainJsonMessage.ts

@@ -1,3 +1,5 @@
 export const isAutoExplainJsonMessage = (noticeMessage: string): boolean => {
-  return noticeMessage.trim().startsWith('duration:') && noticeMessage.includes('{');
+  return (
+    noticeMessage.trim().startsWith('duration:') && noticeMessage.includes('{')
+  );
 };

package/tsconfig.json

@@ -2,25 +2,23 @@
   "compilerOptions": {
     "allowSyntheticDefaultImports": true,
     "declaration": true,
+    "declarationMap": true,
     "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
+    "lib": [
+      "es2021"
+    ],
     "module": "commonjs",
     "moduleResolution": "node",
     "noImplicitAny": false,
     "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": false,
     "outDir": "dist",
     "skipLibCheck": true,
+    "sourceMap": true,
     "strict": true,
-    "target": "es2018"
+    "target": "es2020",
+    "useUnknownInCatchVariables": false
   },
-  "exclude": [
-    "dist",
-    "node_modules"
-  ],
   "include": [
-    "src",
-    "test"
+    "src"
   ]
-}
+}

package/LICENSE

@@ -1,24 +0,0 @@
-Copyright (c) 2021, Gajus Kuizinas (http://gajus.com/)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Gajus Kuizinas (http://gajus.com/) nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL GAJUS KUIZINAS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/dist/src/factories/index.d.ts

@@ -1 +0,0 @@
-export { createQueryLoggingInterceptor, } from './createQueryLoggingInterceptor';

package/dist/src/index.d.ts

@@ -1 +0,0 @@
-export { createQueryLoggingInterceptor, } from './factories';

package/dist/src/index.js

@@ -1,6 +0,0 @@
-"use strict";
-// @flow
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createQueryLoggingInterceptor = void 0;
-var factories_1 = require("./factories");
-Object.defineProperty(exports, "createQueryLoggingInterceptor", { enumerable: true, get: function () { return factories_1.createQueryLoggingInterceptor; } });

package/dist/src/utilities/index.d.ts

@@ -1,2 +0,0 @@
-export { getAutoExplainPayload, } from './getAutoExplainPayload';
-export { isAutoExplainJsonMessage, } from './isAutoExplainJsonMessage';

package/dist/src/utilities/index.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAutoExplainJsonMessage = exports.getAutoExplainPayload = void 0;
-var getAutoExplainPayload_1 = require("./getAutoExplainPayload");
-Object.defineProperty(exports, "getAutoExplainPayload", { enumerable: true, get: function () { return getAutoExplainPayload_1.getAutoExplainPayload; } });
-var isAutoExplainJsonMessage_1 = require("./isAutoExplainJsonMessage");
-Object.defineProperty(exports, "isAutoExplainJsonMessage", { enumerable: true, get: function () { return isAutoExplainJsonMessage_1.isAutoExplainJsonMessage; } });

package/src/factories/index.ts

@@ -1,3 +0,0 @@
-export {
-  createQueryLoggingInterceptor,
-} from './createQueryLoggingInterceptor';

package/src/utilities/index.ts

@@ -1,6 +0,0 @@
-export {
-  getAutoExplainPayload,
-} from './getAutoExplainPayload';
-export {
-  isAutoExplainJsonMessage,
-} from './isAutoExplainJsonMessage';