diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c901be..7c8f304 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -122,21 +122,69 @@ workflows: matrix: parameters: node-version: ["16.19", "18.18"] - slonik-version: ["33.3.3", "34.3.0"] - mocha-slonik-version: ["7.0.1", "8.0.0"] + slonik-version: ["33.3.3", "34.3.0", "35.2.1", "36.0.0", "37.0.1"] + mocha-slonik-version: ["7.0.1", "8.0.0", "9.0.0"] exclude: + - node-version: "16.19" + slonik-version: "33.3.3" + mocha-slonik-version: "9.0.0" + - node-version: "18.18" + slonik-version: "33.3.3" + mocha-slonik-version: "9.0.0" + - node-version: "16.19" + slonik-version: "34.3.0" + mocha-slonik-version: "9.0.0" + - node-version: "18.18" + slonik-version: "34.3.0" + mocha-slonik-version: "9.0.0" - node-version: "16.19" slonik-version: "33.3.3" mocha-slonik-version: "8.0.0" - node-version: "18.18" slonik-version: "33.3.3" mocha-slonik-version: "8.0.0" + - node-version: "16.19" + slonik-version: "35.2.1" + mocha-slonik-version: "8.0.0" + - node-version: "18.18" + slonik-version: "35.2.1" + mocha-slonik-version: "8.0.0" + - node-version: "16.19" + slonik-version: "36.0.0" + mocha-slonik-version: "8.0.0" + - node-version: "18.18" + slonik-version: "36.0.0" + mocha-slonik-version: "8.0.0" + - node-version: "16.19" + slonik-version: "37.0.1" + mocha-slonik-version: "8.0.0" + - node-version: "18.18" + slonik-version: "37.0.1" + mocha-slonik-version: "8.0.0" - node-version: "16.19" slonik-version: "34.3.0" mocha-slonik-version: "7.0.1" - node-version: "18.18" slonik-version: "34.3.0" mocha-slonik-version: "7.0.1" + - node-version: "16.19" + slonik-version: "35.2.1" + mocha-slonik-version: "7.0.1" + - node-version: "18.18" + slonik-version: "35.2.1" + mocha-slonik-version: "7.0.1" + - node-version: "16.19" + slonik-version: "36.0.0" + mocha-slonik-version: "7.0.1" + - node-version: "18.18" + slonik-version: "36.0.0" + mocha-slonik-version: "7.0.1" + - node-version: "16.19" + slonik-version: "37.0.1" + mocha-slonik-version: "7.0.1" + - node-version: "18.18" + slonik-version: "37.0.1" + mocha-slonik-version: "7.0.1" - release: context: - npm diff --git a/package-lock.json b/package-lock.json index 6260d72..4910053 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,13 +28,13 @@ "lint-staged": "^12.3.7", "mocha": "^10.1.0", "mocha-junit-reporter": "^2.0.2", - "mocha-slonik": "^7.0.0 || ^8.0.0", + "mocha-slonik": "^7.0.0 || ^8.0.0 || ^9.0.0", "npm-run-all": "^4.1.5", "nyc": "^15.1.0", "prettier": "^2.6.1", "rimraf": "^3.0.2", "semantic-release": "^20.1.0", - "slonik": "^33.0.0 || ^34.0.0", + "slonik": "^37.0.1", "slonik-interceptor-query-logging": "^1.4.7", "source-map-support": "^0.5.21", "ts-node": "^10.7.0", @@ -43,7 +43,7 @@ "typescript-transform-paths": "^3.3.1" }, "peerDependencies": { - "slonik": "^33.0.0 || ^34.0.0" + "slonik": ">=33.0.0 <38.0.0" } }, "node_modules/@ampproject/remapping": { @@ -3944,6 +3944,18 @@ "node": ">=8.0.0" } }, + "node_modules/get-stack-trace": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/get-stack-trace/-/get-stack-trace-3.1.1.tgz", + "integrity": "sha512-E1rM+umbm9MlMp6zNSap+UI8VVWWmAoUxiAHp1Ron1FV2dM99mgMAHS1tGAGO/ceBjgOXz24GC47aLeNN1llrA==", + "dev": true, + "dependencies": { + "stacktrace-parser": "^0.1.10" + }, + "engines": { + "node": ">=18.0" + } + }, "node_modules/get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -5945,9 +5957,9 @@ } }, "node_modules/mocha": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz", - "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", + "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", "dev": true, "dependencies": { "ansi-colors": "4.1.1", @@ -6016,17 +6028,17 @@ "dev": true }, "node_modules/mocha-slonik": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/mocha-slonik/-/mocha-slonik-8.0.0.tgz", - "integrity": "sha512-gTgbQHYQB2qMw8RdAEPN92nRFneI7L+21Gyy5oIrv13ADzVuJx01UUclK0tet99sprrFmqCNI7RtxUzV+jj1RA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/mocha-slonik/-/mocha-slonik-9.0.0.tgz", + "integrity": "sha512-JXWevYWMZhXafnS6ovKp8q/udBt8CdUh5InnpyftM71jHJwEdNfuNUVSVIVGBhQQF8RlcOu5ubP/FJs7UqbXXw==", "dev": true, "dependencies": { "sinon": "^15.1.0", "ts-mock-imports": "^1.3.8" }, "peerDependencies": { - "mocha": "^10.1.0", - "slonik": ">=34.0.0 <35.0.0" + "mocha": "^10.2.0", + "slonik": ">=35.0.0 <38.0.0" } }, "node_modules/mocha/node_modules/brace-expansion": { @@ -9595,6 +9607,18 @@ "integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==", "dev": true }, + "node_modules/pg-query-stream": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.5.3.tgz", + "integrity": "sha512-ufa94r/lHJdjAm3+zPZEO0gXAmCb4tZPaOt7O76mjcxdL/HxwTuryy76km+u0odBBgtfdKFYq/9XGfiYeQF0yA==", + "dev": true, + "dependencies": { + "pg-cursor": "^2.10.3" + }, + "peerDependencies": { + "pg": "^8" + } + }, "node_modules/pg-types": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-4.0.1.tgz", @@ -11296,24 +11320,24 @@ } }, "node_modules/slonik": { - "version": "34.3.0", - "resolved": "https://registry.npmjs.org/slonik/-/slonik-34.3.0.tgz", - "integrity": "sha512-0WD6CmUPYFYcmWwSjy8ljK9SMbLcwZ8Wj76D5Bwp0f04yAprPgREHf8pV0ZDsq4XfKMemkUrVTcgLQKalQwASA==", + "version": "37.0.1", + "resolved": "https://registry.npmjs.org/slonik/-/slonik-37.0.1.tgz", + "integrity": "sha512-Otcmpcai0Xm/bi4UZt0j6AN6ktkh8cw1XijI1L3NItNpqHpRyhJF4VVyMCxyLwhMWtW5uvfWTaq1RB8em2DyQQ==", "dev": true, "dependencies": { "@types/pg": "^8.10.2", "es6-error": "^4.1.1", + "get-stack-trace": "^3.1.1", "iso8601-duration": "^1.3.0", "pg": "^8.11.3", - "pg-cursor": "^2.10.0", "pg-protocol": "^1.6.0", + "pg-query-stream": "^4.5.3", "pg-types": "^4.0.1", "postgres-array": "^3.0.2", "postgres-interval": "^4.0.0", "roarr": "^7.15.0", "safe-stable-stringify": "^2.4.3", - "serialize-error": "^8.0.0", - "through2": "^4.0.2" + "serialize-error": "^8.0.0" }, "engines": { "node": ">=10.0" @@ -11440,6 +11464,27 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, + "node_modules/stacktrace-parser": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz", + "integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==", + "dev": true, + "dependencies": { + "type-fest": "^0.7.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/stacktrace-parser/node_modules/type-fest": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz", + "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -15387,6 +15432,15 @@ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true }, + "get-stack-trace": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/get-stack-trace/-/get-stack-trace-3.1.1.tgz", + "integrity": "sha512-E1rM+umbm9MlMp6zNSap+UI8VVWWmAoUxiAHp1Ron1FV2dM99mgMAHS1tGAGO/ceBjgOXz24GC47aLeNN1llrA==", + "dev": true, + "requires": { + "stacktrace-parser": "^0.1.10" + } + }, "get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -16856,9 +16910,9 @@ } }, "mocha": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz", - "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", + "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", "dev": true, "requires": { "ansi-colors": "4.1.1", @@ -17042,9 +17096,9 @@ } }, "mocha-slonik": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/mocha-slonik/-/mocha-slonik-8.0.0.tgz", - "integrity": "sha512-gTgbQHYQB2qMw8RdAEPN92nRFneI7L+21Gyy5oIrv13ADzVuJx01UUclK0tet99sprrFmqCNI7RtxUzV+jj1RA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/mocha-slonik/-/mocha-slonik-9.0.0.tgz", + "integrity": "sha512-JXWevYWMZhXafnS6ovKp8q/udBt8CdUh5InnpyftM71jHJwEdNfuNUVSVIVGBhQQF8RlcOu5ubP/FJs7UqbXXw==", "dev": true, "requires": { "sinon": "^15.1.0", @@ -19512,6 +19566,15 @@ "integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==", "dev": true }, + "pg-query-stream": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.5.3.tgz", + "integrity": "sha512-ufa94r/lHJdjAm3+zPZEO0gXAmCb4tZPaOt7O76mjcxdL/HxwTuryy76km+u0odBBgtfdKFYq/9XGfiYeQF0yA==", + "dev": true, + "requires": { + "pg-cursor": "^2.10.3" + } + }, "pg-types": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-4.0.1.tgz", @@ -20688,24 +20751,24 @@ } }, "slonik": { - "version": "34.3.0", - "resolved": "https://registry.npmjs.org/slonik/-/slonik-34.3.0.tgz", - "integrity": "sha512-0WD6CmUPYFYcmWwSjy8ljK9SMbLcwZ8Wj76D5Bwp0f04yAprPgREHf8pV0ZDsq4XfKMemkUrVTcgLQKalQwASA==", + "version": "37.0.1", + "resolved": "https://registry.npmjs.org/slonik/-/slonik-37.0.1.tgz", + "integrity": "sha512-Otcmpcai0Xm/bi4UZt0j6AN6ktkh8cw1XijI1L3NItNpqHpRyhJF4VVyMCxyLwhMWtW5uvfWTaq1RB8em2DyQQ==", "dev": true, "requires": { "@types/pg": "^8.10.2", "es6-error": "^4.1.1", + "get-stack-trace": "^3.1.1", "iso8601-duration": "^1.3.0", "pg": "^8.11.3", - "pg-cursor": "^2.10.0", "pg-protocol": "^1.6.0", + "pg-query-stream": "^4.5.3", "pg-types": "^4.0.1", "postgres-array": "^3.0.2", "postgres-interval": "^4.0.0", "roarr": "^7.15.0", "safe-stable-stringify": "^2.4.3", - "serialize-error": "^8.0.0", - "through2": "^4.0.2" + "serialize-error": "^8.0.0" } }, "slonik-interceptor-query-logging": { @@ -20810,6 +20873,23 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, + "stacktrace-parser": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz", + "integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==", + "dev": true, + "requires": { + "type-fest": "^0.7.1" + }, + "dependencies": { + "type-fest": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz", + "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==", + "dev": true + } + } + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", diff --git a/package.json b/package.json index 10e1ea3..bf9c2b8 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ }, "homepage": "https://github.com/AndrewJo/express-slonik#readme", "peerDependencies": { - "slonik": "^33.0.0 || ^34.0.0" + "slonik": ">=33.0.0 <38.0.0" }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.2", @@ -67,13 +67,13 @@ "lint-staged": "^12.3.7", "mocha": "^10.1.0", "mocha-junit-reporter": "^2.0.2", - "mocha-slonik": "^7.0.0 || ^8.0.0", + "mocha-slonik": "^7.0.0 || ^8.0.0 || ^9.0.0", "npm-run-all": "^4.1.5", "nyc": "^15.1.0", "prettier": "^2.6.1", "rimraf": "^3.0.2", "semantic-release": "^20.1.0", - "slonik": "^33.0.0 || ^34.0.0", + "slonik": "^37.0.1", "slonik-interceptor-query-logging": "^1.4.7", "source-map-support": "^0.5.21", "ts-node": "^10.7.0",