slonik-interceptor-query-logging 1.3.8 → 1.4.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019, Gajus Kuizinas (http://gajus.com/)
+Copyright (c) 2021, Gajus Kuizinas (http://gajus.com/)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@ modification, are permitted provided that the following conditions are met:
 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 ANUARY BE LIABLE FOR ANY
+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

package/README.md

@@ -1,6 +1,6 @@
 # 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.org/gajus/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)
@@ -10,14 +10,13 @@ Logs [Slonik](https://github.com/gajus/slonik) queries.
 
 ## API
 
-```js
+```ts
 import {
   createQueryLoggingInterceptor
-} from 'slonik';
-
+} from 'slonik-interceptor-query-logging';
 ```
 
-```js
+```ts
 /**
  * @property logValues Dictates whether to include parameter values used to execute the query. (default: true)
  */
@@ -26,14 +25,13 @@ type UserConfigurationType = {|
 |};
 
 (userConfiguration: UserConfigurationType) => InterceptorType;
-
 ```
 
 ## Example usage
 
 Note: You must export `ROARR_LOG=true` environment variable for logs to be printed. Refer to [Roarr](https://github.com/gajus/roarr) documentation for more information.
 
-```js
+```ts
 import {
   createPool
 } from 'slonik';
@@ -55,18 +53,16 @@ await connection.any(sql`
     code_alpha_2
   FROM country
 `);
-
 ```
 
 Produces log:
 
-```sql
+```json
 {"context":{"package":"slonik","poolId":"01D4G1EHYPYX1DZ073G08QEPED","logLevel":30,"processId":769420982,"stats":{"idleConnectionCount":0,"totalConnectionCount":1,"waitingRequestCount":0}},"message":"created a new client connection","sequence":0,"time":1551021590799,"version":"1.0.0"}
 {"context":{"package":"slonik","poolId":"01D4G1EHYPYX1DZ073G08QEPED","logLevel":30,"processId":769420982,"stats":{"idleConnectionCount":0,"totalConnectionCount":1,"waitingRequestCount":0}},"message":"client is checked out from the pool","sequence":1,"time":1551021590801,"version":"1.0.0"}
 {"context":{"package":"slonik","poolId":"01D4G1EHYPYX1DZ073G08QEPED","connectionId":"01D4G1EJ8DZFX79EN8CRE5Z7VS","queryId":"01D4G1EJB9P3SJ3V0SSVRTZ800","logLevel":20,"sql":"SELECT id, code_alpha_2 FROM country","stackTrace":[],"values":[]},"message":"executing query","sequence":2,"time":1551021590890,"version":"1.0.0"}
 {"context":{"package":"slonik","poolId":"01D4G1EHYPYX1DZ073G08QEPED","connectionId":"01D4G1EJ8DZFX79EN8CRE5Z7VS","queryId":"01D4G1EJB9P3SJ3V0SSVRTZ800","logLevel":20,"executionTime":"65ms","rowCount":250},"message":"query execution result","sequence":3,"time":1551021590918,"version":"1.0.0"}
 {"context":{"package":"slonik","poolId":"01D4G1EHYPYX1DZ073G08QEPED","logLevel":30,"processId":769420982,"stats":{"idleConnectionCount":0,"totalConnectionCount":0,"waitingRequestCount":0}},"message":"client connection is closed and removed from the client pool","sequence":4,"time":1551021600922,"version":"1.0.0"}
-
 ```
 
 Use [`roarr-cli`](https://github.com/gajus/roarr-cli) to pretty print the logs.
@@ -114,7 +110,6 @@ stats:
   idleConnectionCount:  0
   totalConnectionCount: 0
   waitingRequestCount:  0
-
 ```
 
 ## Logging `auto_explain`
@@ -137,12 +132,11 @@ SET auto_explain.log_timing=true;
 
 -- Enables Slonik to capture auto_explain logs.
 SET client_min_messages=log;
-
 ```
 
 This can be configured using `afterPoolConnection` interceptor, e.g.
 
-```js
+```ts
 const pool = createPool('postgres://localhost', {
   interceptors: [
     {
@@ -196,5 +190,4 @@ notice:
           Actual Total Time:   15.29
           Actual Rows:         195786
           Actual Loops:        1
-
 ```

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

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

package/dist/src/factories/createQueryLoggingInterceptor.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createQueryLoggingInterceptor = void 0;
+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;
+};
+const defaultConfiguration = {
+    logValues: true,
+};
+const createQueryLoggingInterceptor = (userConfiguration) => {
+    const configuration = {
+        ...defaultConfiguration,
+        ...userConfiguration,
+    };
+    return {
+        afterQueryExecution: (context, query, result) => {
+            let rowCount = null;
+            if (result.rowCount) {
+                rowCount = result.rowCount;
+            }
+            for (const notice of result.notices) {
+                if ((0, utilities_1.isAutoExplainJsonMessage)(notice.message)) {
+                    context.log.info({
+                        autoExplain: (0, utilities_1.getAutoExplainPayload)(notice.message),
+                    }, 'auto explain');
+                }
+            }
+            context.log.debug({
+                executionTime: (0, pretty_ms_1.default)(Number(process.hrtime.bigint() - BigInt(context.queryInputTime)) / 1000000),
+                rowCount,
+            }, 'query execution result');
+            return null;
+        },
+        beforeQueryExecution: async (context, query) => {
+            let stackTrace;
+            if (context.stackTrace) {
+                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')) {
+                        stackTrace.push(stringifyCallSite(callSite));
+                    }
+                }
+            }
+            let values;
+            if (configuration.logValues) {
+                values = [];
+                for (const value of query.values) {
+                    if (Buffer.isBuffer(value)) {
+                        values.push('[Buffer ' + value.byteLength + ']');
+                    }
+                    else {
+                        values.push(value);
+                    }
+                }
+            }
+            context.log.debug({
+                sql: query.sql,
+                stackTrace,
+                values,
+            }, 'executing query');
+            return null;
+        },
+        queryExecutionError: (context, query, error) => {
+            context.log.error({
+                error: (0, serialize_error_1.serializeError)(error),
+            }, 'query execution produced an error');
+            return null;
+        },
+    };
+};
+exports.createQueryLoggingInterceptor = createQueryLoggingInterceptor;

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

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

package/dist/src/factories/index.js

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

package/dist/src/index.d.ts

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

package/dist/src/index.js

@@ -0,0 +1,6 @@
+"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/getAutoExplainPayload.d.ts

@@ -0,0 +1 @@
+export declare const getAutoExplainPayload: (noticeMessage: string) => any;

package/dist/src/utilities/getAutoExplainPayload.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAutoExplainPayload = void 0;
+const crack_json_1 = require("crack-json");
+const getAutoExplainPayload = (noticeMessage) => {
+    const matches = (0, crack_json_1.extractJson)(noticeMessage);
+    if (matches.length === 0) {
+        throw new Error('Notice message does not contain a recognizable JSON payload.');
+    }
+    if (matches.length > 1) {
+        throw new Error('Notice message contains multiple JSON payloads.');
+    }
+    return matches[0];
+};
+exports.getAutoExplainPayload = getAutoExplainPayload;

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

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

package/dist/src/utilities/index.js

@@ -0,0 +1,7 @@
+"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/dist/src/utilities/isAutoExplainJsonMessage.d.ts

@@ -0,0 +1 @@
+export declare const isAutoExplainJsonMessage: (noticeMessage: string) => boolean;

package/dist/src/utilities/isAutoExplainJsonMessage.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAutoExplainJsonMessage = void 0;
+const isAutoExplainJsonMessage = (noticeMessage) => {
+    return noticeMessage.trim().startsWith('duration:') && noticeMessage.includes('{');
+};
+exports.isAutoExplainJsonMessage = isAutoExplainJsonMessage;

package/package.json

@@ -5,46 +5,40 @@
     "url": "http://gajus.com"
   },
   "ava": {
-    "babel": {
-      "compileAsTests": [
-        "test/helpers/**/*"
-      ]
-    },
+    "extensions": [
+      "ts"
+    ],
     "files": [
       "test/slonik-interceptor-query-logging/**/*"
     ],
     "require": [
-      "@babel/register"
+      "ts-node/register/transpile-only"
     ]
   },
   "dependencies": {
     "crack-json": "^1.3.0",
-    "pretty-ms": "^6.0.0",
-    "serialize-error": "^5.0.0",
-    "slonik": "^22.4.0"
+    "pretty-ms": "^7.0.1",
+    "serialize-error": "^9.0.0"
   },
   "description": "Logs Slonik queries.",
   "devDependencies": {
-    "@ava/babel": "^1.0.1",
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.8.4",
-    "@babel/plugin-transform-flow-strip-types": "^7.8.3",
-    "@babel/preset-env": "^7.8.4",
-    "@babel/register": "^7.8.3",
-    "ava": "^3.3.0",
-    "babel-plugin-istanbul": "^6.0.0",
-    "babel-plugin-macros": "^2.8.0",
-    "babel-plugin-transform-export-default-name": "^2.0.4",
-    "coveralls": "^3.0.9",
-    "eslint": "^6.8.0",
-    "eslint-config-canonical": "^18.1.1",
-    "flow-bin": "^0.118.0",
-    "flow-copy-source": "^2.0.9",
-    "husky": "^4.2.3",
+    "@istanbuljs/nyc-config-typescript": "^1.0.1",
+    "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.3.0",
+    "eslint-config-canonical": "^32.43.0",
+    "husky": "^7.0.4",
     "inline-loops.macro": "^1.2.2",
-    "nyc": "^15.0.0",
-    "semantic-release": "^17.0.3",
-    "sinon": "^8.1.1"
+    "nyc": "^15.1.0",
+    "semantic-release": "^18.0.1",
+    "sinon": "^12.0.1",
+    "slonik": "^22.4.0",
+    "ts-node": "^10.4.0",
+    "typescript": "^4.5.2"
   },
   "engines": {
     "node": ">=8.0"
@@ -60,36 +54,20 @@
     "logging"
   ],
   "license": "BSD-3-Clause",
-  "main": "./dist/index.js",
+  "main": "./dist/src/index.js",
   "name": "slonik-interceptor-query-logging",
-  "nyc": {
-    "all": true,
-    "exclude": [
-      "src/bin",
-      "src/queries/*.js"
-    ],
-    "include": [
-      "src/**/*.js"
-    ],
-    "instrument": false,
-    "reporter": [
-      "html",
-      "text-summary"
-    ],
-    "require": [
-      "@babel/register"
-    ],
-    "silent": true,
-    "sourceMap": false
+  "peerDependencies": {
+    "slonik": ">=25.1.2"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/gajus/slonik-interceptor-query-logging"
   },
   "scripts": {
-    "build": "rm -fr ./dist && NODE_ENV=production babel ./src --out-dir ./dist --copy-files --source-maps && flow-copy-source src dist",
-    "lint": "eslint ./src ./test && flow",
+    "build": "del-cli ./dist && tsc",
+    "lint": "eslint ./src ./test && tsc --noEmit",
     "test": "NODE_ENV=test nyc ava --verbose --serial"
   },
-  "version": "1.3.8"
+  "typings": "./dist/src/index.d.ts",
+  "version": "1.4.2"
 }

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

@@ -1,16 +1,10 @@
-// @flow
-
+import prettyMs from 'pretty-ms';
 import {
   serializeError,
 } from 'serialize-error';
 import type {
   InterceptorType,
 } from 'slonik';
-import {
-  filter,
-  map,
-} from 'inline-loops.macro';
-import prettyMs from 'pretty-ms';
 import {
   getAutoExplainPayload,
   isAutoExplainJsonMessage,
@@ -19,9 +13,9 @@ import {
 /**
  * @property logValues Dictates whether to include parameter values used to execute the query. (default: true)
  */
-type UserConfigurationType = {|
-  +logValues: boolean,
-|};
+type UserConfigurationType = {
+  logValues: boolean,
+};
 
 const stringifyCallSite = (callSite) => {
   return (callSite.fileName || '') + ':' + callSite.lineNumber + ':' + callSite.columnNumber;
@@ -31,7 +25,7 @@ const defaultConfiguration = {
   logValues: true,
 };
 
-export default (userConfiguration?: UserConfigurationType): InterceptorType => {
+export const createQueryLoggingInterceptor = (userConfiguration?: UserConfigurationType): InterceptorType => {
   const configuration = {
     ...defaultConfiguration,
     ...userConfiguration,
@@ -54,7 +48,7 @@ export default (userConfiguration?: UserConfigurationType): InterceptorType => {
       }
 
       context.log.debug({
-        executionTime: prettyMs(Number(process.hrtime.bigint() - context.queryInputTime) / 1000000),
+        executionTime: prettyMs(Number(process.hrtime.bigint() - BigInt(context.queryInputTime)) / 1_000_000),
         rowCount,
       }, 'query execution result');
 
@@ -64,27 +58,28 @@ export default (userConfiguration?: UserConfigurationType): InterceptorType => {
       let stackTrace;
 
       if (context.stackTrace) {
-        stackTrace = map(
-          filter(context.stackTrace, (callSite) => {
-            // Hide the internal call sites.
-            return callSite.fileName !== null && !callSite.fileName.includes('slonik') && !callSite.fileName.includes('next_tick');
-          }),
-          (callSite) => {
-            return stringifyCallSite(callSite);
-          },
-        );
+        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')) {
+            stackTrace.push(stringifyCallSite(callSite));
+          }
+        }
       }
 
       let values;
 
       if (configuration.logValues) {
-        values = map(query.values, (value) => {
+        values = [];
+
+        for (const value of query.values) {
           if (Buffer.isBuffer(value)) {
-            return '[Buffer ' + value.byteLength + ']';
+            values.push('[Buffer ' + value.byteLength + ']');
+          } else {
+            values.push(value);
           }
-
-          return value;
-        });
+        }
       }
 
       context.log.debug({

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

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

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

@@ -1,10 +1,8 @@
-// @flow
-
 import {
   extractJson,
 } from 'crack-json';
 
-export default (noticeMessage: string) => {
+export const getAutoExplainPayload = (noticeMessage: string) => {
   const matches = extractJson(noticeMessage);
 
   if (matches.length === 0) {

package/src/utilities/index.ts

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

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

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

package/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "declaration": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noImplicitAny": false,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": false,
+    "outDir": "dist",
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "es2018"
+  },
+  "exclude": [
+    "dist",
+    "node_modules"
+  ],
+  "include": [
+    "src",
+    "test"
+  ]
+}

package/.flowconfig

@@ -1,3 +0,0 @@
-[ignore]
-.*/node_modules/.*/test/.*
-<PROJECT_ROOT>/dist/.*

package/dist/factories/createQueryLoggingInterceptor.js

@@ -1,113 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _serializeError = require("serialize-error");
-
-var _prettyMs = _interopRequireDefault(require("pretty-ms"));
-
-var _utilities = require("../utilities");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const stringifyCallSite = callSite => {
-  return (callSite.fileName || '') + ':' + callSite.lineNumber + ':' + callSite.columnNumber;
-};
-
-const defaultConfiguration = {
-  logValues: true
-};
-
-const createQueryLoggingInterceptor = userConfiguration => {
-  const configuration = { ...defaultConfiguration,
-    ...userConfiguration
-  };
-  return {
-    afterQueryExecution: (context, query, result) => {
-      let rowCount = null;
-
-      if (result.rowCount) {
-        rowCount = result.rowCount;
-      }
-
-      for (const notice of result.notices) {
-        if ((0, _utilities.isAutoExplainJsonMessage)(notice.message)) {
-          context.log.info({
-            autoExplain: (0, _utilities.getAutoExplainPayload)(notice.message)
-          }, 'auto explain');
-        }
-      }
-
-      context.log.debug({
-        executionTime: (0, _prettyMs.default)(Number(process.hrtime.bigint() - context.queryInputTime) / 1000000),
-        rowCount
-      }, 'query execution result');
-      return null;
-    },
-    beforeQueryExecution: async (context, query) => {
-      let stackTrace;
-
-      if (context.stackTrace) {
-        const _iterable = context.stackTrace;
-        let _result = [];
-
-        for (let _key = 0, _length = _iterable.length, _value; _key < _length; ++_key) {
-          _value = _iterable[_key];
-          if (_value.fileName !== null && !_value.fileName.includes('slonik') && !_value.fileName.includes('next_tick')) _result.push(_value);
-        }
-
-        let _result2 = [];
-
-        for (let _key2 = 0, _length2 = _result.length, _value2; _key2 < _length2; ++_key2) {
-          _value2 = _result[_key2];
-          _result2[_key2] = stringifyCallSite(_value2);
-        }
-
-        stackTrace = _result2;
-      }
-
-      let values;
-
-      if (configuration.logValues) {
-        const _iterable3 = query.values;
-
-        const _fn3 = value => {
-          if (Buffer.isBuffer(value)) {
-            return '[Buffer ' + value.byteLength + ']';
-          }
-
-          return value;
-        };
-
-        let _result3 = [];
-
-        for (let _key3 = 0, _length3 = _iterable3.length, _value3; _key3 < _length3; ++_key3) {
-          _value3 = _iterable3[_key3];
-          _result3[_key3] = _fn3(_value3, _key3, _iterable3);
-        }
-
-        values = _result3;
-      }
-
-      context.log.debug({
-        sql: query.sql,
-        stackTrace,
-        values
-      }, 'executing query');
-      return null;
-    },
-    queryExecutionError: (context, query, error) => {
-      context.log.error({
-        error: (0, _serializeError.serializeError)(error)
-      }, 'query execution produced an error');
-      return null;
-    }
-  };
-};
-
-var _default = createQueryLoggingInterceptor;
-exports.default = _default;
-//# sourceMappingURL=createQueryLoggingInterceptor.js.map

package/dist/factories/createQueryLoggingInterceptor.js.flow

@@ -1,106 +0,0 @@
-// @flow
-
-import {
-  serializeError,
-} from 'serialize-error';
-import type {
-  InterceptorType,
-} from 'slonik';
-import {
-  filter,
-  map,
-} from 'inline-loops.macro';
-import prettyMs from 'pretty-ms';
-import {
-  getAutoExplainPayload,
-  isAutoExplainJsonMessage,
-} from '../utilities';
-
-/**
- * @property logValues Dictates whether to include parameter values used to execute the query. (default: true)
- */
-type UserConfigurationType = {|
-  +logValues: boolean,
-|};
-
-const stringifyCallSite = (callSite) => {
-  return (callSite.fileName || '') + ':' + callSite.lineNumber + ':' + callSite.columnNumber;
-};
-
-const defaultConfiguration = {
-  logValues: true,
-};
-
-export default (userConfiguration?: UserConfigurationType): InterceptorType => {
-  const configuration = {
-    ...defaultConfiguration,
-    ...userConfiguration,
-  };
-
-  return {
-    afterQueryExecution: (context, query, result) => {
-      let rowCount: number | null = null;
-
-      if (result.rowCount) {
-        rowCount = result.rowCount;
-      }
-
-      for (const notice of result.notices) {
-        if (isAutoExplainJsonMessage(notice.message)) {
-          context.log.info({
-            autoExplain: getAutoExplainPayload(notice.message),
-          }, 'auto explain');
-        }
-      }
-
-      context.log.debug({
-        executionTime: prettyMs(Number(process.hrtime.bigint() - context.queryInputTime) / 1000000),
-        rowCount,
-      }, 'query execution result');
-
-      return null;
-    },
-    beforeQueryExecution: async (context, query) => {
-      let stackTrace;
-
-      if (context.stackTrace) {
-        stackTrace = map(
-          filter(context.stackTrace, (callSite) => {
-            // Hide the internal call sites.
-            return callSite.fileName !== null && !callSite.fileName.includes('slonik') && !callSite.fileName.includes('next_tick');
-          }),
-          (callSite) => {
-            return stringifyCallSite(callSite);
-          },
-        );
-      }
-
-      let values;
-
-      if (configuration.logValues) {
-        values = map(query.values, (value) => {
-          if (Buffer.isBuffer(value)) {
-            return '[Buffer ' + value.byteLength + ']';
-          }
-
-          return value;
-        });
-      }
-
-      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');
-
-      return null;
-    },
-  };
-};

package/dist/factories/createQueryLoggingInterceptor.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/factories/createQueryLoggingInterceptor.js"],"names":["stringifyCallSite","callSite","fileName","lineNumber","columnNumber","defaultConfiguration","logValues","userConfiguration","configuration","afterQueryExecution","context","query","result","rowCount","notice","notices","message","log","info","autoExplain","debug","executionTime","Number","process","hrtime","bigint","queryInputTime","beforeQueryExecution","stackTrace","includes","values","value","Buffer","isBuffer","byteLength","sql","queryExecutionError","error"],"mappings":"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","sourcesContent":["// @flow\n\nimport {\n  serializeError,\n} from 'serialize-error';\nimport type {\n  InterceptorType,\n} from 'slonik';\nimport {\n  filter,\n  map,\n} from 'inline-loops.macro';\nimport prettyMs from 'pretty-ms';\nimport {\n  getAutoExplainPayload,\n  isAutoExplainJsonMessage,\n} from '../utilities';\n\n/**\n * @property logValues Dictates whether to include parameter values used to execute the query. (default: true)\n */\ntype UserConfigurationType = {|\n  +logValues: boolean,\n|};\n\nconst stringifyCallSite = (callSite) => {\n  return (callSite.fileName || '') + ':' + callSite.lineNumber + ':' + callSite.columnNumber;\n};\n\nconst defaultConfiguration = {\n  logValues: true,\n};\n\nexport default (userConfiguration?: UserConfigurationType): InterceptorType => {\n  const configuration = {\n    ...defaultConfiguration,\n    ...userConfiguration,\n  };\n\n  return {\n    afterQueryExecution: (context, query, result) => {\n      let rowCount: number | null = null;\n\n      if (result.rowCount) {\n        rowCount = result.rowCount;\n      }\n\n      for (const notice of result.notices) {\n        if (isAutoExplainJsonMessage(notice.message)) {\n          context.log.info({\n            autoExplain: getAutoExplainPayload(notice.message),\n          }, 'auto explain');\n        }\n      }\n\n      context.log.debug({\n        executionTime: prettyMs(Number(process.hrtime.bigint() - context.queryInputTime) / 1000000),\n        rowCount,\n      }, 'query execution result');\n\n      return null;\n    },\n    beforeQueryExecution: async (context, query) => {\n      let stackTrace;\n\n      if (context.stackTrace) {\n        stackTrace = map(\n          filter(context.stackTrace, (callSite) => {\n            // Hide the internal call sites.\n            return callSite.fileName !== null && !callSite.fileName.includes('slonik') && !callSite.fileName.includes('next_tick');\n          }),\n          (callSite) => {\n            return stringifyCallSite(callSite);\n          },\n        );\n      }\n\n      let values;\n\n      if (configuration.logValues) {\n        values = map(query.values, (value) => {\n          if (Buffer.isBuffer(value)) {\n            return '[Buffer ' + value.byteLength + ']';\n          }\n\n          return value;\n        });\n      }\n\n      context.log.debug({\n        sql: query.sql,\n        stackTrace,\n        values,\n      }, 'executing query');\n\n      return null;\n    },\n    queryExecutionError: (context, query, error) => {\n      context.log.error({\n        error: serializeError(error),\n      }, 'query execution produced an error');\n\n      return null;\n    },\n  };\n};\n"],"file":"createQueryLoggingInterceptor.js"}

package/dist/factories/index.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "createQueryLoggingInterceptor", {
-  enumerable: true,
-  get: function () {
-    return _createQueryLoggingInterceptor.default;
-  }
-});
-
-var _createQueryLoggingInterceptor = _interopRequireDefault(require("./createQueryLoggingInterceptor"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-//# sourceMappingURL=index.js.map

package/dist/factories/index.js.flow

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

package/dist/factories/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/factories/index.js"],"names":[],"mappings":";;;;;;;;;;;;AAEA","sourcesContent":["// @flow\n\nexport {default as createQueryLoggingInterceptor} from './createQueryLoggingInterceptor';\n"],"file":"index.js"}

package/dist/index.js

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

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;AAEA","sourcesContent":["// @flow\n\nexport {\n  createQueryLoggingInterceptor,\n} from './factories';\n"],"file":"index.js"}

package/dist/utilities/getAutoExplainPayload.js

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _crackJson = require("crack-json");
-
-const getAutoExplainPayload = noticeMessage => {
-  const matches = (0, _crackJson.extractJson)(noticeMessage);
-
-  if (matches.length === 0) {
-    throw new Error('Notice message does not contain a recognizable JSON payload.');
-  }
-
-  if (matches.length > 1) {
-    throw new Error('Notice message contains multiple JSON payloads.');
-  }
-
-  return matches[0];
-};
-
-var _default = getAutoExplainPayload;
-exports.default = _default;
-//# sourceMappingURL=getAutoExplainPayload.js.map

package/dist/utilities/getAutoExplainPayload.js.flow

@@ -1,19 +0,0 @@
-// @flow
-
-import {
-  extractJson,
-} from 'crack-json';
-
-export default (noticeMessage: string) => {
-  const matches = extractJson(noticeMessage);
-
-  if (matches.length === 0) {
-    throw new Error('Notice message does not contain a recognizable JSON payload.');
-  }
-
-  if (matches.length > 1) {
-    throw new Error('Notice message contains multiple JSON payloads.');
-  }
-
-  return matches[0];
-};

package/dist/utilities/getAutoExplainPayload.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utilities/getAutoExplainPayload.js"],"names":["noticeMessage","matches","length","Error"],"mappings":";;;;;;;AAEA;;8BAIgBA,a,IAA0B;AACxC,QAAMC,OAAO,GAAG,4BAAYD,aAAZ,CAAhB;;AAEA,MAAIC,OAAO,CAACC,MAAR,KAAmB,CAAvB,EAA0B;AACxB,UAAM,IAAIC,KAAJ,CAAU,8DAAV,CAAN;AACD;;AAED,MAAIF,OAAO,CAACC,MAAR,GAAiB,CAArB,EAAwB;AACtB,UAAM,IAAIC,KAAJ,CAAU,iDAAV,CAAN;AACD;;AAED,SAAOF,OAAO,CAAC,CAAD,CAAd;AACD,C","sourcesContent":["// @flow\n\nimport {\n  extractJson,\n} from 'crack-json';\n\nexport default (noticeMessage: string) => {\n  const matches = extractJson(noticeMessage);\n\n  if (matches.length === 0) {\n    throw new Error('Notice message does not contain a recognizable JSON payload.');\n  }\n\n  if (matches.length > 1) {\n    throw new Error('Notice message contains multiple JSON payloads.');\n  }\n\n  return matches[0];\n};\n"],"file":"getAutoExplainPayload.js"}

package/dist/utilities/index.js

@@ -1,24 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "getAutoExplainPayload", {
-  enumerable: true,
-  get: function () {
-    return _getAutoExplainPayload.default;
-  }
-});
-Object.defineProperty(exports, "isAutoExplainJsonMessage", {
-  enumerable: true,
-  get: function () {
-    return _isAutoExplainJsonMessage.default;
-  }
-});
-
-var _getAutoExplainPayload = _interopRequireDefault(require("./getAutoExplainPayload"));
-
-var _isAutoExplainJsonMessage = _interopRequireDefault(require("./isAutoExplainJsonMessage"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-//# sourceMappingURL=index.js.map

package/dist/utilities/index.js.flow

@@ -1,4 +0,0 @@
-// @flow
-
-export {default as getAutoExplainPayload} from './getAutoExplainPayload';
-export {default as isAutoExplainJsonMessage} from './isAutoExplainJsonMessage';

package/dist/utilities/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utilities/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAEA;;AACA","sourcesContent":["// @flow\n\nexport {default as getAutoExplainPayload} from './getAutoExplainPayload';\nexport {default as isAutoExplainJsonMessage} from './isAutoExplainJsonMessage';\n"],"file":"index.js"}

package/dist/utilities/isAutoExplainJsonMessage.js

@@ -1,14 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-const isAutoExplainJsonMessage = noticeMessage => {
-  return noticeMessage.trim().startsWith('duration:') && noticeMessage.includes('{');
-};
-
-var _default = isAutoExplainJsonMessage;
-exports.default = _default;
-//# sourceMappingURL=isAutoExplainJsonMessage.js.map

package/dist/utilities/isAutoExplainJsonMessage.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utilities/isAutoExplainJsonMessage.js"],"names":["noticeMessage","trim","startsWith","includes"],"mappings":";;;;;;;iCAEgBA,a,IAAmC;AACjD,SAAOA,aAAa,CAACC,IAAd,GAAqBC,UAArB,CAAgC,WAAhC,KAAgDF,aAAa,CAACG,QAAd,CAAuB,GAAvB,CAAvD;AACD,C","sourcesContent":["// @flow\n\nexport default (noticeMessage: string): boolean => {\n  return noticeMessage.trim().startsWith('duration:') && noticeMessage.includes('{');\n};\n"],"file":"isAutoExplainJsonMessage.js"}

package/src/factories/index.js

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

package/src/utilities/index.js

@@ -1,4 +0,0 @@
-// @flow
-
-export {default as getAutoExplainPayload} from './getAutoExplainPayload';
-export {default as isAutoExplainJsonMessage} from './isAutoExplainJsonMessage';

package/src/utilities/isAutoExplainJsonMessage.js

@@ -1,5 +0,0 @@
-// @flow
-
-export default (noticeMessage: string): boolean => {
-  return noticeMessage.trim().startsWith('duration:') && noticeMessage.includes('{');
-};