Fix script

Author: keeganwitt

all.js

@@ -1,4 +1,3 @@
 // override rule to allow running linting before build (dist directory won't exist yet)
 
-// eslint-disable-next-line import/no-unresolved
 require('./dist/all');

scripts/generate-types.ts

@@ -1,6 +1,6 @@
-import * as ts from 'typescript';
 import * as fs from 'fs';
 import * as path from 'path';
+import * as ts from 'typescript';
 
 interface MatcherInfo {
   name: string;
@@ -46,11 +46,11 @@ function extractMatcherInfo(sourceFile: ts.SourceFile): MatcherInfo[] {
         const isOptional = param.initializer !== undefined || param.questionToken !== undefined;
         // Check if parameter is a rest parameter
         const isRest = param.dotDotDotToken !== undefined;
-        return { 
-          name: paramName, 
-          type: paramType, 
+        return {
+          name: paramName,
+          type: paramType,
           optional: isOptional,
-          rest: isRest 
+          rest: isRest,
         };
       });
       const returnType = node.type ? node.type.getText(sourceFile) : 'unknown';
@@ -67,43 +67,52 @@ function generateTypeDefinition(matcher: MatcherInfo): string {
     const lines = matcher.docComment.split('\n').map(line => `   * ${line.trim()}`);
     docBlock = ['  /**', ...lines, '   */'].join('\n');
   }
-  const params = matcher.parameters.map(p => {
-    const prefix = p.rest ? '...' : '';
-    const suffix = p.optional ? '?' : '';
-    return `${prefix}${p.name}${suffix}: ${p.type}`;
-  }).join(', ');
-  
+
+  const params = matcher.parameters
+    .map(p => {
+      const prefix = p.rest ? '...' : '';
+      const suffix = p.optional ? '?' : '';
+      return `${prefix}${p.name}${suffix}: ${p.type}`;
+    })
+    .join(', ');
+
   // Check if the function uses the E type parameter
-  const needsGenericE = matcher.parameters.some(p => p.type.includes('E')) || 
-                       matcher.returnType.includes('E');
-  
+  const needsGenericE = matcher.parameters.some(p => p.type.includes('E')) || matcher.returnType.includes('E');
+
   // Add generic type parameter if needed
   const genericParams = needsGenericE ? '<E>' : '';
-  
+
   // Add two newlines after each method for clarity
   return `\n${docBlock}\n  ${matcher.name}${genericParams}(${params}): R;\n`;
 }
 
 function generateTypeFile(matchers: MatcherInfo[]): string {
-  return `interface CustomMatchers<R> extends Record<string, any> {${matchers
-    .map(generateTypeDefinition)
-    .join('')}
+  return `export {};
+
+interface CustomMatchers<R> extends Record<string, any> {${matchers.map(generateTypeDefinition).join('')}
 }
 
-declare namespace jest {
-  interface Matchers<R> {${matchers
-    .map(generateTypeDefinition)
-    .join('')}
+declare global {
+  namespace jest {
+    interface Matchers<R> extends CustomMatchers<R> {}
+    interface Expect extends CustomMatchers<any> {}
+    interface InverseAsymmetricMatchers extends Expect {}
   }
+}
 
-  interface Expect extends CustomMatchers<any> {}
-  interface InverseAsymmetricMatchers extends Expect {}
+declare module '@jest/expect' {
+  interface Matchers<R> extends CustomMatchers<R> {}
+}
+
+declare module '@jest/globals' {
+  interface Matchers<R> extends CustomMatchers<R> {}
 }
 
 declare module 'jest-extended' {
   const matchers: CustomMatchers<any>;
   export = matchers;
-}`;
+}
+`;
 }
 
 function main() {
@@ -112,8 +121,7 @@ function main() {
   const outputFile = path.join(typesDir, 'index.d.ts');
 
   // Read all matcher files
-  const matcherFiles = fs.readdirSync(matchersDir)
-    .filter(file => file.endsWith('.ts') && file !== 'index.ts');
+  const matcherFiles = fs.readdirSync(matchersDir).filter(file => file.endsWith('.ts') && file !== 'index.ts');
 
   const matchers: MatcherInfo[] = [];
 
@@ -124,7 +132,7 @@ function main() {
       filePath,
       fs.readFileSync(filePath, 'utf8').replace(/\r/g, ''),
       ts.ScriptTarget.Latest,
-      true
+      true,
     );
 
     const matcherInfos = extractMatcherInfo(sourceFile);
@@ -138,4 +146,4 @@ function main() {
   console.log(`Generated type definitions in ${outputFile}`);
 }
 
-main(); 
+main();