test(groq): fixing groq tests

saiichihashimoto · Jul 21, 2023 · b6bc41b · b6bc41b
1 parent 88935c5
commit b6bc41b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/packages/groq/src/index.test.ts b/packages/groq/src/index.test.ts
@@ -65,15 +65,15 @@ describe("groq", () => {
     const UNIQUE_VALUE: unique symbol = Symbol("");
 
     expectType<
-      ExecuteQuery<"@", Scope<any, typeof UNIQUE_VALUE, any>>
+      ExecuteQuery<"@", Scope<never, typeof UNIQUE_VALUE, never>>
     >().toStrictEqual<typeof UNIQUE_VALUE>();
   });
 
   it("key", () => {
     const UNIQUE_VALUE: unique symbol = Symbol("");
 
     expectType<
-      ExecuteQuery<"key", Scope<any, { key: typeof UNIQUE_VALUE }, any>>
+      ExecuteQuery<"key", Scope<never, { key: typeof UNIQUE_VALUE }, never>>
     >().toStrictEqual<typeof UNIQUE_VALUE>();
   });
 
@@ -95,7 +95,10 @@ describe("groq", () => {
     const UNIQUE_VALUE: unique symbol = Symbol("");
 
     expectType<
-      ExecuteQuery<"^", Scope<any, any, Scope<any, typeof UNIQUE_VALUE, any>>>
+      ExecuteQuery<
+        "^",
+        Scope<never, never, Scope<never, typeof UNIQUE_VALUE, never>>
+      >
     >().toStrictEqual<typeof UNIQUE_VALUE>();
   });
 
@@ -105,7 +108,11 @@ describe("groq", () => {
     expectType<
       ExecuteQuery<
         "^.^",
-        Scope<any, any, Scope<any, any, Scope<any, typeof UNIQUE_VALUE, any>>>
+        Scope<
+          never,
+          never,
+          Scope<never, never, Scope<never, typeof UNIQUE_VALUE, never>>
+        >
       >
     >().toStrictEqual<typeof UNIQUE_VALUE>();
   });
@@ -117,9 +124,13 @@ describe("groq", () => {
       ExecuteQuery<
         "^.^.^",
         Scope<
-          any,
-          any,
-          Scope<any, any, Scope<any, any, Scope<any, typeof UNIQUE_VALUE, any>>>
+          never,
+          never,
+          Scope<
+            never,
+            never,
+            Scope<never, never, Scope<never, typeof UNIQUE_VALUE, never>>
+          >
         >
       >
     >().toStrictEqual<typeof UNIQUE_VALUE>();

diff --git a/packages/groq/src/index.ts b/packages/groq/src/index.ts
@@ -126,8 +126,12 @@ type Parent<
     ? Value
     : never
   : TExpression extends `^.${infer TParents}`
-  ? TScope extends Scope<any, any, infer TParent>
-    ? Parent<TParents, NonNullable<TParent>>
+  ? TScope extends Scope<
+      any,
+      any,
+      infer TParentScope extends Scope<any, any, any>
+    >
+    ? Parent<TParents, TParentScope>
     : never
   : never;