fix: OrMatcher types

Author: j4k0xb

packages/matchers/src/types.ts

@@ -17,7 +17,7 @@ export type NodeSchema<T extends t.Node> = {
   [K in Exclude<keyof T, ExcludedNodeKeys>]?: Schema<T[K]> | undefined;
 };
 
-export type OrMatcher<T extends unknown[]> = {
+export type OrMatcher<T> = {
   type: 'or';
   schema: T;
 };
@@ -41,7 +41,7 @@ export type FromCaptureMatcher = {
 export type PredicateMatcher<T> = (input: T) => boolean;
 
 export type Matcher<T> =
-  | OrMatcher<T[]>
+  | OrMatcher<T>
   | ArraySchema<T>
   | NullableSchema<T>
   | CaptureMatcher<T>
@@ -62,9 +62,9 @@ export type Infer<T> =
   T extends NullableSchema<infer U>
     ? U | null
     : T extends ArraySchema<infer U>
-      ? U
+      ? U[]
       : T extends OrMatcher<infer U>
-        ? U[number]
+        ? U
         : T extends CaptureMatcher<infer U>
           ? U
           : T extends FromCaptureMatcher

packages/matchers/test/captures.test.ts

@@ -3,14 +3,12 @@ import { expect, test } from 'vitest';
 import * as m from '../src';
 
 test('capture number', () => {
-  // @ts-expect-error idk
   const matcher = m.compile(m.numericLiteral(m.capture('value')));
   const captures = matcher(t.numericLiteral(1));
   expect(captures).toEqual({ value: 1 });
 });
 
 test('capture node', () => {
-  // @ts-expect-error idk
   const matcher = m.compile(m.variableDeclarator(m.capture('id')));
   const id = t.identifier('foo');
   const captures = matcher(t.variableDeclarator(id));

packages/webcrack/src/unminify/transforms/void-to-undefined.ts

@@ -2,14 +2,16 @@ import * as t from '@babel/types';
 import * as m from '@webcrack/matchers';
 import type { Transform } from '../../ast-utils';
 
-const visitor = m.compileVisitor(m.unaryExpression('void', m.numericLiteral()));
+const onVoidNumber = m.compileVisitor(
+  m.unaryExpression('void', m.numericLiteral()),
+);
 
 export default {
   name: 'void-to-undefined',
   tags: ['safe'],
   scope: true,
   visitor: () =>
-    visitor((path, state) => {
+    onVoidNumber((path, state) => {
       if (!path.scope.hasBinding('undefined', { noGlobals: true })) {
         path.replaceWith(t.identifier('undefined'));
         state.changes++;