wgc 0.9.1 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/dist/commands/federated-graph/commands/check.js +3 -1
- package/dist/commands/federated-graph/commands/check.js.map +1 -1
- package/dist/commands/federated-graph/commands/create.js +2 -1
- package/dist/commands/federated-graph/commands/create.js.map +1 -1
- package/dist/commands/federated-graph/commands/list.js +4 -3
- package/dist/commands/federated-graph/commands/list.js.map +1 -1
- package/dist/commands/federated-graph/commands/update.js +2 -1
- package/dist/commands/federated-graph/commands/update.js.map +1 -1
- package/dist/commands/router/commands/compose.js +21 -17
- package/dist/commands/router/commands/compose.js.map +1 -1
- package/dist/commands/subgraph/commands/check.js +3 -1
- package/dist/commands/subgraph/commands/check.js.map +1 -1
- package/dist/commands/subgraph/commands/list.js +3 -2
- package/dist/commands/subgraph/commands/list.js.map +1 -1
- package/dist/commands/subgraph/commands/publish.js +2 -1
- package/dist/commands/subgraph/commands/publish.js.map +1 -1
- package/dist/commands/subgraph/commands/update.js +2 -1
- package/dist/commands/subgraph/commands/update.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/commands/federated-graph/commands/check.ts +3 -1
- package/src/commands/federated-graph/commands/create.ts +3 -1
- package/src/commands/federated-graph/commands/list.ts +4 -3
- package/src/commands/federated-graph/commands/update.ts +3 -1
- package/src/commands/router/commands/compose.ts +34 -33
- package/src/commands/subgraph/commands/check.ts +3 -1
- package/src/commands/subgraph/commands/list.ts +3 -2
- package/src/commands/subgraph/commands/publish.ts +3 -1
- package/src/commands/subgraph/commands/update.ts +3 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,16 @@ Images can be found [here](https://github.com/orgs/wundergraph/packages?repo_nam
|
|
|
4
4
|
All notable changes to this project will be documented in this file.
|
|
5
5
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
6
6
|
|
|
7
|
+
# [0.10.0](https://github.com/wundergraph/cosmo/compare/wgc@0.9.1...wgc@0.10.0) (2023-09-12)
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* improve compose command input ([#58](https://github.com/wundergraph/cosmo/issues/58)) ([4430f85](https://github.com/wundergraph/cosmo/commit/4430f85615a3fb4bd0cbc41e6919981556927ab5)) (@thisisnithin)
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
* migrate from cli-table to cli-table3 ([#41](https://github.com/wundergraph/cosmo/issues/41)) ([d21bbd9](https://github.com/wundergraph/cosmo/commit/d21bbd935f17ff35d03a2a2cb43ad1fedf815906)) (@JivusAyrus)
|
|
16
|
+
|
|
7
17
|
## [0.9.1](https://github.com/wundergraph/cosmo/compare/wgc@0.9.0...wgc@0.9.1) (2023-09-11)
|
|
8
18
|
|
|
9
19
|
**Note:** Version bump only for package wgc
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Table from 'cli-
|
|
1
|
+
import Table from 'cli-table3';
|
|
2
2
|
import { Command } from 'commander';
|
|
3
3
|
import logSymbols from 'log-symbols';
|
|
4
4
|
import pc from 'picocolors';
|
|
@@ -22,10 +22,12 @@ export default (opts) => {
|
|
|
22
22
|
const compositionErrorsTable = new Table({
|
|
23
23
|
head: [pc.bold(pc.white('ERROR_MESSAGE'))],
|
|
24
24
|
colWidths: [120],
|
|
25
|
+
wordWrap: true,
|
|
25
26
|
});
|
|
26
27
|
const matchedSubgraphsTable = new Table({
|
|
27
28
|
head: [pc.bold(pc.white('NAME')), pc.bold(pc.white('URL')), pc.bold(pc.white('LABELS'))],
|
|
28
29
|
colWidths: [30, 40, 50],
|
|
30
|
+
wordWrap: true,
|
|
29
31
|
});
|
|
30
32
|
switch ((_a = resp.response) === null || _a === void 0 ? void 0 : _a.code) {
|
|
31
33
|
case EnumStatusCode.OK: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/check.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/check.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Table from 'cli-
|
|
1
|
+
import Table from 'cli-table3';
|
|
2
2
|
import { Command } from 'commander';
|
|
3
3
|
import pc from 'picocolors';
|
|
4
4
|
import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common_pb';
|
|
@@ -26,6 +26,7 @@ export default (opts) => {
|
|
|
26
26
|
const compositionErrorsTable = new Table({
|
|
27
27
|
head: [pc.bold(pc.white('FEDERATED_GRAPH_NAME')), pc.bold(pc.white('ERROR_MESSAGE'))],
|
|
28
28
|
colWidths: [30, 120],
|
|
29
|
+
wordWrap: true,
|
|
29
30
|
});
|
|
30
31
|
console.log(pc.yellow('But we found composition errors, while composing the federated graph.\nThe graph will not be updated until the errors are fixed. Please check the errors below:'));
|
|
31
32
|
for (const compositionError of resp.compositionErrors) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import pc from 'picocolors';
|
|
3
3
|
import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common_pb';
|
|
4
|
-
import Table from 'cli-
|
|
4
|
+
import Table from 'cli-table3';
|
|
5
5
|
import logSymbols from 'log-symbols';
|
|
6
6
|
import { baseHeaders } from '../../../core/config.js';
|
|
7
7
|
import program from '../../index.js';
|
|
@@ -25,8 +25,9 @@ export default (opts) => {
|
|
|
25
25
|
pc.bold(pc.white('ROUTING_URL')),
|
|
26
26
|
pc.bold(pc.white('IS_COMPOSABLE')),
|
|
27
27
|
],
|
|
28
|
-
colAligns: ['left', 'left', 'left', '
|
|
29
|
-
colWidths: [
|
|
28
|
+
colAligns: ['left', 'left', 'left', 'center'],
|
|
29
|
+
colWidths: [25, 40, 70, 15],
|
|
30
|
+
wordWrap: true,
|
|
30
31
|
});
|
|
31
32
|
if (((_a = resp.response) === null || _a === void 0 ? void 0 : _a.code) === EnumStatusCode.OK) {
|
|
32
33
|
if (resp.graphs.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/list.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,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/list.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,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,eAAe,CAAC,IAAwB,EAAE,EAAE;IAC1C,MAAM,mBAAmB,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,mBAAmB,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;IAC3D,mBAAmB,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CACxD;YACE,cAAc,EAAE,KAAK;YACrB,sBAAsB;YACtB,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;SACV,EACD;YACE,OAAO,EAAE,WAAW;SACrB,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC;YAC5B,IAAI,EAAE;gBACJ,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACzB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBACnC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBAChC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;aACnC;YACD,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;YAC7C,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;YAC3B,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,MAAK,cAAc,CAAC,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;oBAC/B,WAAW,CAAC,IAAI,CAAC;wBACf,KAAK,CAAC,IAAI;wBACV,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;wBAC7B,KAAK,CAAC,UAAU;wBAChB,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK;qBAC3D,CAAC,CAAC;iBACJ;gBACD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;aACrC;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;aAC1C;SACF;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC,CAAC;SAChE;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Table from 'cli-
|
|
1
|
+
import Table from 'cli-table3';
|
|
2
2
|
import { Command } from 'commander';
|
|
3
3
|
import pc from 'picocolors';
|
|
4
4
|
import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common_pb';
|
|
@@ -26,6 +26,7 @@ export default (opts) => {
|
|
|
26
26
|
const compositionErrorsTable = new Table({
|
|
27
27
|
head: [pc.bold(pc.white('FEDERATED_GRAPH_NAME')), pc.bold(pc.white('ERROR_MESSAGE'))],
|
|
28
28
|
colWidths: [30, 120],
|
|
29
|
+
wordWrap: true,
|
|
29
30
|
});
|
|
30
31
|
console.log(pc.yellow('But we found composition errors, while composing the federated graph.\nThe graph will not be updated until the errors are fixed. Please check the errors below:'));
|
|
31
32
|
for (const compositionError of resp.compositionErrors) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/federated-graph/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,eAAe,CAAC,IAAwB,EAAE,EAAE;IAC1C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,OAAO,CAAC,WAAW,CAAC,iDAAiD,CAAC,CAAC;IACvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,4CAA4C,CAAC,CAAC;IACzE,OAAO,CAAC,MAAM,CACZ,yBAAyB,EACzB,wFAAwF,CACzF,CAAC;IACF,OAAO,CAAC,MAAM,CACZ,6BAA6B,EAC7B,uOAAuO,CACxO,CAAC;IACF,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;;QACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAC1D;YACE,IAAI;YACJ,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,aAAa,EAAE,OAAO,CAAC,YAAY;SACpC,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,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,wBAAwB,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;SAC7E;aAAM,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,MAAK,cAAc,CAAC,+BAA+B,EAAE;YACjF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,wBAAwB,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAE5E,MAAM,sBAAsB,GAAG,IAAI,KAAK,CAAC;gBACvC,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;gBACrF,SAAS,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC;gBACpB,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CACT,EAAE,CAAC,MAAM,CACP,iKAAiK,CAClK,CACF,CAAC;YACF,KAAK,MAAM,gBAAgB,IAAI,IAAI,CAAC,iBAAiB,EAAE;gBACrD,sBAAsB,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;aAC9F;YACD,8DAA8D;YAC9D,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC,CAAC;SAChD;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClE,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;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
|
|
@@ -12,7 +12,7 @@ export default (opts) => {
|
|
|
12
12
|
command.description('Generates the router config locally. The output can be piped to a file.');
|
|
13
13
|
command.requiredOption('-i, --input <path-to-input>', 'The yaml file with data about graph and subgraphs.');
|
|
14
14
|
command.action(async (options) => {
|
|
15
|
-
var _a;
|
|
15
|
+
var _a, _b, _c, _d, _e, _f;
|
|
16
16
|
const inputFile = resolve(process.cwd(), options.input);
|
|
17
17
|
if (!existsSync(inputFile)) {
|
|
18
18
|
console.log(pc.red(pc.bold(`The input file '${pc.bold(inputFile)}' does not exist. Please check the path and try again.`)));
|
|
@@ -20,25 +20,29 @@ export default (opts) => {
|
|
|
20
20
|
}
|
|
21
21
|
const fileContent = (await readFile(inputFile)).toString();
|
|
22
22
|
const config = yaml.load(fileContent);
|
|
23
|
-
const
|
|
24
|
-
for (const s of config.
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
23
|
+
const sdls = [];
|
|
24
|
+
for (const s of config.subgraphs) {
|
|
25
|
+
if ((_a = s.schema) === null || _a === void 0 ? void 0 : _a.file) {
|
|
26
|
+
const sdl = (await readFile(s.schema.file)).toString();
|
|
27
|
+
sdls.push(sdl);
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
const result = await introspectSubgraph({
|
|
31
|
+
subgraphURL: (_c = (_b = s.introspection) === null || _b === void 0 ? void 0 : _b.url) !== null && _c !== void 0 ? _c : s.routing_url,
|
|
32
|
+
additionalHeaders: Object.entries((_e = (_d = s.introspection) === null || _d === void 0 ? void 0 : _d.headers) !== null && _e !== void 0 ? _e : {}).map(([key, value]) => ({
|
|
28
33
|
key,
|
|
29
34
|
value,
|
|
30
35
|
})),
|
|
31
36
|
});
|
|
32
|
-
|
|
37
|
+
if (!result.success) {
|
|
38
|
+
program.error(`Could not introspect subgraph ${s.name}: ${(_f = result.errorMessage) !== null && _f !== void 0 ? _f : 'failed'}`);
|
|
39
|
+
}
|
|
40
|
+
sdls.push(result.sdl);
|
|
33
41
|
}
|
|
34
|
-
const
|
|
35
|
-
if (introspectResults.some((r) => !r.success)) {
|
|
36
|
-
program.error('Could not introspect one or more subgraphs');
|
|
37
|
-
}
|
|
38
|
-
const result = composeSubgraphs(config.graphs[0].subgraphs.map((s, index) => ({
|
|
42
|
+
const result = composeSubgraphs(config.subgraphs.map((s, index) => ({
|
|
39
43
|
name: s.name,
|
|
40
|
-
url: s.
|
|
41
|
-
definitions: parse(
|
|
44
|
+
url: s.routing_url,
|
|
45
|
+
definitions: parse(sdls[index]),
|
|
42
46
|
})));
|
|
43
47
|
if (result.errors && result.errors.length > 0) {
|
|
44
48
|
program.error(`Failed to compose: ${result.errors[0]}`);
|
|
@@ -49,10 +53,10 @@ export default (opts) => {
|
|
|
49
53
|
const routerConfig = buildRouterConfig({
|
|
50
54
|
argumentConfigurations: result.federationResult.argumentConfigurations,
|
|
51
55
|
federatedSDL: printSchema(result.federationResult.federatedGraphSchema),
|
|
52
|
-
subgraphs: config.
|
|
56
|
+
subgraphs: config.subgraphs.map((s, index) => ({
|
|
53
57
|
name: s.name,
|
|
54
|
-
url: s.
|
|
55
|
-
sdl:
|
|
58
|
+
url: s.routing_url,
|
|
59
|
+
sdl: sdls[index],
|
|
56
60
|
})),
|
|
57
61
|
});
|
|
58
62
|
console.log(routerConfig.toJsonString());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../../src/commands/router/commands/compose.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../../src/commands/router/commands/compose.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import { Command } from 'commander';
|
|
|
4
4
|
import { resolve } from 'pathe';
|
|
5
5
|
import pc from 'picocolors';
|
|
6
6
|
import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common_pb';
|
|
7
|
-
import Table from 'cli-table';
|
|
8
7
|
import logSymbols from 'log-symbols';
|
|
8
|
+
import Table from 'cli-table3';
|
|
9
9
|
import { baseHeaders } from '../../../core/config.js';
|
|
10
10
|
export default (opts) => {
|
|
11
11
|
const schemaCheck = new Command('check');
|
|
@@ -29,10 +29,12 @@ export default (opts) => {
|
|
|
29
29
|
const changesTable = new Table({
|
|
30
30
|
head: [pc.bold(pc.white('CHANGE')), pc.bold(pc.white('TYPE')), pc.bold(pc.white('DESCRIPTION'))],
|
|
31
31
|
colWidths: [15, 30, 80],
|
|
32
|
+
wordWrap: true,
|
|
32
33
|
});
|
|
33
34
|
const compositionErrorsTable = new Table({
|
|
34
35
|
head: [pc.bold(pc.white('FEDERATED_GRAPH_NAME')), pc.bold(pc.white('ERROR_MESSAGE'))],
|
|
35
36
|
colWidths: [30, 120],
|
|
37
|
+
wordWrap: true,
|
|
36
38
|
});
|
|
37
39
|
switch ((_a = resp.response) === null || _a === void 0 ? void 0 : _a.code) {
|
|
38
40
|
case EnumStatusCode.OK: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../src/commands/subgraph/commands/check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../src/commands/subgraph/commands/check.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common_pb';
|
|
2
|
-
import Table from 'cli-
|
|
2
|
+
import Table from 'cli-table3';
|
|
3
3
|
import { Command } from 'commander';
|
|
4
4
|
import pc from 'picocolors';
|
|
5
5
|
import { baseHeaders } from '../../../core/config.js';
|
|
@@ -18,7 +18,8 @@ export default (opts) => {
|
|
|
18
18
|
});
|
|
19
19
|
const graphsTable = new Table({
|
|
20
20
|
head: [pc.bold(pc.white('NAME')), pc.bold(pc.white('LABELS')), pc.bold(pc.white('ROUTING_URL'))],
|
|
21
|
-
colWidths: [15,
|
|
21
|
+
colWidths: [15, 30, 60],
|
|
22
|
+
wordWrap: true,
|
|
22
23
|
});
|
|
23
24
|
if (((_a = resp.response) === null || _a === void 0 ? void 0 : _a.code) === EnumStatusCode.OK) {
|
|
24
25
|
if (resp.graphs.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/subgraph/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/subgraph/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,eAAe,CAAC,IAAwB,EAAE,EAAE;IAC1C,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,aAAa,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAC9C,aAAa,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAClD;YACE,sBAAsB;YACtB,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;SACV,EACD;YACE,OAAO,EAAE,WAAW;SACrB,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC;YAC5B,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;YAChG,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;YACvB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,MAAK,cAAc,CAAC,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;oBAC/B,WAAW,CAAC,IAAI,CAAC;wBACf,KAAK,CAAC,IAAI;wBACV,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;wBAClE,KAAK,CAAC,UAAU;qBACjB,CAAC,CAAC;iBACJ;gBACD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;aACrC;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;aACnC;SACF;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC,CAAC;SACzD;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { readFile } from 'node:fs/promises';
|
|
2
2
|
import { existsSync } from 'node:fs';
|
|
3
|
-
import Table from 'cli-
|
|
3
|
+
import Table from 'cli-table3';
|
|
4
4
|
import { Command } from 'commander';
|
|
5
5
|
import { resolve } from 'pathe';
|
|
6
6
|
import pc from 'picocolors';
|
|
@@ -32,6 +32,7 @@ export default (opts) => {
|
|
|
32
32
|
const compositionErrorsTable = new Table({
|
|
33
33
|
head: [pc.bold(pc.white('FEDERATED_GRAPH_NAME')), pc.bold(pc.white('ERROR_MESSAGE'))],
|
|
34
34
|
colWidths: [30, 120],
|
|
35
|
+
wordWrap: true,
|
|
35
36
|
});
|
|
36
37
|
console.log(pc.yellow('But we found composition errors, while composing the federated graph.\nThe graph will not be updated until the errors are fixed. Please check the errors below:'));
|
|
37
38
|
for (const compositionError of resp.compositionErrors) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/commands/subgraph/commands/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/commands/subgraph/commands/publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Table from 'cli-
|
|
1
|
+
import Table from 'cli-table3';
|
|
2
2
|
import { Command } from 'commander';
|
|
3
3
|
import pc from 'picocolors';
|
|
4
4
|
import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common_pb';
|
|
@@ -35,6 +35,7 @@ export default (opts) => {
|
|
|
35
35
|
const compositionErrorsTable = new Table({
|
|
36
36
|
head: [pc.bold(pc.white('FEDERATED_GRAPH_NAME')), pc.bold(pc.white('ERROR_MESSAGE'))],
|
|
37
37
|
colWidths: [30, 120],
|
|
38
|
+
wordWrap: true,
|
|
38
39
|
});
|
|
39
40
|
console.log(pc.yellow('But we found composition errors, while composing the federated graph.\nThe graph will not be updated until the errors are fixed. Please check the errors below:'));
|
|
40
41
|
for (const compositionError of resp.compositionErrors) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/subgraph/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/subgraph/commands/update.ts"],"names":[],"mappings":"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"}
|