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

Distance function: multiple arguments #244

Closed
wants to merge 9 commits into from
Closed

Distance function: multiple arguments #244

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0e5e8f
demo: enable .xml form upload
brontolosone Oct 8, 2024
5c47a71
in *dev mode*, *optionally* bypass the conversion/validation service …
brontolosone Oct 10, 2024
138e452
Merge branch 'demo-accept-xml-form-upload' into 118_variadic_distance…
brontolosone Oct 21, 2024
0e7672f
add multiple-argument distance variant, fixes #118
brontolosone Oct 25, 2024
b21e486
throw when calling distance() with 0 arguments
brontolosone Oct 25, 2024
37e5528
"prettier"
brontolosone Oct 25, 2024
6661f8f
better expressed
brontolosone Oct 29, 2024
b4a146a
Merge branch 'master' into 118_variadic_distance_function
brontolosone Dec 17, 2024
8022781
changeset
brontolosone Dec 17, 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
8 changes: 7 additions & 1 deletion packages/xpath/src/evaluator/functions/FunctionImplementation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class InvalidArgumentError extends Error {
}
}

export type ParameterArityType = 'optional' | 'required' | 'variadic';
export type ParameterArityType = 'optional' | 'required' | 'variadic' | 'variadic+';

export type ParameterTypeHint =
// | 'lazy' // TODO: it might be good to *explicitly* mark certain parameters
Expand Down Expand Up @@ -127,6 +127,12 @@ export class FunctionImplementation<Length extends number> {
max: Infinity,
};

case 'variadic+':
brontolosone marked this conversation as resolved.
Show resolved Hide resolved
return {
min: acc.min + 1,
max: Infinity,
};

default:
throw new UnreachableError(arityType);
}
Expand Down
16 changes: 9 additions & 7 deletions packages/xpath/src/functions/xforms/geo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@ const INVALID_LINE: Line = {
end: INVALID_POINT,
};

const evaluateLines = (context: EvaluationContext, expression: EvaluableArgument): Line[] => {
const points = evaluatePoints(context, expression);

const evaluateLines = (
context: EvaluationContext,
expression: readonly EvaluableArgument[]
): Line[] => {
const points = expression.flatMap((el) => evaluatePoints(context, el));
if (points.length < 2) {
return [INVALID_LINE];
}
Expand Down Expand Up @@ -165,7 +167,7 @@ export const area = new NumberFunction(
'area',
[{ arityType: 'required' }],
(context, [expression]) => {
const lines = evaluateLines(context, expression!);
const lines = evaluateLines(context, [expression!]);

if (lines.some(isInvalidLine)) {
return NaN;
Expand Down Expand Up @@ -202,9 +204,9 @@ const sum = (values: readonly number[]) => {

export const distance = new NumberFunction(
'distance',
[{ arityType: 'required' }],
(context, [expression]) => {
const lines = evaluateLines(context, expression!);
[{ arityType: 'variadic+' }],
(context, args) => {
const lines = evaluateLines(context, args);

if (lines.some(isInvalidLine)) {
return NaN;
Expand Down
2 changes: 1 addition & 1 deletion packages/xpath/test/xforms/area.test.ts → packages/xpath/test/xforms/geo.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('distance() and area() functions', () => {
});
});

describe('area with nodes', () => {
describe('area and distance with nodes', () => {
beforeEach(() => {
testContext = createXFormsTestContext(`
<root>
Expand Down
Loading