Skip to content

Commit 5c4431d

Browse files
n1ru4ln1ru4l
authored
fix esm support (#55)
1 parent 8bef644 commit 5c4431d

13 files changed

Lines changed: 69 additions & 66 deletions

File tree

‎.changeset/flat-shirts-develop.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@theguild/federation-composition': patch
3+
---
4+
5+
fix esm support

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
],
4949
"scripts": {
5050
"bench": "tsx ./benchmark.ts",
51-
"build": "rimraf dist && bob check && bob build",
51+
"build": "rimraf dist && bob build && bob check",
5252
"format": "prettier --write .",
5353
"release": "pnpm build && changeset publish",
5454
"test": "vitest --config ./vitest.config.js",

‎src/supergraph/validation/rules/satisfiablity/edge.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { SatisfiabilityError } from './errors';
2-
import { lazy } from './helpers';
3-
import { AbstractMove, EntityMove, FieldMove, Move } from './moves';
4-
import { Node } from './node';
1+
import { SatisfiabilityError } from './errors.js';
2+
import { lazy } from './helpers.js';
3+
import { AbstractMove, EntityMove, FieldMove, Move } from './moves.js';
4+
import { Node } from './node.js';
55

66
type EdgeResolvabilityResult =
77
| {

‎src/supergraph/validation/rules/satisfiablity/errors.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { Edge } from './edge';
2-
31
type SatisfiabilityErrorKind =
42
| 'KEY' // cannot move to subgraph "X" using @key(fields: "a b c") of "User", the key field(s) cannot be resolved from subgraph "Y".
53
| 'REQUIRE' // cannot satisfy @require conditions on field "User.name".

‎src/supergraph/validation/rules/satisfiablity/fields.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FieldNode, InlineFragmentNode, Kind, SelectionSetNode } from 'graphql';
2-
import { parseFields } from '../../../../subgraph/helpers';
3-
import { stripTypeModifiers } from '../../../../utils/state';
4-
import { SupergraphState } from '../../../state';
2+
import { parseFields } from '../../../../subgraph/helpers.js';
3+
import { stripTypeModifiers } from '../../../../utils/state.js';
4+
import { SupergraphState } from '../../../state.js';
55

66
export type Field =
77
| {

‎src/supergraph/validation/rules/satisfiablity/finder.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { Logger } from '../../../../utils/logger';
2-
import { Edge, isAbstractEdge, isEntityEdge, isFieldEdge } from './edge';
3-
import { SatisfiabilityError } from './errors';
4-
import { Fields } from './fields';
5-
import type { Graph } from './graph';
6-
import type { MoveValidator } from './move-validator';
7-
import type { OperationPath } from './operation-path';
1+
import type { Logger } from '../../../../utils/logger.js';
2+
import { Edge, isAbstractEdge, isEntityEdge, isFieldEdge } from './edge.js';
3+
import { SatisfiabilityError } from './errors.js';
4+
import { Fields } from './fields.js';
5+
import type { Graph } from './graph.js';
6+
import type { MoveValidator } from './move-validator.js';
7+
import type { OperationPath } from './operation-path.js';
88

99
export function concatIfNotExistsString(list: string[], item: string): string[] {
1010
if (list.includes(item)) {

‎src/supergraph/validation/rules/satisfiablity/graph.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
import { specifiedScalarTypes } from 'graphql';
2-
import type { Logger } from '../../../../utils/logger';
3-
import { stripTypeModifiers } from '../../../../utils/state';
4-
import type { EnumTypeState } from '../../../composition/enum-type';
5-
import type { InterfaceTypeState } from '../../../composition/interface-type';
6-
import type { ObjectTypeFieldState, ObjectTypeState } from '../../../composition/object-type';
7-
import type { ScalarTypeState } from '../../../composition/scalar-type';
8-
import type { UnionTypeState } from '../../../composition/union-type';
9-
import type { SupergraphState } from '../../../state';
10-
import { SUPERGRAPH_ID } from './constants';
2+
import type { Logger } from '../../../../utils/logger.js';
3+
import { stripTypeModifiers } from '../../../../utils/state.js';
4+
import type { EnumTypeState } from '../../../composition/enum-type.js';
5+
import type { InterfaceTypeState } from '../../../composition/interface-type.js';
6+
import type { ObjectTypeFieldState, ObjectTypeState } from '../../../composition/object-type.js';
7+
import type { ScalarTypeState } from '../../../composition/scalar-type.js';
8+
import type { UnionTypeState } from '../../../composition/union-type.js';
9+
import type { SupergraphState } from '../../../state.js';
10+
import { SUPERGRAPH_ID } from './constants.js';
1111
import {
1212
assertAbstractEdge,
1313
assertFieldEdge,
1414
Edge,
1515
isAbstractEdge,
1616
isEntityEdge,
1717
isFieldEdge,
18-
} from './edge';
19-
import type { Field, FieldsResolver } from './fields';
20-
import { scoreKeyFields } from './helpers';
21-
import { AbstractMove, EntityMove, FieldMove } from './moves';
22-
import { Node } from './node';
18+
} from './edge.js';
19+
import type { Field, FieldsResolver } from './fields.js';
20+
import { scoreKeyFields } from './helpers.js';
21+
import { AbstractMove, EntityMove, FieldMove } from './moves.js';
22+
import { Node } from './node.js';
2323

2424
export class Graph {
2525
private _warnedAboutIncorrectEdge = false;

‎src/supergraph/validation/rules/satisfiablity/move-validator.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { Logger } from '../../../../utils/logger';
2-
import { Edge, isEntityEdge, isFieldEdge } from './edge';
3-
import { SatisfiabilityError } from './errors';
4-
import type { Field, Fields } from './fields';
5-
import { concatIfNotExistsFields, concatIfNotExistsString, PathFinder } from './finder';
6-
import type { Graph } from './graph';
7-
import { OperationPath } from './operation-path';
1+
import type { Logger } from '../../../../utils/logger.js';
2+
import { Edge, isEntityEdge, isFieldEdge } from './edge.js';
3+
import { SatisfiabilityError } from './errors.js';
4+
import type { Field, Fields } from './fields.js';
5+
import { concatIfNotExistsFields, concatIfNotExistsString, PathFinder } from './finder.js';
6+
import type { Graph } from './graph.js';
7+
import { OperationPath } from './operation-path.js';
88

99
type MoveRequirement = {
1010
paths: OperationPath[];

‎src/supergraph/validation/rules/satisfiablity/moves.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type { Fields } from './fields';
2-
import { lazy } from './helpers';
1+
import type { Fields } from './fields.js';
2+
import { lazy } from './helpers.js';
33

44
export interface Move {
55
toString(): string;

‎src/supergraph/validation/rules/satisfiablity/node.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { EnumTypeState } from '../../../composition/enum-type';
2-
import type { InterfaceTypeState } from '../../../composition/interface-type';
3-
import type { ObjectTypeState } from '../../../composition/object-type';
4-
import type { ScalarTypeState } from '../../../composition/scalar-type';
5-
import type { UnionTypeState } from '../../../composition/union-type';
6-
import { lazy } from './helpers';
1+
import type { EnumTypeState } from '../../../composition/enum-type.js';
2+
import type { InterfaceTypeState } from '../../../composition/interface-type.js';
3+
import type { ObjectTypeState } from '../../../composition/object-type.js';
4+
import type { ScalarTypeState } from '../../../composition/scalar-type.js';
5+
import type { UnionTypeState } from '../../../composition/union-type.js';
6+
import { lazy } from './helpers.js';
77

88
export class Node {
99
private _toString = lazy(() => `${this.typeName}/${this.graphName}`);

0 commit comments

Comments
 (0)