Skip to content

Commit a54a566

Browse files
fix bug 4814, directed argument no longer necessary on operations as it's inferred by the Selection
1 parent 3435daf commit a54a566

File tree

10 files changed

+639
-25
lines changed

10 files changed

+639
-25
lines changed

packages/graphql/src/translate/queryAST/ast/operations/ConnectionReadOperation.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export class ConnectionReadOperation extends Operation {
4040
public readonly relationship: RelationshipAdapter | undefined;
4141
public readonly target: ConcreteEntityAdapter;
4242

43-
protected directed: boolean;
4443
public nodeFields: Field[] = [];
4544
public edgeFields: Field[] = []; // TODO: merge with attachedTo?
4645
protected filters: Filter[] = [];
@@ -52,18 +51,15 @@ export class ConnectionReadOperation extends Operation {
5251

5352
constructor({
5453
relationship,
55-
directed,
5654
target,
5755
selection,
5856
}: {
5957
relationship: RelationshipAdapter | undefined;
6058
target: ConcreteEntityAdapter;
61-
directed: boolean;
6259
selection: EntitySelection;
6360
}) {
6461
super();
6562
this.relationship = relationship;
66-
this.directed = directed;
6763
this.target = target;
6864
this.selection = selection;
6965
}

packages/graphql/src/translate/queryAST/ast/operations/CypherOperation.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,14 @@ export class CypherOperation extends ReadOperation {
3333
cypherAttributeField,
3434
target,
3535
relationship,
36-
directed,
3736
selection,
3837
}: {
3938
cypherAttributeField: AttributeAdapter;
4039
target: ConcreteEntityAdapter;
4140
relationship?: RelationshipAdapter;
42-
directed?: boolean;
4341
selection: EntitySelection;
4442
}) {
45-
super({ target, relationship, directed, selection });
43+
super({ target, relationship, selection });
4644
this.cypherAttributeField = cypherAttributeField;
4745
}
4846

packages/graphql/src/translate/queryAST/ast/operations/FulltextOperation.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,16 @@ export class FulltextOperation extends ReadOperation {
4040
constructor({
4141
target,
4242
relationship,
43-
directed,
4443
scoreField,
4544
selection,
4645
}: {
4746
target: ConcreteEntityAdapter;
4847
relationship?: RelationshipAdapter;
49-
directed?: boolean;
5048
scoreField: FulltextScoreField | undefined;
5149
selection: EntitySelection;
5250
}) {
5351
super({
5452
target,
55-
directed,
5653
relationship,
5754
selection,
5855
});

packages/graphql/src/translate/queryAST/ast/operations/ReadOperation.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ export class ReadOperation extends Operation {
3939
public readonly target: ConcreteEntityAdapter;
4040
public readonly relationship: RelationshipAdapter | undefined;
4141

42-
protected directed: boolean;
43-
4442
public fields: Field[] = [];
4543
protected filters: Filter[] = [];
4644
protected authFilters: AuthorizationFilters[] = [];
@@ -53,17 +51,14 @@ export class ReadOperation extends Operation {
5351
constructor({
5452
target,
5553
relationship,
56-
directed,
5754
selection,
5855
}: {
5956
target: ConcreteEntityAdapter;
6057
relationship?: RelationshipAdapter;
61-
directed?: boolean;
6258
selection: EntitySelection;
6359
}) {
6460
super();
6561
this.target = target;
66-
this.directed = directed ?? true;
6762
this.relationship = relationship;
6863

6964
this.selection = selection;

packages/graphql/src/translate/queryAST/ast/selection/RelationshipSelection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class RelationshipSelection extends EntitySelection {
3030
// Overrides relationship target for composite entities
3131
private targetOverride: ConcreteEntityAdapter | undefined;
3232
private alias: string | undefined;
33-
private directed: boolean;
33+
private directed?: boolean;
3434
private optional: boolean;
3535

3636
constructor({
@@ -49,7 +49,7 @@ export class RelationshipSelection extends EntitySelection {
4949
super();
5050
this.relationship = relationship;
5151
this.alias = alias;
52-
this.directed = directed ?? true;
52+
this.directed = directed;
5353
this.targetOverride = targetOverride;
5454
this.optional = optional ?? false;
5555
}

packages/graphql/src/translate/queryAST/factory/Operations/ConnectionFactory.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export class ConnectionFactory {
6565
resolveTree: ResolveTree;
6666
context: Neo4jGraphQLTranslationContext;
6767
}): CompositeConnectionReadOperation {
68-
const directed = Boolean(resolveTree.args.directed) ?? true;
68+
const directed = resolveTree.args.directed as boolean | undefined;
6969
const resolveTreeWhere: Record<string, any> = this.queryASTFactory.operationsFactory.getWhereArgs(resolveTree);
7070

7171
let nodeWhere: Record<string, any>;
@@ -93,7 +93,6 @@ export class ConnectionFactory {
9393

9494
const connectionPartial = new CompositeConnectionPartial({
9595
relationship,
96-
directed,
9796
target: concreteEntity,
9897
selection,
9998
});
@@ -140,7 +139,6 @@ export class ConnectionFactory {
140139
context,
141140
});
142141
}
143-
const directed = Boolean(resolveTree.args.directed) ?? true;
144142
const resolveTreeWhere: Record<string, any> = this.queryASTFactory.operationsFactory.getWhereArgs(resolveTree);
145143
checkEntityAuthentication({
146144
entity: target.entity,
@@ -152,14 +150,14 @@ export class ConnectionFactory {
152150
if (relationship) {
153151
selection = new RelationshipSelection({
154152
relationship,
155-
directed: Boolean(resolveTree.args?.directed ?? true),
153+
directed: resolveTree.args.directed as boolean | undefined,
156154
});
157155
} else {
158156
selection = new NodeSelection({
159157
target,
160158
});
161159
}
162-
const operation = new ConnectionReadOperation({ relationship, directed, target, selection });
160+
const operation = new ConnectionReadOperation({ relationship, target, selection });
163161

164162
return this.hydrateConnectionOperationAST({
165163
relationship: relationship,

packages/graphql/src/translate/queryAST/factory/Operations/FulltextFactory.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ export class FulltextFactory {
9494
});
9595
const operation = new FulltextOperation({
9696
target: entity,
97-
directed: Boolean(resolverArgs.directed ?? true),
9897
scoreField,
9998
selection,
10099
});

packages/graphql/src/translate/queryAST/factory/Operations/ReadFactory.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ export class ReadFactory {
8787
const operation = new ReadOperation({
8888
target: entity,
8989
relationship,
90-
directed: Boolean(resolveTree.args?.directed ?? true),
9190
selection,
9291
});
9392

@@ -119,7 +118,6 @@ export class ReadFactory {
119118
const readPartial = new CompositeReadPartial({
120119
target: concreteEntity,
121120
relationship,
122-
directed: Boolean(resolveTree.args?.directed ?? true),
123121
selection,
124122
});
125123

0 commit comments

Comments
 (0)