@graphcommerce/graphql-mesh 7.1.0-canary.8 → 8.0.0-canary.40

package/CHANGELOG.md

@@ -1,5 +1,73 @@
 # Change Log
 
+## 8.0.0-canary.40
+
+## 7.1.0-canary.39
+
+### Patch Changes
+
+- [#2113](https://github.com/graphcommerce-org/graphcommerce/pull/2113) [`bf5ae8979`](https://github.com/graphcommerce-org/graphcommerce/commit/bf5ae8979b145e7a96303f839ef2b1238712531a) - Remove requirement of toplevelAwait for graphqlSsrClient and solve logging issue in cli ([@paales](https://github.com/paales))
+
+## 7.1.0-canary.38
+
+## 7.1.0-canary.37
+
+## 7.1.0-canary.36
+
+## 7.1.0-canary.35
+
+## 7.1.0-canary.34
+
+## 7.1.0-canary.33
+
+## 7.1.0-canary.32
+
+## 7.1.0-canary.31
+
+## 7.1.0-canary.30
+
+## 7.1.0-canary.29
+
+## 7.1.0-canary.28
+
+## 7.1.0-canary.27
+
+## 7.1.0-canary.26
+
+## 7.1.0-canary.25
+
+## 7.1.0-canary.24
+
+## 7.1.0-canary.23
+
+## 7.1.0-canary.22
+
+## 7.1.0-canary.21
+
+## 7.1.0-canary.20
+
+## 7.1.0-canary.19
+
+## 7.1.0-canary.18
+
+## 7.1.0-canary.17
+
+## 7.1.0-canary.16
+
+## 7.1.0-canary.15
+
+## 7.1.0-canary.14
+
+## 7.1.0-canary.13
+
+## 7.1.0-canary.12
+
+## 7.1.0-canary.11
+
+## 7.1.0-canary.10
+
+## 7.1.0-canary.9
+
 ## 7.1.0-canary.8
 
 ## 7.0.2-canary.7

package/api/apolloLink.ts

@@ -1,38 +1,19 @@
-/* eslint-disable import/no-extraneous-dependencies */
-
-/**
- * This is a direct copy from
- * https://github.com/Urigo/graphql-mesh/blob/master/packages/apollo-link/src/index.ts but because
- * it throws an error we've created a local copy of it.
- *
- * https://github.com/apollographql/apollo-client/issues/9925
- * https://github.com/Urigo/graphql-mesh/issues/4196
- */
-
 import { ApolloLink, FetchResult, Observable, Operation, RequestHandler } from '@apollo/client/core'
-import { ExecuteMeshFn, SubscribeMeshFn } from '@graphql-mesh/runtime'
+import { ExecuteMeshFn, MeshInstance, SubscribeMeshFn } from '@graphql-mesh/runtime'
 import { isAsyncIterable } from '@graphql-tools/utils'
-import { getOperationAST } from 'graphql'
-
-export interface MeshApolloRequestHandlerOptions {
-  execute: ExecuteMeshFn
-  subscribe?: SubscribeMeshFn
-}
 
 const ROOT_VALUE = {}
-function createMeshApolloRequestHandler(options: MeshApolloRequestHandlerOptions): RequestHandler {
-  return function meshApolloRequestHandler(operation: Operation): Observable<FetchResult> {
-    const operationAst = getOperationAST(operation.query, operation.operationName)
-    if (!operationAst) {
-      throw new Error('GraphQL operation not found')
-    }
-    const operationFn =
-      operationAst.operation === 'subscription' && options.subscribe
-        ? options.subscribe
-        : options.execute
-    return new Observable((observer) => {
+
+function createMeshApolloRequestHandler(
+  mesh: MeshInstance | Promise<MeshInstance>,
+): RequestHandler {
+  return (operation: Operation): Observable<FetchResult> =>
+    new Observable((observer) => {
       Promise.resolve()
         .then(async () => {
+          // Create a new executor for each request
+          const operationFn: SubscribeMeshFn | ExecuteMeshFn = (await mesh).createExecutor({})
+
           const results = await operationFn(
             operation.query,
             operation.variables,
@@ -42,9 +23,7 @@ function createMeshApolloRequestHandler(options: MeshApolloRequestHandlerOptions
           )
           if (isAsyncIterable(results)) {
             for await (const result of results) {
-              if (observer.closed) {
-                return
-              }
+              if (observer.closed) return
               observer.next(result)
             }
             observer.complete()
@@ -54,16 +33,13 @@ function createMeshApolloRequestHandler(options: MeshApolloRequestHandlerOptions
           }
         })
         .catch((error) => {
-          if (!observer.closed) {
-            observer.error(error)
-          }
+          if (!observer.closed) observer.error(error)
         })
     })
-  }
 }
 
 export class MeshApolloLink extends ApolloLink {
-  constructor(options: MeshApolloRequestHandlerOptions) {
+  constructor(options: MeshInstance | Promise<MeshInstance>) {
     super(createMeshApolloRequestHandler(options))
   }
 }

package/package.json

@@ -2,12 +2,9 @@
   "name": "@graphcommerce/graphql-mesh",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "7.1.0-canary.8",
-  "author": "",
-  "license": "MIT",
+  "version": "8.0.0-canary.40",
   "main": "index.ts",
   "dependencies": {
-    "@apollo/client": "~3.8.2",
     "@graphql-mesh/apollo-link": "latest",
     "@graphql-mesh/config": "latest",
     "@graphql-mesh/cross-helpers": "latest",
@@ -19,18 +16,19 @@
     "@graphql-mesh/transform-prune": "latest",
     "@graphql-mesh/types": "latest",
     "@graphql-mesh/utils": "latest",
-    "@graphql-tools/utils": "^10.0.1",
-    "@whatwg-node/fetch": "^0.9.4",
+    "@graphql-tools/utils": "^10.0.8",
+    "@whatwg-node/fetch": "^0.9.14",
     "fetch-retry": "^5.0.6",
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
+    "@apollo/client": "^3",
+    "@graphcommerce/eslint-config-pwa": "8.0.0-canary.40",
+    "@graphcommerce/prettier-config-pwa": "8.0.0-canary.40",
+    "@graphcommerce/typescript-config-pwa": "8.0.0-canary.40",
     "graphql": "^16.7.1"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "7.1.0-canary.8",
-    "@graphcommerce/prettier-config-pwa": "7.1.0-canary.8",
-    "@graphcommerce/typescript-config-pwa": "7.1.0-canary.8",
     "typescript": "5.2.2"
   },
   "sideEffects": false,