Skip to content

Commit 20cdaa1

Browse files
dblockdblock
authored
Fix: '@typescript-eslint/indent': 'warn'. (#262)
Signed-off-by: dblock <[email protected]>
1 parent 61a10f4 commit 20cdaa1

35 files changed

+1260
-1261
lines changed

‎tools/eslint.config.mjs

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export default [
2626
'@typescript-eslint/consistent-type-imports': 'warn',
2727
'@typescript-eslint/dot-notation': 'warn',
2828
'@typescript-eslint/explicit-function-return-type': 'warn',
29-
'@typescript-eslint/indent': 'warn',
3029
'@typescript-eslint/keyword-spacing': 'warn',
3130
'@typescript-eslint/lines-between-class-members': 'warn',
3231
'@typescript-eslint/member-delimiter-style': 'warn',

‎tools/helpers.ts

+29-29
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@ import YAML from "yaml";
33
import _ from "lodash";
44

55
export function resolve(ref: string, root: Record<string, any>) {
6-
const paths = ref.replace('#/', '').split('/');
7-
for(const p of paths) {
8-
root = root[p];
9-
if(root === undefined) break;
10-
}
11-
return root;
6+
const paths = ref.replace('#/', '').split('/');
7+
for(const p of paths) {
8+
root = root[p];
9+
if(root === undefined) break;
10+
}
11+
return root;
1212
}
1313

1414
export function sortByKey(obj: Record<string, any>, priorities: string[] = []) {
15-
const orders = _.fromPairs(priorities.map((k, i) => [k, i+1]));
16-
const sorted = _.entries(obj).sort((a,b) => {
17-
const order_a = orders[a[0]];
18-
const order_b = orders[b[0]];
19-
if(order_a && order_b) return order_a - order_b;
20-
if(order_a) return 1;
21-
if(order_b) return -1;
22-
return a[0].localeCompare(b[0]);
23-
});
24-
sorted.forEach(([k, v]) => {
25-
delete obj[k];
26-
obj[k] = v;
27-
});
15+
const orders = _.fromPairs(priorities.map((k, i) => [k, i+1]));
16+
const sorted = _.entries(obj).sort((a,b) => {
17+
const order_a = orders[a[0]];
18+
const order_b = orders[b[0]];
19+
if(order_a && order_b) return order_a - order_b;
20+
if(order_a) return 1;
21+
if(order_b) return -1;
22+
return a[0].localeCompare(b[0]);
23+
});
24+
sorted.forEach(([k, v]) => {
25+
delete obj[k];
26+
obj[k] = v;
27+
});
2828
}
2929

3030
export function write2file(file_path: string, content: Record<string, any>): void {
31-
fs.writeFileSync(file_path, quoteRefs(YAML.stringify(removeAnchors(content), {lineWidth: 0, singleQuote: true})));
31+
fs.writeFileSync(file_path, quoteRefs(YAML.stringify(removeAnchors(content), {lineWidth: 0, singleQuote: true})));
3232
}
3333

3434
function quoteRefs(str: string): string {
35-
return str.split('\n').map((line) => {
36-
if(line.includes('$ref')) {
37-
const [key, value] = line.split(': ');
38-
if(!value.startsWith("'")) line = `${key}: '${value}'`;
39-
}
40-
return line
41-
}).join('\n');
35+
return str.split('\n').map((line) => {
36+
if(line.includes('$ref')) {
37+
const [key, value] = line.split(': ');
38+
if(!value.startsWith("'")) line = `${key}: '${value}'`;
39+
}
40+
return line
41+
}).join('\n');
4242
}
4343

4444
function removeAnchors(content: Record<string, any>): Record<string, any> {
45-
const replacer = (key: string, value: any) => key === '$anchor' ? undefined : value;
46-
return JSON.parse(JSON.stringify(content, replacer));
45+
const replacer = (key: string, value: any) => key === '$anchor' ? undefined : value;
46+
return JSON.parse(JSON.stringify(content, replacer));
4747
}

‎tools/linter/PathRefsValidator.ts

+60-60
Original file line numberDiff line numberDiff line change
@@ -3,74 +3,74 @@ import RootFile from "./components/RootFile";
33
import NamespacesFolder from "./components/NamespacesFolder";
44

55
export default class PathRefsValidator {
6-
root_file: RootFile;
7-
namespaces_folder: NamespacesFolder;
6+
root_file: RootFile;
7+
namespaces_folder: NamespacesFolder;
88

9-
referenced_paths: Record<string, Set<string>> = {}; // file -> paths
10-
available_paths: Record<string, Set<string>> = {}; // file -> paths
9+
referenced_paths: Record<string, Set<string>> = {}; // file -> paths
10+
available_paths: Record<string, Set<string>> = {}; // file -> paths
1111

12-
constructor(root_file: RootFile, namespaces_folder: NamespacesFolder) {
13-
this.root_file = root_file;
14-
this.namespaces_folder = namespaces_folder;
15-
this.#build_referenced_paths();
16-
this.#build_available_paths();
17-
}
12+
constructor(root_file: RootFile, namespaces_folder: NamespacesFolder) {
13+
this.root_file = root_file;
14+
this.namespaces_folder = namespaces_folder;
15+
this.#build_referenced_paths();
16+
this.#build_available_paths();
17+
}
1818

19-
#build_referenced_paths() {
20-
for (const [path, spec] of Object.entries(this.root_file.spec().paths)) {
21-
const ref = spec!.$ref!;
22-
const file = ref.split('#')[0];
23-
if(!this.referenced_paths[file]) this.referenced_paths[file] = new Set();
24-
this.referenced_paths[file].add(path);
25-
}
19+
#build_referenced_paths() {
20+
for (const [path, spec] of Object.entries(this.root_file.spec().paths)) {
21+
const ref = spec!.$ref!;
22+
const file = ref.split('#')[0];
23+
if(!this.referenced_paths[file]) this.referenced_paths[file] = new Set();
24+
this.referenced_paths[file].add(path);
2625
}
26+
}
2727

28-
#build_available_paths() {
29-
for (const file of this.namespaces_folder.files) {
30-
this.available_paths[file.file] = new Set(Object.keys(file.spec().paths || {}));
31-
}
28+
#build_available_paths() {
29+
for (const file of this.namespaces_folder.files) {
30+
this.available_paths[file.file] = new Set(Object.keys(file.spec().paths || {}));
3231
}
32+
}
3333

34-
validate(): ValidationError[] {
35-
return [
36-
...this.validate_unresolved_refs(),
37-
...this.validate_unreferenced_paths(),
38-
];
39-
}
34+
validate(): ValidationError[] {
35+
return [
36+
...this.validate_unresolved_refs(),
37+
...this.validate_unreferenced_paths(),
38+
];
39+
}
4040

41-
validate_unresolved_refs(): ValidationError[] {
42-
return Object.entries(this.referenced_paths).flatMap(([ref_file, ref_paths]) => {
43-
const available = this.available_paths[ref_file];
44-
if(!available) return {
45-
file: this.root_file.file,
46-
location: `Paths: ${[...ref_paths].join(' , ')}`,
47-
message: `Unresolved path reference: Namespace file ${ref_file} does not exist.`,
48-
};
41+
validate_unresolved_refs(): ValidationError[] {
42+
return Object.entries(this.referenced_paths).flatMap(([ref_file, ref_paths]) => {
43+
const available = this.available_paths[ref_file];
44+
if(!available) return {
45+
file: this.root_file.file,
46+
location: `Paths: ${[...ref_paths].join(' , ')}`,
47+
message: `Unresolved path reference: Namespace file ${ref_file} does not exist.`,
48+
};
4949

50-
return Array.from(ref_paths).map((path) => {
51-
if(!available.has(path)) return {
52-
file: this.root_file.file,
53-
location: `Path: ${path}`,
54-
message: `Unresolved path reference: Path ${path} does not exist in namespace file ${ref_file}.`,
55-
};
56-
}).filter((e) => e) as ValidationError[];
57-
});
58-
}
50+
return Array.from(ref_paths).map((path) => {
51+
if(!available.has(path)) return {
52+
file: this.root_file.file,
53+
location: `Path: ${path}`,
54+
message: `Unresolved path reference: Path ${path} does not exist in namespace file ${ref_file}.`,
55+
};
56+
}).filter((e) => e) as ValidationError[];
57+
});
58+
}
5959

60-
validate_unreferenced_paths(): ValidationError[] {
61-
return Object.entries(this.available_paths).flatMap(([ns_file, ns_paths]) => {
62-
const referenced = this.referenced_paths[ns_file];
63-
if(!referenced) return {
64-
file: ns_file,
65-
message: `Unreferenced paths: No paths are referenced in the root file.`,
66-
};
67-
return Array.from(ns_paths).map((path) => {
68-
if(!referenced || !referenced.has(path)) return {
69-
file: ns_file,
70-
location: `Path: ${path}`,
71-
message: `Unreferenced path: Path ${path} is not referenced in the root file.`,
72-
};
73-
}).filter((e) => e) as ValidationError[];
74-
});
75-
}
60+
validate_unreferenced_paths(): ValidationError[] {
61+
return Object.entries(this.available_paths).flatMap(([ns_file, ns_paths]) => {
62+
const referenced = this.referenced_paths[ns_file];
63+
if(!referenced) return {
64+
file: ns_file,
65+
message: `Unreferenced paths: No paths are referenced in the root file.`,
66+
};
67+
return Array.from(ns_paths).map((path) => {
68+
if(!referenced || !referenced.has(path)) return {
69+
file: ns_file,
70+
location: `Path: ${path}`,
71+
message: `Unreferenced path: Path ${path} is not referenced in the root file.`,
72+
};
73+
}).filter((e) => e) as ValidationError[];
74+
});
75+
}
7676
}

0 commit comments

Comments
 (0)