Fix

Author: ardatan

e2e/semantic-conventions/mesh.config.conventions-disabled.ts

@@ -1,18 +1,13 @@
-import {
-  defineConfig,
-  loadGraphQLHTTPSubgraph,
-} from '@graphql-mesh/compose-cli';
+import { defineConfig, loadGraphQLHTTPSubgraph } from '@graphql-mesh/compose-cli';
 
 export const composeConfig = defineConfig({
   ignoreSemanticConventions: true,
   subgraphs: [
     {
-      sourceHandler: loadGraphQLHTTPSubgraph('books',
-        {
-          endpoint: 'http://localhost:4001/graphql',
-          source: './schema.graphql',
-        }
-      ),
+      sourceHandler: loadGraphQLHTTPSubgraph('books', {
+        endpoint: 'http://localhost:4001/graphql',
+        source: './schema.graphql',
+      }),
     },
   ],
 });

e2e/semantic-conventions/mesh.config.conventions-enabled.ts

@@ -1,17 +1,12 @@
-import {
-  defineConfig,
-  loadGraphQLHTTPSubgraph,
-} from '@graphql-mesh/compose-cli';
+import { defineConfig, loadGraphQLHTTPSubgraph } from '@graphql-mesh/compose-cli';
 
 export const composeConfig = defineConfig({
   subgraphs: [
     {
-      sourceHandler: loadGraphQLHTTPSubgraph('books',
-        {
-          endpoint: 'http://localhost:4001/graphql',
-          source: './schema.graphql',
-        }
-      ),
+      sourceHandler: loadGraphQLHTTPSubgraph('books', {
+        endpoint: 'http://localhost:4001/graphql',
+        source: './schema.graphql',
+      }),
     },
   ],
 });

e2e/semantic-conventions/schema.graphql

@@ -1,7 +1,7 @@
 type Query {
-    bookById(id: ID!): Book
+  bookById(id: ID!): Book
 }
 
 type Book {
-    id: ID!
+  id: ID!
 }

e2e/semantic-conventions/semantic-conventions.test.ts

@@ -4,11 +4,17 @@ const { compose, fs } = createTenv(__dirname);
 const regExp = /@merge\(.*\)/;
 
 it('should generate merge directives', async () => {
-  const { output } = await compose({ output: 'graphql', args: ['-c', 'mesh.config.conventions-enabled.ts'] });
+  const { output } = await compose({
+    output: 'graphql',
+    args: ['-c', 'mesh.config.conventions-enabled.ts'],
+  });
   await expect(fs.read(output)).resolves.toMatch(regExp);
 });
 
 it('should not generate merge directives', async () => {
-  const { output } = await compose({ output: 'graphql', args: ['-c', 'mesh.config.conventions-disabled.ts'] });
+  const { output } = await compose({
+    output: 'graphql',
+    args: ['-c', 'mesh.config.conventions-disabled.ts'],
+  });
   await expect(fs.read(output)).resolves.not.toMatch(regExp);
 });

packages/compose-cli/src/getComposedSchemaFromConfig.ts

@@ -116,20 +116,22 @@ export async function getComposedSchemaFromConfig(config: MeshComposeCLIConfig,
       );
     }
   }
-  const options = {
-    ignoreSemanticConventions: config.ignoreSemanticConventions,
-    alwaysAddTransportDirective: true,
-  };
   if (config.subgraph) {
-    const annotatedSubgraphs = getAnnotatedSubgraphs(subgraphConfigsForComposition, options);
+    const annotatedSubgraphs = getAnnotatedSubgraphs(subgraphConfigsForComposition, {
+      ignoreSemanticConventions: config.ignoreSemanticConventions,
+      alwaysAddTransportDirective: true,
+    });
     const subgraph = annotatedSubgraphs.find(sg => sg.name === config.subgraph);
     if (!subgraph) {
       logger.error(`Subgraph ${config.subgraph} not found`);
       process.exit(1);
     }
     return print(subgraph.typeDefs);
   }
-  const result = composeSubgraphs(subgraphConfigsForComposition, options);
+  const result = composeSubgraphs(subgraphConfigsForComposition, {
+    ignoreSemanticConventions: config.ignoreSemanticConventions,
+    alwaysAddTransportDirective: false,
+  });
   if (result.errors?.length) {
     logger.error(`Failed to compose subgraphs`);
     for (const error of result.errors) {