refactor(linter): add output formatter -move to oxlint

oxc-project · Jan 11, 2025 · 6abc40a · 6abc40a
1 parent dc8ffb0
commit 6abc40a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/oxlint/Cargo.toml b/apps/oxlint/Cargo.toml
@@ -39,6 +39,8 @@ bpaf = { workspace = true, features = ["autocomplete", "bright-color", "derive"]
 ignore = { workspace = true, features = ["simd-accel"] }
 miette = { workspace = true }
 rayon = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 tempfile = { workspace = true }
 tracing-subscriber = { workspace = true, features = [] } # Omit the `regex` feature
 

diff --git a/apps/oxlint/src/command/lint.rs b/apps/oxlint/src/command/lint.rs
@@ -1,7 +1,9 @@
 use std::path::PathBuf;
 
 use bpaf::Bpaf;
-use oxc_linter::{output_formatter::OutputFormat, AllowWarnDeny, FixKind, LintPlugins};
+use oxc_linter::{AllowWarnDeny, FixKind, LintPlugins};
+
+use crate::output_formatter::OutputFormat;
 
 use super::{
     ignore::{ignore_options, IgnoreOptions},

diff --git a/apps/oxlint/src/lib.rs b/apps/oxlint/src/lib.rs
@@ -1,5 +1,6 @@
 mod command;
 mod lint;
+mod output_formatter;
 mod result;
 mod runner;
 mod walk;

diff --git a/apps/oxlint/src/lint.rs b/apps/oxlint/src/lint.rs
@@ -9,17 +9,16 @@ use ignore::gitignore::Gitignore;
 
 use oxc_diagnostics::{DiagnosticService, GraphicalReportHandler};
 use oxc_linter::{
-    loader::LINT_PARTIAL_LOADER_EXT,
-    output_formatter::{OutputFormat, OutputFormatter},
-    AllowWarnDeny, ConfigStoreBuilder, InvalidFilterKind, LintFilter, LintOptions, LintService,
-    LintServiceOptions, Linter, Oxlintrc,
+    loader::LINT_PARTIAL_LOADER_EXT, AllowWarnDeny, ConfigStoreBuilder, InvalidFilterKind,
+    LintFilter, LintOptions, LintService, LintServiceOptions, Linter, Oxlintrc,
 };
 use oxc_span::VALID_EXTENSIONS;
 
 use crate::{
     cli::{
         CliRunResult, LintCommand, LintResult, MiscOptions, OutputOptions, Runner, WarningOptions,
     },
+    output_formatter::{OutputFormat, OutputFormatter},
     walk::{Extensions, Walk},
 };
 

diff --git a/...xc_linter/src/output_formatter/default.rs → apps/oxlint/src/output_formatter/default.rs b/...xc_linter/src/output_formatter/default.rs → apps/oxlint/src/output_formatter/default.rs
@@ -1,6 +1,6 @@
 use std::io::Write;
 
-use crate::RuleTable;
+use oxc_linter::table::RuleTable;
 
 pub struct DefaultOutputFormatter;
 

diff --git a/...s/oxc_linter/src/output_formatter/json.rs → apps/oxlint/src/output_formatter/json.rs b/...s/oxc_linter/src/output_formatter/json.rs → apps/oxlint/src/output_formatter/json.rs
@@ -1,5 +1,5 @@
-use crate::rules::RULES;
-use crate::RuleCategory;
+use oxc_linter::rules::RULES;
+use oxc_linter::RuleCategory;
 use std::io::Write;
 
 #[derive(Debug)]

diff --git a/...es/oxc_linter/src/output_formatter/mod.rs → apps/oxlint/src/output_formatter/mod.rs b/...es/oxc_linter/src/output_formatter/mod.rs → apps/oxlint/src/output_formatter/mod.rs
diff --git a/crates/oxc_linter/src/lib.rs b/crates/oxc_linter/src/lib.rs
@@ -15,12 +15,11 @@ mod module_graph_visitor;
 mod module_record;
 mod options;
 mod rule;
-mod rules;
 mod service;
 mod utils;
 
 pub mod loader;
-pub mod output_formatter;
+pub mod rules;
 pub mod table;
 
 use std::{path::Path, rc::Rc, sync::Arc};
@@ -45,7 +44,6 @@ use crate::{
     context::ContextHost,
     fixer::{Fixer, Message},
     rules::RuleEnum,
-    table::RuleTable,
     utils::iter_possible_jest_call_node,
 };