@reekon-tools/boldr-utils 1.4.2 → 1.4.4

package/dist/formulas/calculateFormula.d.ts

@@ -0,0 +1,2 @@
+import { Formula, Measurement, Units } from '../types/firestore.js';
+export declare const calculateFormula: (formula: Formula, formulas: Formula[], columns: Record<string, any>, measurements: Measurement[], unit: Units) => string | number | null;

package/dist/formulas/calculateFormula.js

@@ -0,0 +1,81 @@
+import { evaluateFormula } from './evaluateFormula.js';
+export const calculateFormula = (formula, formulas, columns, measurements, unit) => {
+    // Convert Firestore Map to plain object if necessary
+    let variableToColumnMap = {};
+    if (formula.variableToColumnMap) {
+        if (formula.variableToColumnMap instanceof Map) {
+            // Convert Firestore Map to plain object
+            variableToColumnMap = Object.fromEntries(formula.variableToColumnMap);
+        }
+        else if (typeof formula.variableToColumnMap === 'object') {
+            // Already a plain object
+            variableToColumnMap = formula.variableToColumnMap;
+        }
+    }
+    if (Object.keys(variableToColumnMap).length === 0) {
+        return null;
+    }
+    // Build valueMap from group.columns and measurementMap
+    const valueMap = {};
+    // Map column IDs to their actual measurement values
+    for (const [columnId, measurementId] of columns.entries()) {
+        const measurement = measurements.find((m) => m.id === measurementId);
+        if (measurement?.value !== undefined) {
+            valueMap[columnId] = measurement.value;
+        }
+        else {
+            const numericValue = typeof measurementId === 'number'
+                ? measurementId
+                : parseFloat(measurementId || '0');
+            valueMap[columnId] = isNaN(numericValue) ? 0 : numericValue;
+        }
+    }
+    // Convert formulas to the expected FormulaDefinition format
+    const formulaDefinitions = formulas
+        .filter((f) => f.variableToColumnMap) // Only include formulas with new schema
+        .map((f) => {
+        const mappings = {};
+        // Convert Firestore Map to plain object if necessary
+        let fVariableToColumnMap = {};
+        if (f.variableToColumnMap instanceof Map) {
+            fVariableToColumnMap = Object.fromEntries(f.variableToColumnMap);
+        }
+        else if (typeof f.variableToColumnMap === 'object') {
+            fVariableToColumnMap = f.variableToColumnMap;
+        }
+        for (const [variable, mapping] of Object.entries(fVariableToColumnMap)) {
+            if (typeof mapping === 'string') {
+                // Handle transition period - old format in new structure
+                mappings[variable] = { id: mapping, type: 'column' };
+            }
+            else {
+                // New format: { id: string; type: 'column' | 'formula' }
+                mappings[variable] = mapping;
+            }
+        }
+        return {
+            id: f.id,
+            name: f.name,
+            expression: f.expression,
+            variableToColumnMap: mappings,
+        };
+    });
+    // Convert the current formula's mappings
+    const currentMappings = {};
+    for (const [variable, mapping] of Object.entries(variableToColumnMap)) {
+        if (typeof mapping === 'string') {
+            currentMappings[variable] = { id: mapping, type: 'column' };
+        }
+        else {
+            currentMappings[variable] = mapping;
+        }
+    }
+    const result = evaluateFormula({
+        expression: formula.expression,
+        mappings: currentMappings,
+        valueMap,
+        unit: unit,
+        formulas: formulaDefinitions,
+    });
+    return result;
+};

package/dist/types/firestore.d.ts

@@ -137,6 +137,9 @@ export interface Group extends FirestoreDoc, Timestamps {
         };
     };
     diagramFileId?: string;
+    formula?: any;
+    isCompleted?: boolean;
+    type?: string;
 }
 export declare enum ColumnType {
     Text = "text",
@@ -153,6 +156,7 @@ export interface Formula extends FirestoreDoc, Timestamps {
     expression: string;
     name: string;
     varaibles: string[];
+    variableToColumnMap: Record<string, any>;
 }
 export interface ColumnConfig {
     id: string;

package/package.json

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