chore: update

Author: meabed

.github/workflows/nodejs.yml

@@ -1,10 +1,14 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# This workflow will do a clean installation of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
 name: Node.js CI
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     runs-on: ubuntu-latest
@@ -13,17 +17,13 @@ jobs:
       contents: write
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [20.x, 22.x, 24.x]
     steps:
       - run: echo "🎉 The job was triggered by a ${{ github.event_name }} event."
-      - uses: styfle/cancel-workflow-action@0.12.0
-        with:
-          workflow_id: nodejs.yml
-          access_token: ${{ secrets.GITHUB_TOKEN }}
       - uses: FranzDiebold/github-env-vars-action@v2
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install node_modules
@@ -41,7 +41,7 @@ jobs:
         env:
           CI: true
       - name: Send codecov.io stats
-        if: matrix.node-version == '18.x'
+        if: matrix.node-version == '20.x'
         run: bash <(curl -s https://codecov.io/bash) || echo ''
 
   publish:
@@ -53,11 +53,11 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 18
-        uses: actions/setup-node@v4
+      - uses: actions/checkout@v6
+      - name: Use Node.js 28.x
+        uses: actions/setup-node@v6
         with:
-          node-version: 18.x
+          node-version: 28.x
       - name: Install node_modules
         run: yarn install
       - name: Build

src/__mocks__/userModel.ts

@@ -1,8 +1,10 @@
-import { mongoose, Schema } from './mongooseCommon';
+import mongoose, { Document, Schema } from 'mongoose';
 import ContactsSchema from './contactsSchema';
 import enumEmployment from './enumEmployment';
 import LanguageSchema from './languageSchema';
-import { Document } from 'mongoose';
+// @ts-ignore
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import type { bsonType } from 'bson';
 
 const UserSchema = new Schema(
   {
@@ -36,7 +38,7 @@ const UserSchema = new Schema(
       description: 'Full years',
       required() {
         // in graphql this field should be Nullable
-        return (this as any).name === 'Something special';
+        return this.name === 'Something special';
       },
     },
 
@@ -146,8 +148,8 @@ UserSchema.virtual('nameVirtual').get(function (this: any) {
 });
 
 export interface IUser extends Document {
-  id: any;
-  _id: any;
+  id: mongoose.Types.ObjectId;
+  n?: string;
   name?: string;
   age?: number;
   gender?: string;
@@ -158,6 +160,7 @@ export interface IUser extends Document {
     email: string;
     skype?: string;
   };
+  salary?: mongoose.Types.Decimal128;
 }
 
 const UserModel = mongoose.model<IUser>('User', UserSchema);

src/__tests__/github_issues/253-test.ts

@@ -9,12 +9,14 @@ const CarSchema = new Schema(
   { s: { type: Number, required: true, alias: 'speed' }, aaa: SubCarSchema },
   { discriminatorKey: 't' }
 );
+
 const Car = mongoose.model('Car', CarSchema);
 
 const TimeMachineSchema = new Schema(
   { f: { type: Number, required: true, alias: 'fluxCompensatorVersion' } },
   { discriminatorKey: 't' }
 );
+
 const TimeMachine = Car.discriminator('TimeMachine', TimeMachineSchema);
 
 const CarDTC = composeWithMongooseDiscriminators(Car);
@@ -29,8 +31,11 @@ schemaComposer.Query.addFields({
 beforeAll(async () => {
   await mongoose.createConnection();
   // todo find away to get the alias types?
-  await TimeMachine.create({ speed: 300, fluxCompensatorVersion: 5 });
+  // await TimeMachine.create({ speed: 300, fluxCompensatorVersion: 5 });
+  const o = new TimeMachine({ speed: 300, fluxCompensatorVersion: 5 });
+  await o.save();
 });
+
 afterAll(() => mongoose.disconnect());
 
 describe('issue #253 - Consider aliases from discriminators during preparation', () => {

src/__tests__/github_issues/268-test.ts

@@ -10,8 +10,7 @@ const UserSchema = new mongoose.Schema({
   name: { type: String, required: true },
   age: { type: Number },
 });
-interface IUser extends Document {
-  _id: number;
+interface IUser extends Document<number> {
   name: string;
   age?: number;
 }

src/__tests__/github_issues/271-test.ts

@@ -29,8 +29,7 @@ interface IAuthor {
   isAlive: boolean;
 }
 
-interface IBook extends Document {
-  _id: number;
+interface IBook extends Document<number> {
   title: string;
   author: IAuthor;
   pageCount?: number;
@@ -158,7 +157,7 @@ describe('nested projections with aliases - issue #271', () => {
         query {
           booksMany {
             bookSize
-            author { 
+            author {
               isAbove100
             }
           }

src/__tests__/github_issues/286-test.ts

@@ -10,8 +10,7 @@ const UserSchema = new mongoose.Schema({
   name: { type: String, required: true },
   age: { type: Number },
 });
-interface IUser extends Document {
-  _id: number;
+interface IUser extends Document<number> {
   name: string;
   age?: number;
 }

src/resolvers/__tests__/createMany-test.ts

@@ -1,7 +1,7 @@
 import { ObjectTypeComposer, Resolver, schemaComposer } from 'graphql-compose';
 import { GraphQLList, GraphQLNonNull } from 'graphql-compose/lib/graphql';
 import { mongoose } from '../../__mocks__/mongooseCommon';
-import { IUser, UserModel } from '../../__mocks__/userModel';
+import { IUser, UserModel, UserSchema } from '../../__mocks__/userModel';
 import { convertModelToGraphQL } from '../../fieldsConverter';
 import { createMany } from '../createMany';
 import { ExtendedResolveParams } from '..';
@@ -208,9 +208,9 @@ describe('createMany() ->', () => {
 
     it('should execute hooks on save', async () => {
       schemaComposer.clear();
-      const ClonedUserSchema = UserModel.schema.clone();
+      const ClonedUserSchema: typeof UserSchema = UserModel.schema.clone();
 
-      ClonedUserSchema.pre<IUser>('save', function () {
+      ClonedUserSchema.pre<IUser>('save', function (this: IUser) {
         this.name = 'ChangedAgain';
         this.age = 18;
       });

src/resolvers/index.ts

@@ -69,7 +69,7 @@ export const resolverFactory = {
   connection,
 };
 
-export {
+export type {
   CountResolverOpts,
   FindByIdResolverOpts,
   FindByIdsResolverOpts,

tsconfig.json

@@ -18,12 +18,10 @@
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,
     "lib": ["es2017", "esnext.asynciterable"],
-    "types": ["node", "jest"],
+    "types": ["node", "jest", "bson"],
     "baseUrl": ".",
     "rootDir": "./src"
   },
   "include": ["src/**/*"],
-  "exclude": [
-    "./node_modules"
-  ]
+  "exclude": ["./node_modules"]
 }