Merge packages of different integration

.github/actions/graphql-bench-pr/src/index.js

@@ -43,15 +43,14 @@ async function prepareRepo(repo, ref, outDir) {
 async function runManyBenches(dir, packages) {
   // Run benchmark
   let packagesArgs = packages.join(' ');
-  const benchCmd = `node ${dir}/bench/bench -c 100 -d 5 -p 10 --packages ${packagesArgs} --silent`
-  console.log(benchCmd)
+  const benchCmd = `node ${dir}/bench/bench -c 100 -d 10 -p 10 --packages ${packagesArgs} --silent`
   await exec(benchCmd);
 }
 
 async function getStats(repo, ref) {
   const dir = repo.replace('/', '-');
   await prepareRepo(repo, ref, dir);
-  await runManyBenches(dir, ['graphyne-express', 'graphyne-server']);
+  await runManyBenches(dir, ['graphyne-server']);
   // Get the result
   const resultsPath = join(cwd, dir, 'bench', 'results');
   const resultObj = {};

bench/benchmarks/graphyne-express.js → bench/benchmarks/graphyne-server-express.js

@@ -1,5 +1,5 @@
 const express = require('express');
-const { GraphyneServer } = require('graphyne-express');
+const { GraphyneServer } = require('graphyne-server');
 const { schema } = require('../buildSchema');
 
 const graphyne = new GraphyneServer({

bench/package.json

@@ -10,7 +10,6 @@
     "express": "^4.17.1",
     "express-graphql": "latest",
     "faker": "^4.1.0",
-    "graphyne-express": ">0.0.0",
     "graphyne-server": ">0.0.0",
     "markdown-table": "^2.0.0",
     "md5": "^2.2.1",

examples/with-express/index.js

@@ -1,5 +1,5 @@
 const express = require('express');
-const { GraphyneServer } = require('graphyne-express');
+const { GraphyneServer } = require('graphyne-server');
 const { makeExecutableSchema } = require('graphql-tools');
 
 const typeDefs = `
@@ -20,20 +20,21 @@ var schema = makeExecutableSchema({
 
 const graphyne = new GraphyneServer({
   schema,
-  context: () => ({ world: 'world' }),
+  context: (req, res) => ({ world: 'world' }),
 });
 
 const app = express();
-app.all('/graphql', graphyne.createHandler());
-// Use GraphiQL
-app.get(
-  '/___graphql',
+
+app.use(
   graphyne.createHandler({
-    path: '/graphql', // This must be set for graphiql to work
+    path: '/graphql',
     graphiql: {
+      path: '/___graphql',
       defaultQuery: 'query { hello }',
     },
+    onNoMatch: (req, res, next) => next(),
   })
 );
+
 app.listen(4000);
 console.log('Running a GraphQL API server at http://localhost:4000/graphql');

examples/with-express/package.json

@@ -8,7 +8,7 @@
     "express": "^4.17.1",
     "graphql": "^15.0.0",
     "graphql-tools": "^4.0.7",
-    "graphyne-express": "latest"
+    "graphyne-server": "^0.2.0"
   },
   "license": "ISC"
 }

examples/with-fastify/index.js

@@ -0,0 +1,42 @@
+const fastify = require('fastify')({
+  logger: true,
+});
+const { GraphyneServer } = require('graphyne-server');
+const { makeExecutableSchema } = require('graphql-tools');
+
+const typeDefs = `
+  type Query {
+    hello: String
+  }
+`;
+const resolvers = {
+  Query: {
+    hello: (obj, variables, context) => `Hello ${context.world}!`,
+  },
+};
+
+var schema = makeExecutableSchema({
+  typeDefs,
+  resolvers,
+});
+
+const graphyne = new GraphyneServer({
+  schema,
+  context: (req, res) => ({ world: 'world' }),
+});
+
+fastify.use(
+  graphyne.createHandler({
+    path: '/graphql',
+    graphiql: {
+      path: '/___graphql',
+      defaultQuery: 'query { hello }',
+    },
+    onNoMatch: (req, res, next) => next(),
+  })
+);
+
+fastify.listen(3000, (err, address) => {
+  if (err) throw err;
+  fastify.log.info(`server listening on ${address}`);
+});

examples/with-fastify/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "with-fastify",
+  "private": true,
+  "scripts": {
+    "start": "node index.js"
+  },
+  "dependencies": {
+    "fastify": "^2.13.1",
+    "graphql": "^15.0.0",
+    "graphql-tools": "^4.0.7",
+    "graphyne-server": "^0.2.0"
+  },
+  "license": "ISC"
+}

examples/with-graphyne/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "graphql": "^15.0.0",
     "graphql-tools": "^4.0.7",
-    "graphyne-server": "latest"
+    "graphyne-server": "^0.2.0"
   },
   "license": "ISC"
 }

examples/with-koa/index.js

@@ -0,0 +1,46 @@
+const Koa = require('koa');
+const { GraphyneServer } = require('graphyne-server');
+const { makeExecutableSchema } = require('graphql-tools');
+
+const typeDefs = `
+  type Query {
+    hello: String
+  }
+`;
+const resolvers = {
+  Query: {
+    hello: (obj, variables, context) => `Hello ${context.world}!`,
+  },
+};
+
+var schema = makeExecutableSchema({
+  typeDefs,
+  resolvers,
+});
+
+const graphyne = new GraphyneServer({
+  schema,
+  context: (req, res) => ({ world: 'world' }),
+});
+
+const app = new Koa();
+
+app.use(
+  graphyne.createHandler({
+    path: '/graphql',
+    graphiql: {
+      path: '/___graphql',
+      defaultQuery: 'query { hello }',
+    },
+    integrationFn: (ctx, next) => {
+      // https://github.com/koajs/koa/blob/master/lib/context.js#L54
+      return {
+        request: ctx.req,
+        response: ctx.res,
+      };
+    },
+  })
+);
+
+app.listen(3000);
+console.log('Running a GraphQL API server at http://localhost:3000/graphql');

examples/with-koa/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "with-koa",
+  "private": true,
+  "scripts": {
+    "start": "node index.js"
+  },
+  "dependencies": {
+    "graphql": "^15.0.0",
+    "graphql-tools": "^4.0.7",
+    "graphyne-server": "^0.2.0",
+    "koa": "^2.11.0"
+  },
+  "license": "ISC"
+}

examples/with-micro/index.js

@@ -0,0 +1,32 @@
+const { send } = require('micro');
+const { GraphyneServer } = require('graphyne-server');
+const { makeExecutableSchema } = require('graphql-tools');
+
+const typeDefs = `
+  type Query {
+    hello: String
+  }
+`;
+const resolvers = {
+  Query: {
+    hello: (obj, variables, context) => `Hello ${context.world}!`,
+  },
+};
+
+var schema = makeExecutableSchema({
+  typeDefs,
+  resolvers,
+});
+
+const graphyne = new GraphyneServer({
+  schema,
+  context: (req, res) => ({ world: 'world' }),
+});
+
+module.exports = graphyne.createHandler({
+  // other options
+  onNoMatch: async (req, res) => {
+    const statusCode = 400;
+    send(res, statusCode, 'not found');
+  },
+});

examples/with-micro/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "with-koa",
+  "private": true,
+  "main": "index.js",
+  "scripts": {
+    "start": "micro"
+  },
+  "dependencies": {
+    "graphql": "^15.0.0",
+    "graphql-tools": "^4.0.7",
+    "graphyne-server": "^0.2.0",
+    "micro": "^9.3.4"
+  },
+  "license": "ISC"
+}