From 578aa7e5e84afdb64f5d5f364c24097dee019ded Mon Sep 17 00:00:00 2001 From: Guy Carmeli Date: Mon, 6 Jan 2025 20:14:40 +0200 Subject: [PATCH] Few more lint fixes --- packages/eslint-plugin-obsidian/src/dto/file.ts | 2 +- .../rules/unresolvedProviderDependencies/classResolver.ts | 4 ++-- .../unresolvedProviderDependencies/dependencyResolver.ts | 6 +++--- .../unresolvedProviderDependencies/subgraphResolver.ts | 6 +++--- packages/eslint-plugin-obsidian/src/utils/filter.ts | 4 ++-- .../fixtures/abstractGraph.ts | 4 ++-- .../fixtures/graphThatExtendsAnotherGraph.ts | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/eslint-plugin-obsidian/src/dto/file.ts b/packages/eslint-plugin-obsidian/src/dto/file.ts index 3276036d..bce982e5 100644 --- a/packages/eslint-plugin-obsidian/src/dto/file.ts +++ b/packages/eslint-plugin-obsidian/src/dto/file.ts @@ -58,7 +58,7 @@ export class File { } findClass(byName: string) { - const clazz = this.classes.find(($clazz) => $clazz.name === byName); + const clazz = this.classes.find($clazz => $clazz.name === byName); return clazz && new ClassFile(clazz, this.imports, this.path); } diff --git a/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/classResolver.ts b/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/classResolver.ts index 2505fd5c..f28a53f5 100644 --- a/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/classResolver.ts +++ b/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/classResolver.ts @@ -5,7 +5,7 @@ export class ClassResolver { constructor(private fileReader: FileReader) { } public resolve(clazz: string, from: ClassFile) { - const classPath = from.imports.find(($import) => $import.includes(clazz)); + const classPath = from.imports.find($import => $import.includes(clazz)); return classPath && this.fileReader.read(from.path, classPath.path).findClass(clazz); } -} \ No newline at end of file +} diff --git a/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/dependencyResolver.ts b/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/dependencyResolver.ts index 51f892f0..1eedd61d 100644 --- a/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/dependencyResolver.ts +++ b/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/dependencyResolver.ts @@ -23,11 +23,11 @@ export class DependencyResolver { private getDependenciesFromSubgraphs(clazz: ClassFile): string[] { return this.subgraphResolver .resolve(clazz) - .flatMap(this.getGraphDependencies); + .flatMap((clazz) => this.getGraphDependencies(clazz)); } private getGraphDependencies({ clazz }: ClassFile) { - return clazz.mapDecoratedMethods('Provides', (method) => method.name) ?? []; + return clazz.mapDecoratedMethods('Provides', method => method.name) ?? []; } private getDependenciesFromSuperClass(clazz: ClassFile) { @@ -35,6 +35,6 @@ export class DependencyResolver { return this.classResolver .resolve(clazz.superClass, clazz) ?.clazz - ?.mapDecoratedMethods('Provides', (method) => method.name) ?? []; + ?.mapDecoratedMethods('Provides', method => method.name) ?? []; } } diff --git a/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/subgraphResolver.ts b/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/subgraphResolver.ts index f537d824..2174de9a 100644 --- a/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/subgraphResolver.ts +++ b/packages/eslint-plugin-obsidian/src/rules/unresolvedProviderDependencies/subgraphResolver.ts @@ -16,8 +16,8 @@ export class SubgraphResolver { ...this.getLocalGraphs(clazz), ...this.getExtendedGraphs(clazz), ] - .filter(nonNull) - .flatMap((g) => [g, ...this.resolve(g)]); + .filter(nonNull) + .flatMap(g => [g, ...this.resolve(g)]); } private getImportedGraphs(clazz: ClassFile) { @@ -49,7 +49,7 @@ export class SubgraphResolver { return [this.classResolver.resolve(clazz.superClass, clazz)]; } - private getSubgraphsPropertyFromGraphDecorator({clazz}: ClassFile) { + private getSubgraphsPropertyFromGraphDecorator({ clazz }: ClassFile) { if (clazz.isAbstract) return undefined; const graphDecorator = clazz.requireDecoratorIgnoreCase('Graph'); return graphDecorator.getProperty('subgraphs'); diff --git a/packages/eslint-plugin-obsidian/src/utils/filter.ts b/packages/eslint-plugin-obsidian/src/utils/filter.ts index 2080d608..7c698ef0 100644 --- a/packages/eslint-plugin-obsidian/src/utils/filter.ts +++ b/packages/eslint-plugin-obsidian/src/utils/filter.ts @@ -1,3 +1,3 @@ export function nonNull(value: T): value is NonNullable { - return value !== undefined; -} \ No newline at end of file + return value !== undefined; +} diff --git a/packages/eslint-plugin-obsidian/tests/unresolvedProviderDependencies/fixtures/abstractGraph.ts b/packages/eslint-plugin-obsidian/tests/unresolvedProviderDependencies/fixtures/abstractGraph.ts index b712764f..2e3bee8f 100644 --- a/packages/eslint-plugin-obsidian/tests/unresolvedProviderDependencies/fixtures/abstractGraph.ts +++ b/packages/eslint-plugin-obsidian/tests/unresolvedProviderDependencies/fixtures/abstractGraph.ts @@ -1,8 +1,8 @@ -import { ObjectGraph, Provides } from "react-obsidian"; +import { ObjectGraph, Provides } from 'react-obsidian'; export abstract class AbstractGraph extends ObjectGraph { @Provides() bar(): string { - return "bar"; + return 'bar'; } } diff --git a/packages/eslint-plugin-obsidian/tests/unresolvedProviderDependencies/fixtures/graphThatExtendsAnotherGraph.ts b/packages/eslint-plugin-obsidian/tests/unresolvedProviderDependencies/fixtures/graphThatExtendsAnotherGraph.ts index 25e214fa..dc5bd085 100644 --- a/packages/eslint-plugin-obsidian/tests/unresolvedProviderDependencies/fixtures/graphThatExtendsAnotherGraph.ts +++ b/packages/eslint-plugin-obsidian/tests/unresolvedProviderDependencies/fixtures/graphThatExtendsAnotherGraph.ts @@ -1,10 +1,10 @@ -import { Graph, Provides } from "react-obsidian"; -import { AbstractGraph } from "./abstractGraph"; +import { Graph, Provides } from 'react-obsidian'; +import { AbstractGraph } from './abstractGraph'; @Graph() export abstract class GraphThatExtendsAnotherGraph extends AbstractGraph { @Provides() baz(): string { - return "baz"; + return 'baz'; } }