From 3d7419e4ea92a8d5f05ac7831fb96354cacf7bf2 Mon Sep 17 00:00:00 2001
From: auvred <aauvred@gmail.com>
Date: Sun, 21 Jan 2024 12:24:46 +0000
Subject: [PATCH] feat: export Query type

---
 src/index.ts                                           | 10 +++++++---
 .../tests/eslint-stylistic.matcher.generated-test.ts   |  4 ++--
 tests/ecosystem/tests/jest.matcher.generated-test.ts   |  4 ++--
 .../tests/ts-eslint.matcher.generated-test.ts          |  4 ++--
 tests/types/match.test.ts                              |  4 ++--
 tests/utils/gen-tests.ts                               |  4 ++--
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 568af76..4e5cdbd 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,8 +1,12 @@
 import type { MatchIt } from './matcher'
 import type { ParseIt } from './parser'
 
-export type Parse<Query extends string> = ParseIt<Query>
-export type Match<Selector, AST extends { type: string }> = MatchIt<
-  Selector,
+export type Parse<Selector extends string> = ParseIt<Selector>
+export type Match<SelectorAST, AST extends { type: string }> = MatchIt<
+  SelectorAST,
   AST
 >
+export type Query<
+  Selector extends string,
+  AST extends { type: string },
+> = Match<Parse<Selector>, AST>
diff --git a/tests/ecosystem/tests/eslint-stylistic.matcher.generated-test.ts b/tests/ecosystem/tests/eslint-stylistic.matcher.generated-test.ts
index e89eb59..aa3afaf 100644
--- a/tests/ecosystem/tests/eslint-stylistic.matcher.generated-test.ts
+++ b/tests/ecosystem/tests/eslint-stylistic.matcher.generated-test.ts
@@ -1,8 +1,8 @@
-import type { Match as MatchIt, Parse as ParseIt } from "../../../src/index"
+import type { Query } from "../../../src/index"
 import type { Equal, Expect } from "../../../src/utils"
 import type { TSESTree as T } from '@typescript-eslint/typescript-estree'
 
-type Match<_T extends string> = MatchIt<ParseIt<_T>, T.Node>
+type Match<_T extends string> = Query<_T, T.Node>
 
 export type TestCases = [
 Expect<Equal<Match<"*">, T.Node>>,
diff --git a/tests/ecosystem/tests/jest.matcher.generated-test.ts b/tests/ecosystem/tests/jest.matcher.generated-test.ts
index 7e9912d..40a8efc 100644
--- a/tests/ecosystem/tests/jest.matcher.generated-test.ts
+++ b/tests/ecosystem/tests/jest.matcher.generated-test.ts
@@ -1,8 +1,8 @@
-import type { Match as MatchIt, Parse as ParseIt } from "../../../src/index"
+import type { Query } from "../../../src/index"
 import type { Equal, Expect } from "../../../src/utils"
 import type { TSESTree as T } from '@typescript-eslint/typescript-estree'
 
-type Match<_T extends string> = MatchIt<ParseIt<_T>, T.Node>
+type Match<_T extends string> = Query<_T, T.Node>
 
 export type TestCases = [
 Expect<Equal<Match<"ArrowFunctionExpression">, T.ArrowFunctionExpression>>,
diff --git a/tests/ecosystem/tests/ts-eslint.matcher.generated-test.ts b/tests/ecosystem/tests/ts-eslint.matcher.generated-test.ts
index e831812..9d9d655 100644
--- a/tests/ecosystem/tests/ts-eslint.matcher.generated-test.ts
+++ b/tests/ecosystem/tests/ts-eslint.matcher.generated-test.ts
@@ -1,8 +1,8 @@
-import type { Match as MatchIt, Parse as ParseIt } from "../../../src/index"
+import type { Query } from "../../../src/index"
 import type { Equal, Expect } from "../../../src/utils"
 import type { TSESTree as T } from '@typescript-eslint/typescript-estree'
 
-type Match<_T extends string> = MatchIt<ParseIt<_T>, T.Node>
+type Match<_T extends string> = Query<_T, T.Node>
 
 export type TestCases = [
 Expect<Equal<Match<"*">, T.Node>>,
diff --git a/tests/types/match.test.ts b/tests/types/match.test.ts
index 3caffd6..319a78b 100644
--- a/tests/types/match.test.ts
+++ b/tests/types/match.test.ts
@@ -1,8 +1,8 @@
-import type { Match as MatchIt, Parse as ParseIt } from '../../src/index'
+import type { Query } from '../../src/index'
 import type { Equal, Expect } from '../../src/utils'
 import type { TSESTree as T } from '@typescript-eslint/typescript-estree'
 
-type Match<_T extends string> = MatchIt<ParseIt<_T>, T.Node>
+type Match<_T extends string> = Query<_T, T.Node>
 
 export type TestCases = [
   Expect<Equal<Match<'Program'>, T.Program>>,
diff --git a/tests/utils/gen-tests.ts b/tests/utils/gen-tests.ts
index 50eade2..2b50407 100644
--- a/tests/utils/gen-tests.ts
+++ b/tests/utils/gen-tests.ts
@@ -29,11 +29,11 @@ function genMatcherTestsFromPairs(
   const srcPath = srcPathRelativeFrom(destPath)
   const indexPath = JSON.stringify(path.join(srcPath, 'index'))
   const utilsPath = JSON.stringify(path.join(srcPath, 'utils'))
-  let content = `import type { Match as MatchIt, Parse as ParseIt } from ${indexPath}
+  let content = `import type { Query } from ${indexPath}
 import type { Equal, Expect } from ${utilsPath}
 import type { TSESTree as T } from '@typescript-eslint/typescript-estree'
 
-type Match<_T extends string> = MatchIt<ParseIt<_T>, T.Node>
+type Match<_T extends string> = Query<_T, T.Node>
 
 export type TestCases = [
 `