@reekon-tools/boldr-utils 1.24.0 → 1.26.0

package/dist/data/hooks/useAnnotationMutations.d.ts

@@ -0,0 +1,9 @@
+import type { AnnotationFile, ImageBlob, JobGroupScope, Patch, UploadedImageRef } from '../AnnotationDataProvider.js';
+export interface AnnotationMutations {
+    create(seed: Partial<AnnotationFile>): Promise<string>;
+    update(fileId: string, patch: Patch<AnnotationFile>): Promise<void>;
+    remove(fileId: string): Promise<void>;
+    uploadImage(fileId: string, role: 'background' | 'thumbnail', blob: ImageBlob): Promise<UploadedImageRef>;
+    deleteImage(fileId: string, storagePath: string): Promise<void>;
+}
+export declare const useAnnotationMutations: (scope: JobGroupScope) => AnnotationMutations;

package/dist/data/hooks/useAnnotationMutations.js

@@ -0,0 +1,11 @@
+import { useCallback, useMemo } from 'react';
+import { useAnnotationData } from '../AnnotationDataContext.js';
+export const useAnnotationMutations = (scope) => {
+    const provider = useAnnotationData();
+    const create = useCallback((seed) => provider.create(scope, seed), [provider, scope.orgId, scope.projectId, scope.jobId, scope.groupId]);
+    const update = useCallback((fileId, patch) => provider.update(scope, fileId, patch), [provider, scope.orgId, scope.projectId, scope.jobId, scope.groupId]);
+    const remove = useCallback((fileId) => provider.delete(scope, fileId), [provider, scope.orgId, scope.projectId, scope.jobId, scope.groupId]);
+    const uploadImage = useCallback((fileId, role, blob) => provider.uploadImage(scope, fileId, role, blob), [provider, scope.orgId, scope.projectId, scope.jobId, scope.groupId]);
+    const deleteImage = useCallback((fileId, storagePath) => provider.deleteImage(scope, fileId, storagePath), [provider, scope.orgId, scope.projectId, scope.jobId, scope.groupId]);
+    return useMemo(() => ({ create, update, remove, uploadImage, deleteImage }), [create, update, remove, uploadImage, deleteImage]);
+};

package/dist/export/buildJobCsv.js

@@ -15,8 +15,7 @@ const objectCell = (obj) => obj.url ? hyperlinkCell(obj.url, obj.name) : escapeC
 const toExportDate = (value) => {
     if (value instanceof Date)
         return value;
-    if (value &&
-        typeof value.toDate === 'function') {
+    if (value && typeof value.toDate === 'function') {
         return value.toDate();
     }
     return null;
@@ -30,7 +29,7 @@ const dateCell = (value) => {
         ? `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())} ${pad2(d.getHours())}:${pad2(d.getMinutes())}`
         : '';
 };
-const userCell = (user) => (user ? [user.firstName, user.lastName].filter(Boolean).join(' ') : '');
+const userCell = (user) => user ? [user.firstName, user.lastName].filter(Boolean).join(' ') : '';
 // Pure CSV assembly for the job export, shared by rock-pro-app and
 // rock-desktop so the two platforms emit identical files. With no objects
 // selected and the legacy measurement/label/notes columns on, the

package/dist/exports.d.ts

@@ -1,4 +1,4 @@
-export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, type EnhancedMapping, type FormulaDefinition, type FormulaEvaluationOptions, } from './formulas/evaluateFormula.js';
+export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, micrometersToUnitNumber, type EnhancedMapping, type FormulaDefinition, type FormulaEvaluationOptions, } from './formulas/evaluateFormula.js';
 export { calculateFormula } from './formulas/calculateFormula.js';
 export { convertMicrometers } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';
@@ -37,7 +37,7 @@ export type { MeasurementStampRenderArgs, RenderMeasurementStamp, } from './anno
 export type { CanvasBackgroundSlotArgs, RenderCanvasBackground, } from './annotation/canvas/backgroundSlot.js';
 export { STAMP_TILE_SIZE, GROUP_HEADER_TILE_WIDTH, GROUP_HEADER_TILE_HEIGHT, GROUP_HEADER_COLLAPSED_WIDTH, GROUP_HEADER_COLLAPSED_HEIGHT, GROUP_HEADER_DESIGN, groupHeaderBaseDims, DEFAULT_TILE_SCALE, TILE_SCALE_MIN, TILE_SCALE_MAX, clampTileScale, resolveTileScaleFactor, resolveHeaderTileScaleFactor, resolveFileTileScaleFactor, tileDocSizeForFactor, tileScaleFromDocSize, stampTileSize, stampTileDims, isUnassociatedStamp, isFileStamp, type StampTileDims, } from './annotation/canvas/stampLayout.js';
 export { GROUP_HEADER_STYLE, describeGroupHeader, groupHeaderSignature, type GroupHeaderBadge, type GroupHeaderDescriptor, } from './annotation/canvas/groupHeaderLayout.js';
-export { createViewportApi, fitToScreen, fitRectToScreen, imageDocRect, panBy, zoomAt, DEFAULT_VIEWPORT, DEFAULT_ZOOM_LIMITS, type ViewportApi, type ViewportState, type ZoomLimits, } from './annotation/canvas/viewport.js';
+export { createViewportApi, fitToScreen, fitRectToScreen, fitDocRectViewport, imageDocRect, panBy, zoomAt, DEFAULT_VIEWPORT, DEFAULT_ZOOM_LIMITS, type ViewportApi, type ViewportState, type ZoomLimits, } from './annotation/canvas/viewport.js';
 export { DEFAULT_PDF_PAGE_GAP, DEFAULT_MIN_ZOOM, DEFAULT_MAX_ZOOM, makePdfDocumentId, createPdfDocument, pdfPageDocRects, pdfDocumentExtent, pdfFirstPageDocRect, computeZoomFloor, type PdfDocRect, } from './annotation/canvas/pdfDocument.js';
 export { normalizePdfRotation, effectivePageRotation, pdfPageDisplaySize, pdfCanvasPageDocId, emptyPdfCanvasPageState, pdfCanvasPageDocument, pdfCanvasKnobsOf, pdfCanvasKnobsEqual, pageStateToCanvasState, canvasStateToPageState, rotatePointInPage, rotatePageState, rotatePdfCanvasPage, type PdfPageDisplaySize, type PdfRotationDelta, } from './annotation/canvas/pdfCanvasPages.js';
 export { LEGACY_BACKGROUND_LAYER_ID, BACKGROUND_PLACEMENT_GAP_RATIO, backgroundLayersOf, backgroundLayerIsLocked, isBackgroundLayerLocked, defaultBackgroundLayerLocked, backgroundLayerDocRect, backgroundLayersUnionRect, placeNewBackgroundLayer, } from './annotation/canvas/backgroundLayers.js';

package/dist/exports.js

@@ -2,7 +2,7 @@
 // platform-specific `AnnotationCanvas` wrapper lives here. The two index
 // files (index.ts, index.native.ts) re-export from this and add their own
 // AnnotationCanvas import.
-export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, } from './formulas/evaluateFormula.js';
+export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, micrometersToUnitNumber, } from './formulas/evaluateFormula.js';
 export { calculateFormula } from './formulas/calculateFormula.js';
 export { convertMicrometers } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';
@@ -43,7 +43,7 @@ export { hydrateCanvasState } from './annotation/data/canvasPersistence.js';
 export { InMemoryAnnotationProvider } from './annotation/data/InMemoryAnnotationProvider.js';
 export { STAMP_TILE_SIZE, GROUP_HEADER_TILE_WIDTH, GROUP_HEADER_TILE_HEIGHT, GROUP_HEADER_COLLAPSED_WIDTH, GROUP_HEADER_COLLAPSED_HEIGHT, GROUP_HEADER_DESIGN, groupHeaderBaseDims, DEFAULT_TILE_SCALE, TILE_SCALE_MIN, TILE_SCALE_MAX, clampTileScale, resolveTileScaleFactor, resolveHeaderTileScaleFactor, resolveFileTileScaleFactor, tileDocSizeForFactor, tileScaleFromDocSize, stampTileSize, stampTileDims, isUnassociatedStamp, isFileStamp, } from './annotation/canvas/stampLayout.js';
 export { GROUP_HEADER_STYLE, describeGroupHeader, groupHeaderSignature, } from './annotation/canvas/groupHeaderLayout.js';
-export { createViewportApi, fitToScreen, fitRectToScreen, imageDocRect, panBy, zoomAt, DEFAULT_VIEWPORT, DEFAULT_ZOOM_LIMITS, } from './annotation/canvas/viewport.js';
+export { createViewportApi, fitToScreen, fitRectToScreen, fitDocRectViewport, imageDocRect, panBy, zoomAt, DEFAULT_VIEWPORT, DEFAULT_ZOOM_LIMITS, } from './annotation/canvas/viewport.js';
 export { DEFAULT_PDF_PAGE_GAP, DEFAULT_MIN_ZOOM, DEFAULT_MAX_ZOOM, makePdfDocumentId, createPdfDocument, pdfPageDocRects, pdfDocumentExtent, pdfFirstPageDocRect, computeZoomFloor, } from './annotation/canvas/pdfDocument.js';
 export { normalizePdfRotation, effectivePageRotation, pdfPageDisplaySize, pdfCanvasPageDocId, emptyPdfCanvasPageState, pdfCanvasPageDocument, pdfCanvasKnobsOf, pdfCanvasKnobsEqual, pageStateToCanvasState, canvasStateToPageState, rotatePointInPage, rotatePageState, rotatePdfCanvasPage, } from './annotation/canvas/pdfCanvasPages.js';
 export { LEGACY_BACKGROUND_LAYER_ID, BACKGROUND_PLACEMENT_GAP_RATIO, backgroundLayersOf, backgroundLayerIsLocked, isBackgroundLayerLocked, defaultBackgroundLayerLocked, backgroundLayerDocRect, backgroundLayersUnionRect, placeNewBackgroundLayer, } from './annotation/canvas/backgroundLayers.js';

package/dist/formulas/calculateFormula.d.ts

@@ -1,2 +1,2 @@
 import { ColumnConfig, DecimalTolerance, FractionalTolerance, Formula, Measurement, Units } from '../types/firestore.js';
-export declare const calculateFormula: (formula: Formula, formulas: Formula[], columns: Record<string, string>, tableConfig: ColumnConfig[], measurements: Measurement[], unit: Units, fractionalTolerance: FractionalTolerance, decimalTolerance: DecimalTolerance) => string | number | null;
+export declare const calculateFormula: (formula: Formula, formulas: Formula[], columns: Record<string, string>, tableConfig: ColumnConfig[], measurements: Measurement[], unit: Units, _fractionalTolerance?: FractionalTolerance, _decimalTolerance?: DecimalTolerance) => string | number | null;

package/dist/formulas/calculateFormula.js

@@ -1,25 +1,15 @@
-import { ColumnType, } from '../types/firestore.js';
-import { evaluateFormula } from './evaluateFormula.js';
-import { convertMicrometers } from '../utils/micrometersToUnit.js';
-function parseMixedNumber(str) {
-    const parts = str.trim().split(' ');
-    let whole = 0;
-    let fraction = 0;
-    if (parts.length === 2) {
-        whole = parseFloat(parts[0]);
-        const [num, den] = parts[1].split('/').map(Number);
-        fraction = num / den;
-    }
-    else if (parts[0].includes('/')) {
-        const [num, den] = parts[0].split('/').map(Number);
-        fraction = num / den;
-    }
-    else {
-        whole = parseFloat(parts[0]);
-    }
-    return whole + fraction;
-}
-export const calculateFormula = (formula, formulas, columns, tableConfig, measurements, unit, fractionalTolerance, decimalTolerance) => {
+import { ColumnType, Units, } from '../types/firestore.js';
+import { evaluateFormula, micrometersToUnitNumber } from './evaluateFormula.js';
+const VALID_UNITS = new Set(Object.values(Units));
+// A measurement operand resolves in ITS column's locked unit when one is set;
+// an unrecognized/legacy override falls back to the caller's unit — never to
+// normalizeUnitForMathJS's silent 'mm' default, which would be a wrong answer
+// rather than a visible error.
+const resolveColumnUnit = (override, fallback) => (override && VALID_UNITS.has(override) ? override : fallback);
+export const calculateFormula = (formula, formulas, columns, tableConfig, measurements, unit, 
+// Unused since measurement values stopped round-tripping through the display
+// string — kept so the 8-arg call sites in the apps don't break.
+_fractionalTolerance, _decimalTolerance) => {
     // Convert Firestore Map to plain object if necessary
     let variableToColumnMap = {};
     if (formula.variableToColumnMap) {
@@ -45,8 +35,16 @@ export const calculateFormula = (formula, formulas, columns, tableConfig, measur
             const measurement = measurements.find((m) => m.id === measurementId);
             if (!measurement)
                 continue;
-            const { value, unit: displayUnit } = convertMicrometers(measurement.value, unit, fractionalTolerance, decimalTolerance);
-            valueMap[columnId] = parseMixedNumber(value);
+            // Straight um -> display-unit number. The old path rendered the display
+            // STRING (convertMicrometers) and re-parsed it, which rounded the value
+            // to the display tolerance and returned NaN / dropped the inches for the
+            // composite feet-inches formats (`5' 3 1/2"`).
+            //
+            // Each operand resolves in its own column's unit (lock ?? user unit),
+            // so a locked column contributes the number its cell displays. With
+            // mixed locks the expression is numeric over display-space values by
+            // design; the RESULT (and typed constants) stay in the caller's unit.
+            valueMap[columnId] = micrometersToUnitNumber(measurement.value, resolveColumnUnit(column.unitOverride, unit));
         }
         else if (column.type === ColumnType.Angle) {
             const measurement = measurements.find((m) => m.id === measurementId);

package/dist/formulas/evaluateFormula.d.ts

@@ -17,6 +17,16 @@ export interface FormulaEvaluationOptions {
     formulas?: FormulaDefinition[];
     scope?: Record<string, number>;
 }
+export declare function normalizeUnitForMathJS(unit: Units | string): string;
+/**
+ * Convert a stored micrometer value to the number the formula scope expects
+ * for `unit` — the same conversion nested-formula results go through. This is
+ * the ONLY sanctioned way to put a measurement into a valueMap: converting via
+ * the display STRING (convertMicrometers + a string parser) both rounds the
+ * value to the display tolerance and falls apart on composite formats like
+ * `5' 3 1/2"`.
+ */
+export declare function micrometersToUnitNumber(micrometers: number, unit: Units): number;
 export declare function evaluateFormula({ expression, mappings, valueMap, unit, formulas, scope, }: FormulaEvaluationOptions): number | string | null;
 export declare function createFormulaScope({ mappings, valueMap, unit, }: {
     mappings: Record<string, string>;

package/dist/formulas/evaluateFormula.js

@@ -7,7 +7,7 @@ const compile = math.compile.bind(math);
 const mathUnit = math.unit.bind(math);
 // Cache for evaluated formulas to improve performance
 const formulaCache = new Map();
-function normalizeUnitForMathJS(unit) {
+export function normalizeUnitForMathJS(unit) {
     switch (unit) {
         case Units.Centimeters:
         case 'cm':
@@ -30,6 +30,17 @@ function normalizeUnitForMathJS(unit) {
             return 'mm'; // fallback
     }
 }
+/**
+ * Convert a stored micrometer value to the number the formula scope expects
+ * for `unit` — the same conversion nested-formula results go through. This is
+ * the ONLY sanctioned way to put a measurement into a valueMap: converting via
+ * the display STRING (convertMicrometers + a string parser) both rounds the
+ * value to the display tolerance and falls apart on composite formats like
+ * `5' 3 1/2"`.
+ */
+export function micrometersToUnitNumber(micrometers, unit) {
+    return mathUnit(micrometers, 'um').toNumber(normalizeUnitForMathJS(unit));
+}
 // Normalize mapping to EnhancedMapping format
 function normalizeMapping(mapping) {
     if (typeof mapping === 'string') {
@@ -112,7 +123,11 @@ export function evaluateFormula({ expression, mappings, valueMap, unit, formulas
         return 'Error: valueMap is required';
     }
     const evaluationStack = new Set(); // For circular dependency detection
-    const cache = new Map(); // Local cache for this evaluation session
+    // Local cache for this evaluation session. Deliberately per-invocation:
+    // valueMap is rebuilt (with any column unit locks applied) on every
+    // calculateFormula call, so the `${formulaId}_${unit}` key needs no lock
+    // signature — a stale entry cannot outlive the call that created it.
+    const cache = new Map();
     function evaluateNestedFormula(formulaId, currentExpression, currentMappings) {
         // Check for circular dependency
         if (evaluationStack.has(formulaId)) {

package/dist/hooks/useParseMeasurement.d.ts

@@ -0,0 +1,4 @@
+export declare const useParseMeasurement: () => {
+    parseMeasurementInput: (input: string, defaultUnit?: string) => number | null;
+    error: string | null;
+};

package/dist/hooks/useParseMeasurement.js

@@ -0,0 +1,14 @@
+import { useState } from 'react';
+import { parseMeasurement } from '../utils/parseMeasurement.js';
+export const useParseMeasurement = () => {
+    const [error, setError] = useState(null);
+    const parseMeasurementInput = (input, defaultUnit = 'mm') => {
+        setError(null);
+        const result = parseMeasurement(input, defaultUnit);
+        if (result === null) {
+            setError('Invalid measurement. Please provide a valid number and unit.');
+        }
+        return result;
+    };
+    return { parseMeasurementInput, error };
+};

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from './exports.js';
-export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, type EnhancedMapping, type FormulaDefinition, type FormulaEvaluationOptions, } from './formulas/evaluateFormula.js';
+export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, micrometersToUnitNumber, type EnhancedMapping, type FormulaDefinition, type FormulaEvaluationOptions, } from './formulas/evaluateFormula.js';
 export { calculateFormula } from './formulas/calculateFormula.js';
 export { convertMicrometers } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';

package/dist/index.js

@@ -3,7 +3,7 @@
 // WithSkiaWeb. Metro/RN consumers resolve `index.native.ts` instead via
 // the `react-native` condition in package.json `exports`.
 export * from './exports.js';
-export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, } from './formulas/evaluateFormula.js';
+export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, micrometersToUnitNumber, } from './formulas/evaluateFormula.js';
 export { calculateFormula } from './formulas/calculateFormula.js';
 export { convertMicrometers } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';

package/dist/server.d.ts

@@ -1,4 +1,4 @@
-export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, type EnhancedMapping, type FormulaDefinition, type FormulaEvaluationOptions, } from './formulas/evaluateFormula.js';
+export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, micrometersToUnitNumber, type EnhancedMapping, type FormulaDefinition, type FormulaEvaluationOptions, } from './formulas/evaluateFormula.js';
 export { calculateFormula } from './formulas/calculateFormula.js';
 export { convertMicrometers } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';
@@ -18,5 +18,5 @@ export { numberToLetterIndex, formGroupInputLabel, listGroupMeasurementLabel, }
 export { toSelectedValues, formatSelectedValues, toStoredValue, } from './utils/selectValues.js';
 export * from './calculator/index.js';
 export * from './export/pdf/index.js';
-export { applyGroupFormulaUm, groupFormulaExpression, micrometersToUnitNumber, unitNumberToMicrometers, type GroupFormulaFrame, } from './formulas/groupFormula.js';
+export { applyGroupFormulaUm, groupFormulaExpression, unitNumberToMicrometers, type GroupFormulaFrame, } from './formulas/groupFormula.js';
 export { MEASUREMENT_LINE_COLOR, MEASUREMENT_LINE_WIDTH, MEASUREMENT_RECT_WIDTH, } from './annotation/canvas/measurementLineStyle.js';

package/dist/server.js

@@ -3,7 +3,7 @@
 // root barrel, whose module graph statically pulls in `react` and
 // `@shopify/react-native-skia`. Only modules with no React/Skia anywhere
 // in their import graph may be re-exported from this file.
-export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, } from './formulas/evaluateFormula.js';
+export { evaluateFormula, createFormulaScope, createEnhancedFormulaScope, clearFormulaCache, micrometersToUnitNumber, } from './formulas/evaluateFormula.js';
 export { calculateFormula } from './formulas/calculateFormula.js';
 export { convertMicrometers } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';
@@ -25,5 +25,9 @@ export * from './calculator/index.js';
 // Canvas → annotated PDF export (Cloud Function renderer). Pure pdf-lib; no
 // React or Skia anywhere in its import graph.
 export * from './export/pdf/index.js';
-export { applyGroupFormulaUm, groupFormulaExpression, micrometersToUnitNumber, unitNumberToMicrometers, } from './formulas/groupFormula.js';
+// groupFormula's own micrometersToUnitNumber (integer constants, NaN on
+// unknown units) stays module-local: the canonical export of that name is the
+// mathjs-exact one from evaluateFormula.js above, and no consumer imported
+// the groupFormula variant.
+export { applyGroupFormulaUm, groupFormulaExpression, unitNumberToMicrometers, } from './formulas/groupFormula.js';
 export { MEASUREMENT_LINE_COLOR, MEASUREMENT_LINE_WIDTH, MEASUREMENT_RECT_WIDTH, } from './annotation/canvas/measurementLineStyle.js';

package/dist/types/firestore.d.ts

@@ -453,6 +453,14 @@ export type ColumnConfig = ColumnConfigBase & ({
 } | {
     type: ColumnType.Measurement;
     columnData?: undefined;
+    /**
+     * Locks the column to a fixed display/input unit for all users;
+     * absent = follow each viewer's default unit. Formula operands from
+     * this column resolve in this unit (calculateFormula). Clearing the
+     * lock removes the key (present-as-undefined is rejected by RN
+     * Firebase and stripped by desktop's sanitizer).
+     */
+    unitOverride?: Units;
 } | {
     type: ColumnType.Boolean;
     columnData?: undefined;

package/dist/utils/evaluateFormula.d.ts

@@ -0,0 +1,20 @@
+type MeasurementMap = Map<string, {
+    id: string;
+    value: number;
+}[]>;
+interface FormulaEvaluationOptions {
+    expression: string;
+    mappings: Record<string, string>;
+    group: {
+        id: string;
+        columns: Map<string, any>;
+    };
+    columns: {
+        id: string;
+        type: string;
+    }[];
+    measurementMap: MeasurementMap;
+    defaultUnit?: string;
+}
+export declare function evaluateFormula({ expression, mappings, group, columns, measurementMap, defaultUnit, }: FormulaEvaluationOptions): number | string;
+export {};

package/dist/utils/evaluateFormula.js

@@ -0,0 +1,31 @@
+import { create, all } from 'mathjs';
+const math = create(all);
+export function evaluateFormula({ expression, mappings, group, columns, measurementMap, defaultUnit = 'um', }) {
+    const scope = {};
+    for (const [variable, columnId] of Object.entries(mappings)) {
+        const rawValue = group.columns.get(columnId);
+        const columnDef = columns.find((c) => c.id === columnId);
+        if (columnDef?.type === 'Measurement') {
+            const groupMeasurements = measurementMap.get(group.id) || [];
+            const measurement = groupMeasurements.find((m) => m.id === rawValue);
+            if (measurement?.value !== undefined) {
+                scope[variable] = math.unit(measurement.value, defaultUnit);
+                continue;
+            }
+        }
+        const parsedValue = typeof rawValue === 'number' ? rawValue : parseFloat(rawValue || '');
+        scope[variable] = isNaN(parsedValue) ? 0 : parsedValue;
+    }
+    try {
+        const compiled = math.compile(expression);
+        const result = compiled.evaluate(scope);
+        if (math.typeOf(result) === 'Unit') {
+            return result.toNumber(defaultUnit);
+        }
+        return result;
+    }
+    catch (err) {
+        console.error(`Formula evaluation failed:`, err);
+        return 'Error';
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reekon-tools/boldr-utils",
-  "version": "1.24.0",
+  "version": "1.26.0",
   "description": "Shared utilities for formulas and measurement conversion used in Reekon apps",
   "author": "REEKON Tools",
   "license": "MIT",