Skip to content
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

Jump to bottom

Print and rethrow errors thrown during parsing in registerXQueryModule #629

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Print and rethrow errors thrown during parsing in registerXQueryModule #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f54b07c
Print and rethrow errors thrown during parsing in registerXQueryModule
bwrrp Feb 6, 2024
9c5320b
Add commas to make the linter happy
bwrrp Feb 6, 2024
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
13 changes: 9 additions & 4 deletions src/registerXQueryModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,15 @@ export default function registerXQueryModule(
moduleString: string,
options: { debug: boolean } = { debug: false },
): string {
const parsedModule = parseExpression(moduleString, {
allowXQuery: true,
debug: options['debug'],
});
let parsedModule;
try {
parsedModule = parseExpression(moduleString, {
allowXQuery: true,
debug: options['debug'],
});
} catch (error) {
printAndRethrowError(moduleString, error);
}

annotateAst(parsedModule, new AnnotationContext(undefined));

Expand Down
9 changes: 9 additions & 0 deletions test/specs/parsing/registerXQueryModule.tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,13 @@ declare function bar:baz() {
'XPST0017',
);
});

it('throws a proper error for parse errors', () => {
chai.expect(() => {
registerXQueryModule(
`declare function local:one() { 1 }(:missing semicolon:)
declare function local:two() { 2 };`,
);
}).to.throw('XPST0003: Failed to parse script. Expected ;');
});
});
Loading