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

Added experimentalFragmentVariables compatibility. #167

Merged
merged 3 commits into from
Apr 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,15 @@ function stripLoc(doc, removeLocAtThisLevel) {
return doc;
}

var experimentalFragmentVariables = false;
function parseDocument(doc) {
var cacheKey = normalize(doc);

if (docCache[cacheKey]) {
return docCache[cacheKey];
}

var parsed = parse(doc);
var parsed = parse(doc, { experimentalFragmentVariables: experimentalFragmentVariables });
if (!parsed || parsed.kind !== 'Document') {
throw new Error('Not a valid GraphQL document.');
}
Expand All @@ -139,6 +140,14 @@ function parseDocument(doc) {
return parsed;
}

function enableExperimentalFragmentVariables() {
experimentalFragmentVariables = true;
}

function disableExperimentalFragmentVariables() {
experimentalFragmentVariables = false;
}

// XXX This should eventually disallow arbitrary string interpolation, like Relay does
function gql(/* arguments */) {
var args = Array.prototype.slice.call(arguments);
Expand All @@ -165,5 +174,7 @@ function gql(/* arguments */) {
gql.default = gql;
gql.resetCaches = resetCaches;
gql.disableFragmentWarnings = disableFragmentWarnings;
gql.enableExperimentalFragmentVariables = enableExperimentalFragmentVariables;
gql.disableExperimentalFragmentVariables = disableExperimentalFragmentVariables;

module.exports = gql;
10 changes: 10 additions & 0 deletions test/graphql.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ const assert = require('chai').assert;
assert.equal(module.exports.Q2.definitions.length, 1);
});

it('parses fragments with variable definitions', () => {
gql.enableExperimentalFragmentVariables();

const parsed = gql`fragment A ($arg: String!) on Type { testQuery }`;
assert.equal(parsed.kind, 'Document');
assert.exists(parsed.definitions[0].variableDefinitions);

gql.disableExperimentalFragmentVariables()
});

// see https://github.com/apollographql/graphql-tag/issues/168
it('does not nest queries needlessly in named exports', () => {
const jsSource = loader.call({ cacheable() {} }, `
Expand Down