wip

privatenumber · Dec 20, 2023 · 251c8e3 · 251c8e3
1 parent 17e3b10
commit 251c8e3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/parse-tsconfig/index.ts b/src/parse-tsconfig/index.ts
@@ -11,7 +11,7 @@ const resolveExtends = (
 	extendsPath: string,
 	fromDirectoryPath: string,
 	circularExtendsTracker: Set<string>,
-	cache?: Cache,
+	cache?: Cache<string>,
 ) => {
 	const resolvedExtendsPath = resolveExtendsPath(
 		extendsPath,
@@ -79,7 +79,7 @@ const resolveExtends = (
 
 const _parseTsconfig = (
 	tsconfigPath: string,
-	cache?: Cache,
+	cache?: Cache<string>,
 	circularExtendsTracker = new Set<string>(),
 ): TsConfigJsonResolved => {
 	let realTsconfigPath: string;
@@ -213,5 +213,5 @@ const _parseTsconfig = (
 
 export const parseTsconfig = (
 	tsconfigPath: string,
-	cache: Cache = new Map(),
+	cache: Cache<string> = new Map(),
 ): TsConfigJsonResolved => _parseTsconfig(tsconfigPath, cache);
diff --git a/src/parse-tsconfig/resolve-extends-path.ts b/src/parse-tsconfig/resolve-extends-path.ts
@@ -18,7 +18,7 @@ const resolveFromPackageJsonPath = (
 	packageJsonPath: string,
 	subpath: string,
 	ignoreExports?: boolean,
-	cache?: Cache,
+	cache?: Cache<string>,
 ) => {
 	const cacheKey = `resolveFromPackageJsonPath:${packageJsonPath}:${subpath}:${ignoreExports}`;
 	if (cache?.has(cacheKey)) {
@@ -67,7 +67,7 @@ const TS_CONFIG_JSON = 'tsconfig.json';
 export const resolveExtendsPath = (
 	requestedPath: string,
 	directoryPath: string,
-	cache?: Cache,
+	cache?: Cache<string>,
 ) => {
 	let filePath = requestedPath;
 

diff --git a/src/types.ts b/src/types.ts
@@ -18,4 +18,4 @@ export type TsConfigResult = {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type Cache = Map<string, any>;
+export type Cache<value = any> = Map<string, value>;
diff --git a/src/utils/fs-cached.ts b/src/utils/fs-cached.ts
@@ -16,12 +16,14 @@ const cacheFs = <MethodName extends keyof FsMethods>(
 	name: MethodName,
 ) => {
 	const method = fs[name];
+	type FsReturnType = ReturnType<FsMethods[MethodName]>;
+
 	return (
 		cache?: Cache,
 		...args: any[]
-	): ReturnType<FsMethods[MethodName]> => {
+	): FsReturnType => {
 		const cacheKey = `${name}:${args.join(':')}`;
-		let result = cache?.get(cacheKey);
+		let result = cache?.get(cacheKey) as FsReturnType;
 
 		if (result === undefined) {
 			result = Reflect.apply(method, fs, args);