@reekon-tools/boldr-utils 1.25.0 → 1.26.1

package/dist/server.js

@@ -3,9 +3,9 @@
 // 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 { convertMicrometers, resultDisplayUnit, } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';
 export * from './types/firestore.js';
 export * from './types/layout.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

@@ -435,6 +435,15 @@ interface ColumnConfigBase {
 export type ColumnConfig = ColumnConfigBase & ({
     type: ColumnType.Formula;
     columnData: FormulaColumnData;
+    /**
+     * Renders the computed result in the decimal/fractional counterpart
+     * of each viewer's unit (in_frac ⇄ in, ft_in_frac ⇄ ft_in_decimal;
+     * no-op for units with no counterpart). Absent = follow the unit's
+     * own format. Lives on the union member — NOT inside columnData,
+     * which every formula-editor save rebuilds wholesale. Clearing
+     * removes the key.
+     */
+    resultDisplay?: 'decimal' | 'fractional';
 } | {
     type: ColumnType.SingleSelect;
     columnData: SelectColumnData;
@@ -453,6 +462,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/dist/utils/micrometersToUnit.d.ts

@@ -1,4 +1,15 @@
 import { DecimalTolerance, FractionalTolerance, Units } from '../types/firestore.js';
+/**
+ * The display unit for a formula column's result under its per-column
+ * decimal/fractional switch. Fraction-vs-decimal is decided entirely by the
+ * Units value (convertMicrometers has no format parameter), so the switch is
+ * a substitution between same-scale counterparts: in_frac ⇄ in and
+ * ft_in_frac ⇄ ft_in_decimal. Units with no counterpart — metric, and plain
+ * ft (the enum has no fractional-feet form) — pass through unchanged, so the
+ * setting is a no-op for those viewers. Same physical scale both ways: this
+ * can never change a computed number, only its rendering.
+ */
+export declare const resultDisplayUnit: (unit: Units, resultDisplay?: "decimal" | "fractional") => Units;
 export declare const roundToT1Values: (value: number, u: Units) => number;
 export declare const convertMicrometers: (micrometers: number | null | undefined, unit: Units, fractionalTolerance?: FractionalTolerance, decimalTolerance?: DecimalTolerance, device?: string) => {
     value: string;

package/dist/utils/micrometersToUnit.js

@@ -1,6 +1,33 @@
 import { DecimalTolerance, FractionalTolerance, Units, convertUnitsToReadable, } from '../types/firestore.js';
 import { create, all } from 'mathjs';
 const math = create(all);
+/**
+ * The display unit for a formula column's result under its per-column
+ * decimal/fractional switch. Fraction-vs-decimal is decided entirely by the
+ * Units value (convertMicrometers has no format parameter), so the switch is
+ * a substitution between same-scale counterparts: in_frac ⇄ in and
+ * ft_in_frac ⇄ ft_in_decimal. Units with no counterpart — metric, and plain
+ * ft (the enum has no fractional-feet form) — pass through unchanged, so the
+ * setting is a no-op for those viewers. Same physical scale both ways: this
+ * can never change a computed number, only its rendering.
+ */
+export const resultDisplayUnit = (unit, resultDisplay) => {
+    if (resultDisplay === 'decimal') {
+        if (unit === Units.FractionalInches)
+            return Units.Inches;
+        if (unit === Units.FeetInchesFractional)
+            return Units.FeetInchesDecimal;
+        return unit;
+    }
+    if (resultDisplay === 'fractional') {
+        if (unit === Units.Inches)
+            return Units.FractionalInches;
+        if (unit === Units.FeetInchesDecimal)
+            return Units.FeetInchesFractional;
+        return unit;
+    }
+    return unit;
+};
 // The T1 rounds differently depending on the selected measurement unit.
 // This function mirrors the rounding behavior implemented on the firmware.
 // The value being rounded is in microns.

package/package.json

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