@pageboard/html 0.14.3 → 0.14.5

package/elements/form.js

@@ -180,7 +180,7 @@ exports.api_form = {
 	tag: 'form[method="post"]',
 	html: `<form is="element-form" method="post" name="[name]" masked="[masked]"
 		action="/.api/form/[$id]"
-		parameters="[$expr?.action?.parameters|templates:$query]"
+		parameters="[$expr?.action?.parameters|as:expressions]"
 		success="[redirection.url][redirection.parameters|as:query]"
 		badrequest="[badrequest.url][badrequest.parameters|as:query]"
 		unauthorized="[unauthorized.url][unauthorized.parameters|as:query]"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pageboard/html",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "description": "",
   "main": "index.js",
   "repository": {

package/ui/form.js

@@ -338,32 +338,32 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 	}
 	async postMethod(e, state) {
 		const form = this;
-		if (e.type != "submit" && form.elements.find(item => item.type == "submit")) return;
-		
-		form.classList.add('loading');
-
-		await Promise.all(
-			Array.from(form.elements)
-				.filter(node => Boolean(node.presubmit) && !node.disabled)
-				.map(input => input.presubmit(state))
-		);
-
-		const request = form.read(true);
-		form.disable();
-
-		const res = await state.fetch(form.method, Page.format({
-			pathname: form.getAttribute('action'),
-			query: state.query
-		}), request).catch(err => err);
+		if (e.type != "submit" && form.elements.find(item => item.type == "submit")) {
+			return;
+		}
 
 		const scope = state.scope.copy();
+		scope.$request = form.read(true);
+		try {
+			const prelist = Array.from(form.elements)
+				.filter(node => Boolean(node.presubmit) && !node.disabled);
+			form.disable();
+			for (const node of prelist) {
+				await node.presubmit(state);
+			}
+			form.classList.add('loading');
+			scope.$response = await state.fetch(form.method, Page.format({
+				pathname: form.getAttribute('action'),
+				query: state.query
+			}), scope.$request);
+		} catch (err) {
+			scope.$response = err;
+		}
+		const res = scope.$response;
 		if (res?.grants) state.scope.$grants = res.grants;
-		scope.$request = request;
-
-		scope.$response = res;
 		scope.$status = res.status;
-		form.enable();
 
+		form.enable();
 		form.classList.remove('loading');
 
 		// messages shown inside form, no navigation

package/ui/input-file.js

@@ -99,10 +99,20 @@ class HTMLElementInputFile extends Page.create(HTMLInputElement) {
 
 		xhr.addEventListener('load', () => {
 			track(100);
+			let obj;
 			try {
-				pass(JSON.parse(xhr.responseText));
-			} catch (ex) {
-				fail(ex);
+				obj = JSON.parse(xhr.responseText);
+			} catch {
+				obj = { type: 'error', data: { message: xhr.responseText } };
+			}
+			if (obj.type == "error") {
+				obj.statusText = obj.data?.message ?? '';
+			}
+			obj.status = xhr.status;
+			if (xhr.status < 200 || xhr.status >= 400) {
+				fail(obj);
+			} else {
+				pass(obj);
 			}
 		});
 
@@ -110,7 +120,7 @@ class HTMLElementInputFile extends Page.create(HTMLInputElement) {
 			if (xhr.status == 0) return fail("Connection error");
 			const msg = xhr.statusText || "Connection error";
 			const err = new Error(msg);
-			err.statusCode = xhr.status;
+			err.status = xhr.status;
 			fail(err);
 		});
 		try {