@reekon-tools/boldr-utils 1.6.24 → 1.6.26

package/dist/exports.d.ts

@@ -8,6 +8,7 @@ export * from './types/layout.js';
 export * from './types/annotation.js';
 export { getToleranceColor, calculateDeviationPercentage, isWithinTolerance, generateToleranceGradient, createDefaultToleranceThresholds, DEFAULT_TOLERANCE_COLORS, type ToleranceThreshold, type ToleranceConfig, } from './utils/tolerance.js';
 export { DEFAULT_GROUP_INDEX, isDefaultGroup, findDefaultGroup, } from './utils/groups.js';
+export { numberToLetterIndex, formGroupInputLabel, listGroupMeasurementLabel, } from './utils/indexLabels.js';
 export { isFieldOp, type AnnotationDataProvider, type AnnotationFile, type AnnotationFileSummary, type FieldOp, type ImageBlob, type JobGroupScope, type JobScope, type Patch, type Unsubscribe, type UploadedImageRef, } from './annotation/data/AnnotationDataProvider.js';
 export { AnnotationDataProviderContext, useAnnotationData, type AnnotationDataProviderProps, } from './annotation/data/AnnotationDataContext.js';
 export { useAnnotationDoc, type UseAnnotationDocResult, } from './annotation/data/hooks/useAnnotationDoc.js';
@@ -22,7 +23,7 @@ export type { CanvasPointerEvent, RequestTextInput, ShapeDrawConfig, Tool, ToolC
 export type { MeasurementRef, PickMeasurement, } from './annotation/canvas/measurementPicker.js';
 export type { MeasurementStampRenderArgs, RenderMeasurementStamp, } from './annotation/canvas/measurementStampOverlay.js';
 export { STAMP_TILE_SIZE, STAMP_INPUT_TILE_SIZE, DEFAULT_TILE_SCALE, TILE_SCALE_MIN, TILE_SCALE_MAX, clampTileScale, stampTileSize, isUnassociatedStamp, } from './annotation/canvas/stampLayout.js';
-export { createViewportApi, fitToScreen, panBy, zoomAt, DEFAULT_VIEWPORT, type ViewportApi, type ViewportState, } from './annotation/canvas/viewport.js';
+export { createViewportApi, fitToScreen, fitRectToScreen, imageDocRect, panBy, zoomAt, DEFAULT_VIEWPORT, type ViewportApi, type ViewportState, } from './annotation/canvas/viewport.js';
 export { createPenTool, type PenToolOptions, } from './annotation/canvas/tools/penTool.js';
 export { createSelectTool } from './annotation/canvas/tools/selectTool.js';
 export { createMeasurementStampTool, type MeasurementStampToolOptions, } from './annotation/canvas/tools/measurementStampTool.js';

package/dist/exports.js

@@ -12,6 +12,7 @@ export * from './types/layout.js';
 export * from './types/annotation.js';
 export { getToleranceColor, calculateDeviationPercentage, isWithinTolerance, generateToleranceGradient, createDefaultToleranceThresholds, DEFAULT_TOLERANCE_COLORS, } from './utils/tolerance.js';
 export { DEFAULT_GROUP_INDEX, isDefaultGroup, findDefaultGroup, } from './utils/groups.js';
+export { numberToLetterIndex, formGroupInputLabel, listGroupMeasurementLabel, } from './utils/indexLabels.js';
 // Annotation data layer (SDK-neutral; apps provide their own provider).
 export { isFieldOp, } from './annotation/data/AnnotationDataProvider.js';
 export { AnnotationDataProviderContext, useAnnotationData, } from './annotation/data/AnnotationDataContext.js';
@@ -22,7 +23,7 @@ export { useAnnotationCanvasDoc, } from './annotation/data/hooks/useAnnotationCa
 export { hydrateCanvasState } from './annotation/data/canvasPersistence.js';
 export { InMemoryAnnotationProvider } from './annotation/data/InMemoryAnnotationProvider.js';
 export { STAMP_TILE_SIZE, STAMP_INPUT_TILE_SIZE, DEFAULT_TILE_SCALE, TILE_SCALE_MIN, TILE_SCALE_MAX, clampTileScale, stampTileSize, isUnassociatedStamp, } from './annotation/canvas/stampLayout.js';
-export { createViewportApi, fitToScreen, panBy, zoomAt, DEFAULT_VIEWPORT, } from './annotation/canvas/viewport.js';
+export { createViewportApi, fitToScreen, fitRectToScreen, imageDocRect, panBy, zoomAt, DEFAULT_VIEWPORT, } from './annotation/canvas/viewport.js';
 export { createPenTool, } from './annotation/canvas/tools/penTool.js';
 export { createSelectTool } from './annotation/canvas/tools/selectTool.js';
 export { createMeasurementStampTool, } from './annotation/canvas/tools/measurementStampTool.js';

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/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/indexLabels.d.ts

@@ -0,0 +1,3 @@
+export declare const numberToLetterIndex: (index: number) => string;
+export declare const formGroupInputLabel: (columnIndex: number, groupIndex: number) => string;
+export declare const listGroupMeasurementLabel: (deviceMeasurementNumber: number | null | undefined, groupIndex: number) => string;

package/dist/utils/indexLabels.js

@@ -0,0 +1,40 @@
+// Canonical measurement / input index labels, shared by rock-desktop and
+// rock-pro-app so every surface (tables, forms, PDF tile overlays, mobile
+// lists) renders the same identifier for the same datum.
+//
+// Two schemes exist:
+//
+// - FORM groups: inputs are identified positionally — the column's index in
+//   the section's tableConfig as a letter, plus the group's 1-based number.
+//   First column in the second group → "A2"; fifth column in the third
+//   group → "E3".
+//
+// - LIST groups: entries are always measurements, identified by their stable
+//   deviceMeasurementNumber (capture sequence) as the letter, plus the same
+//   group number. deviceMeasurementNumber 4 in the second group → "E2".
+//   Legacy measurements without a deviceMeasurementNumber fall back to the
+//   bare group number ("2") — positional letters would shift as the list
+//   re-sorts, so no letter is shown.
+// 0-based index → spreadsheet-style letters: 0 → "A", 25 → "Z", 26 → "AA".
+// Negative / non-finite input yields ''.
+export const numberToLetterIndex = (index) => {
+    if (!Number.isFinite(index) || index < 0)
+        return '';
+    let n = Math.floor(index) + 1;
+    let result = '';
+    while (n > 0) {
+        n--;
+        result = String.fromCharCode((n % 26) + 65) + result;
+        n = Math.floor(n / 26);
+    }
+    return result;
+};
+// Label for a FORM-group input: column position (0-based) + group number.
+// formGroupInputLabel(0, 1) → "A2"
+export const formGroupInputLabel = (columnIndex, groupIndex) => `${numberToLetterIndex(columnIndex)}${groupIndex + 1}`;
+// Label for a LIST-group measurement: deviceMeasurementNumber (0-based) +
+// group number, or the bare group number when the measurement has no device
+// number. listGroupMeasurementLabel(4, 1) → "E2"; (null, 1) → "2".
+export const listGroupMeasurementLabel = (deviceMeasurementNumber, groupIndex) => deviceMeasurementNumber != null && deviceMeasurementNumber >= 0
+    ? `${numberToLetterIndex(deviceMeasurementNumber)}${groupIndex + 1}`
+    : `${groupIndex + 1}`;

package/package.json

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

package/dist/annotation/canvas/tools/measurementLineTool.d.ts

@@ -1,12 +0,0 @@
-import type { PlacedMeasurementRef } from '../../../types/annotation.js';
-import type { Tool } from '../Tool.js';
-export interface MeasurementLineToolOptions {
-    id?: string;
-    label?: string;
-    minDragPx?: number;
-    autoSwitchToSelect?: boolean;
-    selectToolId?: string;
-    onAutoSwitch?: (toToolId: string) => void;
-    onPlaced?: (measurement: PlacedMeasurementRef) => void;
-}
-export declare const createMeasurementLineTool: (options?: MeasurementLineToolOptions) => Tool;

package/dist/annotation/canvas/tools/measurementLineTool.js

@@ -1,95 +0,0 @@
-import { DEFAULT_LAYER_ID } from '../../../types/annotation.js';
-import { DEFAULT_LINE_POS, recomputeAnchor } from '../measurementGeometry.js';
-let counter = 0;
-const makeId = () => `annotation-${Date.now().toString(36)}-${(counter++).toString(36)}`;
-const firstLayerId = (doc) => doc.layers[0]?.id ?? DEFAULT_LAYER_ID;
-// Build the blank line-measurement annotation for a drag from `a` to `b`: a
-// 2-point line with a value tile magnetized to its center (linePos 0.5). The
-// payload mirrors useAnnotationCanvasState's placeAnnotationAtCenter so a drawn
-// line and a (legacy) center-placed one are byte-identical once committed.
-const buildLineMeasurement = (opts) => {
-    const line = { a: opts.a, b: opts.b };
-    return {
-        id: opts.id,
-        layerId: opts.layerId,
-        placement: 'line',
-        line,
-        linePos: DEFAULT_LINE_POS,
-        // Center of the line; recomputeAnchor keeps this in sync on edits.
-        anchor: recomputeAnchor(line, 'line', DEFAULT_LINE_POS, {
-            x: (opts.a.x + opts.b.x) / 2,
-            y: (opts.a.y + opts.b.y) / 2,
-        }),
-        showLabel: true,
-        showValue: true,
-        createdAt: Date.now(),
-    };
-};
-// Drag-to-draw measurement-line tool. Press-drag rubber-bands a measurement
-// annotation (a line with a blank value tile at its center); release commits
-// it. Mirrors createShapeTool's interaction so "input lines" are placed the
-// same way as shapes — draw to add, not tap-the-icon-to-add — replacing the
-// old center-place affordance. The annotation stays blank (no measurement
-// associated) until the user fills it via the tile / picker. Skia-free, like
-// every tool factory; it renders its live preview through ctx.preview, so it
-// works on web and (via the generic tool-pan dispatch) on native.
-export const createMeasurementLineTool = (options = {}) => {
-    const minDragPx = options.minDragPx ?? 4;
-    const autoSwitchToSelect = options.autoSwitchToSelect ?? true;
-    const selectToolId = options.selectToolId ?? 'select';
-    return {
-        id: options.id ?? 'measure-line',
-        label: options.label ?? 'Measurement line',
-        cursor: 'crosshair',
-        onPointerDown(event) {
-            return {
-                kind: 'measurement-line-drawing',
-                id: makeId(),
-                startWorld: event.world,
-                startScreen: event.screen,
-                moved: false,
-            };
-        },
-        onPointerMove(event, ctx, state) {
-            const s = state;
-            if (s?.kind !== 'measurement-line-drawing')
-                return s;
-            const measurement = buildLineMeasurement({
-                id: s.id,
-                layerId: firstLayerId(ctx.document),
-                a: s.startWorld,
-                b: event.world,
-            });
-            ctx.preview({ ops: [{ op: 'addMeasurement', measurement }] });
-            return { ...s, moved: true };
-        },
-        onPointerUp(event, ctx, state) {
-            const s = state;
-            if (s?.kind !== 'measurement-line-drawing')
-                return;
-            const dx = event.screen.x - s.startScreen.x;
-            const dy = event.screen.y - s.startScreen.y;
-            if (!s.moved || dx * dx + dy * dy < minDragPx * minDragPx) {
-                // Accidental tap — discard the rubber-band, commit nothing.
-                ctx.preview({ ops: [] });
-                return;
-            }
-            const measurement = buildLineMeasurement({
-                id: s.id,
-                layerId: firstLayerId(ctx.document),
-                a: s.startWorld,
-                b: event.world,
-            });
-            ctx.commit({ ops: [{ op: 'addMeasurement', measurement }] });
-            // Leave it selected (and hand back to select) so the blank line can be
-            // filled / moved straight away — the same flow as the text tool.
-            ctx.setSelection({ ids: [measurement.id] });
-            options.onPlaced?.(measurement);
-            if (autoSwitchToSelect)
-                options.onAutoSwitch?.(selectToolId);
-        },
-        onCancel(_state, ctx) {
-            ctx.preview({ ops: [] });
-        },
-    };
-};