@graphcommerce/cli 9.0.0-canary.58 → 9.0.0-canary.59

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphcommerce/cli
 
+## 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
 
 ## 9.0.0-canary.57

package/dist/bin/mesh.js

@@ -1,5 +1,28 @@
 #!/usr/bin/env node
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,7 +38,9 @@ const utils_1 = require("@graphql-mesh/utils");
 const dotenv_1 = __importDefault(require("dotenv"));
 const yaml_1 = __importDefault(require("yaml"));
 const findConfig_1 = require("../utils/findConfig");
+// eslint-disable-next-line import/no-unresolved
 require("tsx/cjs"); // support importing typescript configs in CommonJS
+// eslint-disable-next-line import/no-unresolved
 require("tsx/esm"); // support importing typescript configs in ESM
 dotenv_1.default.config();
 function handleFatalError(e, logger = new utils_1.DefaultLogger('◈')) {
@@ -48,8 +73,12 @@ async function cleanup() {
     return undefined;
 }
 const main = async () => {
-    const conf = (await (0, findConfig_1.findConfig)({}));
+    const baseConf = (await (0, findConfig_1.findConfig)({}));
     const graphCommerce = (0, next_config_1.loadConfig)(root);
+    // eslint-disable-next-line global-require
+    // @ts-ignore Might not exist
+    const { meshConfig } = (await Promise.resolve().then(() => __importStar(require('@graphcommerce/graphql-mesh/meshConfig.interceptor'))));
+    const conf = meshConfig(baseConf, graphCommerce);
     // We're configuring a custom fetch function
     conf.customFetch = require.resolve('@graphcommerce/graphql-mesh/customFetch');
     conf.serve = { ...conf.serve, endpoint: '/api/graphql' };
@@ -62,6 +91,24 @@ const main = async () => {
             return node_path_1.default.relative(root, require.resolve(additionalResolver));
         return additionalResolver;
     });
+    conf.sources = conf.sources.map((source) => {
+        const definedHandlers = Object.entries(source.handler);
+        return {
+            ...source,
+            handler: Object.fromEntries(definedHandlers.map(([key, value]) => {
+                if (key === 'openapi' && value) {
+                    const openapi = value;
+                    if (openapi.source.startsWith('@')) {
+                        return [
+                            key,
+                            { ...openapi, source: node_path_1.default.relative(root, require.resolve(openapi.source)) },
+                        ];
+                    }
+                }
+                return [key, value];
+            })),
+        };
+    });
     // Rewrite additionalTypeDefs so we can use module resolution more easily
     if (!conf.additionalTypeDefs)
         conf.additionalTypeDefs = [];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/cli",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.58",
+  "version": "9.0.0-canary.59",
   "scripts": {
     "dev": "tsc --preserveWatchOutput --watch",
     "build": "tsc",
@@ -39,11 +39,11 @@
     "tsx": "^4.16.2"
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.58",
-    "@graphcommerce/hygraph-cli": "^9.0.0-canary.58",
-    "@graphcommerce/next-config": "^9.0.0-canary.58",
-    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.58",
-    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.58",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.59",
+    "@graphcommerce/hygraph-cli": "^9.0.0-canary.59",
+    "@graphcommerce/next-config": "^9.0.0-canary.59",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.59",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.59",
     "graphql": "^16.7.1",
     "react": "^18.2.0"
   },

package/src/bin/mesh.ts

@@ -11,12 +11,16 @@ import {
 } from '@graphcommerce/next-config'
 import { graphqlMesh, DEFAULT_CLI_PARAMS, GraphQLMeshCLIParams } from '@graphql-mesh/cli'
 import { Logger, YamlConfig } from '@graphql-mesh/types'
+import { Handler } from '@graphql-mesh/types/typings/config'
 import { DefaultLogger } from '@graphql-mesh/utils'
 import dotenv from 'dotenv'
+import type { OmitIndexSignature, Entries } from 'type-fest'
 import yaml from 'yaml'
 import { findConfig } from '../utils/findConfig'
-
+import type { meshConfig as meshConfigBase } from '@graphcommerce/graphql-mesh/meshConfig'
+// eslint-disable-next-line import/no-unresolved
 import 'tsx/cjs' // support importing typescript configs in CommonJS
+// eslint-disable-next-line import/no-unresolved
 import 'tsx/esm' // support importing typescript configs in ESM
 
 dotenv.config()
@@ -53,9 +57,16 @@ async function cleanup() {
 }
 
 const main = async () => {
-  const conf = (await findConfig({})) as YamlConfig.Config
+  const baseConf = (await findConfig({})) as YamlConfig.Config
   const graphCommerce = loadConfig(root)
 
+  // eslint-disable-next-line global-require
+  // @ts-ignore Might not exist
+  const { meshConfig } = (await import('@graphcommerce/graphql-mesh/meshConfig.interceptor')) as {
+    meshConfig: typeof meshConfigBase
+  }
+  const conf = meshConfig(baseConf, graphCommerce)
+
   // We're configuring a custom fetch function
   conf.customFetch = require.resolve('@graphcommerce/graphql-mesh/customFetch')
   conf.serve = { ...conf.serve, endpoint: '/api/graphql' }
@@ -70,6 +81,30 @@ const main = async () => {
     return additionalResolver
   })
 
+  type DefinedHandler = OmitIndexSignature<Handler>
+
+  conf.sources = conf.sources.map((source) => {
+    const definedHandlers = Object.entries(source.handler) as Entries<DefinedHandler>
+    return {
+      ...source,
+      handler: Object.fromEntries(
+        definedHandlers.map(([key, value]) => {
+          if (key === 'openapi' && value) {
+            const openapi = value as NonNullable<DefinedHandler['openapi']>
+            if (openapi.source.startsWith('@')) {
+              return [
+                key,
+                { ...openapi, source: path.relative(root, require.resolve(openapi.source)) },
+              ]
+            }
+          }
+
+          return [key, value]
+        }),
+      ),
+    }
+  })
+
   // Rewrite additionalTypeDefs so we can use module resolution more easily
   if (!conf.additionalTypeDefs) conf.additionalTypeDefs = []
   conf.additionalTypeDefs = (