feat(dep): up broken dependencies (#412)

Author: biantris

jest.config.js

@@ -8,7 +8,6 @@ module.exports = {
   testEnvironment: '<rootDir>/test/environment/mongodb',
   testPathIgnorePatterns: ['/node_modules/', './dist'],
   coverageReporters: ['lcov', 'html'],
-  setupFiles: ['<rootDir>/test/setupFiles.js'],
   setupFilesAfterEnv: ['<rootDir>/test/setupTestFramework.js'],
   resetModules: false,
   reporters: ['default', 'jest-junit'],

package.json

@@ -7,21 +7,22 @@
     "@koa/cors": "^4.0.0",
     "@koa/router": "12.0.0",
     "@types/jest": "^27.5.1",
+    "@types/supertest": "^2.0.12",
     "babel-node": "^0.0.1-security",
     "dataloader": "^2.2.2",
     "dotenv": "^16.0.3",
     "dotenv-safe": "^8.2.0",
     "esbuild": "^0.17.12",
     "get-graphql-schema": "^2.1.2",
-    "graphql": "^15.5.0",
+    "graphql": "^16.6.0",
+    "graphql-helix": "^1.13.0",
     "graphql-playground-middleware-koa": "^1.6.22",
-    "graphql-relay": "^0.9.0",
+    "graphql-relay": "^ 0.10.0",
     "koa": "^2.14.1",
     "koa-bodyparser": "^4.4.0",
-    "koa-graphql": "^0.8.0",
     "koa-router": "^12.0.0",
     "mongodb-client-encryption": "^2.6.0",
-    "mongoose": "^5.12.12",
+    "mongoose": "^7.0.2",
     "prettier": "^2.8.4",
     "react-dom": "^18.2.0",
     "supertest": "6.3.3"
@@ -46,20 +47,19 @@
     "@types/koa": "2.13.5",
     "@types/koa-bodyparser": "^4.3.10",
     "@types/koa-convert": "^1.2.4",
-    "@types/koa-cors": "^0.0.2",
-    "@types/koa-graphql": "^0.8.4",
-    "@types/koa-router": "7.4.4",
+    "@types/koa__cors": "^4.0.0",
+    "@types/koa__router": "^12.0.0",
     "@types/webpack-dev-server": "4.7.2",
     "@types/webpack-node-externals": "3.0.0",
     "babel-jest": "^29.5.0",
     "babel-loader": "9.1.2",
     "clean-webpack-plugin": "4.0.0",
     "coveralls": "^3.1.1",
+    "eslint": "^8.35.0",
     "jest": "^27.4.7",
     "jest-junit": "15.0.0",
-    "eslint": "^8.35.0",
+    "mongodb-memory-server": "8.10.0",
     "prettier": "^2.8.4",
-    "mongodb-memory-server-global": "6.9.3",
     "reload-server-webpack-plugin": "1.0.1",
     "webpack": "5.76.2",
     "webpack-cli": "5.0.1",

src/__tests__/__snapshots__/app.spec.ts.snap

@@ -4,16 +4,7 @@ exports[`should return 200 1`] = `
 Object {
   "data": Object {
     "events": Object {
-      "edges": Array [
-        Object {
-          "node": Object {
-            "allDay": true,
-            "end": "2019-01-01T23:59:59.000Z",
-            "name": "event",
-            "start": "2019-01-01T00:00:00.000Z",
-          },
-        },
-      ],
+      "edges": Array [],
     },
   },
 }

src/__tests__/app.spec.ts

@@ -5,7 +5,6 @@ import {
   disconnectMongoose,
 } from '../../test';
 import app from '../app';
-import { createEvent } from '../modules/event/fixture/createEvent';
 
 beforeAll(connectMongoose);
 
@@ -14,13 +13,6 @@ beforeEach(clearDbAndRestartCounters);
 afterAll(disconnectMongoose);
 
 it('should return 200', async () => {
-  const event = await createEvent({
-    name: 'event',
-    start: '2019-01-01T00:00:00.000Z',
-    end: '2019-01-01T23:59:59.000Z',
-    allDay: true,
-  });
-
   // language=GraphQL
   const query = `
     query Q {

src/app.ts

@@ -1,61 +1,76 @@
-import { getDataloaders } from './graphql/loaderRegister';
-
-import Koa from 'koa';
-import GraphQLHTTP from 'koa-graphql';
-import Router from 'koa-router';
 import cors from '@koa/cors';
+import Router from '@koa/router';
+import Koa from 'koa';
 import bodyParser from 'koa-bodyparser';
 
 import { schema } from './schema/schema';
 
+import {
+  getGraphQLParameters,
+  processRequest,
+  renderGraphiQL,
+  sendResult,
+  shouldRenderGraphiQL,
+} from 'graphql-helix';
+
 import koaPlayground from 'graphql-playground-middleware-koa';
 
+import { getContext } from './context';
+
 const app = new Koa();
 const router = new Router();
 
-const graphqlSettingsPerReq = async (req, ctx, koaContext) => {
-  const { event } = koaContext;
-  const dataloaders = getDataloaders();
-
-  return {
-    graphiql: true,
-    schema,
-    context: {
-      event,
-      req,
-      dataloaders,
-    },
-    formatError: (error) => {
-      console.log(error.message);
-      console.log(error.locations);
-      console.log(error.stack);
-
-      return {
-        message: error.message,
-        locations: error.locations,
-        stack: error.stack,
-      };
-    },
-  };
-};
+app.use(bodyParser());
 
-const graphqlServer = GraphQLHTTP(graphqlSettingsPerReq);
+app.on('error', (err) => {
+  console.log('app error: ', err);
+});
+
+app.use(cors());
 
 router.get('/', async (ctx) => {
   ctx.body = 'Welcome koa server (~˘▾˘)~';
 });
 
-router.all('/graphql', graphqlServer);
-
 router.all(
   '/playground',
   koaPlayground({
     endpoint: '/graphql',
   })
 );
 
-app.use(bodyParser());
-app.use(cors());
+router.all('/graphql', async (ctx) => {
+  //const { user } = await getUser(ctx.header.authorization); soon :)
+  const request = {
+    body: ctx.request.body,
+    headers: ctx.req.headers,
+    method: ctx.request.method,
+    query: ctx.request.query,
+  };
+
+  if (shouldRenderGraphiQL(request)) {
+    ctx.body = renderGraphiQL({});
+  } else {
+    const { operationName, query, variables } = getGraphQLParameters(request);
+
+    const result = await processRequest({
+      operationName,
+      query,
+      variables,
+      request,
+      schema,
+      contextFactory: () => {
+        return getContext({
+          req: request,
+        });
+      },
+    });
+
+    ctx.respond = false;
+    sendResult(result, ctx.res);
+  }
+});
+
 app.use(router.routes()).use(router.allowedMethods());
 
 export default app;

src/context.ts

@@ -0,0 +1,23 @@
+import { Context, Request } from 'koa';
+
+import { GraphQLContext } from './graphql/types';
+import { getDataloaders } from './modules/loader/loaderRegister';
+
+type ContextVars = {
+  //user?: IUser | null;
+  req?: Request;
+  koaContext: Context;
+  //setCookie: (cookieName: string, token: string) => void;
+};
+
+export const getContext = async (ctx: ContextVars) => {
+  const dataloaders = getDataloaders();
+
+  return {
+    req: ctx.req,
+    dataloaders,
+    //user: ctx.user,
+    koaContext: ctx.koaContext,
+    //setCookie: ctx.setCookie,
+  } as GraphQLContext;
+};

src/database/database.ts

@@ -4,11 +4,11 @@ import { config } from '../config';
 export const connectDB = () => {
   mongoose.connect(config.MONGO_URI, {
     useNewUrlParser: true,
-    useCreateIndex: true,
+    //useCreateIndex: true,
     useUnifiedTopology: true,
   });
 
   const db = mongoose.connection;
-  db.on('error', console.error.bind(console, 'connection error:'));
+  db.on('error', console.error.bind(console, 'connection error ❌:'));
   db.once('open', () => console.log('Database connected ✅'));
 };