@graphcommerce/graphql-mesh 3.0.11 → 3.1.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.1.0](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/graphql-mesh@3.0.11...@graphcommerce/graphql-mesh@3.1.0) (2021-10-20)
+
+
+### Features
+
+* **graphql-mesh:** simplified the handler to use less code in the project ([f62b752](https://github.com/ho-nl/m2-pwa/commit/f62b75249492f40c5972deede529a25a17c8a617))
+
+
+
+
+
 ## [3.0.11](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/graphql-mesh@3.0.10...@graphcommerce/graphql-mesh@3.0.11) (2021-10-20)
 
 

package/createHandler.ts

@@ -1,4 +1,6 @@
-import { MeshInstance } from '@graphql-mesh/runtime'
+import { processConfig } from '@graphql-mesh/config'
+import { getMesh as getGraphQLMesh, MeshInstance } from '@graphql-mesh/runtime'
+import { MeshStore, InMemoryStoreStorageAdapter } from '@graphql-mesh/store'
 import { YamlConfig } from '@graphql-mesh/types'
 import { ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
 import { ApolloServer } from 'apollo-server-micro'
@@ -11,35 +13,7 @@ import 'ts-tiny-invariant'
 import 'micro'
 import cors from 'micro-cors'
 
-export function injectEnv(json: YamlConfig.Config & { $schema?: string }): YamlConfig.Config {
-  delete json.$schema
-  let content = JSON.stringify(json)
-
-  if (typeof process === 'undefined' || 'env' in process === false) {
-    throw new Error('Process process.env not available')
-  }
-
-  content = content.replace(/\$\{(.*?)\}/g, (_, variable) => {
-    let varName = variable
-    let defaultValue = ''
-
-    if (variable.includes(':')) {
-      const spl = variable.split(':')
-      varName = spl.shift()
-      defaultValue = spl.join(':')
-    }
-
-    if (!process.env[varName]) {
-      throw new Error(`Env variable ${varName} not defined`)
-    }
-
-    return process.env[varName] || defaultValue
-  })
-
-  return JSON.parse(content)
-}
-
-export async function createHandler(meshInstance: MeshInstance, path: string) {
+export async function createApolloHandlerForMesh(meshInstance: MeshInstance, path: string) {
   const apolloServer = new ApolloServer({
     context: ({ req }) => req,
     introspection: true,
@@ -53,6 +27,29 @@ export async function createHandler(meshInstance: MeshInstance, path: string) {
   })
   await apolloServer.start()
 
+  const apolloHandler = apolloServer.createHandler({ path })
+
+  return apolloHandler
+}
+
+export async function getMesh(config: YamlConfig.Config): Promise<MeshInstance> {
+  const store = new MeshStore('.mesh', new InMemoryStoreStorageAdapter(), {
+    validate: true,
+    readonly: false,
+  })
+  return getGraphQLMesh(await processConfig(config, { dir: process.cwd(), store }))
+}
+
+export async function createServer(config: unknown, path: string) {
+  const meshConfig = config as YamlConfig.Config
+
+  const store = new MeshStore('.mesh', new InMemoryStoreStorageAdapter(), {
+    validate: true,
+    readonly: false,
+  })
+  const mesh = await getGraphQLMesh(await processConfig(meshConfig, { dir: process.cwd(), store }))
+  const apolloHandler = await createApolloHandlerForMesh(mesh, path)
+
   const corsHandler = cors({
     allowMethods: ['GET', 'POST', 'OPTIONS'],
     allowHeaders: [
@@ -78,7 +75,5 @@ export async function createHandler(meshInstance: MeshInstance, path: string) {
       'X-ReCaptcha',
     ],
   })
-
-  const apolloHandler = apolloServer.createHandler({ path })
   return corsHandler((req, res) => (req.method === 'OPTIONS' ? res.end() : apolloHandler(req, res)))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphcommerce/graphql-mesh",
-  "version": "3.0.11",
+  "version": "3.1.0",
   "author": "",
   "license": "MIT",
   "scripts": {
@@ -15,6 +15,7 @@
     "@graphql-mesh/graphql": "^0.18.18",
     "@graphql-mesh/merger-stitching": "^0.13.1",
     "@graphql-mesh/runtime": "^0.23.1",
+    "@graphql-mesh/store": "^0.1.18",
     "@graphql-mesh/transform-cache": "^0.9.20",
     "@graphql-mesh/transform-federation": "^0.6.10",
     "@graphql-mesh/transform-filter-schema": "^0.12.1",
@@ -50,5 +51,5 @@
       "project": "./tsconfig.json"
     }
   },
-  "gitHead": "bb97be54c344cb1630b5c6fc49d7cbc49c2df580"
+  "gitHead": "491a0fc0ea281263fe5c133aaabc23ab671a7b3d"
 }