diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 2bc1cb4f..72cc07bb 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -4,6 +4,11 @@ Alla märkbara ändringar ska dokumenteras i denna fil. Baserat på [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), och följer [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.4] - 2022-08-18 + +### Ändrat +- `getMultipleMeetings` sorterar nu först på nummer och sen på år + ## [1.0.3] - 2022-08-17 ### Ändrat diff --git a/package-lock.json b/package-lock.json index ac933b20..19eab40a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,30 +1,30 @@ { "name": "ekorre-ts", - "version": "1.0.3", + "version": "1.0.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ekorre-ts", - "version": "1.0.3", + "version": "1.0.4", "license": "AGPL-3.0-only", "dependencies": { "@esek/auth-server": "2.1.4", - "@graphql-tools/graphql-file-loader": "^7.5.0", - "@graphql-tools/load": "^7.7.1", - "@graphql-tools/schema": "^8.5.1", - "@prisma/client": "^4.1.1", - "apollo-server-core": "^3.10.0", + "@graphql-tools/graphql-file-loader": "^7.5.2", + "@graphql-tools/load": "^7.7.4", + "@graphql-tools/schema": "^9.0.1", + "@prisma/client": "^4.2.1", + "apollo-server-core": "^3.10.1", "apollo-server-errors": "^3.3.1", - "apollo-server-express": "^3.10.0", + "apollo-server-express": "^3.10.1", "axios": "^0.27.2", "cookie-parser": "^1.4.6", "dataloader": "^2.1.0", "dotenv": "^16.0.1", "express": "^4.18.1", "express-fileupload": "^1.4.0", - "graphql": "^16.5.0", - "graphql-scalars": "^1.17.0", + "graphql": "^16.6.0", + "graphql-scalars": "^1.18.0", "jsdom": "^20.0.0", "jsonwebtoken": "^8.5.1", "regenerator-runtime": "^0.13.9", @@ -34,7 +34,7 @@ "typescript": "^4.7.4" }, "devDependencies": { - "@graphql-codegen/cli": "^2.11.5", + "@graphql-codegen/cli": "^2.11.6", "@graphql-codegen/introspection": "2.2.1", "@graphql-codegen/typescript": "2.7.3", "@graphql-codegen/typescript-resolvers": "2.7.3", @@ -42,29 +42,29 @@ "@types/cookie-parser": "^1.4.3", "@types/express": "^4.17.13", "@types/express-fileupload": "^1.2.3", - "@types/inquirer": "^9.0.0", - "@types/jest": "^28.1.6", + "@types/inquirer": "^9.0.1", + "@types/jest": "^28.1.7", "@types/jsdom": "^20.0.0", "@types/jsonwebtoken": "^8.5.8", - "@types/node": "^18.6.5", + "@types/node": "^18.7.6", "@types/set-cookie-parser": "^2.4.2", "@types/supertest": "^2.0.12", - "@typescript-eslint/eslint-plugin": "^5.33.0", - "@typescript-eslint/parser": "^5.33.0", - "eslint": "^8.21.0", + "@typescript-eslint/eslint-plugin": "^5.33.1", + "@typescript-eslint/parser": "^5.33.1", + "eslint": "^8.22.0", "eslint-config-airbnb-typescript": "^17.0.0", "eslint-config-prettier": "^8.5.0", - "eslint-import-resolver-typescript": "^3.4.0", + "eslint-import-resolver-typescript": "^3.4.2", "eslint-plugin-import": "^2.26.0", "inquirer": "^9.1.0", "jest": "^28.1.3", "nanospinner": "^1.1.0", "nodemon": "^2.0.19", "prettier": "^2.7.1", - "prisma": "^4.1.1", + "prisma": "^4.2.1", "prisma-dbml-generator": "^0.9.1", "supertest": "^6.2.4", - "ts-jest": "^28.0.7" + "ts-jest": "^28.0.8" } }, "node_modules/@ampproject/remapping": { @@ -1530,12 +1530,12 @@ } }, "node_modules/@graphql-codegen/cli": { - "version": "2.11.5", - "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-2.11.5.tgz", - "integrity": "sha512-0RntZ/F/d7M7KJU24nDwfKTuuhpwQ8nSs00RgKIqsk4xSX/U9HgOp29pWZfJjHCppb0EiXKBDvK4DtQIqe3n3w==", + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-2.11.6.tgz", + "integrity": "sha512-0R2Bhgjt3XZTSdsn8MGGuJjDEN2z+KCo7920zLZz9boy6bQ0EyuxS9AUATePS9aC3djy2POAIPCHz8iHK68IlQ==", "dev": true, "dependencies": { - "@graphql-codegen/core": "2.6.1", + "@graphql-codegen/core": "2.6.2", "@graphql-codegen/plugin-helpers": "^2.6.2", "@graphql-tools/apollo-engine-loader": "^7.3.6", "@graphql-tools/code-file-loader": "^7.3.1", @@ -1716,13 +1716,13 @@ } }, "node_modules/@graphql-codegen/core": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-2.6.1.tgz", - "integrity": "sha512-X6IIQCIvEm+g6xcd/5ml/Tmz8U6pd4q9s1mM4WcstBQ26v+gzzlj6lc7+6ALhrNm25gHKQ4PiVoG2W0pw503Dw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-2.6.2.tgz", + "integrity": "sha512-58T5yf9nEfAhDwN1Vz1hImqpdJ/gGpCGUaroQ5tqskZPf7eZYYVkEXbtqRZZLx1MCCKwjWX4hMtTPpHhwKCkng==", "dev": true, "dependencies": { "@graphql-codegen/plugin-helpers": "^2.6.2", - "@graphql-tools/schema": "^8.5.0", + "@graphql-tools/schema": "^9.0.0", "@graphql-tools/utils": "^8.8.0", "tslib": "~2.4.0" }, @@ -1928,6 +1928,34 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, + "node_modules/@graphql-tools/delegate/node_modules/@graphql-tools/merge": { + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz", + "integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==", + "dev": true, + "dependencies": { + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0" + }, + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, + "node_modules/@graphql-tools/delegate/node_modules/@graphql-tools/schema": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz", + "integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==", + "dev": true, + "dependencies": { + "@graphql-tools/merge": "8.3.1", + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0", + "value-or-promise": "1.0.11" + }, + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, "node_modules/@graphql-tools/delegate/node_modules/@graphql-tools/utils": { "version": "8.9.0", "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", @@ -1998,12 +2026,12 @@ } }, "node_modules/@graphql-tools/graphql-file-loader": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.0.tgz", - "integrity": "sha512-X3wcC+ZljbXTwdTTSp3oUHJd66mFLDKI750uhB0HidBxE6+wyw7fhmJVJiYROXPswaGliuabpo0JEyLj7hhWKA==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.2.tgz", + "integrity": "sha512-4M5c5SRnxTURNwfq46dlEspWGk+nQpO2nF/p9kxaPiXG0iMAQ8suOd3jQk99LEefQpVhFNb5FumyvUnyW0BogA==", "dependencies": { - "@graphql-tools/import": "6.7.1", - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/import": "6.7.3", + "@graphql-tools/utils": "8.10.0", "globby": "^11.0.3", "tslib": "^2.4.0", "unixify": "^1.0.0" @@ -2013,9 +2041,9 @@ } }, "node_modules/@graphql-tools/graphql-file-loader/node_modules/@graphql-tools/utils": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", - "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.10.0.tgz", + "integrity": "sha512-yI+V373FdXQbYfqdarehn9vRWDZZYuvyQ/xwiv5ez2BbobHrqsexF7qs56plLRaQ8ESYpVAjMQvJWe9s23O0Jg==", "dependencies": { "tslib": "^2.4.0" }, @@ -2052,11 +2080,11 @@ } }, "node_modules/@graphql-tools/import": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.1.tgz", - "integrity": "sha512-StLosFVhdw+eZkL+v9dBabszxCAZtEYW4Oy1+750fDkH39GrmzOB8mWiYna7rm9+GMisC9atJtXuAfMF02Aoag==", + "version": "6.7.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.3.tgz", + "integrity": "sha512-7D/nDfwAj1TEkF+vAxm+hxgYNQW3h1kDz8JnYmvvY1Yv7OxZQQHDNd4tVg3BYVtW2kjsz3nzip46Z8ZQ9L7gHg==", "dependencies": { - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/utils": "8.10.0", "resolve-from": "5.0.0", "tslib": "^2.4.0" }, @@ -2065,9 +2093,9 @@ } }, "node_modules/@graphql-tools/import/node_modules/@graphql-tools/utils": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", - "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.10.0.tgz", + "integrity": "sha512-yI+V373FdXQbYfqdarehn9vRWDZZYuvyQ/xwiv5ez2BbobHrqsexF7qs56plLRaQ8ESYpVAjMQvJWe9s23O0Jg==", "dependencies": { "tslib": "^2.4.0" }, @@ -2103,12 +2131,12 @@ } }, "node_modules/@graphql-tools/load": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.7.1.tgz", - "integrity": "sha512-rJ2WUV41wwAkMnBgtcBym3TKVbPgz7z9tBCjOmbNVLy5bB9StVPdo2Uci0D5xYSgLV9XIt+zdyAnYGptioJeWg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.7.4.tgz", + "integrity": "sha512-2VtVWeMNizNTTc8Dv/hs0lrvGHaLko8jpBoP9TewFdBz6pAXPsLHYnNAhEfBYJd+Vk5GZbnWTfVColxhnF8NEQ==", "dependencies": { - "@graphql-tools/schema": "8.5.1", - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/schema": "9.0.1", + "@graphql-tools/utils": "8.10.0", "p-limit": "3.1.0", "tslib": "^2.4.0" }, @@ -2117,9 +2145,9 @@ } }, "node_modules/@graphql-tools/load/node_modules/@graphql-tools/utils": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", - "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.10.0.tgz", + "integrity": "sha512-yI+V373FdXQbYfqdarehn9vRWDZZYuvyQ/xwiv5ez2BbobHrqsexF7qs56plLRaQ8ESYpVAjMQvJWe9s23O0Jg==", "dependencies": { "tslib": "^2.4.0" }, @@ -2246,12 +2274,12 @@ } }, "node_modules/@graphql-tools/schema": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz", - "integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.1.tgz", + "integrity": "sha512-Y6apeiBmvXEz082IAuS/ainnEEQrzMECP1MRIV72eo2WPa6ZtLYPycvIbd56Z5uU2LKP4XcWRgK6WUbCyN16Rw==", "dependencies": { - "@graphql-tools/merge": "8.3.1", - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/merge": "8.3.3", + "@graphql-tools/utils": "8.10.0", "tslib": "^2.4.0", "value-or-promise": "1.0.11" }, @@ -2260,11 +2288,11 @@ } }, "node_modules/@graphql-tools/schema/node_modules/@graphql-tools/merge": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz", - "integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==", + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.3.tgz", + "integrity": "sha512-EfULshN2s2s2mhBwbV9WpGnoehRLe7eIMdZrKfHhxlBWOvtNUd3KSCN0PUdAMd7lj1jXUW9KYdn624JrVn6qzg==", "dependencies": { - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/utils": "8.10.0", "tslib": "^2.4.0" }, "peerDependencies": { @@ -2272,9 +2300,9 @@ } }, "node_modules/@graphql-tools/schema/node_modules/@graphql-tools/utils": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", - "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.10.0.tgz", + "integrity": "sha512-yI+V373FdXQbYfqdarehn9vRWDZZYuvyQ/xwiv5ez2BbobHrqsexF7qs56plLRaQ8ESYpVAjMQvJWe9s23O0Jg==", "dependencies": { "tslib": "^2.4.0" }, @@ -2346,6 +2374,34 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, + "node_modules/@graphql-tools/wrap/node_modules/@graphql-tools/merge": { + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz", + "integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==", + "dev": true, + "dependencies": { + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0" + }, + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, + "node_modules/@graphql-tools/wrap/node_modules/@graphql-tools/schema": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz", + "integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==", + "dev": true, + "dependencies": { + "@graphql-tools/merge": "8.3.1", + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0", + "value-or-promise": "1.0.11" + }, + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, "node_modules/@graphql-tools/wrap/node_modules/@graphql-tools/utils": { "version": "8.9.0", "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", @@ -2907,8 +2963,9 @@ }, "node_modules/@pkgr/utils": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.3.0.tgz", + "integrity": "sha512-7dIJ9CRVzBnqyEl7diUHPUFJf/oty2SeoVzcMocc5PeOUDK9KGzvgIBjGRRzzlRDaOjh3ADwH0WeibQvi3ls2Q==", "dev": true, - "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "is-glob": "^4.0.3", @@ -2925,12 +2982,12 @@ } }, "node_modules/@prisma/client": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.1.1.tgz", - "integrity": "sha512-2pXuIUYxHv5H9o6QTa1VIsl4yMgsAjKQOitlo8WVTB+vo73rmMJITBPavdGUZSWUc7adMkFzEV3y5rVTUQr77Q==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.2.1.tgz", + "integrity": "sha512-PZBkY60+k5oix+e6IUfl3ub8TbRLNsPLdfWrdy2eh80WcHTaT+/UfvXf/B7gXedH7FRtbPFHZXk1hZenJiJZFQ==", "hasInstallScript": true, "dependencies": { - "@prisma/engines-version": "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8" + "@prisma/engines-version": "4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826" }, "engines": { "node": ">=14.17" @@ -2996,16 +3053,16 @@ "dev": true }, "node_modules/@prisma/engines": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.1.1.tgz", - "integrity": "sha512-DCw8L/SS0IXqmj5IW/fMxOXiifnsfjBzDfRhf0j3NFWqvMCh9OtfjmXQZxVgI2mwvJLc/5jzXhkiWT39qS09dA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.2.1.tgz", + "integrity": "sha512-0KqBwREUOjBiHwITsQzw2DWfLHjntvbqzGRawj4sBMnIiL5CXwyDUKeHOwXzKMtNr1rEjxEsypM14g0CzLRK3g==", "devOptional": true, "hasInstallScript": true }, "node_modules/@prisma/engines-version": { - "version": "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8.tgz", - "integrity": "sha512-cRRJwpHFGFJZvtHbY3GZjMffNBEjjZk68ztn+S2hDgPCGB4H66IK26roK94GJxBodSehwRJ0wGyebC2GoIH1JQ==" + "version": "4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826.tgz", + "integrity": "sha512-tktkqdiwqE4QhmE088boPt+FwPj1Jub/zk+5F6sEfcRHzO5yz9jyMD5HFVtiwxZPLx/8Xg9ElnuTi8E5lWVQFQ==" }, "node_modules/@prisma/fetch-engine": { "version": "3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b", @@ -3602,8 +3659,9 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.29", - "license": "MIT", + "version": "4.17.30", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz", + "integrity": "sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -3620,9 +3678,9 @@ } }, "node_modules/@types/inquirer": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.0.tgz", - "integrity": "sha512-4sncHTq3AWbLWZOs83DQlrKxhdehs2AW79Dp1amoGGc6B+oJal7fQJa/EO1Taa5CQLSywEMAgw2SFB1fZIX3PQ==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.1.tgz", + "integrity": "sha512-I4eZdYXpFHj0pAzMndJFQMu/4hCc6Z340au9lvxHofGJnFmVgckxR/t9jRzsOVviajsOmEL+OABx+e0e28IbNw==", "dev": true, "dependencies": { "@types/through": "*", @@ -3654,12 +3712,12 @@ } }, "node_modules/@types/jest": { - "version": "28.1.6", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.6.tgz", - "integrity": "sha512-0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ==", + "version": "28.1.7", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.7.tgz", + "integrity": "sha512-acDN4VHD40V24tgu0iC44jchXavRNVFXQ/E6Z5XNsswgoSO/4NgsXoEYmPUGookKldlZQyIpmrEXsHI9cA3ZTA==", "dev": true, "dependencies": { - "jest-matcher-utils": "^28.0.0", + "expect": "^28.0.0", "pretty-format": "^28.0.0" } }, @@ -3721,9 +3779,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.6.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz", - "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==" + "version": "18.7.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz", + "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -3832,14 +3890,14 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz", - "integrity": "sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz", + "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/type-utils": "5.33.0", - "@typescript-eslint/utils": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/type-utils": "5.33.1", + "@typescript-eslint/utils": "5.33.1", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -3879,14 +3937,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.0.tgz", - "integrity": "sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz", + "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/typescript-estree": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/typescript-estree": "5.33.1", "debug": "^4.3.4" }, "engines": { @@ -3906,13 +3964,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz", - "integrity": "sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz", + "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/visitor-keys": "5.33.0" + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/visitor-keys": "5.33.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3923,12 +3981,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz", - "integrity": "sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz", + "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==", "dev": true, "dependencies": { - "@typescript-eslint/utils": "5.33.0", + "@typescript-eslint/utils": "5.33.1", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -3949,9 +4007,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.0.tgz", - "integrity": "sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz", + "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3962,13 +4020,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz", - "integrity": "sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz", + "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/visitor-keys": "5.33.0", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/visitor-keys": "5.33.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -4004,15 +4062,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.0.tgz", - "integrity": "sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz", + "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/typescript-estree": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/typescript-estree": "5.33.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -4028,12 +4086,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz", - "integrity": "sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz", + "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.33.0", + "@typescript-eslint/types": "5.33.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -4241,8 +4299,9 @@ } }, "node_modules/apollo-server-core": { - "version": "3.10.0", - "license": "MIT", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.10.1.tgz", + "integrity": "sha512-UFFziv6h15QbKRZOA6wLyr1Sle9kns3JuQ5DEB7OYe5AIoOJNjZkWXX/tmLFUrSmlnDDryi6Sf5pDzpYmUC/UA==", "dependencies": { "@apollo/utils.keyvaluecache": "^1.0.1", "@apollo/utils.logger": "^1.0.0", @@ -4274,6 +4333,43 @@ "graphql": "^15.3.0 || ^16.0.0" } }, + "node_modules/apollo-server-core/node_modules/@graphql-tools/merge": { + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz", + "integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==", + "dependencies": { + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0" + }, + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, + "node_modules/apollo-server-core/node_modules/@graphql-tools/schema": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz", + "integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==", + "dependencies": { + "@graphql-tools/merge": "8.3.1", + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0", + "value-or-promise": "1.0.11" + }, + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, + "node_modules/apollo-server-core/node_modules/@graphql-tools/utils": { + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", + "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "dependencies": { + "tslib": "^2.4.0" + }, + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, "node_modules/apollo-server-env": { "version": "4.2.1", "license": "MIT", @@ -4295,16 +4391,17 @@ } }, "node_modules/apollo-server-express": { - "version": "3.10.0", - "license": "MIT", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.10.1.tgz", + "integrity": "sha512-r0esst3YGNdlphYiOrflfBqJ15VAZAhYhWSFo2kPF4knsIGK5HUkeqwjMr+fFDBn4DEfYzC+I1+LnsF/hFN8VQ==", "dependencies": { "@types/accepts": "^1.3.5", "@types/body-parser": "1.19.2", "@types/cors": "2.8.12", "@types/express": "4.17.13", - "@types/express-serve-static-core": "4.17.29", + "@types/express-serve-static-core": "4.17.30", "accepts": "^1.3.5", - "apollo-server-core": "^3.10.0", + "apollo-server-core": "^3.10.1", "apollo-server-types": "^3.6.2", "body-parser": "^1.19.0", "cors": "^2.8.5", @@ -5540,8 +5637,9 @@ }, "node_modules/define-lazy-prop": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -5961,9 +6059,9 @@ } }, "node_modules/eslint": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", - "integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", + "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.0", @@ -6077,9 +6175,9 @@ } }, "node_modules/eslint-import-resolver-typescript": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.4.0.tgz", - "integrity": "sha512-rBCgiEovwX/HQ8ESWV+XIWZaFiRtDeAXNZdcTATB8UbMuadc9qfGOlIP+vy+c7nsgfEBN4NTwy5qunGNptDP0Q==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.4.2.tgz", + "integrity": "sha512-8SuWlRIEO83X9PsJSK9VjgH0EDk1ZzNI36+r3C0xNYVJ+O1+TprOFtTwqqyPMHG+br/I9A5Q80RE7K3/eIr9XA==", "dev": true, "dependencies": { "debug": "^4.3.4", @@ -6088,7 +6186,7 @@ "globby": "^13.1.2", "is-core-module": "^2.9.0", "is-glob": "^4.0.3", - "synckit": "^0.8.1" + "synckit": "^0.8.3" }, "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" @@ -7177,8 +7275,9 @@ }, "node_modules/globalyzer": { "version": "0.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", + "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", + "dev": true }, "node_modules/globby": { "version": "11.1.0", @@ -7200,8 +7299,9 @@ }, "node_modules/globrex": { "version": "0.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true }, "node_modules/graceful-fs": { "version": "4.2.10", @@ -7215,9 +7315,9 @@ "dev": true }, "node_modules/graphql": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.5.0.tgz", - "integrity": "sha512-qbHgh8Ix+j/qY+a/ZcJnFQ+j8ezakqPiHwPiZhV/3PgGlgf96QMBB5/f2rkiC9sgLoy/xvT6TSiaf2nTHJh5iA==", + "version": "16.6.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz", + "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==", "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } @@ -7298,10 +7398,11 @@ } }, "node_modules/graphql-scalars": { - "version": "1.17.0", - "license": "MIT", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/graphql-scalars/-/graphql-scalars-1.18.0.tgz", + "integrity": "sha512-XrMwSim4xJ5n1UdT3YMJh9uT3oB/th5jR5bIMJvYxmgq/rGDkfXNtCRSL/+dLMHxGM0thYPfIZDua1+aQlKBMA==", "dependencies": { - "tslib": "~2.3.0" + "tslib": "~2.4.0" }, "engines": { "node": ">=10" @@ -7310,10 +7411,6 @@ "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/graphql-scalars/node_modules/tslib": { - "version": "2.3.1", - "license": "0BSD" - }, "node_modules/graphql-tag": { "version": "2.12.6", "license": "MIT", @@ -7971,8 +8068,9 @@ }, "node_modules/is-docker": { "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true, - "license": "MIT", "bin": { "is-docker": "cli.js" }, @@ -8224,8 +8322,9 @@ }, "node_modules/is-wsl": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, - "license": "MIT", "dependencies": { "is-docker": "^2.0.0" }, @@ -9917,8 +10016,9 @@ }, "node_modules/open": { "version": "8.4.0", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", + "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", "dev": true, - "license": "MIT", "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", @@ -10479,13 +10579,13 @@ "dev": true }, "node_modules/prisma": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.1.1.tgz", - "integrity": "sha512-yw50J8If2dKP4wYIi695zthsCASQFHiogGvUHHWd3falx/rpsD6Sb1LMLRV9nO3iGG3lozxNJ2PSINxK7xwdpg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.2.1.tgz", + "integrity": "sha512-HuYqnTDgH8atjPGtYmY0Ql9XrrJnfW7daG1PtAJRW0E6gJxc50lY3vrIDn0yjMR3TvRlypjTcspQX8DT+xD4Sg==", "devOptional": true, "hasInstallScript": true, "dependencies": { - "@prisma/engines": "4.1.1" + "@prisma/engines": "4.2.1" }, "bin": { "prisma": "build/index.js", @@ -11594,9 +11694,10 @@ "license": "MIT" }, "node_modules/synckit": { - "version": "0.8.1", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.3.tgz", + "integrity": "sha512-1goXnDYNJlKwCM37f5MTzRwo+8SqutgVtg2d37D6YnHHT4E3IhQMRfKiGdfTZU7LBlI6T8inCQUxnMBFHrbqWw==", "dev": true, - "license": "MIT", "dependencies": { "@pkgr/utils": "^2.3.0", "tslib": "^2.4.0" @@ -11801,8 +11902,9 @@ }, "node_modules/tiny-glob": { "version": "0.2.9", + "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", + "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", "dev": true, - "license": "MIT", "dependencies": { "globalyzer": "0.1.0", "globrex": "^0.1.2" @@ -11894,9 +11996,9 @@ } }, "node_modules/ts-jest": { - "version": "28.0.7", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.7.tgz", - "integrity": "sha512-wWXCSmTwBVmdvWrOpYhal79bDpioDy4rTT+0vyUnE3ZzM7LOAAGG9NXwzkEL/a516rQEgnMmS/WKP9jBPCVJyA==", + "version": "28.0.8", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz", + "integrity": "sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==", "dev": true, "dependencies": { "bs-logger": "0.x", @@ -13656,12 +13758,12 @@ } }, "@graphql-codegen/cli": { - "version": "2.11.5", - "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-2.11.5.tgz", - "integrity": "sha512-0RntZ/F/d7M7KJU24nDwfKTuuhpwQ8nSs00RgKIqsk4xSX/U9HgOp29pWZfJjHCppb0EiXKBDvK4DtQIqe3n3w==", + "version": "2.11.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-2.11.6.tgz", + "integrity": "sha512-0R2Bhgjt3XZTSdsn8MGGuJjDEN2z+KCo7920zLZz9boy6bQ0EyuxS9AUATePS9aC3djy2POAIPCHz8iHK68IlQ==", "dev": true, "requires": { - "@graphql-codegen/core": "2.6.1", + "@graphql-codegen/core": "2.6.2", "@graphql-codegen/plugin-helpers": "^2.6.2", "@graphql-tools/apollo-engine-loader": "^7.3.6", "@graphql-tools/code-file-loader": "^7.3.1", @@ -13794,13 +13896,13 @@ } }, "@graphql-codegen/core": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-2.6.1.tgz", - "integrity": "sha512-X6IIQCIvEm+g6xcd/5ml/Tmz8U6pd4q9s1mM4WcstBQ26v+gzzlj6lc7+6ALhrNm25gHKQ4PiVoG2W0pw503Dw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-2.6.2.tgz", + "integrity": "sha512-58T5yf9nEfAhDwN1Vz1hImqpdJ/gGpCGUaroQ5tqskZPf7eZYYVkEXbtqRZZLx1MCCKwjWX4hMtTPpHhwKCkng==", "dev": true, "requires": { "@graphql-codegen/plugin-helpers": "^2.6.2", - "@graphql-tools/schema": "^8.5.0", + "@graphql-tools/schema": "^9.0.0", "@graphql-tools/utils": "^8.8.0", "tslib": "~2.4.0" } @@ -13970,6 +14072,28 @@ "value-or-promise": "1.0.11" }, "dependencies": { + "@graphql-tools/merge": { + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz", + "integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==", + "dev": true, + "requires": { + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0" + } + }, + "@graphql-tools/schema": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz", + "integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==", + "dev": true, + "requires": { + "@graphql-tools/merge": "8.3.1", + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0", + "value-or-promise": "1.0.11" + } + }, "@graphql-tools/utils": { "version": "8.9.0", "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", @@ -14031,21 +14155,21 @@ } }, "@graphql-tools/graphql-file-loader": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.0.tgz", - "integrity": "sha512-X3wcC+ZljbXTwdTTSp3oUHJd66mFLDKI750uhB0HidBxE6+wyw7fhmJVJiYROXPswaGliuabpo0JEyLj7hhWKA==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.2.tgz", + "integrity": "sha512-4M5c5SRnxTURNwfq46dlEspWGk+nQpO2nF/p9kxaPiXG0iMAQ8suOd3jQk99LEefQpVhFNb5FumyvUnyW0BogA==", "requires": { - "@graphql-tools/import": "6.7.1", - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/import": "6.7.3", + "@graphql-tools/utils": "8.10.0", "globby": "^11.0.3", "tslib": "^2.4.0", "unixify": "^1.0.0" }, "dependencies": { "@graphql-tools/utils": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", - "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.10.0.tgz", + "integrity": "sha512-yI+V373FdXQbYfqdarehn9vRWDZZYuvyQ/xwiv5ez2BbobHrqsexF7qs56plLRaQ8ESYpVAjMQvJWe9s23O0Jg==", "requires": { "tslib": "^2.4.0" } @@ -14077,19 +14201,19 @@ } }, "@graphql-tools/import": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.1.tgz", - "integrity": "sha512-StLosFVhdw+eZkL+v9dBabszxCAZtEYW4Oy1+750fDkH39GrmzOB8mWiYna7rm9+GMisC9atJtXuAfMF02Aoag==", + "version": "6.7.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.3.tgz", + "integrity": "sha512-7D/nDfwAj1TEkF+vAxm+hxgYNQW3h1kDz8JnYmvvY1Yv7OxZQQHDNd4tVg3BYVtW2kjsz3nzip46Z8ZQ9L7gHg==", "requires": { - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/utils": "8.10.0", "resolve-from": "5.0.0", "tslib": "^2.4.0" }, "dependencies": { "@graphql-tools/utils": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", - "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.10.0.tgz", + "integrity": "sha512-yI+V373FdXQbYfqdarehn9vRWDZZYuvyQ/xwiv5ez2BbobHrqsexF7qs56plLRaQ8ESYpVAjMQvJWe9s23O0Jg==", "requires": { "tslib": "^2.4.0" } @@ -14120,20 +14244,20 @@ } }, "@graphql-tools/load": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.7.1.tgz", - "integrity": "sha512-rJ2WUV41wwAkMnBgtcBym3TKVbPgz7z9tBCjOmbNVLy5bB9StVPdo2Uci0D5xYSgLV9XIt+zdyAnYGptioJeWg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.7.4.tgz", + "integrity": "sha512-2VtVWeMNizNTTc8Dv/hs0lrvGHaLko8jpBoP9TewFdBz6pAXPsLHYnNAhEfBYJd+Vk5GZbnWTfVColxhnF8NEQ==", "requires": { - "@graphql-tools/schema": "8.5.1", - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/schema": "9.0.1", + "@graphql-tools/utils": "8.10.0", "p-limit": "3.1.0", "tslib": "^2.4.0" }, "dependencies": { "@graphql-tools/utils": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", - "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.10.0.tgz", + "integrity": "sha512-yI+V373FdXQbYfqdarehn9vRWDZZYuvyQ/xwiv5ez2BbobHrqsexF7qs56plLRaQ8ESYpVAjMQvJWe9s23O0Jg==", "requires": { "tslib": "^2.4.0" } @@ -14239,29 +14363,29 @@ } }, "@graphql-tools/schema": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz", - "integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.1.tgz", + "integrity": "sha512-Y6apeiBmvXEz082IAuS/ainnEEQrzMECP1MRIV72eo2WPa6ZtLYPycvIbd56Z5uU2LKP4XcWRgK6WUbCyN16Rw==", "requires": { - "@graphql-tools/merge": "8.3.1", - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/merge": "8.3.3", + "@graphql-tools/utils": "8.10.0", "tslib": "^2.4.0", "value-or-promise": "1.0.11" }, "dependencies": { "@graphql-tools/merge": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz", - "integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==", + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.3.tgz", + "integrity": "sha512-EfULshN2s2s2mhBwbV9WpGnoehRLe7eIMdZrKfHhxlBWOvtNUd3KSCN0PUdAMd7lj1jXUW9KYdn624JrVn6qzg==", "requires": { - "@graphql-tools/utils": "8.9.0", + "@graphql-tools/utils": "8.10.0", "tslib": "^2.4.0" } }, "@graphql-tools/utils": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", - "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.10.0.tgz", + "integrity": "sha512-yI+V373FdXQbYfqdarehn9vRWDZZYuvyQ/xwiv5ez2BbobHrqsexF7qs56plLRaQ8ESYpVAjMQvJWe9s23O0Jg==", "requires": { "tslib": "^2.4.0" } @@ -14321,6 +14445,28 @@ "value-or-promise": "1.0.11" }, "dependencies": { + "@graphql-tools/merge": { + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz", + "integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==", + "dev": true, + "requires": { + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0" + } + }, + "@graphql-tools/schema": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz", + "integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==", + "dev": true, + "requires": { + "@graphql-tools/merge": "8.3.1", + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0", + "value-or-promise": "1.0.11" + } + }, "@graphql-tools/utils": { "version": "8.9.0", "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", @@ -14758,6 +14904,8 @@ }, "@pkgr/utils": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.3.0.tgz", + "integrity": "sha512-7dIJ9CRVzBnqyEl7diUHPUFJf/oty2SeoVzcMocc5PeOUDK9KGzvgIBjGRRzzlRDaOjh3ADwH0WeibQvi3ls2Q==", "dev": true, "requires": { "cross-spawn": "^7.0.3", @@ -14769,11 +14917,11 @@ } }, "@prisma/client": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.1.1.tgz", - "integrity": "sha512-2pXuIUYxHv5H9o6QTa1VIsl4yMgsAjKQOitlo8WVTB+vo73rmMJITBPavdGUZSWUc7adMkFzEV3y5rVTUQr77Q==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.2.1.tgz", + "integrity": "sha512-PZBkY60+k5oix+e6IUfl3ub8TbRLNsPLdfWrdy2eh80WcHTaT+/UfvXf/B7gXedH7FRtbPFHZXk1hZenJiJZFQ==", "requires": { - "@prisma/engines-version": "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8" + "@prisma/engines-version": "4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826" } }, "@prisma/debug": { @@ -14831,15 +14979,15 @@ } }, "@prisma/engines": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.1.1.tgz", - "integrity": "sha512-DCw8L/SS0IXqmj5IW/fMxOXiifnsfjBzDfRhf0j3NFWqvMCh9OtfjmXQZxVgI2mwvJLc/5jzXhkiWT39qS09dA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.2.1.tgz", + "integrity": "sha512-0KqBwREUOjBiHwITsQzw2DWfLHjntvbqzGRawj4sBMnIiL5CXwyDUKeHOwXzKMtNr1rEjxEsypM14g0CzLRK3g==", "devOptional": true }, "@prisma/engines-version": { - "version": "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8.tgz", - "integrity": "sha512-cRRJwpHFGFJZvtHbY3GZjMffNBEjjZk68ztn+S2hDgPCGB4H66IK26roK94GJxBodSehwRJ0wGyebC2GoIH1JQ==" + "version": "4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.2.0-33.2920a97877e12e055c1333079b8d19cee7f33826.tgz", + "integrity": "sha512-tktkqdiwqE4QhmE088boPt+FwPj1Jub/zk+5F6sEfcRHzO5yz9jyMD5HFVtiwxZPLx/8Xg9ElnuTi8E5lWVQFQ==" }, "@prisma/fetch-engine": { "version": "3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b", @@ -15350,7 +15498,9 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.29", + "version": "4.17.30", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz", + "integrity": "sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==", "requires": { "@types/node": "*", "@types/qs": "*", @@ -15367,9 +15517,9 @@ } }, "@types/inquirer": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.0.tgz", - "integrity": "sha512-4sncHTq3AWbLWZOs83DQlrKxhdehs2AW79Dp1amoGGc6B+oJal7fQJa/EO1Taa5CQLSywEMAgw2SFB1fZIX3PQ==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.1.tgz", + "integrity": "sha512-I4eZdYXpFHj0pAzMndJFQMu/4hCc6Z340au9lvxHofGJnFmVgckxR/t9jRzsOVviajsOmEL+OABx+e0e28IbNw==", "dev": true, "requires": { "@types/through": "*", @@ -15401,12 +15551,12 @@ } }, "@types/jest": { - "version": "28.1.6", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.6.tgz", - "integrity": "sha512-0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ==", + "version": "28.1.7", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.7.tgz", + "integrity": "sha512-acDN4VHD40V24tgu0iC44jchXavRNVFXQ/E6Z5XNsswgoSO/4NgsXoEYmPUGookKldlZQyIpmrEXsHI9cA3ZTA==", "dev": true, "requires": { - "jest-matcher-utils": "^28.0.0", + "expect": "^28.0.0", "pretty-format": "^28.0.0" } }, @@ -15465,9 +15615,9 @@ "dev": true }, "@types/node": { - "version": "18.6.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz", - "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==" + "version": "18.7.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz", + "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A==" }, "@types/normalize-package-data": { "version": "2.4.1", @@ -15566,14 +15716,14 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz", - "integrity": "sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz", + "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/type-utils": "5.33.0", - "@typescript-eslint/utils": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/type-utils": "5.33.1", + "@typescript-eslint/utils": "5.33.1", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -15592,52 +15742,52 @@ } }, "@typescript-eslint/parser": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.0.tgz", - "integrity": "sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz", + "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/typescript-estree": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/typescript-estree": "5.33.1", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz", - "integrity": "sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz", + "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/visitor-keys": "5.33.0" + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/visitor-keys": "5.33.1" } }, "@typescript-eslint/type-utils": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz", - "integrity": "sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz", + "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==", "dev": true, "requires": { - "@typescript-eslint/utils": "5.33.0", + "@typescript-eslint/utils": "5.33.1", "debug": "^4.3.4", "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.0.tgz", - "integrity": "sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz", + "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz", - "integrity": "sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz", + "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/visitor-keys": "5.33.0", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/visitor-keys": "5.33.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -15657,26 +15807,26 @@ } }, "@typescript-eslint/utils": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.0.tgz", - "integrity": "sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz", + "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.33.0", - "@typescript-eslint/types": "5.33.0", - "@typescript-eslint/typescript-estree": "5.33.0", + "@typescript-eslint/scope-manager": "5.33.1", + "@typescript-eslint/types": "5.33.1", + "@typescript-eslint/typescript-estree": "5.33.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/visitor-keys": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz", - "integrity": "sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==", + "version": "5.33.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz", + "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.33.0", + "@typescript-eslint/types": "5.33.1", "eslint-visitor-keys": "^3.3.0" } }, @@ -15809,7 +15959,9 @@ } }, "apollo-server-core": { - "version": "3.10.0", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.10.1.tgz", + "integrity": "sha512-UFFziv6h15QbKRZOA6wLyr1Sle9kns3JuQ5DEB7OYe5AIoOJNjZkWXX/tmLFUrSmlnDDryi6Sf5pDzpYmUC/UA==", "requires": { "@apollo/utils.keyvaluecache": "^1.0.1", "@apollo/utils.logger": "^1.0.0", @@ -15833,6 +15985,36 @@ "sha.js": "^2.4.11", "uuid": "^8.0.0", "whatwg-mimetype": "^3.0.0" + }, + "dependencies": { + "@graphql-tools/merge": { + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz", + "integrity": "sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==", + "requires": { + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0" + } + }, + "@graphql-tools/schema": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz", + "integrity": "sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==", + "requires": { + "@graphql-tools/merge": "8.3.1", + "@graphql-tools/utils": "8.9.0", + "tslib": "^2.4.0", + "value-or-promise": "1.0.11" + } + }, + "@graphql-tools/utils": { + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz", + "integrity": "sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==", + "requires": { + "tslib": "^2.4.0" + } + } } }, "apollo-server-env": { @@ -15846,15 +16028,17 @@ "requires": {} }, "apollo-server-express": { - "version": "3.10.0", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.10.1.tgz", + "integrity": "sha512-r0esst3YGNdlphYiOrflfBqJ15VAZAhYhWSFo2kPF4knsIGK5HUkeqwjMr+fFDBn4DEfYzC+I1+LnsF/hFN8VQ==", "requires": { "@types/accepts": "^1.3.5", "@types/body-parser": "1.19.2", "@types/cors": "2.8.12", "@types/express": "4.17.13", - "@types/express-serve-static-core": "4.17.29", + "@types/express-serve-static-core": "4.17.30", "accepts": "^1.3.5", - "apollo-server-core": "^3.10.0", + "apollo-server-core": "^3.10.1", "apollo-server-types": "^3.6.2", "body-parser": "^1.19.0", "cors": "^2.8.5", @@ -16746,6 +16930,8 @@ }, "define-lazy-prop": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", "dev": true }, "define-properties": { @@ -17018,9 +17204,9 @@ } }, "eslint": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", - "integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", + "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.0", @@ -17170,9 +17356,9 @@ } }, "eslint-import-resolver-typescript": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.4.0.tgz", - "integrity": "sha512-rBCgiEovwX/HQ8ESWV+XIWZaFiRtDeAXNZdcTATB8UbMuadc9qfGOlIP+vy+c7nsgfEBN4NTwy5qunGNptDP0Q==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.4.2.tgz", + "integrity": "sha512-8SuWlRIEO83X9PsJSK9VjgH0EDk1ZzNI36+r3C0xNYVJ+O1+TprOFtTwqqyPMHG+br/I9A5Q80RE7K3/eIr9XA==", "dev": true, "requires": { "debug": "^4.3.4", @@ -17181,7 +17367,7 @@ "globby": "^13.1.2", "is-core-module": "^2.9.0", "is-glob": "^4.0.3", - "synckit": "^0.8.1" + "synckit": "^0.8.3" }, "dependencies": { "globby": { @@ -17841,6 +18027,8 @@ }, "globalyzer": { "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", + "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", "dev": true }, "globby": { @@ -17856,6 +18044,8 @@ }, "globrex": { "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", "dev": true }, "graceful-fs": { @@ -17869,9 +18059,9 @@ "dev": true }, "graphql": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.5.0.tgz", - "integrity": "sha512-qbHgh8Ix+j/qY+a/ZcJnFQ+j8ezakqPiHwPiZhV/3PgGlgf96QMBB5/f2rkiC9sgLoy/xvT6TSiaf2nTHJh5iA==" + "version": "16.6.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz", + "integrity": "sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==" }, "graphql-config": { "version": "4.3.1", @@ -17930,14 +18120,11 @@ } }, "graphql-scalars": { - "version": "1.17.0", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/graphql-scalars/-/graphql-scalars-1.18.0.tgz", + "integrity": "sha512-XrMwSim4xJ5n1UdT3YMJh9uT3oB/th5jR5bIMJvYxmgq/rGDkfXNtCRSL/+dLMHxGM0thYPfIZDua1+aQlKBMA==", "requires": { - "tslib": "~2.3.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.1" - } + "tslib": "~2.4.0" } }, "graphql-tag": { @@ -18349,6 +18536,8 @@ }, "is-docker": { "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true }, "is-extglob": { @@ -18495,6 +18684,8 @@ }, "is-wsl": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, "requires": { "is-docker": "^2.0.0" @@ -19714,6 +19905,8 @@ }, "open": { "version": "8.4.0", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", + "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", "dev": true, "requires": { "define-lazy-prop": "^2.0.0", @@ -20084,12 +20277,12 @@ "dev": true }, "prisma": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.1.1.tgz", - "integrity": "sha512-yw50J8If2dKP4wYIi695zthsCASQFHiogGvUHHWd3falx/rpsD6Sb1LMLRV9nO3iGG3lozxNJ2PSINxK7xwdpg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.2.1.tgz", + "integrity": "sha512-HuYqnTDgH8atjPGtYmY0Ql9XrrJnfW7daG1PtAJRW0E6gJxc50lY3vrIDn0yjMR3TvRlypjTcspQX8DT+xD4Sg==", "devOptional": true, "requires": { - "@prisma/engines": "4.1.1" + "@prisma/engines": "4.2.1" } }, "prisma-dbml-generator": { @@ -20863,7 +21056,9 @@ "version": "3.2.4" }, "synckit": { - "version": "0.8.1", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.3.tgz", + "integrity": "sha512-1goXnDYNJlKwCM37f5MTzRwo+8SqutgVtg2d37D6YnHHT4E3IhQMRfKiGdfTZU7LBlI6T8inCQUxnMBFHrbqWw==", "dev": true, "requires": { "@pkgr/utils": "^2.3.0", @@ -21009,6 +21204,8 @@ }, "tiny-glob": { "version": "0.2.9", + "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", + "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", "dev": true, "requires": { "globalyzer": "0.1.0", @@ -21074,9 +21271,9 @@ } }, "ts-jest": { - "version": "28.0.7", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.7.tgz", - "integrity": "sha512-wWXCSmTwBVmdvWrOpYhal79bDpioDy4rTT+0vyUnE3ZzM7LOAAGG9NXwzkEL/a516rQEgnMmS/WKP9jBPCVJyA==", + "version": "28.0.8", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz", + "integrity": "sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==", "dev": true, "requires": { "bs-logger": "0.x", diff --git a/package.json b/package.json index 233d4972..e1257ec8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ekorre-ts", - "version": "1.0.3", + "version": "1.0.4", "description": "E-Sektionens backend", "main": "src/index.ts", "scripts": { @@ -44,21 +44,21 @@ }, "dependencies": { "@esek/auth-server": "2.1.4", - "@graphql-tools/graphql-file-loader": "^7.5.0", - "@graphql-tools/load": "^7.7.1", - "@graphql-tools/schema": "^8.5.1", - "@prisma/client": "^4.1.1", - "apollo-server-core": "^3.10.0", + "@graphql-tools/graphql-file-loader": "^7.5.2", + "@graphql-tools/load": "^7.7.4", + "@graphql-tools/schema": "^9.0.1", + "@prisma/client": "^4.2.1", + "apollo-server-core": "^3.10.1", "apollo-server-errors": "^3.3.1", - "apollo-server-express": "^3.10.0", + "apollo-server-express": "^3.10.1", "axios": "^0.27.2", "cookie-parser": "^1.4.6", "dataloader": "^2.1.0", "dotenv": "^16.0.1", "express": "^4.18.1", "express-fileupload": "^1.4.0", - "graphql": "^16.5.0", - "graphql-scalars": "^1.17.0", + "graphql": "^16.6.0", + "graphql-scalars": "^1.18.0", "jsdom": "^20.0.0", "jsonwebtoken": "^8.5.1", "regenerator-runtime": "^0.13.9", @@ -68,7 +68,7 @@ "typescript": "^4.7.4" }, "devDependencies": { - "@graphql-codegen/cli": "^2.11.5", + "@graphql-codegen/cli": "^2.11.6", "@graphql-codegen/introspection": "2.2.1", "@graphql-codegen/typescript": "2.7.3", "@graphql-codegen/typescript-resolvers": "2.7.3", @@ -76,28 +76,28 @@ "@types/cookie-parser": "^1.4.3", "@types/express": "^4.17.13", "@types/express-fileupload": "^1.2.3", - "@types/inquirer": "^9.0.0", - "@types/jest": "^28.1.6", + "@types/inquirer": "^9.0.1", + "@types/jest": "^28.1.7", "@types/jsdom": "^20.0.0", "@types/jsonwebtoken": "^8.5.8", - "@types/node": "^18.6.5", + "@types/node": "^18.7.6", "@types/set-cookie-parser": "^2.4.2", "@types/supertest": "^2.0.12", - "@typescript-eslint/eslint-plugin": "^5.33.0", - "@typescript-eslint/parser": "^5.33.0", - "eslint": "^8.21.0", + "@typescript-eslint/eslint-plugin": "^5.33.1", + "@typescript-eslint/parser": "^5.33.1", + "eslint": "^8.22.0", "eslint-config-airbnb-typescript": "^17.0.0", "eslint-config-prettier": "^8.5.0", - "eslint-import-resolver-typescript": "^3.4.0", + "eslint-import-resolver-typescript": "^3.4.2", "eslint-plugin-import": "^2.26.0", "inquirer": "^9.1.0", "jest": "^28.1.3", "nanospinner": "^1.1.0", "nodemon": "^2.0.19", "prettier": "^2.7.1", - "prisma": "^4.1.1", + "prisma": "^4.2.1", "prisma-dbml-generator": "^0.9.1", "supertest": "^6.2.4", - "ts-jest": "^28.0.7" + "ts-jest": "^28.0.8" } } diff --git a/src/api/meeting.api.ts b/src/api/meeting.api.ts index e8b95203..7dc1bfa4 100644 --- a/src/api/meeting.api.ts +++ b/src/api/meeting.api.ts @@ -18,7 +18,7 @@ export class MeetingAPI { */ async getAllMeetings(limit = 20, sortOrder: 'desc' | 'asc' = 'desc'): Promise { const m = await prisma.prismaMeeting.findMany({ - orderBy: [{ year: sortOrder }, { number: sortOrder }], + orderBy: [{ type: sortOrder }, { year: sortOrder }, { number: sortOrder }], take: limit, }); @@ -41,7 +41,8 @@ export class MeetingAPI { } /** - * Retrieves multiple meetings from the database, with possible specifics + * Retrieves multiple meetings from the database, with possible specifics, ordered + * by type first, then year and finally number * @param year Year of the meeting * @param number The number of the meeting, if applicable * @param type The type of meeting @@ -68,6 +69,7 @@ export class MeetingAPI { where: { AND: whereAnd, }, + orderBy: [{ type: 'desc' }, { year: 'desc' }, { number: 'desc' }], }); if (m === null) { @@ -78,7 +80,8 @@ export class MeetingAPI { } /** - * Retrieves the latest board meetings, ordered by number and then year + * Retrieves the latest board meetings, ordered + * by type first, then year and finally number * @param limit The number of board meetings to be returned. If `null`, all board meetings are returned */ async getLatestBoardMeetings(limit?: number): Promise { @@ -86,7 +89,7 @@ export class MeetingAPI { where: { type: 'SM', }, - orderBy: [{ number: 'desc' }, { year: 'desc' }], + orderBy: [{ type: 'desc' }, { year: 'desc' }, { number: 'desc' }], take: limit, }); @@ -249,10 +252,10 @@ export class MeetingAPI { * Attempts to remove a document from a meeting. Returns `true` if the meeting * was found and the reference for this document type is guaranteed to be `null` in the * database. - * + * * *Note:* This does not actually remove the file from the file system, only makes it * unrelated to this meeting - * + * * *Trivia:* Also known as *Annas Method*, this method was created specifically * because Ordförande 2021 Anna Hollsten loved to upload documents as protocols and * vice versa. The old website had no function to remove documents, meaning the poor diff --git a/test/unit/meeting.api.test.ts b/test/unit/meeting.api.test.ts index f28172af..1eaf22e4 100644 --- a/test/unit/meeting.api.test.ts +++ b/test/unit/meeting.api.test.ts @@ -42,7 +42,7 @@ beforeAll(async () => { afterAll(async () => { await api.clear(); - await Promise.all([ + await Promise.allSettled([ prisma.prismaFile.delete({ where: { id: DUMMY_FILE.id } }), prisma.prismaFile.delete({ where: { id: DUMMY_PRIVATE_FILE.id } }), deleteDummyUser(),