@@ -156,8 +156,10 @@ declare module "godot" {
156
156
DummyKey extends any
157
157
? (
158
158
Path extends keyof Map
159
- ? Map [ Path ] extends Permitted
160
- ? Map [ Path ]
159
+ ? [ Map [ Path ] ] extends [ Permitted ]
160
+ ? [ undefined ] extends [ Map [ Path ] ]
161
+ ? null | Exclude < Map [ Path ] , undefined >
162
+ : Map [ Path ]
161
163
: Default
162
164
: Path extends `${infer Key extends Exclude < keyof Map , DefaultKey > & string } /${infer SubPath } `
163
165
? Map [ Key ] extends PathMappable < DummyKey , infer ChildMap >
@@ -177,9 +179,9 @@ declare module "godot" {
177
179
> ;
178
180
179
181
type NodePathMap = PathMap < Node > ;
180
- type StaticNodePath < Map extends NodePathMap > = StaticPath < Map , Node , never , typeof __PathMappableDummyKeys . Node > ;
181
- type ResolveNodePath < Map extends NodePathMap , Path extends string , Default = never > =
182
- ResolvePath < Map , Path , Default , Node , never , typeof __PathMappableDummyKeys . Node > ;
182
+ type StaticNodePath < Map extends NodePathMap , Permitted = Node > = StaticPath < Map , Permitted , never , typeof __PathMappableDummyKeys . Node > ;
183
+ type ResolveNodePath < Map extends NodePathMap , Path extends string , Default = never , Permitted = Node > =
184
+ ResolvePath < Map , Path , Default , Permitted , never , typeof __PathMappableDummyKeys . Node > ;
183
185
type ResolveNodePathMap < Map extends NodePathMap , Path extends string , Default = never > = Path extends keyof Map
184
186
? Map [ Path ] extends Node < infer ChildMap >
185
187
? ChildMap
0 commit comments