ASTReducer: correctly type scalar values (#3873)

graphql · Apr 3, 2023 · ee303a8 · ee303a8
1 parent 8c749e9
commit ee303a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/language/printer.ts b/src/language/printer.ts
@@ -143,7 +143,6 @@ const printDocASTReducer: ASTReducer<string> = {
   FloatValue: { leave: ({ value }) => value },
   StringValue: {
     leave: ({ value, block: isBlockString }) =>
-      // @ts-expect-error FIXME: it's a problem with ASTReducer, will be fixed in separate PR
       isBlockString === true ? printBlockString(value) : printString(value),
   },
   BooleanValue: { leave: ({ value }) => (value ? 'true' : 'false') },

diff --git a/src/language/visitor.ts b/src/language/visitor.ts
@@ -71,11 +71,11 @@ type ASTReducerFn<TReducedNode extends ASTNode, R> = (
   ancestors: ReadonlyArray<ASTNode | ReadonlyArray<ASTNode>>,
 ) => R;
 
-type ReducedField<T, R> = T extends null | undefined
-  ? T
-  : T extends ReadonlyArray<any>
+type ReducedField<T, R> = T extends ASTNode
+  ? R
+  : T extends ReadonlyArray<ASTNode>
   ? ReadonlyArray<R>
-  : R;
+  : T;
 
 /**
  * A KeyMap describes each the traversable properties of each kind of node.