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.

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

Update mergeSchemas and delegation API, plus Schema Transfroms #527

Merged
merged 67 commits into from
Apr 23, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
08e2058
Next api
freiksenet Feb 15, 2018
6f3728e
mre from master
freiksenet Feb 15, 2018
9b18a78
Merge remote-tracking branch 'origin/master' into next-api
freiksenet Feb 15, 2018
0c1b48a
Make all tests pass
freiksenet Feb 15, 2018
59d2779
Namespacing schema
freiksenet Feb 20, 2018
a0e8416
Backwards compatible implementation
freiksenet Feb 21, 2018
4b108cb
Alpha 6
freiksenet Feb 21, 2018
a986cc9
More helpful warnings
freiksenet Feb 21, 2018
4fcd04b
Drop old versions
freiksenet Feb 21, 2018
a21165d
Update dependencies
freiksenet Feb 21, 2018
1c0f3f8
Lock apollo-link to lower version to avoid their bug
freiksenet Feb 21, 2018
39f1d7a
Merge remote-tracking branch 'origin/master' into next-api
freiksenet Feb 21, 2018
f914bee
Richer onTypeConflict
freiksenet Feb 26, 2018
65bd750
Alpha 7
freiksenet Feb 27, 2018
033efb5
Filtering types
freiksenet Feb 28, 2018
4a04136
Separate transforms
freiksenet Mar 1, 2018
652d608
Better
freiksenet Mar 6, 2018
0988b01
Fixed fragments
freiksenet Mar 13, 2018
d0f8d3d
Alpha 10
freiksenet Mar 13, 2018
96b78bf
Merge remote-tracking branch 'origin/master' into next-api
freiksenet Mar 13, 2018
08caa78
Starting doing the docs
freiksenet Mar 15, 2018
ec96674
Updated docs
freiksenet Mar 15, 2018
59e0da5
More docs
freiksenet Mar 16, 2018
fd8b8f0
Merge branch 'master' into next-api
freiksenet Mar 16, 2018
51d2ccf
Removed re-export
freiksenet Mar 16, 2018
e380441
Add failing spec for merging schemas w/ unions that implement an inte…
mzikherman Mar 26, 2018
23edf1a
Merge remote-tracking branch 'mzikherman/unions_and_interfaces' into …
freiksenet Apr 2, 2018
6b7a1ce
Expand new interfaces to their implementations
freiksenet Apr 2, 2018
27bd1d8
Alpha 11
freiksenet Apr 2, 2018
ed681c9
Older graphql support
freiksenet Apr 2, 2018
07d2f72
Fix older graphql v2
freiksenet Apr 2, 2018
a0780f5
Merge branch 'master' into next-api
freiksenet Apr 2, 2018
a0e5e2c
Add __typename at expansion
freiksenet Apr 2, 2018
388973a
Alpha 12
freiksenet Apr 2, 2018
04b659e
Fix more issues with abstract types
freiksenet Apr 3, 2018
4bffa18
Alpha 13
freiksenet Apr 3, 2018
a19d94a
Rollback to old API
freiksenet Apr 3, 2018
0db0123
Alpha 14
freiksenet Apr 3, 2018
54d140a
Merge branch 'master' into next-api
freiksenet Apr 5, 2018
3b71ebc
graphql -> execute (#710)
Apr 5, 2018
c3aaf92
Rename makeTransformSchema to transformSchema.
benjamn Apr 4, 2018
cf2c921
Add back Travis CI testing in Node 4.
benjamn Apr 4, 2018
b740ede
Limit transforms/index.ts re-exports as much as possible.
benjamn Apr 4, 2018
55eb147
First pass at editing schema-delegation.md.
benjamn Apr 4, 2018
8fb3b45
Make delegateToSchema take named rather than positional parameters.
benjamn Apr 5, 2018
dbee260
Make additional args optional when calling delegateToSchema.
benjamn Apr 5, 2018
8970eaa
Merge remote-tracking branch 'origin/master' into next-api
freiksenet Apr 17, 2018
cabbd94
Remove transform warnings
freiksenet Apr 17, 2018
2e14209
Alpha 15
freiksenet Apr 17, 2018
663c9af
Don't overuse fragments that won't be valid
freiksenet Apr 17, 2018
fa1228c
Alpha 16
freiksenet Apr 17, 2018
101fd40
Fix examples of delegateToSchema (#742)
kuzmiigo Apr 18, 2018
370e701
Added Changelog
freiksenet Apr 19, 2018
62972c3
Update schema-transforms.md
freiksenet Apr 20, 2018
341a4ba
Move everything to be a class
freiksenet Apr 20, 2018
f0219e0
Make delegate to schema backwards compatible
freiksenet Apr 20, 2018
0e92f24
Merge branch 'master' into next-api
freiksenet Apr 20, 2018
1116562
Minor tweaks to schema-delegation.md.
benjamn Apr 20, 2018
e3634d6
Editing pass over schema-stitching.md.
benjamn Apr 20, 2018
193aaa6
Define reusable IResolversParameterType.
benjamn Apr 20, 2018
dc5187f
Reimplement RenameTypes#transformResult without using visitObject.
benjamn Apr 20, 2018
452586a
Rearrange and simplify v3.0.0 CHANGELOG.md section.
benjamn Apr 20, 2018
e5eb694
Editing pass over schema-transforms.md.
benjamn Apr 20, 2018
169e698
Rename Boolean (object) type annotations to boolean (primitive).
benjamn Apr 20, 2018
9b834b4
Remove qualified export, add wrapquery and extractfield
freiksenet Apr 23, 2018
fa9af99
Merge branch 'master' into next-api
freiksenet Apr 23, 2018
adb1a7f
Code coverage fixes.
benjamn Apr 23, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions src/transforms/RenameTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import isSpecifiedScalarType from '../isSpecifiedScalarType';
import { Request, Result } from '../Interfaces';
import { Transform } from '../transforms/transforms';
import { visitSchema, VisitSchemaKind } from '../transforms/visitSchema';
import visitObject from '../transforms/visitObject';

export type RenameOptions = {
renameBuiltins: boolean;
Expand Down Expand Up @@ -81,17 +80,38 @@ export default class RenameTypes implements Transform {

public transformResult(result: Result): Result {
if (result.data) {
const newData = visitObject(result.data, (key, value) => {
if (key === '__typename') {
return this.renamer(value);
const data = this.renameTypes(result.data, 'data');
if (data !== result.data) {
return { ...result, data };
}
}

return result;
}

private renameTypes(value: any, name: string) {
if (name === '__typename') {
return this.renamer(value);
}

if (value && typeof value === 'object') {
const newObject = Object.create(Object.getPrototypeOf(value));
Copy link
Contributor

@benjamn benjamn Apr 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I changed this code so that it now handles arrays as well as any other kind of object, preserving the original prototype. I think it's important to transform arrays as well as objects here, since you could have objects nested inside array results that need their __typenames to be updated.

let returnNewObject = false;

Object.keys(value).forEach(key => {
const oldChild = value[key];
const newChild = this.renameTypes(oldChild, key);
newObject[key] = newChild;
if (newChild !== oldChild) {
returnNewObject = true;
}
});
const newResult = {
...result,
data: newData,
};
return newResult;

if (returnNewObject) {
return newObject;
}
}
return result;

return value;
}
}
40 changes: 0 additions & 40 deletions src/transforms/visitObject.ts

This file was deleted.