feat: support overrides in buildFromOxlintConfig(File)

oxc-project · Dec 4, 2024 · 2290e2c · 2290e2c
1 parent 6728fb9
commit 2290e2c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/src/build-from-oxlint-config.spec.ts b/src/build-from-oxlint-config.spec.ts
@@ -235,7 +235,7 @@ describe('buildFromOxlintConfig', () => {
       expect('vitest/no-conditional-tests' in configs[1].rules).toBe(true);
     });
 
-    it('reenable rule in overrides', () => {
+    it(' rule in overrides', () => {
       const configs = buildFromOxlintConfig({
         rules: {
           'no-debugger': 'warn',
@@ -252,11 +252,11 @@ describe('buildFromOxlintConfig', () => {
 
       expect(configs.length).toBe(2);
       assert(configs[0].rules !== undefined);
-      expect(configs[0].rules['no-debugger']).toBe('off');
+      expect('no-debugger' in configs[0].rules).toBe(true);
 
       console.log(configs[1].rules);
       assert(configs[1].rules !== undefined);
-      expect(configs[1].rules['no-debugger']).toBe('warn');
+      expect('no-debugger' in configs[1].rules).toBe(false);
     });
   });
 });

diff --git a/src/build-from-oxlint-config/index.ts b/src/build-from-oxlint-config/index.ts
@@ -83,7 +83,7 @@ export const buildFromOxlintConfig = (
   const configRules = readRulesFromConfig(config);
 
   if (configRules !== undefined) {
-    handleRulesScope(configRules, rules, true);
+    handleRulesScope(configRules, rules);
   }
 
   const overrides = readOverridesFromConfig(config);

diff --git a/src/build-from-oxlint-config/overrides.ts b/src/build-from-oxlint-config/overrides.ts
@@ -30,8 +30,7 @@ export const handleOverridesScope = (
 
     const rules = readRulesFromConfig(override);
     if (rules !== undefined) {
-      // ToDo -- when off, we should enable the default settings
-      handleRulesScope(rules, eslintRules, false);
+      handleRulesScope(rules, eslintRules);
     }
 
     eslintConfig.rules = eslintRules;

diff --git a/src/build-from-oxlint-config/rules.ts b/src/build-from-oxlint-config/rules.ts
@@ -77,8 +77,7 @@ const isActiveValue = (value: unknown) =>
  */
 export const handleRulesScope = (
   oxlintRules: OxlintConfigRules,
-  rules: Record<string, 'off' | 'warn'>,
-  disableRule: boolean
+  rules: Record<string, 'off'>
 ): void => {
   for (const rule in oxlintRules) {
     const eslintName = getEsLintRuleName(rule);
@@ -95,13 +94,7 @@ export const handleRulesScope = (
       rules[eslintName] = 'off';
     } else if (rule in rules && isDeactivateValue(oxlintRules[rule])) {
       // rules extended by categories or plugins can be disabled manually
-      if (disableRule) {
-        delete rules[eslintName];
-      }
-      // inside overrides we need to enable the rule again
-      else {
-        rules[eslintName] = 'warn';
-      }
+      delete rules[eslintName];
     }
   }
 };

diff --git a/src/build-from-oxlint-config/types.ts b/src/build-from-oxlint-config/types.ts
@@ -12,9 +12,7 @@ export type OxlintConfigOverride = {
   rules?: OxlintConfigRules;
 };
 
-export type EslintPluginOxLintConfig = Linter.Config<
-  Record<string, 'off' | 'warn'>
->;
+export type EslintPluginOxLintConfig = Linter.Config<Record<string, 'off'>>;
 
 export type OxlintConfig = {
   [key: string]: unknown;