@verbb/formie-core 1.0.15 → 1.0.16

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 1.0.16 - 2026-10-28
+
+### Changed
+- Updated the package build toolchain to Vite 8.3.4.
+
+### Fixed
+- Fixed calculations using formatted calculation values as numeric inputs.
+
 ## 1.0.15 - 2026-10-15
 
 ### Changed

package/dist/calculations.d.ts

@@ -5,6 +5,10 @@ export type CalculationVariable = {
     index?: string;
     rows?: string;
     fieldKind?: string;
+    numberFormat?: {
+        prefix?: string;
+        suffix?: string;
+    };
 };
 export type CalculationFormula = {
     formula?: string;

package/dist/calculations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculations.d.ts","sourceRoot":"","sources":["../src/calculations.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,mBAAmB,GAAG;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAmCrE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAEzE;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,kBAAkB,GAAG,wBAAwB,EAAE,CAIrG;AAED,wBAAgB,0BAA0B,CACtC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,UAAU,EAAE,MAAM,GAAG,SAAS,GAC/B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAyBzB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAgBnG;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAiB7G;AAED,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,OAAO,EAAE,kBAAkB,GAC5B,MAAM,GAAG,MAAM,CAEjB"}
+{"version":3,"file":"calculations.d.ts","sourceRoot":"","sources":["../src/calculations.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,mBAAmB,GAAG;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAmCrE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAEzE;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,kBAAkB,GAAG,wBAAwB,EAAE,CAIrG;AAED,wBAAgB,0BAA0B,CACtC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,UAAU,EAAE,MAAM,GAAG,SAAS,GAC/B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAyBzB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAgBnG;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CA6B7G;AAED,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,OAAO,EAAE,kBAAkB,GAC5B,MAAM,GAAG,MAAM,CAEjB"}

package/dist/index.js

@@ -1,5 +1,5 @@
 //#region \0rolldown/runtime.js
-var e = Object.create, t = Object.defineProperty, n = Object.getOwnPropertyDescriptor, r = Object.getOwnPropertyNames, i = Object.getPrototypeOf, a = Object.prototype.hasOwnProperty, o = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), s = (e, i, o, s) => {
+var e = Object.create, t = Object.defineProperty, n = Object.getOwnPropertyDescriptor, r = Object.getOwnPropertyNames, i = Object.getPrototypeOf, a = Object.prototype.hasOwnProperty, o = (e, t) => () => (t || (e((t = { exports: {} }).exports, t, t.exports), e = null), t.exports), s = (e, i, o, s) => {
 	if (i && typeof i == "object" || typeof i == "function") for (var c = r(i), l = 0, u = c.length, d; l < u; l++) d = c[l], !a.call(e, d) && d !== o && t(e, d, {
 		get: ((e) => i[e]).bind(null, d),
 		enumerable: !(s = n(i, d)) || s.enumerable
@@ -789,9 +789,7 @@ function K(e, t, n, r, i) {
 		a.forEach((e) => {
 			e.meta?.hidden !== !0 && K(e, o[e.handle], n, `${r}.${e.handle}`, i);
 		}), Oe(e, o, r, i);
-		return;
-	}
-	if (D(e)) {
+	} else if (D(e)) {
 		let a = Array.isArray(t) ? t : [], o = M(e);
 		a.forEach((e, t) => {
 			let a = e && typeof e == "object" ? e : {};
@@ -941,7 +939,7 @@ function J({ envelope: e, transport: t }) {
 					values: o.values,
 					action: s
 				});
-				return l(f) ? r : (c((e) => W({
+				return l(f) || (c((e) => W({
 					...e,
 					status: "ready",
 					session: r.session ?? e.session,
@@ -951,7 +949,7 @@ function J({ envelope: e, transport: t }) {
 				})), n.emit("formie:submit:result", r), (r.currentPageId || r.nextPageId) && n.emit("formie:page:navigate", {
 					currentPageId: o.currentPageId,
 					nextPageId: r.nextPageId || r.currentPageId
-				}), r);
+				})), r;
 			} catch (e) {
 				let t = e instanceof Error ? e.message : "Submission failed.", r = {
 					success: !1,
@@ -974,60 +972,59 @@ function J({ envelope: e, transport: t }) {
 		async setPage(e) {
 			if (o.status === "destroyed" || o.status === "submitting") return;
 			let r = ++a;
-			if (!t.setPage) {
-				c((t) => W({
-					...t,
-					status: "ready",
-					currentPageId: e,
-					session: {
-						...t.session,
-						currentPageId: e
-					}
-				}));
-				return;
-			}
-			c((e) => ({
-				...e,
-				status: "refreshing"
+			if (!t.setPage) c((t) => W({
+				...t,
+				status: "ready",
+				currentPageId: e,
+				session: {
+					...t.session,
+					currentPageId: e
+				}
 			}));
-			try {
-				let i = await t.setPage({
-					definition: o.definition,
-					session: o.session,
-					values: o.values,
-					currentPageId: o.currentPageId,
-					targetPageId: e
-				});
-				if (l(r)) return;
-				if (!i.success || !i.session) {
-					c((e) => ({
+			else {
+				c((e) => ({
+					...e,
+					status: "refreshing"
+				}));
+				try {
+					let i = await t.setPage({
+						definition: o.definition,
+						session: o.session,
+						values: o.values,
+						currentPageId: o.currentPageId,
+						targetPageId: e
+					});
+					if (l(r)) return;
+					if (!i.success || !i.session) {
+						c((e) => ({
+							...e,
+							status: "ready",
+							errors: i.errors,
+							lastSubmitResult: i
+						})), n.emit("formie:submit:result", i);
+						return;
+					}
+					let a = i.session;
+					c((e) => W({
 						...e,
 						status: "ready",
-						errors: i.errors,
-						lastSubmitResult: i
-					})), n.emit("formie:submit:result", i);
-					return;
+						session: a,
+						currentPageId: a.currentPageId
+					})), n.emit("formie:page:navigate", {
+						currentPageId: o.currentPageId,
+						nextPageId: e
+					});
+				} catch (t) {
+					let i = t instanceof Error ? t.message : "Unable to change page.";
+					l(r) || (c((e) => ({
+						...e,
+						status: "ready"
+					})), n.emit("formie:page:navigate:error", {
+						currentPageId: o.currentPageId,
+						nextPageId: e,
+						error: i
+					}));
 				}
-				let a = i.session;
-				c((e) => W({
-					...e,
-					status: "ready",
-					session: a,
-					currentPageId: a.currentPageId
-				})), n.emit("formie:page:navigate", {
-					currentPageId: o.currentPageId,
-					nextPageId: e
-				});
-			} catch (t) {
-				let i = t instanceof Error ? t.message : "Unable to change page.";
-				l(r) || (c((e) => ({
-					...e,
-					status: "ready"
-				})), n.emit("formie:page:navigate:error", {
-					currentPageId: o.currentPageId,
-					nextPageId: e,
-					error: i
-				}));
 			}
 		},
 		async refreshSession() {
@@ -1096,10 +1093,10 @@ var Y = [
 	"formie:session:refreshed",
 	"formie:session:refresh:error",
 	"formie:state:reset"
-], Ne = /* @__PURE__ */ c((/* @__PURE__ */ o(((e, t) => {
+], Ne = /* @__PURE__ */ c((/* @__PURE__ */ o(((e, t, n) => {
 	(function(n, r) {
 		typeof e == "object" && t !== void 0 ? r(e) : typeof define == "function" && define.amd ? define(["exports"], r) : r((n = typeof globalThis < "u" ? globalThis : n || self).ExpressionLanguage = {});
-	})(e, function(e) {
+	})(n, function(e) {
 		function t(e, t, n) {
 			return (t = function(e) {
 				var t = function(e, t) {
@@ -1110,7 +1107,7 @@ var Y = [
 						if (typeof r != "object") return r;
 						throw TypeError("@@toPrimitive must return a primitive value.");
 					}
-					return (t === "string" ? String : Number)(e);
+					return String(e);
 				}(e, "string");
 				return typeof t == "symbol" ? t : t + "";
 			}(t)) in e ? Object.defineProperty(e, t, {
@@ -3979,7 +3976,7 @@ var Y = [
 				e in n || (n[e] = t[e]);
 			}), e.ExpressionLanguage = n;
 		}
-	}(typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : e);
+	}(typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : n);
 })))(), 1), Pe = null;
 function Fe() {
 	let e = Ne, t = e.ExpressionLanguage || e.default || Ne;
@@ -4000,9 +3997,7 @@ function Z(e, t) {
 		if (Array.isArray(n)) {
 			let r = n.map((e) => typeof e == "string" && e.trim() !== "" && !Number.isNaN(Number(e)) ? Number(e) : e), i = r.filter((e) => typeof e == "number");
 			e[t] = i.length === r.length && r.length > 0 ? i.reduce((e, t) => e + Number(t || 0), 0) : r;
-			return;
-		}
-		typeof n == "string" && n.trim() !== "" && !Number.isNaN(Number(n)) && (e[t] = Number(n));
+		} else typeof n == "string" && n.trim() !== "" && !Number.isNaN(Number(n)) && (e[t] = Number(n));
 	}), e;
 }
 function Q(e, t) {
@@ -4013,6 +4008,13 @@ function Q(e, t) {
 	return `${t.prefix || ""}${i}${t.suffix || ""}`;
 }
 function Re(e, t) {
+	if (e.numberFormat) {
+		let { prefix: n = "", suffix: r = "" } = e.numberFormat, i = (e) => {
+			let t = e;
+			return n && t.startsWith(n) && (t = t.slice(n.length)), r && t.endsWith(r) && (t = t.slice(0, -r.length)), Number(t || 0);
+		};
+		return Array.isArray(t) ? t.map(i) : i(t);
+	}
 	let n = e.type?.endsWith("\\Number");
 	return e.type?.endsWith("\\Checkboxes") ? Array.isArray(t) ? t.length ? t : "" : t ? [t] : "" : Array.isArray(t) ? t.length ? n ? t.map((e) => Number(e || 0)) : t : "" : n ? Number(t || 0) : t;
 }

package/package.json

@@ -1,48 +1,48 @@
 {
-  "name": "@verbb/formie-core",
-  "version": "1.0.15",
-  "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist",
-    "CHANGELOG.md",
-    "LICENSE.md"
-  ],
-  "license": "SEE LICENSE IN LICENSE.md",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/verbb/formie.git"
-  },
-  "bugs": {
-    "url": "https://github.com/verbb/formie/issues"
-  },
-  "homepage": "https://docs.verbb.io/formie",
-  "engines": {
-    "node": ">=20.0.0"
-  },
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+    "name": "@verbb/formie-core",
+    "version": "1.0.16",
+    "type": "module",
+    "main": "./dist/index.js",
+    "module": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "files": [
+        "dist",
+        "CHANGELOG.md",
+        "LICENSE.md"
+    ],
+    "license": "SEE LICENSE IN LICENSE.md",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/verbb/formie.git"
     },
-    "./package.json": "./package.json"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "node ../../scripts/build-condition-schema.mjs && vite build && npx tsc -p tsconfig.json",
-    "test": "vitest run"
-  },
-  "dependencies": {
-    "expression-language": "^2.5.4"
-  },
-  "devDependencies": {
-    "typescript": "^6.0.3",
-    "vite": "^8.0.10",
-    "vitest": "^4.1.11"
-  }
+    "bugs": {
+        "url": "https://github.com/verbb/formie/issues"
+    },
+    "homepage": "https://docs.verbb.io/formie",
+    "engines": {
+        "node": ">=20.0.0"
+    },
+    "sideEffects": false,
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js"
+        },
+        "./package.json": "./package.json"
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "scripts": {
+        "build": "node ../../scripts/build-condition-schema.mjs && vite build && npx tsc -p tsconfig.json",
+        "test": "vitest run"
+    },
+    "dependencies": {
+        "expression-language": "^2.5.4"
+    },
+    "devDependencies": {
+        "typescript": "^6.0.3",
+        "vite": "^8.3.5",
+        "vitest": "^4.1.11"
+    }
 }