Skip to content

Commit 5c38707

Browse files
goenningzhengbli
authored andcommitted
evaluate should allow null for resolver and result (#165)
* evaluate should allow null resolver / result * fix return type and allow null for XPathExpression.evaluate
1 parent 6bb1867 commit 5c38707

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

baselines/dom.generated.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2969,7 +2969,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
29692969
* @param y The y-offset
29702970
*/
29712971
elementFromPoint(x: number, y: number): Element;
2972-
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
2972+
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult;
29732973
/**
29742974
* Executes a command on the current document, current selection, or the given range.
29752975
* @param commandId String that specifies the command to execute. This command can be any of the command identifiers that can be executed in script.
@@ -13217,7 +13217,7 @@ declare var XMLSerializer: {
1321713217
interface XPathEvaluator {
1321813218
createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
1321913219
createNSResolver(nodeResolver?: Node): XPathNSResolver;
13220-
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
13220+
evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult;
1322113221
}
1322213222

1322313223
declare var XPathEvaluator: {
@@ -13226,7 +13226,7 @@ declare var XPathEvaluator: {
1322613226
}
1322713227

1322813228
interface XPathExpression {
13229-
evaluate(contextNode: Node, type: number, result: XPathResult): XPathExpression;
13229+
evaluate(contextNode: Node, type: number, result: XPathResult | null): XPathResult;
1323013230
}
1323113231

1323213232
declare var XPathExpression: {

inputfiles/overridingTypes.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -906,5 +906,23 @@
906906
"readonly": true,
907907
"name": "types",
908908
"type": "string[]"
909+
},
910+
{
911+
"kind": "method",
912+
"interface": "XPathEvaluator",
913+
"name": "evaluate",
914+
"signatures": ["evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult"]
915+
},
916+
{
917+
"kind": "method",
918+
"interface": "Document",
919+
"name": "evaluate",
920+
"signatures": ["evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult"]
921+
},
922+
{
923+
"kind": "method",
924+
"interface": "XPathExpression",
925+
"name": "evaluate",
926+
"signatures": ["evaluate(contextNode: Node, type: number, result: XPathResult | null): XPathResult"]
909927
}
910928
]

0 commit comments

Comments
 (0)