From b0e5e8f3c7813af65a60ebfafa55f2c922a70ec0 Mon Sep 17 00:00:00 2001
From: brontolosone <177225737+brontolosone@users.noreply.github.com>
Date: Tue, 8 Oct 2024 14:40:24 +0000
Subject: [PATCH 1/7] demo: enable .xml form upload

---
 packages/web-forms/src/demo/FormUpload.vue | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/web-forms/src/demo/FormUpload.vue b/packages/web-forms/src/demo/FormUpload.vue
index 8fa22ebc0..2347d6345 100644
--- a/packages/web-forms/src/demo/FormUpload.vue
+++ b/packages/web-forms/src/demo/FormUpload.vue
@@ -77,19 +77,23 @@ const uploadFile = async (file: File) => {
 	reset();
 	uploadedFilename.value = file.name;
 
-	const { data: response, error: conversionError } = await convertXlsForm(file);
-
-	if (conversionError) {
-		error.value = conversionError;
-	} else if (response) {
-		if (response.error) {
-			error.value = response.error;
-		} else if (response.xform_url) {
-			xformUrl.value = response.xform_url;
-		}
+	if (file.name.endsWith('.xml')) {
+		xformUrl.value = URL.createObjectURL(file);
+	} else {
+		const { data: response, error: conversionError } = await convertXlsForm(file);
+
+		if (conversionError) {
+			error.value = conversionError;
+		} else if (response) {
+			if (response.error) {
+				error.value = response.error;
+			} else if (response.xform_url) {
+				xformUrl.value = response.xform_url;
+			}
 
-		if (response.warnings && response.warnings.length > 0) {
-			warnings.value = response.warnings;
+			if (response.warnings && response.warnings.length > 0) {
+				warnings.value = response.warnings;
+			}
 		}
 	}
 

From 5c47a71857ad1649036d9ed9e717518ae11a0be0 Mon Sep 17 00:00:00 2001
From: brontolosone <177225737+brontolosone@users.noreply.github.com>
Date: Thu, 10 Oct 2024 12:34:37 +0000
Subject: [PATCH 2/7] in *dev mode*, *optionally* bypass the
 conversion/validation service for xml form uploads

---
 packages/web-forms/src/demo/FormUpload.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/web-forms/src/demo/FormUpload.vue b/packages/web-forms/src/demo/FormUpload.vue
index 2347d6345..0431d0ebb 100644
--- a/packages/web-forms/src/demo/FormUpload.vue
+++ b/packages/web-forms/src/demo/FormUpload.vue
@@ -27,6 +27,10 @@ const { data: config, error: configErrors } = useConfiguration();
 
 const xlsformOnlineBaseUrl = computed(() => config.value?.['xlsform-online-url']);
 
+const inDevMode = import.meta.env.DEV;
+
+const bypassConverterForXml = ref<boolean>(false);
+
 watch(configErrors, (value) => {
 	if (value) {
 		error.value =
@@ -77,8 +81,8 @@ const uploadFile = async (file: File) => {
 	reset();
 	uploadedFilename.value = file.name;
 
-	if (file.name.endsWith('.xml')) {
-		xformUrl.value = URL.createObjectURL(file);
+	if (bypassConverterForXml.value && file.name.endsWith('.xml')) {
+		xformUrl.value = URL.createObjectURL(file); // leaks; in non-demo code, we might want to deallocate the object URL at some point.
 	} else {
 		const { data: response, error: conversionError } = await convertXlsForm(file);
 
@@ -149,6 +153,14 @@ document.addEventListener(
 						<span class="icon-insert_drive_file" />
 						Drag and drop XLSForm or <a href="javascript:;" class="upload-file-link" @click="fileInput.click()">upload form</a>
 					</span>
+					<template v-if="inDevMode">
+						<label>
+							<input
+								v-model="bypassConverterForXml" type="checkbox"
+							>
+							Bypass converter for <code>XML</code> upload
+						</label>
+					</template>
 				</template>
 				<template v-else>
 					<PrimeProgressSpinner class="spinner" />

From 0e7672f497a5c028cfe9fcfd8dacbafe7c7a5bf8 Mon Sep 17 00:00:00 2001
From: brontolosone <177225737+brontolosone@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:21:01 +0000
Subject: [PATCH 3/7] add multiple-argument distance variant, fixes #118

---
 packages/xpath/src/functions/xforms/geo.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/xpath/src/functions/xforms/geo.ts b/packages/xpath/src/functions/xforms/geo.ts
index f4a4a6cd1..1414847cd 100644
--- a/packages/xpath/src/functions/xforms/geo.ts
+++ b/packages/xpath/src/functions/xforms/geo.ts
@@ -78,9 +78,9 @@ 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];
 	}
@@ -165,7 +165,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;
@@ -202,9 +202,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;

From b21e486c98508dcd42110d0a77d79c7a2027fa2b Mon Sep 17 00:00:00 2001
From: brontolosone <177225737+brontolosone@users.noreply.github.com>
Date: Fri, 25 Oct 2024 18:16:10 +0000
Subject: [PATCH 4/7] throw when calling distance() with 0 arguments

---
 .../src/evaluator/functions/FunctionImplementation.ts     | 8 +++++++-
 packages/xpath/src/functions/xforms/geo.ts                | 2 +-
 packages/xpath/test/xforms/{area.test.ts => geo.test.ts}  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
 rename packages/xpath/test/xforms/{area.test.ts => geo.test.ts} (99%)

diff --git a/packages/xpath/src/evaluator/functions/FunctionImplementation.ts b/packages/xpath/src/evaluator/functions/FunctionImplementation.ts
index 8b973d665..1c30f7db1 100644
--- a/packages/xpath/src/evaluator/functions/FunctionImplementation.ts
+++ b/packages/xpath/src/evaluator/functions/FunctionImplementation.ts
@@ -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
@@ -127,6 +127,12 @@ export class FunctionImplementation<Length extends number> {
 							max: Infinity,
 						};
 
+					case 'variadic+':
+						return {
+							min: acc.min + 1,
+							max: Infinity,
+						};
+
 					default:
 						throw new UnreachableError(arityType);
 				}
diff --git a/packages/xpath/src/functions/xforms/geo.ts b/packages/xpath/src/functions/xforms/geo.ts
index 1414847cd..48146ea4c 100644
--- a/packages/xpath/src/functions/xforms/geo.ts
+++ b/packages/xpath/src/functions/xforms/geo.ts
@@ -202,7 +202,7 @@ const sum = (values: readonly number[]) => {
 
 export const distance = new NumberFunction(
 	'distance',
-	[{ arityType: 'variadic' }],
+	[{ arityType: 'variadic+' }],
 	(context, args) => {
 		const lines = evaluateLines(context, args);
 
diff --git a/packages/xpath/test/xforms/area.test.ts b/packages/xpath/test/xforms/geo.test.ts
similarity index 99%
rename from packages/xpath/test/xforms/area.test.ts
rename to packages/xpath/test/xforms/geo.test.ts
index 1adcf1da7..8d9f5eae8 100644
--- a/packages/xpath/test/xforms/area.test.ts
+++ b/packages/xpath/test/xforms/geo.test.ts
@@ -43,7 +43,7 @@ describe('distance() and area() functions', () => {
 		});
 	});
 
-	describe('area with nodes', () => {
+	describe('area and distance with nodes', () => {
 		beforeEach(() => {
 			testContext = createXFormsTestContext(`
         <root>

From 37e5528cfaf5b1d1060bd87992845400aab5ee3b Mon Sep 17 00:00:00 2001
From: brontolosone <177225737+brontolosone@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:24:28 +0000
Subject: [PATCH 5/7] "prettier"

---
 packages/xpath/src/functions/xforms/geo.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/xpath/src/functions/xforms/geo.ts b/packages/xpath/src/functions/xforms/geo.ts
index 48146ea4c..78362b982 100644
--- a/packages/xpath/src/functions/xforms/geo.ts
+++ b/packages/xpath/src/functions/xforms/geo.ts
@@ -78,8 +78,10 @@ const INVALID_LINE: Line = {
 	end: INVALID_POINT,
 };
 
-const evaluateLines = (context: EvaluationContext, expression: readonly EvaluableArgument[]): Line[] => {
-
+const evaluateLines = (
+	context: EvaluationContext,
+	expression: readonly EvaluableArgument[]
+): Line[] => {
 	const points = expression.flatMap((el) => evaluatePoints(context, el));
 	if (points.length < 2) {
 		return [INVALID_LINE];

From 6661f8fe4080eb224c9e1ec7a0d427617db883fd Mon Sep 17 00:00:00 2001
From: brontolosone <177225737+brontolosone@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:23:42 +0000
Subject: [PATCH 6/7] better expressed

---
 .../src/evaluator/functions/FunctionImplementation.ts     | 8 +-------
 packages/xpath/src/functions/xforms/geo.ts                | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/xpath/src/evaluator/functions/FunctionImplementation.ts b/packages/xpath/src/evaluator/functions/FunctionImplementation.ts
index 1c30f7db1..8b973d665 100644
--- a/packages/xpath/src/evaluator/functions/FunctionImplementation.ts
+++ b/packages/xpath/src/evaluator/functions/FunctionImplementation.ts
@@ -39,7 +39,7 @@ export class InvalidArgumentError extends Error {
 	}
 }
 
-export type ParameterArityType = 'optional' | 'required' | 'variadic' | 'variadic+';
+export type ParameterArityType = 'optional' | 'required' | 'variadic';
 
 export type ParameterTypeHint =
 	// | 'lazy' // TODO: it might be good to *explicitly* mark certain parameters
@@ -127,12 +127,6 @@ export class FunctionImplementation<Length extends number> {
 							max: Infinity,
 						};
 
-					case 'variadic+':
-						return {
-							min: acc.min + 1,
-							max: Infinity,
-						};
-
 					default:
 						throw new UnreachableError(arityType);
 				}
diff --git a/packages/xpath/src/functions/xforms/geo.ts b/packages/xpath/src/functions/xforms/geo.ts
index 78362b982..d36edbfcf 100644
--- a/packages/xpath/src/functions/xforms/geo.ts
+++ b/packages/xpath/src/functions/xforms/geo.ts
@@ -204,7 +204,7 @@ const sum = (values: readonly number[]) => {
 
 export const distance = new NumberFunction(
 	'distance',
-	[{ arityType: 'variadic+' }],
+	[{ arityType: 'required' }, { arityType: 'variadic' }],
 	(context, args) => {
 		const lines = evaluateLines(context, args);
 

From 8022781ef1a8432dac42ed2819b26a1d3a98ec5b Mon Sep 17 00:00:00 2001
From: brontolosone <177225737+brontolosone@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:32:38 +0000
Subject: [PATCH 7/7] changeset

---
 .changeset/funny-items-know.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .changeset/funny-items-know.md

diff --git a/.changeset/funny-items-know.md b/.changeset/funny-items-know.md
new file mode 100644
index 000000000..77eaa3058
--- /dev/null
+++ b/.changeset/funny-items-know.md
@@ -0,0 +1,8 @@
+---
+"@getodk/xpath": patch
+---
+
+Distance function can now accepts multiple arguments.
+This makes it easier to compute the distance between multiple points within a form's primary instance.
+Previously, to achieve this, you'd have to introduce a calculate which concatenates those points together,
+and then call the distance function with a reference to that calculate as the argument.