Revert "Refactor Cosmiconfig types" (#7661)

This reverts commit 9afaa08.
stylelint · May 1, 2024 · c56f714 · c56f714
1 parent f87f784
commit c56f714
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 50 deletions.
diff --git a/.changeset/little-mirrors-deny.md b/.changeset/little-mirrors-deny.md
@@ -0,0 +1,5 @@
+---
+"stylelint": patch
+---
+
+Fixed: `CosmiconfigResult` type error
diff --git a/lib/getConfigForFile.cjs b/lib/getConfigForFile.cjs
@@ -11,11 +11,15 @@ const configurationError = require('./utils/configurationError.cjs');
 const IS_TEST = process.env.NODE_ENV === 'test';
 const STOP_DIR = IS_TEST ? process.cwd() : undefined;
 
+/** @typedef {import('stylelint').InternalApi} StylelintInternalApi */
+/** @typedef {import('stylelint').Config} StylelintConfig */
+/** @typedef {import('stylelint').CosmiconfigResult} StylelintCosmiconfigResult */
+
 /**
- * @param {import('stylelint').InternalApi} stylelint
+ * @param {StylelintInternalApi} stylelint
  * @param {string} [searchPath]
  * @param {string} [filePath]
- * @returns {Promise<import('stylelint').CosmiconfigResult>}
+ * @returns {Promise<StylelintCosmiconfigResult>}
  */
 async function getConfigForFile(
 	stylelint,

diff --git a/lib/getConfigForFile.mjs b/lib/getConfigForFile.mjs
@@ -9,11 +9,15 @@ import configurationError from './utils/configurationError.mjs';
 const IS_TEST = process.env.NODE_ENV === 'test';
 const STOP_DIR = IS_TEST ? process.cwd() : undefined;
 
+/** @typedef {import('stylelint').InternalApi} StylelintInternalApi */
+/** @typedef {import('stylelint').Config} StylelintConfig */
+/** @typedef {import('stylelint').CosmiconfigResult} StylelintCosmiconfigResult */
+
 /**
- * @param {import('stylelint').InternalApi} stylelint
+ * @param {StylelintInternalApi} stylelint
  * @param {string} [searchPath]
  * @param {string} [filePath]
- * @returns {Promise<import('stylelint').CosmiconfigResult>}
+ * @returns {Promise<StylelintCosmiconfigResult>}
  */
 export default async function getConfigForFile(
 	stylelint,

diff --git a/lib/standalone.cjs b/lib/standalone.cjs
@@ -350,20 +350,8 @@ async function postProcessStylelintResult(stylelint, stylelintResult, filePath)
 		return;
 	}
 
-	let root = stylelintResult?._postcssResult?.root;
-
-	if (root) {
-		if ('type' in root) {
-			if (root.type !== 'root') {
-				root = undefined;
-			}
-		} else {
-			root = undefined;
-		}
-	}
-
-	for (const postprocess of config._processorFunctions.values()) {
-		postprocess?.(stylelintResult, root);
+	for (let postprocess of config._processorFunctions.values()) {
+		postprocess?.(stylelintResult, stylelintResult._postcssResult?.root);
 	}
 }
 

diff --git a/lib/standalone.mjs b/lib/standalone.mjs
@@ -348,19 +348,7 @@ async function postProcessStylelintResult(stylelint, stylelintResult, filePath)
 		return;
 	}
 
-	let root = stylelintResult?._postcssResult?.root;
-
-	if (root) {
-		if ('type' in root) {
-			if (root.type !== 'root') {
-				root = undefined;
-			}
-		} else {
-			root = undefined;
-		}
-	}
-
-	for (const postprocess of config._processorFunctions.values()) {
-		postprocess?.(stylelintResult, root);
+	for (let postprocess of config._processorFunctions.values()) {
+		postprocess?.(stylelintResult, stylelintResult._postcssResult?.root);
 	}
 }
diff --git a/patches/cosmiconfig+9.0.0.patch b/patches/cosmiconfig+9.0.0.patch
diff --git a/types/stylelint/index.d.ts b/types/stylelint/index.d.ts
@@ -1,6 +1,6 @@
 import type * as PostCSS from 'postcss';
 import type { GlobbyOptions } from 'globby';
-import type * as Cosmiconfig from 'cosmiconfig';
+import type { cosmiconfig, TransformSync as CosmiconfigTransformSync } from 'cosmiconfig';
 
 type ConfigExtends = string | string[];
 
@@ -129,7 +129,9 @@ declare namespace stylelint {
 	export type DisablePropertyName = PropertyNamesOfType<Config, DisableSettings>;
 
 	/** @internal */
-	export type CosmiconfigResult = Cosmiconfig.CosmiconfigResult<Config>;
+	export type CosmiconfigResult =
+		| (ReturnType<CosmiconfigTransformSync> & { config: Config })
+		| null;
 
 	/** @internal */
 	export type DisabledRange = {
@@ -768,7 +770,7 @@ declare namespace stylelint {
 	 */
 	export type InternalApi = {
 		_options: LinterOptions & { cwd: string };
-		_extendExplorer: Cosmiconfig.PublicExplorer;
+		_extendExplorer: ReturnType<typeof cosmiconfig>;
 		_specifiedConfigCache: Map<Config, Promise<CosmiconfigResult>>;
 		_postcssResultCache: Map<string, PostCSS.Result>;
 		_fileCache: FileCache;