chore: adjust types

Signed-off-by: Ferdinand Thiessen <[email protected]>

Author: susnux

lib/configs/codeStyle.ts

@@ -20,7 +20,7 @@ import l10nPlugin from '../plugins/l10n/index.ts'
  *
  * @param options options defining the config preset flavor
  */
-export function codeStyle(options: ConfigOptions): (Linter.Config | Linter.BaseConfig)[] {
+export function codeStyle(options: ConfigOptions): Linter.Config[] {
 	return [
 		// Nextcloud code style
 		{

lib/index.ts

@@ -2,6 +2,8 @@
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
+import type { Linter } from 'eslint'
 import type { ConfigOptions } from './types.d.ts'
 
 import { codeStyle } from './configs/codeStyle.ts'
@@ -18,7 +20,7 @@ import { vue3 } from './configs/vue3.ts'
 /**
  * Nextcloud shared configuration for projects using Vue 2 with Javascript <script> blocks
  */
-export const recommendedVue2Javascript = createConfig({
+export const recommendedVue2Javascript: Linter.Config[] = createConfig({
 	isLibrary: false,
 	vue2: true,
 	vueIsTypescript: false,
@@ -27,7 +29,7 @@ export const recommendedVue2Javascript = createConfig({
 /**
  * Nextcloud shared configuration for projects using Vue 2 with Typescript <script> blocks
  */
-export const recommendedVue2 = createConfig({
+export const recommendedVue2: Linter.Config[] = createConfig({
 	isLibrary: false,
 	vue2: true,
 	vueIsTypescript: true,
@@ -36,31 +38,31 @@ export const recommendedVue2 = createConfig({
 /**
  * Nextcloud shared configuration for projects using Vue 3 with Javascript <script> blocks
  */
-export const recommendedJavascript = createConfig({
+export const recommendedJavascript: Linter.Config[] = createConfig({
 	isLibrary: false,
 	vueIsTypescript: false,
 })
 
 /**
  * Nextcloud shared configuration for projects using Vue 3 with Typescript <script> blocks
  */
-export const recommended = createConfig({
+export const recommended: Linter.Config[] = createConfig({
 	isLibrary: false,
 	vueIsTypescript: true,
 })
 
 /**
  * Nextcloud shared configuration for projects using Vue 3 with Typescript <script> blocks
  */
-export const recommendedLibrary = createConfig({
+export const recommendedLibrary: Linter.Config[] = createConfig({
 	isLibrary: true,
 	vueIsTypescript: true,
 })
 
 /**
  * Nextcloud shared configuration for projects using Vue 3 with Typescript <script> blocks
  */
-export const recommendedVue2Library = createConfig({
+export const recommendedVue2Library: Linter.Config[] = createConfig({
 	isLibrary: true,
 	vue2: true,
 	vueIsTypescript: true,
@@ -75,7 +77,7 @@ export { default as l10nPlugin } from './plugins/l10n/index.ts'
  *
  * @param options - Configuration options
  */
-function createConfig(options: ConfigOptions & { vue2?: boolean }) {
+function createConfig(options: ConfigOptions & { vue2?: boolean }): Linter.Config[] {
 	return [
 		...filesystem,
 		...javascript(options),

lib/plugins/packageJson.ts

@@ -3,13 +3,14 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import type { JSONRuleDefinition, JSONRuleVisitor } from '@eslint/json/types'
 import type { ESLint, Rule } from 'eslint'
 
 import path from 'node:path'
 import sortPackageJson from 'sort-package-json'
 import { packageVersion } from '../version.ts'
 
-const SortPackageJsonRule: Rule.RuleModule = {
+const SortPackageJsonRule: JSONRuleDefinition = {
 	meta: {
 		fixable: 'code',
 		docs: {
@@ -33,7 +34,7 @@ const SortPackageJsonRule: Rule.RuleModule = {
 		],
 	},
 
-	create(context: Rule.RuleContext): Rule.RuleListener {
+	create(context) {
 		if (path.basename(context.filename) !== 'package.json') {
 			return {}
 		}
@@ -51,12 +52,13 @@ const SortPackageJsonRule: Rule.RuleModule = {
 						node: body,
 						message: 'package.json is not sorted correctly',
 						fix(fixer: Rule.RuleFixer): Rule.Fix {
+							// @ts-expect-error its always an object node
 							return fixer.replaceText(body, sortedPackageJsonText)
 						},
 					})
 				}
 			},
-		} satisfies Rule.NodeListener
+		} as JSONRuleVisitor
 	},
 }
 
@@ -69,6 +71,7 @@ const Plugin: ESLint.Plugin = {
 		version: packageVersion,
 	},
 	rules: {
+		// @ts-expect-error ESLint is missing some API for language-specific rules
 		'sort-package-json': SortPackageJsonRule,
 	},
 }

lib/utils.ts

@@ -11,7 +11,7 @@ import type { Linter } from 'eslint'
  * @param configs The configs to restrict
  * @param files The glob pattern to assign
  */
-export function restrictConfigFiles(configs: Linter.Config[], files: string[]) {
+export function restrictConfigFiles(configs: Linter.Config[], files: string[]): Linter.Config[] {
 	return configs.map((config) => ({
 		...config,
 		files: [