graphql 15.10.2 → 15.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/error/GraphQLError.js +7 -6
- package/error/GraphQLError.js.flow +3 -3
- package/error/GraphQLError.mjs +8 -7
- package/execution/execute.d.ts +2 -0
- package/execution/execute.js +33 -12
- package/execution/execute.js.flow +32 -11
- package/execution/execute.mjs +33 -12
- package/execution/values.d.ts +1 -1
- package/execution/values.js +5 -5
- package/execution/values.js.flow +5 -2
- package/execution/values.mjs +4 -4
- package/graphql.d.ts +1 -0
- package/graphql.js +4 -1
- package/graphql.js.flow +5 -1
- package/graphql.mjs +4 -1
- package/jsutils/SetMap.js +56 -0
- package/jsutils/SetMap.js.flow +39 -0
- package/jsutils/SetMap.mjs +47 -0
- package/language/lexer.js +21 -2
- package/language/lexer.js.flow +24 -2
- package/language/lexer.mjs +21 -2
- package/language/location.d.ts +5 -0
- package/language/location.js +64 -0
- package/language/location.js.flow +39 -0
- package/language/location.mjs +62 -0
- package/language/parser.js +34 -19
- package/language/parser.js.flow +54 -10
- package/language/parser.mjs +34 -19
- package/language/printer.d.ts +7 -0
- package/language/printer.js +251 -118
- package/language/printer.js.flow +345 -141
- package/language/printer.mjs +246 -116
- package/language/reducer.js +99 -0
- package/language/reducer.js.flow +89 -0
- package/language/reducer.mjs +89 -0
- package/package.json +1 -4
- package/subscription/subscribe.d.ts +2 -0
- package/subscription/subscribe.js +4 -3
- package/subscription/subscribe.js.flow +6 -0
- package/subscription/subscribe.mjs +4 -3
- package/type/definition.d.ts +2 -1
- package/type/definition.js +8 -8
- package/type/definition.js.flow +13 -7
- package/type/definition.mjs +7 -7
- package/type/scalars.js +5 -5
- package/type/scalars.js.flow +1 -1
- package/type/scalars.mjs +1 -1
- package/utilities/buildASTSchema.js +3 -0
- package/utilities/buildASTSchema.js.flow +3 -0
- package/utilities/buildASTSchema.mjs +3 -0
- package/utilities/coerceInputValue.d.ts +1 -0
- package/utilities/coerceInputValue.js +9 -8
- package/utilities/coerceInputValue.js.flow +42 -9
- package/utilities/coerceInputValue.mjs +10 -9
- package/utilities/findBreakingChanges.js +3 -23
- package/utilities/findBreakingChanges.js.flow +2 -15
- package/utilities/findBreakingChanges.mjs +2 -21
- package/utilities/sortValueNode.js +52 -0
- package/utilities/sortValueNode.js.flow +42 -0
- package/utilities/sortValueNode.mjs +42 -0
- package/utilities/valueFromAST.js +2 -2
- package/utilities/valueFromAST.js.flow +8 -2
- package/utilities/valueFromAST.mjs +2 -2
- package/validation/ValidationContext.d.ts +8 -0
- package/validation/ValidationContext.js +82 -24
- package/validation/ValidationContext.js.flow +70 -21
- package/validation/ValidationContext.mjs +80 -24
- package/validation/rules/FieldsOnCorrectTypeRule.js +2 -2
- package/validation/rules/FieldsOnCorrectTypeRule.js.flow +8 -2
- package/validation/rules/FieldsOnCorrectTypeRule.mjs +2 -2
- package/validation/rules/KnownArgumentNamesRule.js +8 -9
- package/validation/rules/KnownArgumentNamesRule.js.flow +16 -6
- package/validation/rules/KnownArgumentNamesRule.mjs +8 -9
- package/validation/rules/KnownTypeNamesRule.js +1 -1
- package/validation/rules/KnownTypeNamesRule.js.flow +6 -4
- package/validation/rules/KnownTypeNamesRule.mjs +1 -1
- package/validation/rules/MaxIntrospectionDepthRule.js +37 -17
- package/validation/rules/MaxIntrospectionDepthRule.js.flow +46 -15
- package/validation/rules/MaxIntrospectionDepthRule.mjs +37 -17
- package/validation/rules/NoUnusedFragmentsRule.js +6 -13
- package/validation/rules/NoUnusedFragmentsRule.js.flow +6 -10
- package/validation/rules/NoUnusedFragmentsRule.mjs +6 -13
- package/validation/rules/OverlappingFieldsCanBeMergedRule.js +402 -208
- package/validation/rules/OverlappingFieldsCanBeMergedRule.js.flow +566 -330
- package/validation/rules/OverlappingFieldsCanBeMergedRule.mjs +400 -206
- package/validation/rules/ValuesOfCorrectTypeRule.js +6 -6
- package/validation/rules/ValuesOfCorrectTypeRule.js.flow +11 -6
- package/validation/rules/ValuesOfCorrectTypeRule.mjs +4 -4
- package/validation/validate.d.ts +1 -1
- package/validation/validate.js +6 -2
- package/validation/validate.js.flow +8 -2
- package/validation/validate.mjs +5 -2
- package/validation/validationAbortedError.d.ts +4 -0
- package/validation/validationAbortedError.js +12 -0
- package/validation/validationAbortedError.js.flow +7 -0
- package/validation/validationAbortedError.mjs +4 -0
- package/version.js +3 -3
- package/version.js.flow +3 -3
- package/version.mjs +3 -3
|
@@ -5,12 +5,16 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.ValidationContext = exports.SDLValidationContext = exports.ASTValidationContext = void 0;
|
|
7
7
|
|
|
8
|
+
var _SetMap = require("../jsutils/SetMap.js");
|
|
9
|
+
|
|
8
10
|
var _kinds = require("../language/kinds.js");
|
|
9
11
|
|
|
10
12
|
var _visitor = require("../language/visitor.js");
|
|
11
13
|
|
|
12
14
|
var _TypeInfo = require("../utilities/TypeInfo.js");
|
|
13
15
|
|
|
16
|
+
var _validationAbortedError = require("./validationAbortedError.js");
|
|
17
|
+
|
|
14
18
|
function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
|
|
15
19
|
|
|
16
20
|
/**
|
|
@@ -20,10 +24,11 @@ function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.crea
|
|
|
20
24
|
*/
|
|
21
25
|
var ASTValidationContext = /*#__PURE__*/function () {
|
|
22
26
|
function ASTValidationContext(ast, onError) {
|
|
27
|
+
this._remainingFragmentWork = 50000;
|
|
23
28
|
this._ast = ast;
|
|
24
29
|
this._fragments = undefined;
|
|
25
30
|
this._fragmentSpreads = new Map();
|
|
26
|
-
this._recursivelyReferencedFragments = new
|
|
31
|
+
this._recursivelyReferencedFragments = new _SetMap.SetMap();
|
|
27
32
|
this._onError = onError;
|
|
28
33
|
}
|
|
29
34
|
|
|
@@ -78,39 +83,72 @@ var ASTValidationContext = /*#__PURE__*/function () {
|
|
|
78
83
|
}
|
|
79
84
|
|
|
80
85
|
return spreads;
|
|
81
|
-
}
|
|
86
|
+
} // TODO: In the next major version, accept multiple operations here and
|
|
87
|
+
// remove getRecursivelyReferencedFragmentsForOperations.
|
|
88
|
+
;
|
|
82
89
|
|
|
83
90
|
_proto.getRecursivelyReferencedFragments = function getRecursivelyReferencedFragments(operation) {
|
|
84
|
-
|
|
91
|
+
return this.getRecursivelyReferencedFragmentsForOperations([operation]);
|
|
92
|
+
};
|
|
85
93
|
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
var collectedNames = Object.create(null);
|
|
89
|
-
var nodesToVisit = [operation.selectionSet];
|
|
94
|
+
_proto.getRecursivelyReferencedFragmentsForOperations = function getRecursivelyReferencedFragmentsForOperations(operations) {
|
|
95
|
+
var fragmentNames = new Set();
|
|
90
96
|
|
|
91
|
-
|
|
92
|
-
|
|
97
|
+
for (var _i4 = 0; _i4 < operations.length; _i4++) {
|
|
98
|
+
var _ref2 = operations[_i4];
|
|
99
|
+
var selectionSet = _ref2.selectionSet;
|
|
93
100
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
101
|
+
for (var _i6 = 0, _this$getFragmentSpre2 = this.getFragmentSpreads(selectionSet); _i6 < _this$getFragmentSpre2.length; _i6++) {
|
|
102
|
+
var _ref4 = _this$getFragmentSpre2[_i6];
|
|
103
|
+
var name = _ref4.name;
|
|
104
|
+
fragmentNames.add(name.value);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
97
107
|
|
|
98
|
-
|
|
99
|
-
collectedNames[fragName] = true;
|
|
100
|
-
var fragment = this.getFragment(fragName);
|
|
108
|
+
var fragments = this._recursivelyReferencedFragments.get(fragmentNames);
|
|
101
109
|
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
110
|
+
if (!fragments) {
|
|
111
|
+
fragments = [];
|
|
112
|
+
this.spendFragmentWork(fragmentNames.size);
|
|
113
|
+
var collectedNames = new Set(fragmentNames);
|
|
114
|
+
var namesToVisit = Array.from(fragmentNames);
|
|
115
|
+
|
|
116
|
+
for (var i = 0; i < namesToVisit.length; i++) {
|
|
117
|
+
var fragName = namesToVisit[i];
|
|
118
|
+
var fragment = this.getFragment(fragName);
|
|
119
|
+
|
|
120
|
+
if (fragment) {
|
|
121
|
+
fragments.push(fragment);
|
|
122
|
+
var spreads = this.getFragmentSpreads(fragment.selectionSet);
|
|
123
|
+
this.spendFragmentWork(spreads.length);
|
|
124
|
+
|
|
125
|
+
for (var _i8 = 0; _i8 < spreads.length; _i8++) {
|
|
126
|
+
var spread = spreads[_i8];
|
|
127
|
+
var _name = spread.name.value;
|
|
128
|
+
|
|
129
|
+
if (!collectedNames.has(_name)) {
|
|
130
|
+
collectedNames.add(_name);
|
|
131
|
+
namesToVisit.push(_name);
|
|
105
132
|
}
|
|
106
133
|
}
|
|
107
134
|
}
|
|
108
135
|
}
|
|
109
136
|
|
|
110
|
-
this._recursivelyReferencedFragments.set(
|
|
137
|
+
this._recursivelyReferencedFragments.set(fragmentNames, fragments);
|
|
111
138
|
}
|
|
112
139
|
|
|
113
140
|
return fragments;
|
|
141
|
+
}
|
|
142
|
+
/** @internal */
|
|
143
|
+
;
|
|
144
|
+
|
|
145
|
+
_proto.spendFragmentWork = function spendFragmentWork(cost) {
|
|
146
|
+
this._remainingFragmentWork -= cost;
|
|
147
|
+
/* istanbul ignore next (Large validation work is covered by resource-limit probes.) */
|
|
148
|
+
|
|
149
|
+
if (this._remainingFragmentWork < 0) {
|
|
150
|
+
throw _validationAbortedError.validationAbortedError;
|
|
151
|
+
}
|
|
114
152
|
};
|
|
115
153
|
|
|
116
154
|
return ASTValidationContext;
|
|
@@ -125,6 +163,7 @@ var SDLValidationContext = /*#__PURE__*/function (_ASTValidationContext) {
|
|
|
125
163
|
var _this;
|
|
126
164
|
|
|
127
165
|
_this = _ASTValidationContext.call(this, ast, onError) || this;
|
|
166
|
+
_this.hideSuggestions = false;
|
|
128
167
|
_this._schema = schema;
|
|
129
168
|
return _this;
|
|
130
169
|
}
|
|
@@ -143,10 +182,11 @@ exports.SDLValidationContext = SDLValidationContext;
|
|
|
143
182
|
var ValidationContext = /*#__PURE__*/function (_ASTValidationContext2) {
|
|
144
183
|
_inheritsLoose(ValidationContext, _ASTValidationContext2);
|
|
145
184
|
|
|
146
|
-
function ValidationContext(schema, ast, typeInfo, onError) {
|
|
185
|
+
function ValidationContext(schema, ast, typeInfo, onError, hideSuggestions) {
|
|
147
186
|
var _this2;
|
|
148
187
|
|
|
149
188
|
_this2 = _ASTValidationContext2.call(this, ast, onError) || this;
|
|
189
|
+
_this2.hideSuggestions = hideSuggestions !== null && hideSuggestions !== void 0 ? hideSuggestions : false;
|
|
150
190
|
_this2._schema = schema;
|
|
151
191
|
_this2._typeInfo = typeInfo;
|
|
152
192
|
_this2._variableUsages = new Map();
|
|
@@ -190,13 +230,31 @@ var ValidationContext = /*#__PURE__*/function (_ASTValidationContext2) {
|
|
|
190
230
|
var usages = this._recursiveVariableUsages.get(operation);
|
|
191
231
|
|
|
192
232
|
if (!usages) {
|
|
193
|
-
|
|
233
|
+
var fragments = this.getRecursivelyReferencedFragments(operation);
|
|
234
|
+
|
|
235
|
+
var fragmentUsages = this._recursiveVariableUsages.get(fragments);
|
|
236
|
+
|
|
237
|
+
if (!fragmentUsages) {
|
|
238
|
+
this.spendFragmentWork(fragments.length);
|
|
239
|
+
fragmentUsages = [];
|
|
194
240
|
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
241
|
+
for (var _i10 = 0; _i10 < fragments.length; _i10++) {
|
|
242
|
+
var frag = fragments[_i10];
|
|
243
|
+
var localUsages = this.getVariableUsages(frag);
|
|
244
|
+
this.spendFragmentWork(localUsages.length);
|
|
245
|
+
|
|
246
|
+
for (var _i12 = 0; _i12 < localUsages.length; _i12++) {
|
|
247
|
+
var usage = localUsages[_i12];
|
|
248
|
+
fragmentUsages.push(usage);
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
this._recursiveVariableUsages.set(fragments, fragmentUsages);
|
|
198
253
|
}
|
|
199
254
|
|
|
255
|
+
this.spendFragmentWork(fragmentUsages.length);
|
|
256
|
+
usages = this.getVariableUsages(operation).concat(fragmentUsages);
|
|
257
|
+
|
|
200
258
|
this._recursiveVariableUsages.set(operation, usages);
|
|
201
259
|
}
|
|
202
260
|
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
// @flow strict
|
|
2
|
+
import { SetMap } from '../jsutils/SetMap';
|
|
3
|
+
|
|
2
4
|
import type { ObjMap } from '../jsutils/ObjMap';
|
|
3
5
|
|
|
4
6
|
import type { GraphQLError } from '../error/GraphQLError';
|
|
@@ -29,6 +31,8 @@ import type {
|
|
|
29
31
|
|
|
30
32
|
import { TypeInfo, visitWithTypeInfo } from '../utilities/TypeInfo';
|
|
31
33
|
|
|
34
|
+
import { validationAbortedError } from './validationAbortedError';
|
|
35
|
+
|
|
32
36
|
type NodeWithSelectionSet = OperationDefinitionNode | FragmentDefinitionNode;
|
|
33
37
|
type VariableUsage = {|
|
|
34
38
|
+node: VariableNode,
|
|
@@ -42,20 +46,22 @@ type VariableUsage = {|
|
|
|
42
46
|
* validation rule.
|
|
43
47
|
*/
|
|
44
48
|
export class ASTValidationContext {
|
|
49
|
+
_remainingFragmentWork: number;
|
|
45
50
|
_ast: DocumentNode;
|
|
46
51
|
_onError: (err: GraphQLError) => void;
|
|
47
52
|
_fragments: ?ObjMap<FragmentDefinitionNode>;
|
|
48
53
|
_fragmentSpreads: Map<SelectionSetNode, $ReadOnlyArray<FragmentSpreadNode>>;
|
|
49
|
-
_recursivelyReferencedFragments:
|
|
50
|
-
|
|
54
|
+
_recursivelyReferencedFragments: SetMap<
|
|
55
|
+
string,
|
|
51
56
|
$ReadOnlyArray<FragmentDefinitionNode>,
|
|
52
57
|
>;
|
|
53
58
|
|
|
54
59
|
constructor(ast: DocumentNode, onError: (err: GraphQLError) => void) {
|
|
60
|
+
this._remainingFragmentWork = 50_000;
|
|
55
61
|
this._ast = ast;
|
|
56
62
|
this._fragments = undefined;
|
|
57
63
|
this._fragmentSpreads = new Map();
|
|
58
|
-
this._recursivelyReferencedFragments = new
|
|
64
|
+
this._recursivelyReferencedFragments = new SetMap();
|
|
59
65
|
this._onError = onError;
|
|
60
66
|
}
|
|
61
67
|
|
|
@@ -105,37 +111,64 @@ export class ASTValidationContext {
|
|
|
105
111
|
return spreads;
|
|
106
112
|
}
|
|
107
113
|
|
|
114
|
+
// TODO: In the next major version, accept multiple operations here and
|
|
115
|
+
// remove getRecursivelyReferencedFragmentsForOperations.
|
|
108
116
|
getRecursivelyReferencedFragments(
|
|
109
117
|
operation: OperationDefinitionNode,
|
|
110
118
|
): $ReadOnlyArray<FragmentDefinitionNode> {
|
|
111
|
-
|
|
119
|
+
return this.getRecursivelyReferencedFragmentsForOperations([operation]);
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
getRecursivelyReferencedFragmentsForOperations(
|
|
123
|
+
operations: $ReadOnlyArray<OperationDefinitionNode>,
|
|
124
|
+
): $ReadOnlyArray<FragmentDefinitionNode> {
|
|
125
|
+
const fragmentNames: Set<string> = new Set();
|
|
126
|
+
for (const { selectionSet } of operations) {
|
|
127
|
+
for (const { name } of this.getFragmentSpreads(selectionSet)) {
|
|
128
|
+
fragmentNames.add(name.value);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
let fragments = this._recursivelyReferencedFragments.get(fragmentNames);
|
|
112
132
|
if (!fragments) {
|
|
113
133
|
fragments = [];
|
|
114
|
-
|
|
115
|
-
const
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
134
|
+
this.spendFragmentWork(fragmentNames.size);
|
|
135
|
+
const collectedNames = new Set(fragmentNames);
|
|
136
|
+
const namesToVisit = Array.from(fragmentNames);
|
|
137
|
+
for (let i = 0; i < namesToVisit.length; i++) {
|
|
138
|
+
const fragName = namesToVisit[i];
|
|
139
|
+
const fragment = this.getFragment(fragName);
|
|
140
|
+
if (fragment) {
|
|
141
|
+
fragments.push(fragment);
|
|
142
|
+
const spreads = this.getFragmentSpreads(fragment.selectionSet);
|
|
143
|
+
this.spendFragmentWork(spreads.length);
|
|
144
|
+
for (const spread of spreads) {
|
|
145
|
+
const name = spread.name.value;
|
|
146
|
+
if (!collectedNames.has(name)) {
|
|
147
|
+
collectedNames.add(name);
|
|
148
|
+
namesToVisit.push(name);
|
|
126
149
|
}
|
|
127
150
|
}
|
|
128
151
|
}
|
|
129
152
|
}
|
|
130
|
-
this._recursivelyReferencedFragments.set(
|
|
153
|
+
this._recursivelyReferencedFragments.set(fragmentNames, fragments);
|
|
131
154
|
}
|
|
132
155
|
return fragments;
|
|
133
156
|
}
|
|
157
|
+
|
|
158
|
+
/** @internal */
|
|
159
|
+
spendFragmentWork(cost: number): void {
|
|
160
|
+
this._remainingFragmentWork -= cost;
|
|
161
|
+
/* istanbul ignore next (Large validation work is covered by resource-limit probes.) */
|
|
162
|
+
if (this._remainingFragmentWork < 0) {
|
|
163
|
+
throw validationAbortedError;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
134
166
|
}
|
|
135
167
|
|
|
136
168
|
export type ASTValidationRule = (ASTValidationContext) => ASTVisitor;
|
|
137
169
|
|
|
138
170
|
export class SDLValidationContext extends ASTValidationContext {
|
|
171
|
+
hideSuggestions: boolean;
|
|
139
172
|
_schema: ?GraphQLSchema;
|
|
140
173
|
|
|
141
174
|
constructor(
|
|
@@ -144,6 +177,7 @@ export class SDLValidationContext extends ASTValidationContext {
|
|
|
144
177
|
onError: (err: GraphQLError) => void,
|
|
145
178
|
) {
|
|
146
179
|
super(ast, onError);
|
|
180
|
+
this.hideSuggestions = false;
|
|
147
181
|
this._schema = schema;
|
|
148
182
|
}
|
|
149
183
|
|
|
@@ -155,11 +189,12 @@ export class SDLValidationContext extends ASTValidationContext {
|
|
|
155
189
|
export type SDLValidationRule = (SDLValidationContext) => ASTVisitor;
|
|
156
190
|
|
|
157
191
|
export class ValidationContext extends ASTValidationContext {
|
|
192
|
+
hideSuggestions: boolean;
|
|
158
193
|
_schema: GraphQLSchema;
|
|
159
194
|
_typeInfo: TypeInfo;
|
|
160
195
|
_variableUsages: Map<NodeWithSelectionSet, $ReadOnlyArray<VariableUsage>>;
|
|
161
196
|
_recursiveVariableUsages: Map<
|
|
162
|
-
OperationDefinitionNode
|
|
197
|
+
OperationDefinitionNode | $ReadOnlyArray<FragmentDefinitionNode>,
|
|
163
198
|
$ReadOnlyArray<VariableUsage>,
|
|
164
199
|
>;
|
|
165
200
|
|
|
@@ -168,8 +203,10 @@ export class ValidationContext extends ASTValidationContext {
|
|
|
168
203
|
ast: DocumentNode,
|
|
169
204
|
typeInfo: TypeInfo,
|
|
170
205
|
onError: (err: GraphQLError) => void,
|
|
206
|
+
hideSuggestions?: ?boolean,
|
|
171
207
|
) {
|
|
172
208
|
super(ast, onError);
|
|
209
|
+
this.hideSuggestions = hideSuggestions ?? false;
|
|
173
210
|
this._schema = schema;
|
|
174
211
|
this._typeInfo = typeInfo;
|
|
175
212
|
this._variableUsages = new Map();
|
|
@@ -209,10 +246,22 @@ export class ValidationContext extends ASTValidationContext {
|
|
|
209
246
|
): $ReadOnlyArray<VariableUsage> {
|
|
210
247
|
let usages = this._recursiveVariableUsages.get(operation);
|
|
211
248
|
if (!usages) {
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
249
|
+
const fragments = this.getRecursivelyReferencedFragments(operation);
|
|
250
|
+
let fragmentUsages = this._recursiveVariableUsages.get(fragments);
|
|
251
|
+
if (!fragmentUsages) {
|
|
252
|
+
this.spendFragmentWork(fragments.length);
|
|
253
|
+
fragmentUsages = [];
|
|
254
|
+
for (const frag of fragments) {
|
|
255
|
+
const localUsages = this.getVariableUsages(frag);
|
|
256
|
+
this.spendFragmentWork(localUsages.length);
|
|
257
|
+
for (const usage of localUsages) {
|
|
258
|
+
fragmentUsages.push(usage);
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
this._recursiveVariableUsages.set(fragments, fragmentUsages);
|
|
215
262
|
}
|
|
263
|
+
this.spendFragmentWork(fragmentUsages.length);
|
|
264
|
+
usages = this.getVariableUsages(operation).concat(fragmentUsages);
|
|
216
265
|
this._recursiveVariableUsages.set(operation, usages);
|
|
217
266
|
}
|
|
218
267
|
return usages;
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
|
|
2
2
|
|
|
3
|
+
import { SetMap } from "../jsutils/SetMap.mjs";
|
|
3
4
|
import { Kind } from "../language/kinds.mjs";
|
|
4
5
|
import { visit } from "../language/visitor.mjs";
|
|
5
6
|
import { TypeInfo, visitWithTypeInfo } from "../utilities/TypeInfo.mjs";
|
|
7
|
+
import { validationAbortedError } from "./validationAbortedError.mjs";
|
|
6
8
|
|
|
7
9
|
/**
|
|
8
10
|
* An instance of this class is passed as the "this" context to all validators,
|
|
@@ -11,10 +13,11 @@ import { TypeInfo, visitWithTypeInfo } from "../utilities/TypeInfo.mjs";
|
|
|
11
13
|
*/
|
|
12
14
|
export var ASTValidationContext = /*#__PURE__*/function () {
|
|
13
15
|
function ASTValidationContext(ast, onError) {
|
|
16
|
+
this._remainingFragmentWork = 50000;
|
|
14
17
|
this._ast = ast;
|
|
15
18
|
this._fragments = undefined;
|
|
16
19
|
this._fragmentSpreads = new Map();
|
|
17
|
-
this._recursivelyReferencedFragments = new
|
|
20
|
+
this._recursivelyReferencedFragments = new SetMap();
|
|
18
21
|
this._onError = onError;
|
|
19
22
|
}
|
|
20
23
|
|
|
@@ -69,39 +72,72 @@ export var ASTValidationContext = /*#__PURE__*/function () {
|
|
|
69
72
|
}
|
|
70
73
|
|
|
71
74
|
return spreads;
|
|
72
|
-
}
|
|
75
|
+
} // TODO: In the next major version, accept multiple operations here and
|
|
76
|
+
// remove getRecursivelyReferencedFragmentsForOperations.
|
|
77
|
+
;
|
|
73
78
|
|
|
74
79
|
_proto.getRecursivelyReferencedFragments = function getRecursivelyReferencedFragments(operation) {
|
|
75
|
-
|
|
80
|
+
return this.getRecursivelyReferencedFragmentsForOperations([operation]);
|
|
81
|
+
};
|
|
76
82
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
var collectedNames = Object.create(null);
|
|
80
|
-
var nodesToVisit = [operation.selectionSet];
|
|
83
|
+
_proto.getRecursivelyReferencedFragmentsForOperations = function getRecursivelyReferencedFragmentsForOperations(operations) {
|
|
84
|
+
var fragmentNames = new Set();
|
|
81
85
|
|
|
82
|
-
|
|
83
|
-
|
|
86
|
+
for (var _i4 = 0; _i4 < operations.length; _i4++) {
|
|
87
|
+
var _ref2 = operations[_i4];
|
|
88
|
+
var selectionSet = _ref2.selectionSet;
|
|
84
89
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
90
|
+
for (var _i6 = 0, _this$getFragmentSpre2 = this.getFragmentSpreads(selectionSet); _i6 < _this$getFragmentSpre2.length; _i6++) {
|
|
91
|
+
var _ref4 = _this$getFragmentSpre2[_i6];
|
|
92
|
+
var name = _ref4.name;
|
|
93
|
+
fragmentNames.add(name.value);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
88
96
|
|
|
89
|
-
|
|
90
|
-
collectedNames[fragName] = true;
|
|
91
|
-
var fragment = this.getFragment(fragName);
|
|
97
|
+
var fragments = this._recursivelyReferencedFragments.get(fragmentNames);
|
|
92
98
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
99
|
+
if (!fragments) {
|
|
100
|
+
fragments = [];
|
|
101
|
+
this.spendFragmentWork(fragmentNames.size);
|
|
102
|
+
var collectedNames = new Set(fragmentNames);
|
|
103
|
+
var namesToVisit = Array.from(fragmentNames);
|
|
104
|
+
|
|
105
|
+
for (var i = 0; i < namesToVisit.length; i++) {
|
|
106
|
+
var fragName = namesToVisit[i];
|
|
107
|
+
var fragment = this.getFragment(fragName);
|
|
108
|
+
|
|
109
|
+
if (fragment) {
|
|
110
|
+
fragments.push(fragment);
|
|
111
|
+
var spreads = this.getFragmentSpreads(fragment.selectionSet);
|
|
112
|
+
this.spendFragmentWork(spreads.length);
|
|
113
|
+
|
|
114
|
+
for (var _i8 = 0; _i8 < spreads.length; _i8++) {
|
|
115
|
+
var spread = spreads[_i8];
|
|
116
|
+
var _name = spread.name.value;
|
|
117
|
+
|
|
118
|
+
if (!collectedNames.has(_name)) {
|
|
119
|
+
collectedNames.add(_name);
|
|
120
|
+
namesToVisit.push(_name);
|
|
96
121
|
}
|
|
97
122
|
}
|
|
98
123
|
}
|
|
99
124
|
}
|
|
100
125
|
|
|
101
|
-
this._recursivelyReferencedFragments.set(
|
|
126
|
+
this._recursivelyReferencedFragments.set(fragmentNames, fragments);
|
|
102
127
|
}
|
|
103
128
|
|
|
104
129
|
return fragments;
|
|
130
|
+
}
|
|
131
|
+
/** @internal */
|
|
132
|
+
;
|
|
133
|
+
|
|
134
|
+
_proto.spendFragmentWork = function spendFragmentWork(cost) {
|
|
135
|
+
this._remainingFragmentWork -= cost;
|
|
136
|
+
/* istanbul ignore next (Large validation work is covered by resource-limit probes.) */
|
|
137
|
+
|
|
138
|
+
if (this._remainingFragmentWork < 0) {
|
|
139
|
+
throw validationAbortedError;
|
|
140
|
+
}
|
|
105
141
|
};
|
|
106
142
|
|
|
107
143
|
return ASTValidationContext;
|
|
@@ -113,6 +149,7 @@ export var SDLValidationContext = /*#__PURE__*/function (_ASTValidationContext)
|
|
|
113
149
|
var _this;
|
|
114
150
|
|
|
115
151
|
_this = _ASTValidationContext.call(this, ast, onError) || this;
|
|
152
|
+
_this.hideSuggestions = false;
|
|
116
153
|
_this._schema = schema;
|
|
117
154
|
return _this;
|
|
118
155
|
}
|
|
@@ -128,10 +165,11 @@ export var SDLValidationContext = /*#__PURE__*/function (_ASTValidationContext)
|
|
|
128
165
|
export var ValidationContext = /*#__PURE__*/function (_ASTValidationContext2) {
|
|
129
166
|
_inheritsLoose(ValidationContext, _ASTValidationContext2);
|
|
130
167
|
|
|
131
|
-
function ValidationContext(schema, ast, typeInfo, onError) {
|
|
168
|
+
function ValidationContext(schema, ast, typeInfo, onError, hideSuggestions) {
|
|
132
169
|
var _this2;
|
|
133
170
|
|
|
134
171
|
_this2 = _ASTValidationContext2.call(this, ast, onError) || this;
|
|
172
|
+
_this2.hideSuggestions = hideSuggestions !== null && hideSuggestions !== void 0 ? hideSuggestions : false;
|
|
135
173
|
_this2._schema = schema;
|
|
136
174
|
_this2._typeInfo = typeInfo;
|
|
137
175
|
_this2._variableUsages = new Map();
|
|
@@ -175,13 +213,31 @@ export var ValidationContext = /*#__PURE__*/function (_ASTValidationContext2) {
|
|
|
175
213
|
var usages = this._recursiveVariableUsages.get(operation);
|
|
176
214
|
|
|
177
215
|
if (!usages) {
|
|
178
|
-
|
|
216
|
+
var fragments = this.getRecursivelyReferencedFragments(operation);
|
|
217
|
+
|
|
218
|
+
var fragmentUsages = this._recursiveVariableUsages.get(fragments);
|
|
219
|
+
|
|
220
|
+
if (!fragmentUsages) {
|
|
221
|
+
this.spendFragmentWork(fragments.length);
|
|
222
|
+
fragmentUsages = [];
|
|
223
|
+
|
|
224
|
+
for (var _i10 = 0; _i10 < fragments.length; _i10++) {
|
|
225
|
+
var frag = fragments[_i10];
|
|
226
|
+
var localUsages = this.getVariableUsages(frag);
|
|
227
|
+
this.spendFragmentWork(localUsages.length);
|
|
179
228
|
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
229
|
+
for (var _i12 = 0; _i12 < localUsages.length; _i12++) {
|
|
230
|
+
var usage = localUsages[_i12];
|
|
231
|
+
fragmentUsages.push(usage);
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
this._recursiveVariableUsages.set(fragments, fragmentUsages);
|
|
183
236
|
}
|
|
184
237
|
|
|
238
|
+
this.spendFragmentWork(fragmentUsages.length);
|
|
239
|
+
usages = this.getVariableUsages(operation).concat(fragmentUsages);
|
|
240
|
+
|
|
185
241
|
this._recursiveVariableUsages.set(operation, usages);
|
|
186
242
|
}
|
|
187
243
|
|
|
@@ -38,10 +38,10 @@ function FieldsOnCorrectTypeRule(context) {
|
|
|
38
38
|
var schema = context.getSchema();
|
|
39
39
|
var fieldName = node.name.value; // First determine if there are any suggested types to condition on.
|
|
40
40
|
|
|
41
|
-
var suggestion = (0, _didYouMean.default)('to use an inline fragment on', getSuggestedTypeNames(schema, type, fieldName)); // If there are no suggested types, then perhaps this was a typo?
|
|
41
|
+
var suggestion = (0, _didYouMean.default)('to use an inline fragment on', context.hideSuggestions ? [] : getSuggestedTypeNames(schema, type, fieldName)); // If there are no suggested types, then perhaps this was a typo?
|
|
42
42
|
|
|
43
43
|
if (suggestion === '') {
|
|
44
|
-
suggestion = (0, _didYouMean.default)(getSuggestedFieldNames(type, fieldName));
|
|
44
|
+
suggestion = (0, _didYouMean.default)(context.hideSuggestions ? [] : getSuggestedFieldNames(type, fieldName));
|
|
45
45
|
} // Report an error, including helpful suggestions.
|
|
46
46
|
|
|
47
47
|
|
|
@@ -46,12 +46,18 @@ export function FieldsOnCorrectTypeRule(
|
|
|
46
46
|
// First determine if there are any suggested types to condition on.
|
|
47
47
|
let suggestion = didYouMean(
|
|
48
48
|
'to use an inline fragment on',
|
|
49
|
-
|
|
49
|
+
context.hideSuggestions
|
|
50
|
+
? []
|
|
51
|
+
: getSuggestedTypeNames(schema, type, fieldName),
|
|
50
52
|
);
|
|
51
53
|
|
|
52
54
|
// If there are no suggested types, then perhaps this was a typo?
|
|
53
55
|
if (suggestion === '') {
|
|
54
|
-
suggestion = didYouMean(
|
|
56
|
+
suggestion = didYouMean(
|
|
57
|
+
context.hideSuggestions
|
|
58
|
+
? []
|
|
59
|
+
: getSuggestedFieldNames(type, fieldName),
|
|
60
|
+
);
|
|
55
61
|
}
|
|
56
62
|
|
|
57
63
|
// Report an error, including helpful suggestions.
|
|
@@ -24,10 +24,10 @@ export function FieldsOnCorrectTypeRule(context) {
|
|
|
24
24
|
var schema = context.getSchema();
|
|
25
25
|
var fieldName = node.name.value; // First determine if there are any suggested types to condition on.
|
|
26
26
|
|
|
27
|
-
var suggestion = didYouMean('to use an inline fragment on', getSuggestedTypeNames(schema, type, fieldName)); // If there are no suggested types, then perhaps this was a typo?
|
|
27
|
+
var suggestion = didYouMean('to use an inline fragment on', context.hideSuggestions ? [] : getSuggestedTypeNames(schema, type, fieldName)); // If there are no suggested types, then perhaps this was a typo?
|
|
28
28
|
|
|
29
29
|
if (suggestion === '') {
|
|
30
|
-
suggestion = didYouMean(getSuggestedFieldNames(type, fieldName));
|
|
30
|
+
suggestion = didYouMean(context.hideSuggestions ? [] : getSuggestedFieldNames(type, fieldName));
|
|
31
31
|
} // Report an error, including helpful suggestions.
|
|
32
32
|
|
|
33
33
|
|
|
@@ -39,10 +39,9 @@ function KnownArgumentNamesRule(context) {
|
|
|
39
39
|
|
|
40
40
|
if (!argDef && fieldDef && parentType) {
|
|
41
41
|
var argName = argNode.name.value;
|
|
42
|
-
var
|
|
42
|
+
var suggestions = context.hideSuggestions ? [] : (0, _suggestionList.default)(argName, fieldDef.args.map(function (arg) {
|
|
43
43
|
return arg.name;
|
|
44
|
-
});
|
|
45
|
-
var suggestions = (0, _suggestionList.default)(argName, knownArgsNames);
|
|
44
|
+
}));
|
|
46
45
|
context.reportError(new _GraphQLError.GraphQLError("Unknown argument \"".concat(argName, "\" on field \"").concat(parentType.name, ".").concat(fieldDef.name, "\".") + (0, _didYouMean.default)(suggestions), argNode));
|
|
47
46
|
}
|
|
48
47
|
}
|
|
@@ -60,9 +59,9 @@ function KnownArgumentNamesOnDirectivesRule(context) {
|
|
|
60
59
|
|
|
61
60
|
for (var _i2 = 0; _i2 < definedDirectives.length; _i2++) {
|
|
62
61
|
var directive = definedDirectives[_i2];
|
|
63
|
-
directiveArgs[directive.name] = directive.args.map(function (arg) {
|
|
62
|
+
directiveArgs[directive.name] = new Set(directive.args.map(function (arg) {
|
|
64
63
|
return arg.name;
|
|
65
|
-
});
|
|
64
|
+
}));
|
|
66
65
|
}
|
|
67
66
|
|
|
68
67
|
var astDefinitions = context.getDocument().definitions;
|
|
@@ -75,9 +74,9 @@ function KnownArgumentNamesOnDirectivesRule(context) {
|
|
|
75
74
|
|
|
76
75
|
// istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
|
|
77
76
|
var argsNodes = (_def$arguments = def.arguments) !== null && _def$arguments !== void 0 ? _def$arguments : [];
|
|
78
|
-
directiveArgs[def.name.value] = argsNodes.map(function (arg) {
|
|
77
|
+
directiveArgs[def.name.value] = new Set(argsNodes.map(function (arg) {
|
|
79
78
|
return arg.name.value;
|
|
80
|
-
});
|
|
79
|
+
}));
|
|
81
80
|
}
|
|
82
81
|
}
|
|
83
82
|
|
|
@@ -91,8 +90,8 @@ function KnownArgumentNamesOnDirectivesRule(context) {
|
|
|
91
90
|
var argNode = _directiveNode$argume2[_i6];
|
|
92
91
|
var argName = argNode.name.value;
|
|
93
92
|
|
|
94
|
-
if (knownArgs.
|
|
95
|
-
var suggestions = (0, _suggestionList.default)(argName, knownArgs);
|
|
93
|
+
if (!knownArgs.has(argName)) {
|
|
94
|
+
var suggestions = context.hideSuggestions ? [] : (0, _suggestionList.default)(argName, Array.from(knownArgs));
|
|
96
95
|
context.reportError(new _GraphQLError.GraphQLError("Unknown argument \"".concat(argName, "\" on directive \"@").concat(directiveName, "\".") + (0, _didYouMean.default)(suggestions), argNode));
|
|
97
96
|
}
|
|
98
97
|
}
|