syntax/types: Derive ChildKeyByNodeType type from visitorKeys obj…

…ect definition
glimmerjs · Dec 24, 2018 · 15f3633 · 15f3633
1 parent ebe2ef1
commit 15f3633
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/@glimmer/syntax/lib/types/nodes.ts b/packages/@glimmer/syntax/lib/types/nodes.ts
@@ -1,4 +1,4 @@
-import { VisitorKeysMap } from './visitor-keys';
+import visitorKeys, { VisitorKeysMap } from './visitor-keys';
 
 export type Option<T> = T | null;
 
@@ -212,8 +212,7 @@ export type NodeType = keyof Nodes;
 export type Node = Nodes[NodeType];
 
 // VisitorKeysMap drives ParentNode and LeafNode typing
-export type ValuesOfType<T, U> = { [K in keyof T]: T[K] extends U ? T[K] : never }[keyof T];
-export type ChildKeyByNodeType = { [T in NodeType]: ValuesOfType<VisitorKeysMap[T], string> };
+export type ChildKeyByNodeType = { [T in keyof VisitorKeysMap]: typeof visitorKeys[T][number] };
 
 // All potential child keys, e.g. `body`, `value`, `path`, ...
 export type ChildKey = ChildKeyByNodeType[NodeType];