Skip to content

Commit befe44e

Browse files
dimaMachinadimaMachina
authored
fix broken links (#1391)
* fix * fix broken links * yet another fix
1 parent b892513 commit befe44e

File tree

84 files changed

+344
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+344
-271
lines changed

‎.eslintrc.cjs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ module.exports = {
77
'@theguild/eslint-config/mdx',
88
],
99
rules: {
10-
'@typescript-eslint/no-explicit-any': 'off', // too strict
11-
'@typescript-eslint/no-non-null-assertion': 'off', // too strict
1210
'unicorn/prefer-array-some': 'error',
1311
'unicorn/better-regex': 'error',
1412
'prefer-destructuring': ['error', { object: true }],
@@ -18,8 +16,17 @@ module.exports = {
1816
{
1917
files: ['**/*.{,c,m}ts{,x}'],
2018
excludedFiles: ['**/*.md{,x}/*'],
19+
// extends: [
20+
// 'plugin:@typescript-eslint/recommended-requiring-type-checking',
21+
// 'plugin:@typescript-eslint/strict',
22+
// 'prettier',
23+
// ],
2124
rules: {
2225
'@typescript-eslint/no-unnecessary-type-assertion': 'error',
26+
'@typescript-eslint/no-explicit-any': 'off', // too strict
27+
'@typescript-eslint/no-non-null-assertion': 'off', // too strict
28+
'@typescript-eslint/array-type': ['error', { readonly: 'generic' }],
29+
'@typescript-eslint/consistent-type-imports': ['error', { prefer: 'no-type-imports' }],
2330
},
2431
parserOptions: {
2532
project: ['tsconfig.json', 'website/tsconfig.json', 'tsconfig.eslint.json'],

‎packages/plugin/src/cache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class ModuleCache<T, K = any> {
1212
log('setting entry for', cacheKey);
1313
}
1414

15-
get(cacheKey: K, settings = { lifetime: 10 /* seconds */ }): void | T {
15+
get(cacheKey: K, settings = { lifetime: 10 /* seconds */ }): T | void {
1616
const value = this.map.get(cacheKey);
1717
if (!value) {
1818
log('cache miss for', cacheKey);

‎packages/plugin/src/estree-converter/converter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function convertToESTree<T extends DocumentNode>(node: T, schema?: GraphQ
2727
]
2828
: [];
2929

30-
const calculatedTypeInfo: TypeInformation | Record<string, never> = typeInfo
30+
const calculatedTypeInfo: Record<string, never> | TypeInformation = typeInfo
3131
? {
3232
argument: typeInfo.getArgument(),
3333
defaultValue: typeInfo.getDefaultValue(),

‎packages/plugin/src/estree-converter/types.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,24 @@ export type TypeInformation = {
5656
};
5757

5858
type NodeWithName =
59-
| TypeDefinitionNode
60-
| TypeExtensionNode
61-
| ExecutableDefinitionNode
59+
| ArgumentNode
6260
| DirectiveDefinitionNode
63-
| FieldDefinitionNode
6461
| EnumValueDefinitionNode
62+
| ExecutableDefinitionNode
63+
| FieldDefinitionNode
6564
| FieldNode
6665
| FragmentSpreadNode
67-
| VariableNode
68-
| ArgumentNode
69-
| NamedTypeNode;
66+
| NamedTypeNode
67+
| TypeDefinitionNode
68+
| TypeExtensionNode
69+
| VariableNode;
7070

7171
type NodeWithType =
7272
| FieldDefinitionNode
7373
| InputValueDefinitionNode
74-
| OperationTypeDefinitionNode
75-
| NonNullTypeNode
7674
| ListTypeNode
75+
| NonNullTypeNode
76+
| OperationTypeDefinitionNode
7777
| VariableDefinitionNode;
7878

7979
type ParentNode<T> = T extends DocumentNode
@@ -84,16 +84,16 @@ type ParentNode<T> = T extends DocumentNode
8484
? EnumTypeDefinitionNode | EnumTypeExtensionNode
8585
: T extends InputValueDefinitionNode
8686
?
87+
| DirectiveDefinitionNode
88+
| FieldDefinitionNode
8789
| InputObjectTypeDefinitionNode
8890
| InputObjectTypeExtensionNode
89-
| FieldDefinitionNode
90-
| DirectiveDefinitionNode
9191
: T extends FieldDefinitionNode
9292
?
93-
| ObjectTypeDefinitionNode
94-
| ObjectTypeExtensionNode
9593
| InterfaceTypeDefinitionNode
9694
| InterfaceTypeExtensionNode
95+
| ObjectTypeDefinitionNode
96+
| ObjectTypeExtensionNode
9797
: T extends SelectionSetNode
9898
? ExecutableDefinitionNode | FieldNode | InlineFragmentNode
9999
: T extends SelectionNode

‎packages/plugin/src/estree-converter/utils.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,30 @@ export function getBaseType(type: GraphQLOutputType): GraphQLNamedType {
2727

2828
// Hardcoded type because tests fails on graphql 15
2929
type TokenKindValue =
30-
| '<SOF>'
31-
// | '<EOF>'
30+
| ':'
3231
| '!'
33-
| '$'
34-
| '&'
32+
| '...'
3533
| '('
3634
| ')'
37-
| '...'
38-
| ':'
39-
| '='
40-
| '@'
4135
| '['
4236
| ']'
4337
| '{'
44-
| '|'
4538
| '}'
46-
| 'Name'
47-
| 'Int'
48-
| 'Float'
49-
| 'String'
39+
| '@'
40+
| '&'
41+
// | '<EOF>'
42+
| '<SOF>'
43+
| '='
44+
| '|'
45+
| '$'
5046
| 'BlockString'
51-
| 'Comment';
47+
| 'Comment'
48+
| 'Float'
49+
| 'Int'
50+
| 'Name'
51+
| 'String';
5252

53-
export function convertToken<T extends 'Line' | 'Block' | TokenKindValue>(
53+
export function convertToken<T extends TokenKindValue | 'Block' | 'Line'>(
5454
token: Token,
5555
type: T,
5656
): Omit<AST.Token, 'type'> & { type: T } {

‎packages/plugin/src/processor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const processor: Linter.Processor<Block | string> = {
2929
onDiskConfigLoaded = true;
3030
}
3131

32-
let keywords: readonly string[] = RELEVANT_KEYWORDS;
32+
let keywords: ReadonlyArray<string> = RELEVANT_KEYWORDS;
3333
const pluckConfig: GraphQLTagPluckOptions =
3434
onDiskConfig?.getProjectForFile(filePath).extensions.pluckConfig;
3535

‎packages/plugin/src/rules/alphabetize.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ import { ARRAY_DEFAULT_OPTIONS, truthy } from '../utils.js';
2828
const RULE_ID = 'alphabetize';
2929

3030
const fieldsEnum: (
31-
| 'ObjectTypeDefinition'
32-
| 'InterfaceTypeDefinition'
3331
| 'InputObjectTypeDefinition'
32+
| 'InterfaceTypeDefinition'
33+
| 'ObjectTypeDefinition'
3434
)[] = [
3535
Kind.OBJECT_TYPE_DEFINITION,
3636
Kind.INTERFACE_TYPE_DEFINITION,
3737
Kind.INPUT_OBJECT_TYPE_DEFINITION,
3838
];
3939
const valuesEnum: ['EnumTypeDefinition'] = [Kind.ENUM_TYPE_DEFINITION];
40-
const selectionsEnum: ('OperationDefinition' | 'FragmentDefinition')[] = [
40+
const selectionsEnum: ('FragmentDefinition' | 'OperationDefinition')[] = [
4141
Kind.OPERATION_DEFINITION,
4242
Kind.FRAGMENT_DEFINITION,
4343
];
4444
const variablesEnum: ['OperationDefinition'] = [Kind.OPERATION_DEFINITION];
45-
const argumentsEnum: ('FieldDefinition' | 'Field' | 'DirectiveDefinition' | 'Directive')[] = [
45+
const argumentsEnum: ('Directive' | 'DirectiveDefinition' | 'Field' | 'FieldDefinition')[] = [
4646
Kind.FIELD_DEFINITION,
4747
Kind.FIELD,
4848
Kind.DIRECTIVE_DEFINITION,
@@ -370,12 +370,12 @@ export const rule: GraphQLESLintRule<RuleOptions> = {
370370
if (fieldsSelector) {
371371
listeners[fieldsSelector] = (
372372
node: GraphQLESTreeNode<
373-
| ObjectTypeDefinitionNode
374-
| ObjectTypeExtensionNode
375-
| InterfaceTypeDefinitionNode
376-
| InterfaceTypeExtensionNode
377373
| InputObjectTypeDefinitionNode
378374
| InputObjectTypeExtensionNode
375+
| InterfaceTypeDefinitionNode
376+
| InterfaceTypeExtensionNode
377+
| ObjectTypeDefinitionNode
378+
| ObjectTypeExtensionNode
379379
>,
380380
) => {
381381
checkNodes(node.fields);
@@ -408,7 +408,7 @@ export const rule: GraphQLESLintRule<RuleOptions> = {
408408
if (argumentsSelector) {
409409
listeners[argumentsSelector] = (
410410
node: GraphQLESTreeNode<
411-
FieldDefinitionNode | FieldNode | DirectiveDefinitionNode | DirectiveNode
411+
DirectiveDefinitionNode | DirectiveNode | FieldDefinitionNode | FieldNode
412412
>,
413413
) => {
414414
checkNodes(node.arguments);

‎packages/plugin/src/rules/graphql-js-validation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function validateDocument({
5252
token => token.loc.start.line === line && token.loc.start.column === column - 1,
5353
);
5454

55-
let loc: { line: number; column: number } | AST.SourceLocation = {
55+
let loc: AST.SourceLocation | { line: number; column: number } = {
5656
line,
5757
column: column - 1,
5858
};
@@ -168,7 +168,7 @@ const validationToRule = (
168168
},
169169
docs: RuleDocsInfo<any>,
170170
): Record<typeof ruleId, GraphQLESLintRule<[], true>> => {
171-
let ruleFn: null | ValidationRule = null;
171+
let ruleFn: ValidationRule | null = null;
172172

173173
try {
174174
ruleFn = require(`graphql/validation/rules/${ruleName}Rule`)[`${ruleName}Rule`];

‎packages/plugin/src/rules/no-typename-prefix.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ export const rule: GraphQLESLintRule = {
4848
return {
4949
'ObjectTypeDefinition, ObjectTypeExtension, InterfaceTypeDefinition, InterfaceTypeExtension'(
5050
node: GraphQLESTreeNode<
51-
| ObjectTypeDefinitionNode
52-
| ObjectTypeExtensionNode
5351
| InterfaceTypeDefinitionNode
5452
| InterfaceTypeExtensionNode
53+
| ObjectTypeDefinitionNode
54+
| ObjectTypeExtensionNode
5555
>,
5656
) {
5757
const typeName = node.name.value;

‎packages/plugin/src/rules/relay-arguments.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ export const rule: GraphQLESLintRule<RuleOptions, true> = {
9898
}
9999

100100
function checkField(
101-
typeName: 'String' | 'Int',
102-
argumentName: 'first' | 'last' | 'after' | 'before',
101+
typeName: 'Int' | 'String',
102+
argumentName: 'after' | 'before' | 'first' | 'last',
103103
): void {
104104
const argument = args[argumentName];
105105
const hasArgument = !!argument;

0 commit comments

Comments
 (0)