chore: rewrite file watcher

Author: yurks

src/index.ts

@@ -5,14 +5,10 @@ import {
   generate,
   loadContext,
 } from '@graphql-codegen/cli';
-import {
-  type FileMatcher,
-  isCodegenConfig,
-  isGraphQLDocument,
-  isGraphQLSchema,
-} from './utils/fileMatchers';
+import { isCodegenConfig, isFileMatched } from './utils/fileMatchers';
 import { isBuildMode, isServeMode, type ViteMode } from './utils/viteModes';
 import { debugLog } from './utils/debugLog';
+import { getDocumentPaths, getSchemaPaths } from './utils/configPaths';
 
 export interface Options {
   /**
@@ -178,56 +174,41 @@ export function GraphQLCodegen(options?: Options): Plugin {
         }
       }
     },
-    configureServer(server) {
+    async configureServer(server) {
       if (!enableWatcher) return;
 
-      const listener = async (filePath = '') => {
-        log('File changed:', filePath);
+      const documentPaths = await getDocumentPaths(codegenContext);
+      const schemaPaths = await getSchemaPaths(codegenContext);
 
-        const isConfig = await isCodegenConfig(filePath, codegenContext);
+      const isMatch = (filePath: string) => {
+        let matched = false;
+        if (matchOnDocuments) {
+          if (isFileMatched(filePath, documentPaths)) {
+            matched = true;
+            log(`Graphql document file matched: ${filePath}`);
+          }
+        }
+
+        if (matchOnSchemas) {
+          if (isFileMatched(filePath, schemaPaths)) {
+            matched = true;
+            log(`Graphql schema file matched: ${filePath}`);
+          }
+        }
+
+        return matched;
+      };
+
+      const listener = async (filePath = '') => {
+        const isConfig = isCodegenConfig(filePath, codegenContext.filepath);
 
         if (isConfig) {
           log('Codegen config file changed, restarting vite');
-          server.restart();
+          await server.restart();
           return;
         }
 
-        const matchers: [
-          enabled: boolean,
-          name: string,
-          matcher: FileMatcher,
-        ][] = [
-          [matchOnDocuments, 'document', isGraphQLDocument],
-          [matchOnSchemas, 'schema', isGraphQLSchema],
-        ];
-
-        const matcherResults = await Promise.all(
-          matchers.map(async ([enabled, name, matcher]) => {
-            if (!enabled) {
-              log(`Check for ${name} file skipped in file watcher by config`);
-              return false;
-            }
-
-            try {
-              const isMatch = await matcher(filePath, codegenContext);
-
-              log(`Check for ${name} file successful in file watcher`);
-
-              if (isMatch) log(`File matched a graphql ${name}`);
-              else log(`File did not match a graphql ${name}`);
-
-              return isMatch;
-            } catch (error) {
-              // GraphQL Codegen handles logging useful errors
-              log(`Check for ${name} file failed in file watcher`);
-              return false;
-            }
-          }),
-        );
-
-        const isMatch = matcherResults.some((result) => result);
-
-        if (!isMatch) return;
+        if (!isMatch(filePath)) return;
 
         try {
           await generateWithOverride(configOverrideWatcher);

src/utils/fileMatchers.ts

@@ -1,34 +1,15 @@
 import { normalizePath } from 'vite';
-import type { CodegenContext } from '@graphql-codegen/cli';
-import { getDocumentPaths, getSchemaPaths } from '../utils/configPaths';
 
-export type FileMatcher = (
-  filePath: string,
-  context: CodegenContext,
-) => Promise<boolean>;
+export const isCodegenConfig = (filePath: string, configPath?: string) => {
+  if (!configPath) return false;
 
-export const isCodegenConfig: FileMatcher = async (filePath, context) => {
-  if (!context.filepath) return false;
-
-  return normalizePath(filePath) === normalizePath(context.filepath);
-};
-
-export const isGraphQLDocument: FileMatcher = async (filePath, context) => {
-  const documentPaths = await getDocumentPaths(context);
-
-  if (!documentPaths.length) return false;
-
-  const normalizedFilePath = normalizePath(filePath);
-
-  return documentPaths.some((path) => normalizedFilePath.includes(path));
+  return normalizePath(filePath) === normalizePath(configPath);
 };
 
-export const isGraphQLSchema: FileMatcher = async (filePath, context) => {
-  const schemaPaths = await getSchemaPaths(context);
-
-  if (!schemaPaths.length) return false;
+export const isFileMatched = (filePath: string, lookupPaths: string[]) => {
+  if (!lookupPaths.length) return false;
 
   const normalizedFilePath = normalizePath(filePath);
 
-  return schemaPaths.some((path) => normalizedFilePath.includes(path));
+  return lookupPaths.includes(normalizedFilePath);
 };