diff --git a/common/package.json b/common/package.json index 1ffe54022..fad1d53e1 100644 --- a/common/package.json +++ b/common/package.json @@ -14,6 +14,7 @@ "author": "zkldi", "license": "MIT", "devDependencies": { + "@types/node": "^17.0.8", "@types/tap": "15.0.3", "@typescript-eslint/eslint-plugin": "4.19.0", "@typescript-eslint/parser": "4.19.0", @@ -23,11 +24,11 @@ "prettier": "2.2.1", "tap": "15.0.9", "ts-node": "10.0.0", - "typescript": "4.3.4", - "@types/node": "^17.0.8", - "monk": "7.3.4" + "typescript": "4.3.4" + }, + "dependencies": { + "@types/mongodb": "3.6.18" }, - "dependencies": {}, "nyc": { "reporter": [ "html", diff --git a/common/pnpm-lock.yaml b/common/pnpm-lock.yaml index 45991b98e..f9162d03b 100644 --- a/common/pnpm-lock.yaml +++ b/common/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.3 specifiers: + '@types/mongodb': 3.6.18 '@types/node': ^17.0.8 '@types/tap': 15.0.3 '@typescript-eslint/eslint-plugin': 4.19.0 @@ -8,12 +9,14 @@ specifiers: eslint: 7.22.0 eslint-config-prettier: 8.1.0 eslint-plugin-prettier: 3.3.1 - monk: 7.3.4 prettier: 2.2.1 tap: 15.0.9 ts-node: 10.0.0 typescript: 4.3.4 +dependencies: + '@types/mongodb': 3.6.18 + devDependencies: '@types/node': 17.0.8 '@types/tap': 15.0.3 @@ -22,7 +25,6 @@ devDependencies: eslint: 7.22.0 eslint-config-prettier: 8.1.0_eslint@7.22.0 eslint-plugin-prettier: 3.3.1_44b94358ac15c7c093df3d5421ccc811 - monk: 7.3.4 prettier: 2.2.1 tap: 15.0.9_ts-node@10.0.0+typescript@4.3.4 ts-node: 10.0.0_44920ace97a6a912bf804a53b77b33b1 @@ -402,7 +404,7 @@ packages: resolution: {integrity: sha512-mVRvYnTOZJz3ccpxhr3wgxVmSeiYinW+zlzQz3SXWaJmD1DuL05Jeq7nKw3SnbKmbleW5qrLG5vdyWe/A9sXhw==} dependencies: '@types/node': 17.0.8 - dev: true + dev: false /@types/json-schema/7.0.7: resolution: {integrity: sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==} @@ -413,11 +415,10 @@ packages: dependencies: '@types/bson': 4.0.3 '@types/node': 17.0.8 - dev: true + dev: false /@types/node/17.0.8: resolution: {integrity: sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==} - dev: true /@types/tap/15.0.3: resolution: {integrity: sha512-usOLtmMm1jfjPdkt9R9HMTU/J6m9QNYjgFs5U2tFiOzQSd7lDd/aAMprExYLnJnZb6tM4ujmGv7ITe+1smIRgg==} @@ -692,13 +693,6 @@ packages: engines: {node: '>=10'} dev: true - /bl/2.2.1: - resolution: {integrity: sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==} - dependencies: - readable-stream: 2.3.7 - safe-buffer: 5.2.1 - dev: true - /brace-expansion/1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -725,11 +719,6 @@ packages: node-releases: 1.1.73 dev: true - /bson/1.1.6: - resolution: {integrity: sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==} - engines: {node: '>=0.6.19'} - dev: true - /buffer-from/1.1.1: resolution: {integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==} dev: true @@ -959,11 +948,6 @@ packages: engines: {node: '>=0.4.0'} dev: true - /denque/1.5.0: - resolution: {integrity: sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==} - engines: {node: '>=0.10'} - dev: true - /diff/4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} @@ -1537,10 +1521,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /isarray/1.0.0: - resolution: {integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=} - dev: true - /isexe/2.0.0: resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=} dev: true @@ -1771,11 +1751,6 @@ packages: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} dev: true - /memory-pager/1.5.0: - resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==} - dev: true - optional: true - /merge2/1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -1824,86 +1799,6 @@ packages: hasBin: true dev: true - /mongodb/3.6.9: - resolution: {integrity: sha512-1nSCKgSunzn/CXwgOWgbPHUWOO5OfERcuOWISmqd610jn0s8BU9K4879iJVabqgpPPbA6hO7rG48eq+fGED3Mg==} - engines: {node: '>=4'} - peerDependencies: - aws4: '*' - bson-ext: '*' - kerberos: '*' - mongodb-client-encryption: '*' - mongodb-extjson: '*' - snappy: '*' - peerDependenciesMeta: - aws4: - optional: true - bson-ext: - optional: true - kerberos: - optional: true - mongodb-client-encryption: - optional: true - mongodb-extjson: - optional: true - snappy: - optional: true - dependencies: - bl: 2.2.1 - bson: 1.1.6 - denque: 1.5.0 - optional-require: 1.0.3 - safe-buffer: 5.2.1 - optionalDependencies: - saslprep: 1.0.3 - dev: true - - /monk-middleware-cast-ids/0.2.1: - resolution: {integrity: sha1-QMQOWmyzPM7cKJIglDJ17ohhxSk=} - dev: true - - /monk-middleware-fields/0.2.0: - resolution: {integrity: sha1-/2N6819ZSIecyyvhWpE2CRG+psE=} - dev: true - - /monk-middleware-handle-callback/0.2.2: - resolution: {integrity: sha512-5hBynb7asZ2uw9XVze7C3XH0zXT51yFDvYydk/5HnWWzh2NLglDSiKDcX0yLKPHzFgiq+5Z4Laq5fFVnFsmm8w==} - dev: true - - /monk-middleware-options/0.2.1: - resolution: {integrity: sha1-WNrhxRjUZjbr3/UG+t/Hc7tEKIY=} - dev: true - - /monk-middleware-query/0.2.0: - resolution: {integrity: sha1-qSbGd9SlYgxiFRsKVtDAwVFnWHQ=} - dev: true - - /monk-middleware-wait-for-connection/0.2.0: - resolution: {integrity: sha1-MSlY0w5Yi1fQl1TdfJe0hDMWg1o=} - dev: true - - /monk/7.3.4: - resolution: {integrity: sha512-PkPNiElwroVyKQj01usyziOvwiKYBUVSq7YU1FB4KFr0J3v0GeXW0TebYsLR4u33WB8JGqPiAcuzDspfdujqQg==} - dependencies: - '@types/mongodb': 3.6.18 - debug: 4.3.1 - mongodb: 3.6.9 - monk-middleware-cast-ids: 0.2.1 - monk-middleware-fields: 0.2.0 - monk-middleware-handle-callback: 0.2.2 - monk-middleware-options: 0.2.1 - monk-middleware-query: 0.2.0 - monk-middleware-wait-for-connection: 0.2.0 - object-assign: 4.1.1 - transitivePeerDependencies: - - aws4 - - bson-ext - - kerberos - - mongodb-client-encryption - - mongodb-extjson - - snappy - - supports-color - dev: true - /ms/2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} dev: true @@ -1989,11 +1884,6 @@ packages: hasBin: true dev: true - /optional-require/1.0.3: - resolution: {integrity: sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA==} - engines: {node: '>=4'} - dev: true - /optionator/0.9.1: resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} engines: {node: '>= 0.8.0'} @@ -2113,10 +2003,6 @@ packages: hasBin: true dev: true - /process-nextick-args/2.0.1: - resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - dev: true - /process-on-spawn/1.0.0: resolution: {integrity: sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==} engines: {node: '>=8'} @@ -2168,18 +2054,6 @@ packages: prop-types: 15.7.2 dev: true - /readable-stream/2.3.7: - resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==} - dependencies: - core-util-is: 1.0.2 - inherits: 2.0.4 - isarray: 1.0.0 - process-nextick-args: 2.0.1 - safe-buffer: 5.1.2 - string_decoder: 1.1.1 - util-deprecate: 1.0.2 - dev: true - /readdirp/3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} @@ -2285,14 +2159,6 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: true - /saslprep/1.0.3: - resolution: {integrity: sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==} - engines: {node: '>=6'} - dependencies: - sparse-bitfield: 3.0.3 - dev: true - optional: true - /semver/6.3.0: resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} hasBin: true @@ -2357,13 +2223,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /sparse-bitfield/3.0.3: - resolution: {integrity: sha1-/0rm5oZWBWuks+eSqzM004JzyhE=} - dependencies: - memory-pager: 1.5.0 - dev: true - optional: true - /spawn-wrap/2.0.0: resolution: {integrity: sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==} engines: {node: '>=8'} @@ -2429,12 +2288,6 @@ packages: strip-ansi: 6.0.0 dev: true - /string_decoder/1.1.1: - resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} - dependencies: - safe-buffer: 5.1.2 - dev: true - /strip-ansi/3.0.1: resolution: {integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=} engines: {node: '>=0.10.0'} @@ -2715,10 +2568,6 @@ packages: punycode: 2.1.1 dev: true - /util-deprecate/1.0.2: - resolution: {integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=} - dev: true - /uuid/3.4.0: resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==} deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. diff --git a/common/src/types.ts b/common/src/types.ts index 2dcc8f54c..9657c931d 100644 --- a/common/src/types.ts +++ b/common/src/types.ts @@ -1,4 +1,9 @@ -import { IObjectID } from "monk"; +// Monk type-stub to avoid pulling the whole dep in +interface IObjectID { + readonly toHexString: () => string; + readonly toString: () => string; +} + import { FilterQuery } from "mongodb"; import { AllClassSets, GameClasses } from "./game-classes";