Skip to content

Fix handling of AST expressions in fontoxpath:evaluate error handling #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bwrrp merged 1 commit into from
Mar 24, 2025
Merged

Fix handling of AST expressions in fontoxpath:evaluate error handling #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/expressions/functions/builtInFunctions_fontoxpath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function buildResultIterator(
args: ISequence,
staticContext: StaticContext,
executionParameters: ExecutionParameters,
): { queryValue: Value; resultIterator: IIterator<Value> } {
): { evaluableExpression: EvaluableExpression; resultIterator: IIterator<Value> } {
const queryValue = query.first();
const variables = (args.first() as MapValue).keyValuePairs.reduce((expandedArgs, arg) => {
expandedArgs[arg.key.value] = createDoublyIterableSequence(arg.value());
Expand All @@ -53,9 +53,11 @@ function buildResultIterator(
const contextItemSequence = variables['.'] ? variables['.']() : sequenceFactory.empty();
delete variables['.'];

const evaluableExpression = getEvaluableExpressionFromValue(queryValue);

try {
const { expression, staticContext: innerStaticContext } = staticallyCompileXPath(
getEvaluableExpressionFromValue(queryValue),
evaluableExpression,
{
allowUpdating: false,
allowXQuery: true,
Expand Down Expand Up @@ -87,10 +89,10 @@ function buildResultIterator(

return {
resultIterator: expression.evaluate(innerDynamicContext, executionParameters).value,
queryValue,
evaluableExpression,
};
} catch (error) {
printAndRethrowError(queryValue.value, error);
printAndRethrowError(evaluableExpression, error);
}
}

Expand All @@ -102,11 +104,11 @@ const fontoxpathEvaluate: FunctionDefinitionType = (
args,
) => {
let resultIterator: IIterator<Value>;
let queryValue: Value;
let evaluableExpression: EvaluableExpression;
return sequenceFactory.create({
next: () => {
if (!resultIterator) {
({ resultIterator, queryValue } = buildResultIterator(
({ resultIterator, evaluableExpression } = buildResultIterator(
query,
args,
staticContext,
Expand All @@ -117,7 +119,7 @@ const fontoxpathEvaluate: FunctionDefinitionType = (
try {
return resultIterator.next(IterationHint.NONE);
} catch (error) {
printAndRethrowError(queryValue.value, error);
printAndRethrowError(evaluableExpression, error);
}
},
});
Expand Down
17 changes: 17 additions & 0 deletions test/specs/parsing/functions/functions.fontoxpath.tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import {
domFacade,
evaluateXPath,
evaluateXPathToBoolean,
evaluateXPathToFirstNode,
evaluateXPathToNumber,
evaluateXPathToString,
parseScript,
registerCustomXPathFunction,
} from 'fontoxpath';
import * as slimdom from 'slimdom';
Expand Down Expand Up @@ -158,6 +160,21 @@ describe('extension functions', () => {
42,
));

it('throws when passed an XQueryX program with stack traces that throws', () => {
const expr = parseScript('format-integer($n,"A")', { debug: true }, documentNode);
chai.assert.throws(
() =>
evaluateXPathToString(
`fontoxpath:evaluate($expr, map{ 'n': 1.2 })`,
documentNode,
domFacade,
{ expr },
{ language: evaluateXPath.XQUERY_3_1_LANGUAGE, debug: true },
),
'XPTY0004',
);
});

it('throws when passed nonsense as an XQueryX program', () =>
chai.assert.throws(
() =>
Expand Down
Loading