Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

transforms should always pass along unmodified parts of originalRequest #1633

Merged
merged 1 commit into from Jun 11, 2020
Merged

transforms should always pass along unmodified parts of originalRequest #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/delegate/src/transforms/AddArgumentsAsVariables.ts
View file
Open in desktop
Expand Up @@ -30,11 +30,12 @@ export default class AddArgumentsAsVariables implements Transform {
}

public transformRequest(originalRequest: Request): Request {
const { document, newVariables } = addVariablesToRootField(this.targetSchema, originalRequest, this.args);
const { document, variables } = addVariablesToRootField(this.targetSchema, originalRequest, this.args);

return {
...originalRequest,
document,
variables: newVariables,
variables,
};
}
}
Expand All @@ -45,7 +46,7 @@ function addVariablesToRootField(
args: Record<string, any>
): {
document: DocumentNode;
newVariables: Record<string, any>;
variables: Record<string, any>;
} {
const document = originalRequest.document;
const variableValues = originalRequest.variables;
Expand Down Expand Up @@ -118,7 +119,7 @@ function addVariablesToRootField(
...document,
definitions: [...newOperations, ...fragments],
},
newVariables: variableValues,
variables: variableValues,
};
}

Expand Down
5 changes: 3 additions & 2 deletions packages/wrap/src/transforms/ExtractField.ts
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ export default class ExtractField implements Transform {
});

fieldPath = [];
const newDocument = visit(originalRequest.document, {
const document = visit(originalRequest.document, {
[Kind.FIELD]: {
enter: (node: FieldNode) => {
fieldPath.push(node.name.value);
Expand All @@ -48,9 +48,10 @@ export default class ExtractField implements Transform {
},
},
});

return {
...originalRequest,
document: newDocument,
document,
};
}
}
6 changes: 3 additions & 3 deletions packages/wrap/src/transforms/RenameRootTypes.ts
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ export default class RenameRootTypes implements Transform {
}

public transformRequest(originalRequest: Request): Request {
const newDocument = visit(originalRequest.document, {
const document = visit(originalRequest.document, {
[Kind.NAMED_TYPE]: (node: NamedTypeNode) => {
const name = node.name.value;
if (name in this.reverseMap) {
Expand All @@ -46,8 +46,8 @@ export default class RenameRootTypes implements Transform {
},
});
return {
document: newDocument,
variables: originalRequest.variables,
...originalRequest,
document,
};
}

Expand Down
7 changes: 4 additions & 3 deletions packages/wrap/src/transforms/RenameTypes.ts
View file
Open in desktop
Expand Up @@ -95,7 +95,7 @@ export default class RenameTypes implements Transform {
}

public transformRequest(originalRequest: Request): Request {
const newDocument = visit(originalRequest.document, {
const document = visit(originalRequest.document, {
[Kind.NAMED_TYPE]: (node: NamedTypeNode) => {
const name = node.name.value;
if (name in this.reverseMap) {
Expand All @@ -109,9 +109,10 @@ export default class RenameTypes implements Transform {
}
},
});

return {
document: newDocument,
variables: originalRequest.variables,
...originalRequest,
document,
};
}

Expand Down
7 changes: 3 additions & 4 deletions packages/wrap/src/transforms/TransformQuery.ts
View file
Open in desktop
Expand Up @@ -39,11 +39,9 @@ export default class TransformQuery implements Transform {
}

public transformRequest(originalRequest: Request): Request {
const document = originalRequest.document;

const pathLength = this.path.length;
let index = 0;
const newDocument = visit(document, {
const document = visit(originalRequest.document, {
[Kind.FIELD]: {
enter: node => {
if (index === pathLength || node.name.value !== this.path[index]) {
Expand All @@ -66,9 +64,10 @@ export default class TransformQuery implements Transform {
},
},
});

return {
...originalRequest,
document: newDocument,
document,
};
}

Expand Down
5 changes: 2 additions & 3 deletions packages/wrap/src/transforms/WrapQuery.ts
View file
Open in desktop
Expand Up @@ -16,10 +16,9 @@ export default class WrapQuery implements Transform {
}

public transformRequest(originalRequest: Request): Request {
const document = originalRequest.document;
const fieldPath: Array<string> = [];
const ourPath = JSON.stringify(this.path);
const newDocument = visit(document, {
const document = visit(originalRequest.document, {
[Kind.FIELD]: {
enter: (node: FieldNode) => {
fieldPath.push(node.name.value);
Expand Down Expand Up @@ -49,7 +48,7 @@ export default class WrapQuery implements Transform {
});
return {
...originalRequest,
document: newDocument,
document,
};
}

Expand Down