@reekon-tools/boldr-utils 1.4.0 → 1.4.2

package/dist/index.d.ts

@@ -3,4 +3,5 @@ export { convertMicrometers } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';
 export { useParseMeasurement } from './hooks/useParseMeasurement.js';
 export * from './types/firestore.js';
+export * from './types/layout.js';
 export { getToleranceColor, calculateDeviationPercentage, isWithinTolerance, generateToleranceGradient, createDefaultToleranceThresholds, DEFAULT_TOLERANCE_COLORS, type ToleranceThreshold, type ToleranceConfig, } from './utils/tolerance.js';

package/dist/index.js

@@ -3,4 +3,5 @@ export { convertMicrometers } from './utils/micrometersToUnit.js';
 export { parseMeasurement } from './utils/parseMeasurement.js';
 export { useParseMeasurement } from './hooks/useParseMeasurement.js';
 export * from './types/firestore.js';
+export * from './types/layout.js';
 export { getToleranceColor, calculateDeviationPercentage, isWithinTolerance, generateToleranceGradient, createDefaultToleranceThresholds, DEFAULT_TOLERANCE_COLORS, } from './utils/tolerance.js';

package/dist/types/firestore.d.ts

@@ -90,12 +90,26 @@ export interface Folder extends FirestoreDoc {
     projectId: string | null;
     type: FolderType;
 }
+export declare enum JobType {
+    DEFAULT = "default",
+    CUTLIST = "cutlist"
+}
 export interface Job extends FirestoreDoc, Timestamps {
     name: string;
     folderId: string;
     progress: number;
     projectId: string;
     totalTasks: string;
+    toleranceConfig?: {
+        thresholds: {
+            id: string;
+            percentage: number;
+            color: string;
+        }[];
+        updatedAt: Date;
+    };
+    areaMapFileId?: string;
+    type?: JobType;
 }
 export interface Section {
     id: string;
@@ -131,7 +145,9 @@ export declare enum ColumnType {
     Boolean = "boolean",
     Formula = "formula",
     SingleSelect = "singleSelect",
-    MultiSelect = "multiSelect"
+    MultiSelect = "multiSelect",
+    Angle = "angle",
+    ConversionTable = "conversionTable"
 }
 export interface Formula extends FirestoreDoc, Timestamps {
     expression: string;
@@ -146,10 +162,19 @@ export interface ColumnConfig {
     mappings?: Record<string, string>;
     withTolerance?: boolean;
     options?: string[];
+    conversions?: Conversion[];
+}
+export interface Conversion {
+    label: string;
+    value: string;
 }
 export interface Row {
     [key: string]: any;
 }
+export declare enum MeasurementType {
+    Angle = "angle",
+    Length = "length"
+}
 export interface Measurement extends FirestoreDoc, Timestamps, CreatedBy {
     projectId: string;
     jobId: string;
@@ -164,6 +189,9 @@ export interface Measurement extends FirestoreDoc, Timestamps, CreatedBy {
     relative?: boolean;
     measureBack?: boolean;
     centerFinding?: boolean;
+    isCompleted?: boolean;
+    type?: MeasurementType;
+    note?: string;
 }
 export declare enum Units {
     Centimeters = "cm",

package/dist/types/firestore.js

@@ -15,6 +15,11 @@ export var FolderType;
     FolderType["Project"] = "project";
     FolderType["Job"] = "job";
 })(FolderType || (FolderType = {}));
+export var JobType;
+(function (JobType) {
+    JobType["DEFAULT"] = "default";
+    JobType["CUTLIST"] = "cutlist";
+})(JobType || (JobType = {}));
 export var ColumnType;
 (function (ColumnType) {
     ColumnType["Text"] = "text";
@@ -24,7 +29,14 @@ export var ColumnType;
     ColumnType["Formula"] = "formula";
     ColumnType["SingleSelect"] = "singleSelect";
     ColumnType["MultiSelect"] = "multiSelect";
+    ColumnType["Angle"] = "angle";
+    ColumnType["ConversionTable"] = "conversionTable";
 })(ColumnType || (ColumnType = {}));
+export var MeasurementType;
+(function (MeasurementType) {
+    MeasurementType["Angle"] = "angle";
+    MeasurementType["Length"] = "length";
+})(MeasurementType || (MeasurementType = {}));
 export var Units;
 (function (Units) {
     Units["Centimeters"] = "cm";

package/dist/types/layout.d.ts

@@ -40,13 +40,15 @@ export interface Layout {
     faces: Record<string, Face>;
     backgroundImage?: {
         fileId: string;
-        position: {
+        opacity: number;
+        centerWorld: {
             x: number;
             y: number;
         };
-        scale: number;
-        rotation?: number;
-        opacity?: number;
+        pixelSizeWorld: number;
+        widthPx: number;
+        heightPx: number;
+        rotationRad: number;
     };
     metadata?: {
         projectId?: string;

package/dist/utils/micrometersToUnit.js

@@ -15,8 +15,15 @@ export const convertMicrometers = (micrometers, unit, fractionalTolerance, decim
                 const whole = Math.floor(inches);
                 const fractional = inches - whole;
                 const numerator = Math.round(fractional * denominator);
-                value =
-                    numerator === 0 ? `${whole}` : `${whole} ${numerator}/${denominator}`;
+                if (numerator === denominator) {
+                    value = `${whole + 1}`;
+                }
+                else {
+                    value =
+                        numerator === 0
+                            ? `${whole}`
+                            : `${whole} ${numerator}/${denominator}`;
+                }
             }
             else {
                 value = inches.toFixed(decimalTolerance.length - 2); // Match decimal places to tolerance
@@ -36,10 +43,15 @@ export const convertMicrometers = (micrometers, unit, fractionalTolerance, decim
                 const fractional = inches - wholeInches;
                 const denominator = parseInt(fractionalTolerance, 10);
                 const numerator = Math.round(fractional * denominator);
-                value =
-                    numerator === 0
-                        ? `${wholeFeet}' ${wholeInches}"`
-                        : `${wholeFeet}' ${wholeInches} ${numerator}/${denominator}"`;
+                if (numerator === denominator) {
+                    value = `${wholeFeet}' ${wholeInches + 1}"`;
+                }
+                else {
+                    value =
+                        numerator === 0
+                            ? `${wholeFeet}' ${wholeInches}"`
+                            : `${wholeFeet}' ${wholeInches} ${numerator}/${denominator}"`;
+                }
             }
             else if (unit === Units.FeetInchesDecimal) {
                 const inches = (fractionalFeet * 12).toFixed(decimalTolerance.length - 2);

package/package.json

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