chore: update

meabed · meabed · commit d391104ee5db · 2025-12-10T01:56:02.000-05:00
diff --git a/src/__mocks__/userModel.ts b/src/__mocks__/userModel.ts
@@ -147,6 +147,7 @@ UserSchema.virtual('nameVirtual').get(function (this: any) {
 });
 
 export interface IUser extends Document {
+  id: any;
   _id: any;
   name?: string;
   age?: number;
diff --git a/src/__tests__/fieldConverter-test.ts b/src/__tests__/fieldConverter-test.ts
@@ -38,12 +38,12 @@ describe('fieldConverter', () => {
         const wrongArgs: any = [{ a: 1 }];
         // @ts-expect-error
         getFieldsFromModel(...wrongArgs);
-      }).toThrowError(/incorrect mongoose model/);
+      }).toThrow(/incorrect mongoose model/);
       expect(() => {
         const wrongArgs: any = [{ schema: {} }];
         // @ts-expect-error
         getFieldsFromModel(...wrongArgs);
-      }).toThrowError(/incorrect mongoose model/);
+      }).toThrow(/incorrect mongoose model/);
     });
   });
 
@@ -54,25 +54,25 @@ describe('fieldConverter', () => {
         const wrongArgs: any = [];
         // @ts-expect-error
         deriveComplexType(...wrongArgs);
-      }).toThrowError(err);
+      }).toThrow(err);
       expect(() => {
         const wrongArgs = [123];
         // @ts-expect-error
         deriveComplexType(...wrongArgs);
-      }).toThrowError(err);
+      }).toThrow(err);
       expect(() => {
         const wrongArgs = [{ a: 1 }];
         // @ts-expect-error
         deriveComplexType(...wrongArgs);
-      }).toThrowError(err);
+      }).toThrow(err);
       expect(() => {
         const wrongArgs = [{ path: 'name' }];
         // @ts-expect-error
         deriveComplexType(...wrongArgs);
-      }).toThrowError(err);
+      }).toThrow(err);
       expect(() => {
         deriveComplexType({ path: 'name', instance: 'Abc' });
-      }).not.toThrowError(err);
+      }).not.toThrow(err);
     });
 
     it('should derive DOCUMENT_ARRAY', () => {
diff --git a/src/__tests__/github_issues/141-test.ts b/src/__tests__/github_issues/141-test.ts
@@ -10,7 +10,7 @@ const UserSchema = new mongoose.Schema({
   _id: { type: Number },
   name: { type: String, required: true },
 });
-interface IUser extends Document {
+interface IUser extends Document<number> {
   _id: number;
   name: string;
 }
diff --git a/src/__tests__/github_issues/261-test.ts b/src/__tests__/github_issues/261-test.ts
@@ -20,7 +20,7 @@ const UserSchema = new mongoose.Schema({
   },
   periods: [{ from: Number, to: Number, _id: false }],
 });
-interface IUser extends Document {
+interface IUser extends Document<number> {
   _id: number;
   name: string;
   age?: number;
@@ -71,11 +71,11 @@ describe('issue #261 - Non-nullability for mongoose fields that have a default v
         analytics: UserAnalytics!
         periods: [UserPeriods]!
       }
-      
+
       type UserAnalytics {
         isEnabled: Boolean!
       }
-      
+
       type UserPeriods {
         from: Float
         to: Float
@@ -97,11 +97,11 @@ describe('issue #261 - Non-nullability for mongoose fields that have a default v
         analytics: UserWithoutDefaultsAnalytics
         periods: [UserWithoutDefaultsPeriods]
       }
-      
+
       type UserWithoutDefaultsAnalytics {
         isEnabled: Boolean
       }
-      
+
       type UserWithoutDefaultsPeriods {
         from: Float
         to: Float
@@ -122,9 +122,9 @@ describe('issue #261 - Non-nullability for mongoose fields that have a default v
           analytics {
             isEnabled
           }
-          periods { 
-            from 
-            to 
+          periods {
+            from
+            to
           }
         }`,
       })
diff --git a/src/composeMongoose.ts b/src/composeMongoose.ts
@@ -105,7 +105,7 @@ export type ObjectTypeComposerWithMongooseResolvers<
   mongooseResolvers: GenerateResolverType<TDoc, TContext>;
 };
 
-export function composeMongoose<TDoc extends Document, TContext = any>(
+export function composeMongoose<TDoc extends Document<any>, TContext = any>(
   model: Model<TDoc>,
   opts: ComposeMongooseOpts<TContext> = {}
 ): ObjectTypeComposerWithMongooseResolvers<TDoc, TContext> {
diff --git a/src/resolvers/__tests__/createMany-test.ts b/src/resolvers/__tests__/createMany-test.ts
@@ -133,7 +133,7 @@ describe('createMany() ->', () => {
       });
 
       // should throw error if error not requested in graphql query
-      await expect(resolver.resolve({})).rejects.toThrowError(
+      await expect(resolver.resolve({})).rejects.toThrow(
         'requires args.records to be an Array'
       );
     });
@@ -214,10 +214,9 @@ describe('createMany() ->', () => {
       schemaComposer.clear();
       const ClonedUserSchema = UserModel.schema.clone();
 
-      ClonedUserSchema.pre<IUser>('save', function (next) {
+      ClonedUserSchema.pre<IUser>('save', function () {
         this.name = 'ChangedAgain';
         this.age = 18;
-        return next();
       });
 
       const ClonedUserModel = mongoose.model('UserClone', ClonedUserSchema);
diff --git a/src/resolvers/__tests__/createOne-test.ts b/src/resolvers/__tests__/createOne-test.ts
@@ -115,7 +115,7 @@ describe('createOne() ->', () => {
       });
 
       // should throw error if error not requested in graphql query
-      await expect(resolver.resolve({})).rejects.toThrowError(
+      await expect(resolver.resolve({})).rejects.toThrow(
         'requires at least one value in args'
       );
     });
@@ -153,7 +153,7 @@ describe('createOne() ->', () => {
             record: { valid: 'AlwaysFails', contacts: { email: 'mail' } },
           },
         })
-      ).rejects.toThrowError(
+      ).rejects.toThrow(
         'User validation failed: n: Path `n` is required., valid: this is a validate message'
       );
     });
diff --git a/src/resolvers/__tests__/removeById-test.ts b/src/resolvers/__tests__/removeById-test.ts
@@ -90,7 +90,7 @@ describe('removeById() ->', () => {
       });
 
       // should throw error if error not requested in graphql query
-      await expect(resolver.resolve({})).rejects.toThrowError('resolver requires args._id');
+      await expect(resolver.resolve({})).rejects.toThrow('resolver requires args._id');
     });
 
     it('should remove document in database', async () => {
diff --git a/src/resolvers/__tests__/removeMany-test.ts b/src/resolvers/__tests__/removeMany-test.ts
@@ -124,7 +124,7 @@ describe('removeMany() ->', () => {
       });
 
       // should throw error if error not requested in graphql query
-      await expect(resolver.resolve({})).rejects.toThrowError(
+      await expect(resolver.resolve({})).rejects.toThrow(
         'requires at least one value in args.filter'
       );
     });
diff --git a/src/resolvers/__tests__/removeOne-test.ts b/src/resolvers/__tests__/removeOne-test.ts
@@ -113,7 +113,7 @@ describe('removeOne() ->', () => {
       });
 
       // should throw error if error not requested in graphql query
-      await expect(resolver.resolve({})).rejects.toThrowError(
+      await expect(resolver.resolve({})).rejects.toThrow(
         'requires at least one value in args.filter'
       );
     });
diff --git a/src/resolvers/__tests__/updateById-test.ts b/src/resolvers/__tests__/updateById-test.ts
@@ -104,7 +104,7 @@ describe('updateById() ->', () => {
       });
 
       // should throw error if error not requested in graphql query
-      await expect(resolver.resolve({})).rejects.toThrowError('requires args.record');
+      await expect(resolver.resolve({})).rejects.toThrow('requires args.record');
     });
 
     it('should return empty payload.error', async () => {
@@ -148,7 +148,7 @@ describe('updateById() ->', () => {
             record: { name: 'some name', valid: 'AlwaysFails' },
           },
         })
-      ).rejects.toThrowError('User validation failed: valid: this is a validate message');
+      ).rejects.toThrow('User validation failed: valid: this is a validate message');
     });
 
     it('should change data via args.record in model', async () => {
diff --git a/src/resolvers/__tests__/updateMany-test.ts b/src/resolvers/__tests__/updateMany-test.ts
@@ -133,7 +133,7 @@ describe('updateMany() ->', () => {
       });
 
       // should throw error if error not requested in graphql query
-      await expect(resolver.resolve({})).rejects.toThrowError('at least one value in args.record');
+      await expect(resolver.resolve({})).rejects.toThrow('at least one value in args.record');
     });
 
     it('should call `beforeQuery` method with non-executed `query` as arg', async () => {
diff --git a/src/resolvers/__tests__/updateOne-test.ts b/src/resolvers/__tests__/updateOne-test.ts
@@ -152,7 +152,7 @@ describe('updateOne() ->', () => {
       });
 
       // should throw error if error not requested in graphql query
-      await expect(resolver.resolve({})).rejects.toThrowError(
+      await expect(resolver.resolve({})).rejects.toThrow(
         'requires at least one value in args.filter'
       );
     });
@@ -196,7 +196,7 @@ describe('updateOne() ->', () => {
             record: { valid: 'AlwaysFails' },
           },
         })
-      ).rejects.toThrowError('User validation failed: valid: this is a validate message');
+      ).rejects.toThrow('User validation failed: valid: this is a validate message');
     });
 
     it('should skip records', async () => {
diff --git a/src/resolvers/helpers/__tests__/filter-test.ts b/src/resolvers/helpers/__tests__/filter-test.ts
@@ -25,19 +25,19 @@ describe('Resolver helper `filter` ->', () => {
         const wrongArgs: any = [{}];
         // @ts-expect-error
         filterHelperArgs(...wrongArgs);
-      }).toThrowError('should be instance of ObjectTypeComposer');
+      }).toThrow('should be instance of ObjectTypeComposer');
     });
 
     it('should throw error if second arg is not MongooseModel', () => {
       expect(() => {
         const wrongArgs: any = [UserTC, {}];
         // @ts-expect-error
         filterHelperArgs(...wrongArgs);
-      }).toThrowError('should be instance of MongooseModel');
+      }).toThrow('should be instance of MongooseModel');
     });
 
     it('should throw error if `opts` is not provided', () => {
-      expect(() => filterHelperArgs(UserTC, UserModel)).toThrowError('provide non-empty options');
+      expect(() => filterHelperArgs(UserTC, UserModel)).toThrow('provide non-empty options');
     });
 
     it('should return filter field', () => {
diff --git a/src/resolvers/helpers/__tests__/record-test.ts b/src/resolvers/helpers/__tests__/record-test.ts
@@ -18,7 +18,7 @@ describe('Resolver helper `record` ->', () => {
 
   describe('recordHelperArgs()', () => {
     it('should throw error if provided empty opts', () => {
-      expect(() => recordHelperArgs(UserTC)).toThrowError('provide non-empty options');
+      expect(() => recordHelperArgs(UserTC)).toThrow('provide non-empty options');
     });
 
     it('should return input field', () => {
diff --git a/src/resolvers/helpers/__tests__/sort-test.ts b/src/resolvers/helpers/__tests__/sort-test.ts
@@ -55,19 +55,19 @@ describe('Resolver helper `sort` ->', () => {
         const wrongArgs: any = [{}];
         // @ts-expect-error
         sortHelperArgs(...wrongArgs);
-      }).toThrowError('should be instance of ObjectTypeComposer');
+      }).toThrow('should be instance of ObjectTypeComposer');
     });
 
     it('should throw error if second arg is not Mongoose model', () => {
       expect(() => {
         const wrongArgs: any = [UserTC, {}];
         // @ts-expect-error
         sortHelperArgs(...wrongArgs);
-      }).toThrowError('should be instance of Mongoose Model');
+      }).toThrow('should be instance of Mongoose Model');
     });
 
     it('should throw error if `sortTypeName` not provided in opts', () => {
-      expect(() => sortHelperArgs(UserTC, UserModel)).toThrowError(
+      expect(() => sortHelperArgs(UserTC, UserModel)).toThrow(
         'provide non-empty `sortTypeName`'
       );
     });

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ const UserSchema = new mongoose.Schema({`
`10`	`10`	`_id: { type: Number },`
`11`	`11`	`name: { type: String, required: true },`
`12`	`12`	`});`
`13`		`-interface IUser extends Document {`
	`13`	`+interface IUser extends Document<number> {`
`14`	`14`	`_id: number;`
`15`	`15`	`name: string;`
`16`	`16`	`}`