Skip to content

Commit 276d388

Browse files
committed
refactor(napi/oxlint): rename rules to ruleNames
1 parent 02f84f8 commit 276d388

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

crates/oxc_linter/src/config/config_builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,8 @@ impl ConfigStoreBuilder {
475475
}?;
476476

477477
match result {
478-
PluginLoadResult::Success { name, offset, rules } => {
479-
external_plugin_store.register_plugin(plugin_path, name, offset, rules);
478+
PluginLoadResult::Success { name, offset, rule_names } => {
479+
external_plugin_store.register_plugin(plugin_path, name, offset, rule_names);
480480
Ok(())
481481
}
482482
PluginLoadResult::Failure(e) => Err(ConfigBuilderError::PluginLoadFailed {

crates/oxc_linter/src/external_linter.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ pub type ExternalLinterCb = Arc<
3030

3131
#[derive(Clone, Debug, Deserialize, Serialize)]
3232
pub enum PluginLoadResult {
33-
Success { name: String, offset: usize, rules: Vec<String> },
33+
#[serde(rename_all = "camelCase")]
34+
Success {
35+
name: String,
36+
offset: usize,
37+
rule_names: Vec<String>,
38+
},
3439
Failure(String),
3540
}
3641

crates/oxc_linter/src/external_plugin_store.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl ExternalPluginStore {
3737
plugin_path: String,
3838
plugin_name: String,
3939
offset: usize,
40-
rules: Vec<String>,
40+
rule_names: Vec<String>,
4141
) {
4242
let newly_inserted = self.registered_plugin_paths.insert(plugin_path);
4343
assert!(newly_inserted, "register_plugin: plugin already registered");
@@ -54,7 +54,7 @@ impl ExternalPluginStore {
5454
self.rules.len()
5555
);
5656

57-
for rule_name in rules {
57+
for rule_name in rule_names {
5858
let rule_id = self.rules.push(ExternalRule { name: rule_name.clone(), plugin_id });
5959
self.plugins[plugin_id].rules.insert(rule_name, rule_id);
6060
}

napi/oxlint2/src-js/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ async function loadPluginImpl(path) {
5353

5454
// TODO: Use a validation library to assert the shape of the plugin, and of rules
5555
let ruleId = registeredRules.length;
56-
const rules = [];
56+
const ruleNames = [];
5757
const ret = {
5858
name: plugin.meta.name,
5959
offset: ruleId,
60-
rules,
60+
ruleNames,
6161
};
6262

6363
for (const [ruleName, rule] of Object.entries(plugin.rules)) {
64-
rules.push(ruleName);
64+
ruleNames.push(ruleName);
6565
registeredRules.push({ rule, context: new Context(ruleId) });
6666
ruleId++;
6767
}

0 commit comments

Comments
 (0)