Skip to content

Commit 01c015d

Browse files
nodkznodkz
committed
feat(TypeScript): migrate mongoose typings from @types/mongoose to built-in types in v5.11
1 parent 15ed47d commit 01c015d

File tree

6 files changed

+38
-50
lines changed

6 files changed

+38
-50
lines changed

‎package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"devDependencies": {
3636
"@types/graphql": "14.5.0",
3737
"@types/jest": "26.0.15",
38-
"@types/mongoose": "5.10.1",
3938
"@typescript-eslint/eslint-plugin": "4.8.1",
4039
"@typescript-eslint/parser": "4.8.1",
4140
"eslint": "7.14.0",
@@ -46,8 +45,8 @@
4645
"graphql": "15.4.0",
4746
"graphql-compose": "7.22.1",
4847
"jest": "26.6.3",
49-
"mongodb-memory-server": "6.9.2",
50-
"mongoose": "5.10.15",
48+
"mongodb-memory-server": "6.9.3",
49+
"mongoose": "5.11.15",
5150
"prettier": "2.2.0",
5251
"request": "2.88.2",
5352
"rimraf": "3.0.2",

‎src/resolvers/helpers/validate.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export type ValidationsWithMessage = {
2020

2121
export async function validateDoc(doc: Document): Promise<ValidationsWithMessage | null> {
2222
const validations: MongooseError.ValidationError | null = await new Promise((resolve) => {
23-
doc.validate(resolve);
23+
doc.validate(resolve as any);
2424
});
2525

2626
return validations?.errors

‎src/resolvers/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ export type AllResolversOpts = {
4141
export type ExtendedResolveParams<TDoc extends Document = any, TContext = any> = Partial<
4242
ResolverResolveParams<TDoc, TContext, any>
4343
> & {
44-
query: Query<any>;
44+
query: Query<any, any>;
4545
rawQuery: { [optName: string]: any };
46-
beforeQuery?: (query: Query<any>, rp: ExtendedResolveParams<TDoc>) => Promise<any>;
46+
beforeQuery?: (query: Query<any, any>, rp: ExtendedResolveParams<TDoc>) => Promise<any>;
4747
beforeRecordMutate?: (record: TDoc, rp: ExtendedResolveParams<TDoc>) => Promise<any>;
4848
model: Model<TDoc>;
4949
};

‎src/resolvers/removeMany.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ export function removeMany<TSource = any, TContext = any, TDoc extends Document
8383
resolveParams.model = model;
8484
filterHelper(resolveParams, aliases);
8585

86-
// @ts-expect-error
8786
if (resolveParams.query.deleteMany) {
88-
// @ts-expect-error
8987
resolveParams.query = resolveParams.query.deleteMany();
9088
} else {
9189
// old mongoose

‎src/resolvers/updateMany.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ export function updateMany<TSource = any, TContext = any, TDoc extends Document
118118

119119
resolveParams.query = resolveParams.query.setOptions({ multi: true });
120120

121-
// @ts-expect-error
122121
if (resolveParams.query.updateMany) {
123-
// @ts-expect-error
124122
resolveParams.query.updateMany({
125123
$set: toMongoDottedObject(recordData, aliases),
126124
});

‎yarn.lock‎

Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -799,22 +799,14 @@
799799
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
800800
integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
801801

802-
"@types/mongodb@*":
803-
version "3.5.34"
804-
resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.5.34.tgz#eaa04b9a85906129fb9aab2eb63079edcf802a98"
805-
integrity sha512-73iy3+MiH+wxSM+hVA5jcW9ZTUaor2WKvM7hW+htOSgVb7E6/JBHOWaxj7rL1/vaxEBziKRr/VPecy3YAKqLuQ==
802+
"@types/mongodb@^3.5.27":
803+
version "3.6.7"
804+
resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.6.7.tgz#b15300254083bc4c6b09036ccaaa75d2f9c6e35c"
805+
integrity sha512-47P64kbkXarlleSMzSrRG04uzY+Dr3xAilOiqRIsqj/sZrmq6cUMx8njydY/iWMqi8IdE9ojFQl/X3ou9EsAlQ==
806806
dependencies:
807807
"@types/bson" "*"
808808
"@types/node" "*"
809809

810-
"@types/mongoose@5.10.1":
811-
version "5.10.1"
812-
resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.10.1.tgz#41d5fe0fef5dce33c140467f1cb2a53b689a66e6"
813-
integrity sha512-5yqbLHOyCQhUb7GPGW0A2dauUbhwgBvUWMzYcaUQiHdLZ8slgRp2R6i8FETZ+t5xeXpfhylYp9U7dAng7WamqQ==
814-
dependencies:
815-
"@types/mongodb" "*"
816-
"@types/node" "*"
817-
818810
"@types/node@*", "@types/node@>= 8":
819811
version "14.14.9"
820812
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.9.tgz#04afc9a25c6ff93da14deabd65dc44485b53c8d6"
@@ -4406,10 +4398,10 @@ jsprim@^1.2.2:
44064398
json-schema "0.2.3"
44074399
verror "1.10.0"
44084400

4409-
kareem@2.3.1:
4410-
version "2.3.1"
4411-
resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.1.tgz#def12d9c941017fabfb00f873af95e9c99e1be87"
4412-
integrity sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw==
4401+
kareem@2.3.2:
4402+
version "2.3.2"
4403+
resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93"
4404+
integrity sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ==
44134405

44144406
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
44154407
version "3.2.2"
@@ -5060,10 +5052,10 @@ modify-values@^1.0.0:
50605052
resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
50615053
integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
50625054

5063-
mongodb-memory-server-core@6.9.2:
5064-
version "6.9.2"
5065-
resolved "https://registry.yarnpkg.com/mongodb-memory-server-core/-/mongodb-memory-server-core-6.9.2.tgz#a064602e85c065c63776cef20ec7311d2b2da206"
5066-
integrity sha512-0naMEESKsJNBg4/djN9qc+Argmg5UElJ/EFP9M4opTH//GZ1Rn6SI5S43NFHJrizOPGojAAp21gn7rNOru7Ypw==
5055+
mongodb-memory-server-core@6.9.3:
5056+
version "6.9.3"
5057+
resolved "https://registry.yarnpkg.com/mongodb-memory-server-core/-/mongodb-memory-server-core-6.9.3.tgz#1c5f7d339e8ac66290b5f1363a49efb40a32e3c5"
5058+
integrity sha512-9ZaWemIQLbu9VG553ksMiV7TNnzICqXhSSQv/7Io6dnuO8VpoLLdd1wIz+r2YuWFP7U159JPWQc8QG9jIL27og==
50675059
dependencies:
50685060
"@types/tmp" "^0.2.0"
50695061
camelcase "^6.0.0"
@@ -5084,12 +5076,12 @@ mongodb-memory-server-core@6.9.2:
50845076
optionalDependencies:
50855077
mongodb "3.6.2"
50865078

5087-
mongodb-memory-server@6.9.2:
5088-
version "6.9.2"
5089-
resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-6.9.2.tgz#75880bf5f485deceba2d7df20659b2796ff703cf"
5090-
integrity sha512-+8axA5PlO+C3H+kgsxt6+6edcKAaY56YjYt+MWj9t1ZiKsEr+7SPsQfJcEoX+Kiz802jt1BOOIbYQVLX+08Hag==
5079+
mongodb-memory-server@6.9.3:
5080+
version "6.9.3"
5081+
resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-6.9.3.tgz#1ea342531603625ef501fa12217f447d0ecea6b3"
5082+
integrity sha512-VU2ey+fknmZflHltPCznZr9fja8T6K7DTG5m7wSxmQC/Qf/kkKmRGqIPcZoEU5znRR/8m/EaOe+hFWkjmh1W5A==
50915083
dependencies:
5092-
mongodb-memory-server-core "6.9.2"
5084+
mongodb-memory-server-core "6.9.3"
50935085

50945086
mongodb@3.6.2:
50955087
version "3.6.2"
@@ -5122,17 +5114,18 @@ mongoose-legacy-pluralize@1.0.2:
51225114
resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
51235115
integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==
51245116

5125-
mongoose@5.10.15:
5126-
version "5.10.15"
5127-
resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.10.15.tgz#5e559467890e0883d2a1ff0470a7467a1b47e52d"
5128-
integrity sha512-3QUWCpMRdFCPIBZkjG/B2OkfMY2WLkR+hv335o4T2mn3ta9kx8qVvXeUDojp3OHMxBZVUyCA+hDyyP4/aKmHuA==
5117+
mongoose@5.11.15:
5118+
version "5.11.15"
5119+
resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.11.15.tgz#ee8ba751c83ee21f4b399aba7cb10276dd316320"
5120+
integrity sha512-8T4bT6eCGB7MqCm40oVhnhT/1AyAdwe+y1rYUhdl3ljsks3BpYz8whZgcMkIoh6VoCCjipOXRqZqdk1UByvlYA==
51295121
dependencies:
5122+
"@types/mongodb" "^3.5.27"
51305123
bson "^1.1.4"
5131-
kareem "2.3.1"
5124+
kareem "2.3.2"
51325125
mongodb "3.6.3"
51335126
mongoose-legacy-pluralize "1.0.2"
5134-
mpath "0.7.0"
5135-
mquery "3.2.2"
5127+
mpath "0.8.3"
5128+
mquery "3.2.3"
51365129
ms "2.1.2"
51375130
regexp-clone "1.0.0"
51385131
safe-buffer "5.2.1"
@@ -5151,15 +5144,15 @@ move-concurrently@^1.0.1:
51515144
rimraf "^2.5.4"
51525145
run-queue "^1.0.3"
51535146

5154-
mpath@0.7.0:
5155-
version "0.7.0"
5156-
resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.7.0.tgz#20e8102e276b71709d6e07e9f8d4d0f641afbfb8"
5157-
integrity sha512-Aiq04hILxhz1L+f7sjGyn7IxYzWm1zLNNXcfhDtx04kZ2Gk7uvFdgZ8ts1cWa/6d0TQmag2yR8zSGZUmp0tFNg==
5147+
mpath@0.8.3:
5148+
version "0.8.3"
5149+
resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.8.3.tgz#828ac0d187f7f42674839d74921970979abbdd8f"
5150+
integrity sha512-eb9rRvhDltXVNL6Fxd2zM9D4vKBxjVVQNLNijlj7uoXUy19zNDsIif5zR+pWmPCWNKwAtqyo4JveQm4nfD5+eA==
51585151

5159-
mquery@3.2.2:
5160-
version "3.2.2"
5161-
resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.2.2.tgz#e1383a3951852ce23e37f619a9b350f1fb3664e7"
5162-
integrity sha512-XB52992COp0KP230I3qloVUbkLUxJIu328HBP2t2EsxSFtf4W1HPSOBWOXf1bqxK4Xbb66lfMJ+Bpfd9/yZE1Q==
5152+
mquery@3.2.3:
5153+
version "3.2.3"
5154+
resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.2.3.tgz#bcf54fdfe3baf57b6a22f9b62b1ad5fa18ffe96a"
5155+
integrity sha512-cIfbP4TyMYX+SkaQ2MntD+F2XbqaBHUYWk3j+kqdDztPWok3tgyssOZxMHMtzbV1w9DaSlvEea0Iocuro41A4g==
51635156
dependencies:
51645157
bluebird "3.5.1"
51655158
debug "3.1.0"

0 commit comments

Comments
 (0)