fix: null from tseslint

darraghoriordan · Feb 1, 2025 · 8cab1fe · 8cab1fe
1 parent f9d4855
commit 8cab1fe
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -46,13 +46,12 @@ export const plugin: TSESLint.FlatConfig.Plugin = classicPlugin as Omit<
 >;
 const flatBaseConfig = (
     plugin: FlatConfig.Plugin,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     parser: FlatConfig.Parser
 ): FlatConfig.Config => {
     const baseConfig: FlatConfig.Config = {
         name: "@darraghor/nestjs-typed/base",
         languageOptions: {
-            // parser,
+            parser,
             sourceType: "module",
         },
         plugins: {

diff --git a/src/rules/injectablesShouldBeProvided/injectableShouldBeProvided.ts b/src/rules/injectablesShouldBeProvided/injectableShouldBeProvided.ts
@@ -103,10 +103,14 @@ function initializeModuleMappings(
             process.cwd()
         );
 
-    listOfPotentialNestModuleFiles = FileEnumeratorWrapper.enumerateFiles(
-        mappedSourceDirectory,
-        [".ts"],
-        filterFromPaths
+    listOfPotentialNestModuleFiles = FileEnumeratorWrapper.enumerateFiles({
+        sourceGlobs: mappedSourceDirectory,
+        extensions: [".ts"],
+        filterFromPaths,
+    });
+    console.log(
+        "listOfPotentialNestModuleFiles",
+        listOfPotentialNestModuleFiles
     );
 
     nestModuleMap = NestProvidedInjectableMapper.parseFileList(

diff --git a/src/utils/files/customFileEnumeratorWrapper.ts b/src/utils/files/customFileEnumeratorWrapper.ts
@@ -9,11 +9,15 @@ interface FilePath {
 
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class
 export class FileEnumerator {
-    static enumerateFiles(
-        sourceGlobs: string[],
-        extensions: string[],
-        filterFromPaths: string[]
-    ): FilePath[] {
+    static enumerateFiles({
+        sourceGlobs,
+        extensions,
+        filterFromPaths,
+    }: {
+        sourceGlobs: string[];
+        extensions: string[];
+        filterFromPaths: string[];
+    }): FilePath[] {
         // Create glob pattern that includes extensions
         const patterns = sourceGlobs.flatMap((pattern) => {
             if (path.extname(pattern)) {

diff --git a/src/utils/nestModules/nestProvidedInjectableMapper.ts b/src/utils/nestModules/nestProvidedInjectableMapper.ts
@@ -38,15 +38,12 @@ const NestProvidedInjectableMapper = {
     parseFileList(
         files: {
             ignored: boolean;
-            filename: NestProvidedFilePath;
+            filename: string;
         }[],
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         context: Readonly<TSESLint.RuleContext<never, any>>
-    ): Map<NestProvidedFilePath, NestProvidedInjectablesMap> {
-        const moduleMaps = new Map<
-            NestProvidedFilePath,
-            NestProvidedInjectablesMap
-        >();
+    ): Map<string, NestProvidedInjectablesMap> {
+        const moduleMaps = new Map<string, NestProvidedInjectablesMap>();
         files
             .map((f) => {
                 const fileContents =
@@ -58,9 +55,7 @@ const NestProvidedInjectableMapper = {
                     context
                 );
 
-                const result:
-                    | [NestProvidedFilePath, NestProvidedInjectablesMap]
-                    | null =
+                const result: [string, NestProvidedInjectablesMap] | null =
                     NestProvidedInjectableMapper.mapAllProvidedInjectablesInModuleOrProviderFile(
                         fileAstString,
                         f.filename
@@ -69,6 +64,7 @@ const NestProvidedInjectableMapper = {
             })
             // eslint-disable-next-line @typescript-eslint/unbound-method
             .filter(NestProvidedInjectableMapper.notEmpty)
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             .forEach((m) => moduleMaps.set(m[0], m[1]));
 
         return moduleMaps;
@@ -100,7 +96,7 @@ const NestProvidedInjectableMapper = {
     mapAllProvidedInjectablesInModuleOrProviderFile(
         ast: TSESTree.Program,
         path: string
-    ): [NestProvidedFilePath, NestProvidedInjectablesMap] | null {
+    ): [string, NestProvidedInjectablesMap] | null {
         try {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
             if (!unambiguous.isModule(ast as any)) {