Correctly use ignores config, Lint xo with xo (#584)

index.js

@@ -13,7 +13,6 @@ import {
 	getIgnores,
 	mergeWithFileConfig,
 	buildConfig,
-	mergeOptions,
 } from './lib/options-manager.js';
 
 /** Merge multiple reports into a single report */
@@ -152,7 +151,7 @@ const lintFiles = async (patterns, inputOptions = {}) => {
 	inputOptions = normalizeOptions(inputOptions);
 	inputOptions.cwd = path.resolve(inputOptions.cwd || process.cwd());
 
-	const files = await globFiles(patterns, mergeOptions(inputOptions));
+	const files = await globFiles(patterns, mergeWithFileConfig(inputOptions).options);
 
 	const reports = await pMap(
 		files,

lib/options-manager.js

@@ -540,12 +540,13 @@ const gatherImportResolvers = options => {
 };
 
 export {
-	findApplicableOverrides,
-	mergeWithPrettierConfig,
 	normalizeOptions,
 	getIgnores,
 	mergeWithFileConfig,
 	buildConfig,
+
+	// For tests
 	applyOverrides,
-	mergeOptions,
+	findApplicableOverrides,
+	mergeWithPrettierConfig,
 };

package.json

@@ -16,7 +16,7 @@
 		"node": ">=12.20"
 	},
 	"scripts": {
-		"test": "eslint --quiet . --ext .js,.cjs && nyc ava"
+		"test": "node cli.js && nyc ava"
 	},
 	"files": [
 		"config",
@@ -106,18 +106,13 @@
 		"temp-write": "^5.0.0",
 		"webpack": "^5.48.0"
 	},
-	"eslintConfig": {
-		"extends": [
-			"eslint-config-xo",
-			"./config/plugins.cjs",
-			"./config/overrides.cjs"
+	"xo": {
+		"ignores": [
+			"test/fixtures",
+			"test/temp",
+			"coverage"
 		]
 	},
-	"eslintIgnore": [
-		"test/fixtures",
-		"test/temp",
-		"coverage"
-	],
 	"ava": {
 		"files": [
 			"!test/temp"

test/fixtures/nested-ignores/a.js

@@ -0,0 +1 @@
+console.log('semicolon')

test/fixtures/nested-ignores/b.js

@@ -0,0 +1 @@
+console.log('semicolon')

test/fixtures/nested-ignores/child/a.js

@@ -0,0 +1 @@
+console.log('semicolon')

test/fixtures/nested-ignores/child/b.js

@@ -0,0 +1 @@
+console.log('semicolon')

test/fixtures/nested-ignores/child/package.json

@@ -0,0 +1,8 @@
+{
+	"xo": {
+		"ignores": [
+			"b.js",
+			"**/b.js"
+		]
+	}
+}

test/fixtures/nested-ignores/package.json

@@ -0,0 +1,8 @@
+{
+	"xo": {
+		"ignores": [
+			"a.js",
+			"**/a.js"
+		]
+	}
+}

test/ignores.js

@@ -0,0 +1,40 @@
+import path from 'node:path';
+import test from 'ava';
+import createEsmUtils from 'esm-utils';
+import {globby} from 'globby';
+import xo from '../index.js';
+
+const {__dirname} = createEsmUtils(import.meta);
+
+test('Should pickup "ignores" config', async t => {
+	const cwd = path.join(__dirname, 'fixtures/nested-ignores');
+
+	t.deepEqual(
+		await globby(['**/*.js'], {cwd}),
+		['a.js', 'b.js', 'child/a.js', 'child/b.js'],
+		'Should has 4 js files.',
+	);
+
+	// Should not match
+	// `a.js` (ignored by config in current directory)
+	// `child/a.js` (ignored by config in current directory)
+	// `child/b.js` (ignored by config in child directory)
+	const result = await xo.lintFiles('.', {cwd});
+	const files = result.results.map(({filePath}) => filePath);
+	t.deepEqual(files, [path.join(cwd, 'b.js')], 'Should only report on `b.js`.');
+});
+
+test('Should ignore "ignores" config in parent', async t => {
+	const cwd = path.join(__dirname, 'fixtures/nested-ignores/child');
+
+	t.deepEqual(
+		await globby(['**/*.js'], {cwd}),
+		['a.js', 'b.js'],
+		'Should has 2 js files.',
+	);
+
+	// Should only match `a.js` even it's ignored in parent
+	const result = await xo.lintFiles('.', {cwd});
+	const files = result.results.map(({filePath}) => filePath);
+	t.deepEqual(files, [path.join(cwd, 'a.js')], 'Should only report on `a.js`.');
+});