@graphcommerce/graphql-mesh 8.1.0-canary.9 → 9.0.0-canary.101

package/CHANGELOG.md

@@ -1,13 +1,225 @@
 # Change Log
 
+## 9.0.0-canary.101
+
+### Minor Changes
+
+- [#2380](https://github.com/graphcommerce-org/graphcommerce/pull/2380) [`3710d8b`](https://github.com/graphcommerce-org/graphcommerce/commit/3710d8bf1cceb5a991e5cfdfc15d42e462704c6d) - Solves the issue `TypeError: url?.startsWith is not a function`. The generated `.mesh/index.ts` would be generated as a requirejs module while next.js expects an esm module. In the end we properly generated the mesh correctly and now there is an `import.meta.url` instead of using `require('node:url')`. To solve this we needed to solve a chain of issues:
+
+  1. The generation of the mesh is based on the version of the mesh that is imported (esm or commonjs). See [source](https://github.com/ardatan/graphql-mesh/blob/bf588d372c0078378aaa24beea2da794af7949e6/scripts/replace-import-meta-url-in-cjs.ts#L9-L10) for the lines that need to be different. This meant that we needed to change the @graphcommerce/cli package to be of type:module instead of a commonjs module.
+
+  2) To properly convert the module to an esm module we've migrated the build of the cli package to use 'pkgroll' instead of tsc, because tsc is limited in what it outputs and can't really convert classic imports to esm.
+  3) To load possible mesh plugins we require additional .ts files to be loaded with [tsx](https://tsx.is/). To get the tsx loader to work properly in combination with esm modules, we need at least [node 18.19.0](https://nodejs.org/en/blog/release/v18.19.0#new-nodemodule-api-register-for-module-customization-hooks-new-initialize-hook). Minimal Node version upped to 18.19.0 and add support for node 22. ([@paales](https://github.com/paales))
+
+## 9.0.0-canary.100
+
+## 9.0.0-canary.99
+
+## 9.0.0-canary.98
+
+## 9.0.0-canary.97
+
+## 9.0.0-canary.96
+
+## 9.0.0-canary.95
+
+## 9.0.0-canary.94
+
+## 9.0.0-canary.93
+
+## 9.0.0-canary.92
+
+## 9.0.0-canary.91
+
+## 9.0.0-canary.90
+
+## 9.0.0-canary.89
+
+## 9.0.0-canary.88
+
+## 9.0.0-canary.87
+
+## 9.0.0-canary.86
+
+## 9.0.0-canary.85
+
+## 9.0.0-canary.84
+
+## 9.0.0-canary.83
+
+## 9.0.0-canary.82
+
+## 9.0.0-canary.81
+
+## 9.0.0-canary.80
+
+## 9.0.0-canary.79
+
+## 9.0.0-canary.78
+
+## 9.0.0-canary.77
+
+## 9.0.0-canary.76
+
+## 9.0.0-canary.75
+
+## 9.0.0-canary.74
+
+## 9.0.0-canary.73
+
+## 9.0.0-canary.72
+
+## 9.0.0-canary.71
+
+### Patch Changes
+
+- [#2345](https://github.com/graphcommerce-org/graphcommerce/pull/2345) [`d4ae30b`](https://github.com/graphcommerce-org/graphcommerce/commit/d4ae30ba28815ccb9d3a0478da995b7c609618e5) - Solve issue where customFetch coudn’t be loaded correctly ([@paales](https://github.com/paales))
+
+## 9.0.0-canary.70
+
+## 9.0.0-canary.69
+
+## 9.0.0-canary.68
+
+## 9.0.0-canary.67
+
+### Patch Changes
+
+- [#2336](https://github.com/graphcommerce-org/graphcommerce/pull/2336) [`214bc56`](https://github.com/graphcommerce-org/graphcommerce/commit/214bc56950f397727d2c5417741dc62419080dfa) - Added traverseSelectionSet utility function to extract a child selection set from the parent. ([@Renzovh](https://github.com/Renzovh))
+
+## 9.0.0-canary.66
+
+## 9.0.0-canary.65
+
+## 9.0.0-canary.64
+
+## 9.0.0-canary.63
+
+## 9.0.0-canary.62
+
+## 9.0.0-canary.61
+
+## 9.0.0-canary.60
+
+## 9.0.0-canary.59
+
+### Minor Changes
+
+- [#2309](https://github.com/graphcommerce-org/graphcommerce/pull/2309) [`b46e17e`](https://github.com/graphcommerce-org/graphcommerce/commit/b46e17ebe390b4d0040639dfdac33c36a60576ac) - When generating the mesh the configuration is passed through `@graphcommerce/graphql-mesh/meshConfig` allowing plugins to modify the mesh configuration without having to change the `.meshrc.yaml` itself. ([@Renzovh](https://github.com/Renzovh))
+
+## 9.0.0-canary.58
+
+### Minor Changes
+
+- [#2330](https://github.com/graphcommerce-org/graphcommerce/pull/2330) [`bc3ec5e`](https://github.com/graphcommerce-org/graphcommerce/commit/bc3ec5e439b97cea4a2cef23e4008c7e0cfd6797) - Created a new @graphql-mesh plugin to forward headers from backends as forwardedHeaders in extensions ([@paales](https://github.com/paales))
+
+## 9.0.0-canary.57
+
+## 9.0.0-canary.56
+
+## 9.0.0-canary.55
+
+## 9.0.0-canary.54
+
+## 8.1.0-canary.53
+
+## 8.1.0-canary.52
+
+## 8.1.0-canary.51
+
+## 8.1.0-canary.50
+
+## 8.1.0-canary.49
+
+## 8.1.0-canary.48
+
+## 8.1.0-canary.47
+
+## 8.1.0-canary.46
+
+## 8.1.0-canary.45
+
+## 8.1.0-canary.44
+
+## 8.1.0-canary.43
+
+## 8.1.0-canary.42
+
+## 8.1.0-canary.41
+
+## 8.1.0-canary.40
+
+## 8.1.0-canary.39
+
+## 8.1.0-canary.38
+
+## 8.1.0-canary.37
+
+## 8.1.0-canary.36
+
+## 8.1.0-canary.35
+
+## 8.1.0-canary.34
+
+## 8.1.0-canary.33
+
+## 8.1.0-canary.32
+
+## 8.1.0-canary.31
+
+## 8.1.0-canary.30
+
+## 8.1.0-canary.29
+
+### Patch Changes
+
+- [#2290](https://github.com/graphcommerce-org/graphcommerce/pull/2290) [`21f2ac0`](https://github.com/graphcommerce-org/graphcommerce/commit/21f2ac06b95cfc9b51febe19e6859cbba2b578b4) - Fix cors issues with Dynamic Row Property Picker App ([@JoshuaS98](https://github.com/JoshuaS98))
+
+## 8.1.0-canary.28
+
+## 8.1.0-canary.27
+
+## 8.1.0-canary.26
+
+## 8.1.0-canary.25
+
+## 8.1.0-canary.24
+
+## 8.1.0-canary.23
+
+## 8.1.0-canary.22
+
+## 8.1.0-canary.21
+
+## 8.1.0-canary.20
+
+## 8.1.0-canary.19
+
+## 8.1.0-canary.18
+
+## 8.1.0-canary.17
+
+## 8.1.0-canary.16
+
+## 8.1.0-canary.15
+
+## 8.1.0-canary.14
+
+## 8.1.0-canary.13
+
+## 8.1.0-canary.12
+
+## 8.1.0-canary.11
+
+## 8.1.0-canary.10
+
 ## 8.1.0-canary.9
 
 ## 8.1.0-canary.8
 
 ### Patch Changes
 
-- [#2247](https://github.com/graphcommerce-org/graphcommerce/pull/2247) [`6831040`](https://github.com/graphcommerce-org/graphcommerce/commit/68310401448b7b42b53757db4a84de4a01e35aa2) - Suppress warning where a dependency is an expression, Added uglify-es and long as the dependencies couldn’t be found
-  ([@paales](https://github.com/paales))
+- [#2247](https://github.com/graphcommerce-org/graphcommerce/pull/2247) [`6831040`](https://github.com/graphcommerce-org/graphcommerce/commit/68310401448b7b42b53757db4a84de4a01e35aa2) - Suppress warning where a dependency is an expression, Added uglify-es and long as the dependencies couldn’t be found ([@paales](https://github.com/paales))
 
 ## 8.1.0-canary.7
 
@@ -97,8 +309,7 @@
 
 ### Patch Changes
 
-- [#2113](https://github.com/graphcommerce-org/graphcommerce/pull/2113) [`bf5ae89`](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))
+- [#2113](https://github.com/graphcommerce-org/graphcommerce/pull/2113) [`bf5ae89`](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))
 
 ## 8.0.0-canary.100
 

package/api/createEnvelop.ts

@@ -7,5 +7,19 @@ const handler = createBuiltMeshHTTPHandler()
 export const createServer = async (endpoint: string) => {
   if (endpoint !== '/api/graphql')
     throw Error('Moving the GraphQL Endpoint is not supported at the moment')
-  return (req: NextApiRequest, res: NextApiResponse) => handler(req, res)
+  return (req: NextApiRequest, res: NextApiResponse) => {
+    res.setHeader('Access-Control-Allow-Origin', req.headers.origin || '*')
+    const requestedHeaders = req.headers['access-control-request-headers']
+    if (requestedHeaders) {
+      res.setHeader('Access-Control-Allow-Headers', requestedHeaders)
+    }
+
+    if (req.method === 'OPTIONS') {
+      res.status(200)
+      res.end()
+      return
+    }
+
+    handler(req, res)
+  }
 }

package/{customFetch.js → customFetch.ts}

@@ -1,9 +1,7 @@
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable @typescript-eslint/no-var-requires */
-const fetchRetry = require('fetch-retry')
+import fetchRetry from 'fetch-retry'
 
-/** @type {fetchRetry.default} */
 const fetcher = fetchRetry(
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, no-underscore-dangle, @typescript-eslint/no-var-requires
   process.env.__NEXT_PROCESSED_ENV ? fetch : require('@whatwg-node/fetch').fetch,
 )
 
@@ -12,8 +10,10 @@ const fetcher = fetchRetry(
  * @param {import('fetch-retry').RequestInitWithRetry | undefined} options
  * @returns {Promise<Response>}
  */
-module.exports = (url, options) => {
-  /** @type {RequestInit['headers']} */
+export default (
+  url: RequestInfo | URL,
+  options: import('fetch-retry').RequestInitWithRetry | undefined,
+): Promise<Response> => {
   const headers = Object.fromEntries(
     Object.entries(options?.headers ?? {}).filter(([_, value]) => value !== ''),
   )

package/index.ts

@@ -1,3 +1,4 @@
 export * from './api/createEnvelop'
 export * from './api/apolloLink'
 export * from './.mesh'
+export * from './utils/traverseSelectionSet'

package/meshConfig.ts

@@ -0,0 +1,11 @@
+import type { GraphCommerceConfig } from '@graphcommerce/next-config'
+import type { YamlConfig } from '@graphql-mesh/types'
+
+export type MeshConfigFunction = typeof meshConfig
+
+export function meshConfig(
+  config: YamlConfig.Config,
+  graphCommerceConfig: GraphCommerceConfig,
+): YamlConfig.Config {
+  return config
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/graphql-mesh",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.1.0-canary.9",
+  "version": "9.0.0-canary.101",
   "main": "index.ts",
   "dependencies": {
     "@graphql-mesh/apollo-link": "latest",
@@ -10,30 +10,39 @@
     "@graphql-mesh/cross-helpers": "latest",
     "@graphql-mesh/graphql": "latest",
     "@graphql-mesh/http": "latest",
+    "@graphql-mesh/json-schema": "latest",
+    "@graphql-mesh/openapi": "latest",
     "@graphql-mesh/plugin-http-details-extensions": "latest",
     "@graphql-mesh/runtime": "latest",
     "@graphql-mesh/store": "latest",
+    "@graphql-mesh/transform-encapsulate": "latest",
     "@graphql-mesh/transform-filter-schema": "latest",
+    "@graphql-mesh/transform-hoist-field": "latest",
+    "@graphql-mesh/transform-naming-convention": "latest",
+    "@graphql-mesh/transform-prefix": "latest",
     "@graphql-mesh/transform-prune": "latest",
+    "@graphql-mesh/transform-rename": "latest",
+    "@graphql-mesh/transform-replace-field": "latest",
+    "@graphql-mesh/transform-type-merging": "latest",
     "@graphql-mesh/types": "latest",
     "@graphql-mesh/utils": "latest",
-    "@graphql-tools/utils": "^10.0.12",
-    "@whatwg-node/fetch": "^0.9.15",
+    "@graphql-tools/utils": "^10.3.2",
+    "@whatwg-node/fetch": "^0.9.21",
     "fetch-retry": "^5.0.6",
     "long": "^5.2.3",
-    "tslib": "^2.6.2",
-    "uglify-es": "3.3.9"
+    "tslib": "^2.7.0",
+    "uglify-es": "3.3.10"
   },
   "peerDependencies": {
     "@apollo/client": "^3",
-    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.9",
-    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.9",
-    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.9",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.101",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.101",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.101",
     "graphql": "^16.7.1"
   },
   "devDependencies": {
-    "@types/uglify-es": "^3",
-    "typescript": "5.3.3"
+    "@types/uglify-es": "^3.0.3",
+    "typescript": "5.6.2"
   },
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",

package/plugin/forward-headers.ts

@@ -0,0 +1,73 @@
+import { isAsyncIterable } from '@envelop/core'
+import { MeshPlugin, MeshPluginOptions } from '@graphql-mesh/types'
+import type { MeshContext } from '../.mesh'
+
+interface ForwardHeaderConfig {
+  forwardHeaders?: string[]
+}
+
+/**
+ * Configure in your meshrc.yaml:
+ *
+ * ```yaml
+ * plugins:
+ *   - '@graphcommerce/graphql-mesh/plugin/forward-headers':
+ *     forwardHeaders:
+ *       - X-Magento-Cache-Id
+ * ```
+ *
+ * On your GraphQL response, you will have a new `forwardedHeaders` field in the `extensions` object (always lower case).
+ *
+ * ```json
+ * {
+ *   "data": {},
+ *   "extensions": {
+ *     "forwardedHeaders": {
+ *       "x-magento-cache-id": "homeHash"
+ *     }
+ *   }
+ * }
+ * ```
+ */
+export default function useForwardHeadersPlugin(
+  config: MeshPluginOptions<ForwardHeaderConfig>,
+): MeshPlugin<MeshContext> {
+  const forwardHeaders = config.forwardHeaders?.map((header) => header.toLowerCase())
+
+  const store = new WeakMap<any, Map<string, string>>()
+  function getStoredForContext(context: MeshContext) {
+    let stored = store.get(context)
+    if (!stored) {
+      stored = new Map()
+      store.set(context, stored)
+    }
+    return stored
+  }
+
+  return {
+    onFetch({ context }) {
+      if (!context) return undefined
+      return ({ response }) => {
+        const stored = getStoredForContext(context)
+        response.headers.forEach((value, headerName) => {
+          if (forwardHeaders?.includes(headerName)) stored.set(headerName, value)
+        })
+      }
+    },
+
+    onExecute({ args: { contextValue } }) {
+      return {
+        onExecuteDone({ result, setResult }) {
+          if (isAsyncIterable(result)) return
+          const stored = store.get(contextValue)
+          if (stored) {
+            setResult({
+              ...result,
+              extensions: { ...result.extensions, forwardedHeaders: Object.fromEntries(stored) },
+            })
+          }
+        },
+      }
+    },
+  }
+}

package/plugins/meshConfigFake.ts

@@ -0,0 +1,12 @@
+import type { MeshConfigFunction } from '@graphcommerce/graphql-mesh/meshConfig'
+import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
+
+export const config: PluginConfig = {
+  module: '@graphcommerce/graphql-mesh/meshConfig',
+  type: 'function',
+}
+
+/**
+ * This plugin does not apply any changes to the Mesh configuration, but solely exists to generate the meshConfig.interceptor.ts file.
+ */
+export const meshConfig: FunctionPlugin<MeshConfigFunction> = (prev, ...args) => prev(...args)

package/utils/traverseSelectionSet.ts

@@ -0,0 +1,46 @@
+import { Kind, SelectionNode, SelectionSetNode } from 'graphql'
+import type { Path } from 'react-hook-form'
+
+function isNumeric(n: string) {
+  return !Number.isNaN(parseFloat(n))
+}
+
+export function traverseSelectionSet<Q>(incomingSelectionSet: SelectionSetNode, path: Path<Q>) {
+  const pathArray = path.split(/[,[\].]+?/)
+  let selectionSet = incomingSelectionSet
+  let pathIndex = 0
+
+  while (pathIndex < pathArray.length) {
+    let currentValue = pathArray[pathIndex]
+    const isNegation = currentValue.startsWith('!')
+    currentValue = isNegation ? currentValue.slice(1) : currentValue
+
+    if (!isNumeric(currentValue)) {
+      const newSelections: SelectionNode[] = []
+
+      for (const selection of selectionSet.selections) {
+        if (selection.kind === Kind.FIELD) {
+          if (!isNegation && selection.name.value === currentValue) {
+            newSelections.push(...(selection.selectionSet?.selections ?? []))
+          }
+          if (isNegation && selection.name.value !== currentValue) {
+            newSelections.push(...(selection.selectionSet?.selections ?? []))
+          }
+        }
+      }
+
+      selectionSet = {
+        kind: Kind.SELECTION_SET,
+        selections: newSelections,
+      }
+    }
+
+    pathIndex++
+  }
+
+  return selectionSet
+}
+
+export function hasSelectionSetPath<Q>(selectionSet: SelectionSetNode, path: Path<Q>): boolean {
+  return traverseSelectionSet<Q>(selectionSet, path).selections.length > 0
+}