wgc 0.8.2 → 0.9.0

package/dist/utils.d.ts

@@ -0,0 +1,17 @@
+import { FederationResultContainer, Subgraph } from '@wundergraph/composition';
+export interface Header {
+    key: string;
+    value: string;
+}
+export declare const introspectSubgraph: ({ subgraphURL, additionalHeaders, }: {
+    subgraphURL: string;
+    additionalHeaders: Header[];
+}) => Promise<{
+    sdl: string;
+    errorMessage?: string;
+    success: boolean;
+}>;
+/**
+ * Composes a list of subgraphs into a single schema.
+ */
+export declare function composeSubgraphs(subgraphs: Subgraph[]): FederationResultContainer;

package/dist/utils.js

@@ -0,0 +1,43 @@
+import { federateSubgraphs } from '@wundergraph/composition';
+export const introspectSubgraph = async ({ subgraphURL, additionalHeaders, }) => {
+    const headers = new Headers();
+    headers.append('Content-Type', 'application/json');
+    for (const header of additionalHeaders) {
+        headers.append(header.key, header.value);
+    }
+    const graphql = JSON.stringify({
+        query: `
+        {
+          _service{
+            sdl
+          }
+        }
+      `,
+        variables: {},
+    });
+    const response = await fetch(subgraphURL, {
+        method: 'POST',
+        headers,
+        body: graphql,
+    });
+    if (response.status !== 200) {
+        return {
+            success: false,
+            errorMessage: 'Could not introspect the subgraph.',
+            sdl: '',
+        };
+    }
+    const body = await response.json();
+    const data = body.data;
+    return {
+        success: true,
+        sdl: data._service.sdl,
+    };
+};
+/**
+ * Composes a list of subgraphs into a single schema.
+ */
+export function composeSubgraphs(subgraphs) {
+    return federateSubgraphs(subgraphs);
+}
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuC,MAAM,0BAA0B,CAAC;AAOlG,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,WAAW,EACX,iBAAiB,GAIlB,EAAqE,EAAE;IACtE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IACnD,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE;QACtC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1C;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7B,KAAK,EAAE;;;;;;OAMJ;QACH,SAAS,EAAE,EAAE;KACd,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE;QACxC,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,OAAO;KACd,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;QAC3B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,YAAY,EAAE,oCAAoC;YAClD,GAAG,EAAE,EAAE;SACR,CAAC;KACH;IACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,OAAO;QACL,OAAO,EAAE,IAAI;QACb,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG;KACvB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAqB;IACpD,OAAO,iBAAiB,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wgc",
-  "version": "0.8.2",
+  "version": "0.9.0",
   "description": "The official CLI tool to manage the GraphQL Federation Platform Cosmo",
   "type": "module",
   "main": "dist/index.js",
@@ -32,11 +32,14 @@
     "@bufbuild/buf": "^1.26.1",
     "@connectrpc/connect": "^0.13.2",
     "@connectrpc/connect-node": "^0.13.2",
-    "@wundergraph/cosmo-connect": "0.8.1",
-    "@wundergraph/cosmo-shared": "0.6.2",
+    "@wundergraph/composition": "0.6.1",
+    "@wundergraph/cosmo-connect": "0.9.0",
+    "@wundergraph/cosmo-shared": "0.6.4",
     "cli-table": "^0.3.11",
     "commander": "^11.0.0",
+    "graphql": "^16.7.1",
     "inquirer": "^9.2.7",
+    "js-yaml": "^4.1.0",
     "log-symbols": "^5.1.0",
     "pathe": "^1.1.1",
     "picocolors": "^1.0.0"
@@ -44,6 +47,7 @@
   "devDependencies": {
     "@types/cli-table": "^0.3.1",
     "@types/inquirer": "^9.0.3",
+    "@types/js-yaml": "^4.0.5",
     "@types/node": "^20.3.1",
     "del-cli": "^5.0.0",
     "eslint": "^8.44.0",
@@ -53,5 +57,5 @@
     "typescript": "^5.1.3",
     "vitest": "^0.34.1"
   },
-  "gitHead": "b45604ab335e25616af99a7e4c803a106b35a25c"
-}
+  "gitHead": "665a7bd20e06164aa2ae2dd79003547cec96f731"
+}

package/src/commands/federated-graph/index.ts

@@ -1,13 +1,12 @@
 import { Command } from 'commander';
 import { BaseCommandOptions } from '../../core/types/types.js';
-import CreateFederatedGraphCommand from './commands/create.js';
-import FetchFederatedGraphCommand from './commands/fetch.js';
-import DeleteFederatedGraphCommand from './commands/delete.js';
-import UpdateFederatedGraphCommand from './commands/update.js';
 import CheckFederatedGraphCommand from './commands/check.js';
 import CreateFederatedGraphToken from './commands/create-token.js';
-import FetchRouterConfig from './commands/fetch-config.js';
+import CreateFederatedGraphCommand from './commands/create.js';
+import DeleteFederatedGraphCommand from './commands/delete.js';
+import FetchFederatedGraphCommand from './commands/fetch.js';
 import ListFederatedGraphs from './commands/list.js';
+import UpdateFederatedGraphCommand from './commands/update.js';
 
 export default (opts: BaseCommandOptions) => {
   const schema = new Command('federated-graph');
@@ -18,7 +17,6 @@ export default (opts: BaseCommandOptions) => {
   schema.addCommand(UpdateFederatedGraphCommand(opts));
   schema.addCommand(CheckFederatedGraphCommand(opts));
   schema.addCommand(CreateFederatedGraphToken(opts));
-  schema.addCommand(FetchRouterConfig(opts));
   schema.addCommand(ListFederatedGraphs(opts));
   return schema;
 };

package/src/commands/index.ts

@@ -2,9 +2,10 @@ import { Command } from 'commander';
 import pc from 'picocolors';
 import { CreateClient } from '../core/client/client.js';
 import { config } from '../core/config.js';
-import SchemaCommands from './subgraph/index.js';
 import AuthCommands from './auth/index.js';
 import FederatedGraphCommands from './federated-graph/index.js';
+import RouterCommands from './router/index.js';
+import SchemaCommands from './subgraph/index.js';
 
 if (!config.apiKey) {
   console.log(
@@ -43,5 +44,10 @@ program.addCommand(
     client,
   }),
 );
+program.addCommand(
+  RouterCommands({
+    client,
+  }),
+);
 
 export default program;

package/src/commands/router/commands/compose.ts

@@ -0,0 +1,98 @@
+import { existsSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import { buildRouterConfig } from '@wundergraph/cosmo-shared';
+import { Command, program } from 'commander';
+import { parse, printSchema } from 'graphql';
+import * as yaml from 'js-yaml';
+import { resolve } from 'pathe';
+import pc from 'picocolors';
+import { BaseCommandOptions } from '../../../core/types/types.js';
+import { composeSubgraphs, introspectSubgraph } from '../../../utils.js';
+
+type Subgraph = {
+  name: string;
+  url: string;
+  headers?: {
+    [key: string]: string;
+  };
+};
+
+type Graph = {
+  name: string;
+  router: {
+    url: string;
+  };
+  subgraphs: Subgraph[];
+};
+
+type Config = {
+  version: number;
+  graphs: Graph[];
+};
+
+export default (opts: BaseCommandOptions) => {
+  const command = new Command('compose');
+  command.description('Generates the router config locally. The output can be piped to a file.');
+  command.requiredOption('-i, --input <path-to-input>', 'The yaml file with data about graph and subgraphs.');
+  command.action(async (options) => {
+    const inputFile = resolve(process.cwd(), options.input);
+
+    if (!existsSync(inputFile)) {
+      console.log(
+        pc.red(pc.bold(`The input file '${pc.bold(inputFile)}' does not exist. Please check the path and try again.`)),
+      );
+      process.exit(1);
+    }
+
+    const fileContent = (await readFile(inputFile)).toString();
+    const config = yaml.load(fileContent) as Config;
+
+    const promises = [];
+    for (const s of config.graphs[0].subgraphs) {
+      const promise = introspectSubgraph({
+        subgraphURL: s.url,
+        additionalHeaders: Object.entries(s.headers ?? {}).map(([key, value]) => ({
+          key,
+          value,
+        })),
+      });
+      promises.push(promise);
+    }
+
+    const introspectResults = await Promise.all(promises);
+
+    if (introspectResults.some((r) => !r.success)) {
+      program.error('Could not introspect one or more subgraphs');
+    }
+
+    const result = composeSubgraphs(
+      config.graphs[0].subgraphs.map((s, index) => ({
+        name: s.name,
+        url: s.url,
+        definitions: parse(introspectResults[index].sdl),
+      })),
+    );
+
+    if (result.errors && result.errors.length > 0) {
+      program.error(`Failed to compose: ${result.errors[0]}`);
+    }
+
+    if (!result.federationResult) {
+      program.error('Failed to compose given subgraphs');
+    }
+
+    const routerConfig = buildRouterConfig({
+      argumentConfigurations: result.federationResult.argumentConfigurations,
+      federatedSDL: printSchema(result.federationResult.federatedGraphSchema),
+      subgraphs: config.graphs[0].subgraphs.map((s, index) => ({
+        name: s.name,
+        url: s.url,
+        sdl: introspectResults[index].sdl,
+      })),
+    });
+
+    console.log(routerConfig.toJsonString());
+  });
+
+  return command;
+};

package/src/commands/{federated-graph/commands/fetch-config.ts → router/commands/fetch.ts}

@@ -5,7 +5,7 @@ import { baseHeaders } from '../../../core/config.js';
 import { BaseCommandOptions } from '../../../core/types/types.js';
 
 export default (opts: BaseCommandOptions) => {
-  const command = new Command('fetch-config');
+  const command = new Command('fetch');
   command.description(
     'Fetches the latest valid router config for a federated graph. The output can be piped to a file.',
   );

package/src/commands/router/index.ts

@@ -0,0 +1,12 @@
+import { Command } from 'commander';
+import { BaseCommandOptions } from '../../core/types/types.js';
+import ComposeRouterConfig from './commands/compose.js';
+import FetchRouterConfig from './commands/fetch.js';
+
+export default (opts: BaseCommandOptions) => {
+  const cmd = new Command('router');
+  cmd.description('Provides commands for fetching and composing router configs');
+  cmd.addCommand(FetchRouterConfig(opts));
+  cmd.addCommand(ComposeRouterConfig(opts));
+  return cmd;
+};

package/src/commands/subgraph/commands/introspect.ts

@@ -0,0 +1,40 @@
+import { splitLabel } from '@wundergraph/cosmo-shared';
+import { Command } from 'commander';
+import pc from 'picocolors';
+import { BaseCommandOptions } from '../../../core/types/types.js';
+import { introspectSubgraph } from '../../../utils.js';
+import program from '../../index.js';
+
+export default (opts: BaseCommandOptions) => {
+  const introspectSubgraphCmd = new Command('introspect');
+  introspectSubgraphCmd.description('Introspects a subgraph.');
+  introspectSubgraphCmd.requiredOption(
+    '-r, --routing-url <url>',
+    'The routing url of your subgraph. This is the url that the subgraph will be accessible at.',
+  );
+  introspectSubgraphCmd.option(
+    '--header [headers...]',
+    'The headers to apply when the subgraph is introspected. This is used for authentication and authorization.The headers are passed in the format <key>=<value> <key>=<value>.Use quotes if there exists space in the key/value.',
+  );
+  introspectSubgraphCmd.action(async (options) => {
+    const resp = await introspectSubgraph({
+      subgraphURL: options.routingUrl,
+      additionalHeaders:
+        options.header?.map((label: string) => {
+          const { key, value } = splitLabel(label);
+          return {
+            key,
+            value,
+          };
+        }) || [],
+    });
+
+    if (resp.success === true) {
+      console.log(resp.sdl);
+    } else {
+      program.error(pc.red('Could not introspect the subgraph.'));
+    }
+  });
+
+  return introspectSubgraphCmd;
+};

package/src/commands/subgraph/index.ts

@@ -7,6 +7,7 @@ import DeleteSubgraph from './commands/delete.js';
 import UpdateSubgraph from './commands/update.js';
 import FixSubGraph from './commands/fix.js';
 import ListSubgraphs from './commands/list.js';
+import IntrospectSubgraph from './commands/introspect.js';
 
 export default (opts: BaseCommandOptions) => {
   const schema = new Command('subgraph');
@@ -18,5 +19,6 @@ export default (opts: BaseCommandOptions) => {
   schema.addCommand(UpdateSubgraph(opts));
   schema.addCommand(FixSubGraph(opts));
   schema.addCommand(ListSubgraphs(opts));
+  schema.addCommand(IntrospectSubgraph(opts));
   return schema;
 };

package/src/utils.ts

@@ -0,0 +1,57 @@
+import { federateSubgraphs, FederationResultContainer, Subgraph } from '@wundergraph/composition';
+
+export interface Header {
+  key: string;
+  value: string;
+}
+
+export const introspectSubgraph = async ({
+  subgraphURL,
+  additionalHeaders,
+}: {
+  subgraphURL: string;
+  additionalHeaders: Header[];
+}): Promise<{ sdl: string; errorMessage?: string; success: boolean }> => {
+  const headers = new Headers();
+  headers.append('Content-Type', 'application/json');
+  for (const header of additionalHeaders) {
+    headers.append(header.key, header.value);
+  }
+
+  const graphql = JSON.stringify({
+    query: `
+        {
+          _service{
+            sdl
+          }
+        }
+      `,
+    variables: {},
+  });
+
+  const response = await fetch(subgraphURL, {
+    method: 'POST',
+    headers,
+    body: graphql,
+  });
+  if (response.status !== 200) {
+    return {
+      success: false,
+      errorMessage: 'Could not introspect the subgraph.',
+      sdl: '',
+    };
+  }
+  const body = await response.json();
+  const data = body.data;
+  return {
+    success: true,
+    sdl: data._service.sdl,
+  };
+};
+
+/**
+ * Composes a list of subgraphs into a single schema.
+ */
+export function composeSubgraphs(subgraphs: Subgraph[]): FederationResultContainer {
+  return federateSubgraphs(subgraphs);
+}

package/dist/commands/federated-graph/commands/fetch-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fetch-config.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/fetch-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,eAAe,CAAC,IAAwB,EAAE,EAAE;IAC1C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5C,OAAO,CAAC,WAAW,CACjB,kGAAkG,CACnG,CAAC;IACF,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,2CAA2C,CAAC,CAAC;IACxE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;;QACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAChE;YACE,SAAS,EAAE,IAAI;SAChB,EACD;YACE,OAAO,EAAE,WAAW;SACrB,CACF,CAAC;QAEF,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,MAAK,cAAc,CAAC,EAAE,EAAE;YAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,yDAAyD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACnG,IAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,EAAE;gBAC1B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC,CAAC,CAAC;aACtD;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,OAAO,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,MAAM,0CAAE,YAAY,EAAE,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}