Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: graphql/graphql-js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v15.6.0
Choose a base ref
...
head repository: graphql/graphql-js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v15.6.1
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on Sep 27, 2021

  1. Copy the full SHA
    eb0fed0 View commit details

Commits on Oct 5, 2021

  1. 15.6.1

    IvanGoncharov committed Oct 5, 2021
    Copy the full SHA
    dcf3751 View commit details
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql",
"version": "15.6.0",
"version": "15.6.1",
"description": "A Query Language and Runtime which can target any service.",
"license": "MIT",
"private": true,
12 changes: 11 additions & 1 deletion src/type/__tests__/introspection-test.js
Original file line number Diff line number Diff line change
@@ -761,7 +761,17 @@ describe('Introspection', () => {
},
{
name: 'args',
args: [],
args: [
{
name: 'includeDeprecated',
type: {
kind: 'SCALAR',
name: 'Boolean',
ofType: null,
},
defaultValue: 'false',
},
],
type: {
kind: 'NON_NULL',
name: null,
12 changes: 11 additions & 1 deletion src/type/introspection.js
Original file line number Diff line number Diff line change
@@ -106,7 +106,17 @@ export const __Directive = new GraphQLObjectType({
type: new GraphQLNonNull(
new GraphQLList(new GraphQLNonNull(__InputValue)),
),
resolve: (directive) => directive.args,
args: {
includeDeprecated: {
type: GraphQLBoolean,
defaultValue: false,
},
},
resolve(field, { includeDeprecated }) {
return includeDeprecated
? field.args
: field.args.filter((arg) => arg.deprecationReason == null);
},
},
}: GraphQLFieldConfigMap<GraphQLDirective, mixed>),
});
14 changes: 14 additions & 0 deletions src/utilities/__tests__/getIntrospectionQuery-test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
import { expect } from 'chai';
import { describe, it } from 'mocha';

import { parse } from '../../language/parser';

import { validate } from '../../validation/validate';

import type { IntrospectionOptions } from '../getIntrospectionQuery';
import { buildSchema } from '../buildASTSchema';
import { getIntrospectionQuery } from '../getIntrospectionQuery';

const dummySchema = buildSchema(`
type Query {
dummy: String
}
`);

function expectIntrospectionQuery(options?: IntrospectionOptions) {
const query = getIntrospectionQuery(options);

const validationErrors = validate(dummySchema, parse(query));
expect(validationErrors).to.deep.equal([]);

return {
toMatch(name: string, times: number = 1): void {
const pattern = toRegExp(name);
4 changes: 2 additions & 2 deletions src/utilities/__tests__/printSchema-test.js
Original file line number Diff line number Diff line change
@@ -766,7 +766,7 @@ describe('Type System Printer', () => {
description: String
isRepeatable: Boolean!
locations: [__DirectiveLocation!]!
args: [__InputValue!]!
args(includeDeprecated: Boolean = false): [__InputValue!]!
}
"""
@@ -965,7 +965,7 @@ describe('Type System Printer', () => {
description: String
isRepeatable: Boolean!
locations: [__DirectiveLocation!]!
args: [__InputValue!]!
args(includeDeprecated: Boolean = false): [__InputValue!]!
}
# A Directive can be adjacent to many parts of the GraphQL language, a __DirectiveLocation describes one such possible adjacencies.
4 changes: 2 additions & 2 deletions src/version.js
Original file line number Diff line number Diff line change
@@ -6,14 +6,14 @@
/**
* A string containing the version of the GraphQL.js library
*/
export const version = '15.6.0';
export const version = '15.6.1';

/**
* An object containing the components of the GraphQL.js version string
*/
export const versionInfo = Object.freeze({
major: 15,
minor: 6,
patch: 0,
patch: 1,
preReleaseTag: null,
});