@reekon-tools/boldr-cad 1.0.0 → 1.2.0

package/src/units/format.ts

@@ -1,4 +1,4 @@
-import { getUnitPrefs, type UnitPrefs } from './prefs';
+import { getUnitPrefs, isMetric, type UnitPrefs } from './prefs';
 
 let custom: ((inches: number) => string) | null = null;
 let hostPrefs: UnitPrefs | null = null;
@@ -19,11 +19,14 @@ export const hostUnits = (): UnitPrefs | null => (custom ? hostPrefs ?? { unit:
 export const followingHostUnits = (): boolean => !!custom && !own;
 export function setOwnUnits(v: boolean): void { own = v; }
 
-/** Format a length in inches: 150.5 → 12'-6 1/2" (ft-in), 150 1/2" (in), 3,823 mm (mm). */
+/** Format a length in inches: 150.5 → 12'-6 1/2" (ft-in), 150 1/2" (in), 12.54' (ft), 3,823 mm (mm), 382.27 cm (cm), 3.823 m (m). */
 export function fmtLen(v: number, u: UnitPrefs = getUnitPrefs()): string {
   v = Math.abs(v);
   if (custom && !own && u === getUnitPrefs()) return custom(v);
   if (u.unit === 'mm') return Math.round(v * 25.4).toLocaleString() + ' mm';
+  if (u.unit === 'cm') return (v * 2.54).toFixed(2) + ' cm';
+  if (u.unit === 'm') return (v * 0.0254).toFixed(3) + ' m';
+  if (u.unit === 'ft') return (v / 12).toFixed(2) + "'";
   const d = u.denom;
   const t = Math.round(v * d) / d;
   let ft = u.unit === 'ftin' ? Math.floor(t / 12 + 1e-9) : 0;
@@ -41,7 +44,7 @@ export function fmtLen(v: number, u: UnitPrefs = getUnitPrefs()): string {
 
 /** Format an area given in square inches. */
 export function fmtArea(sqin: number, u: UnitPrefs = getUnitPrefs()): string {
-  if (u.unit === 'mm') return (sqin * 0.00064516).toFixed(2) + ' m²';
+  if (isMetric(u.unit)) return (sqin * 0.00064516).toFixed(2) + ' m²';
   return (sqin / 144).toFixed(1) + ' sq ft';
 }
 

package/src/units/parse.ts

@@ -1,4 +1,4 @@
-import { getUnitPrefs, type UnitPrefs } from './prefs';
+import { bareScale, getUnitPrefs, type UnitPrefs } from './prefs';
 
 /** Tiny recursive-descent evaluator for + - * / and parentheses. Throws on bad input. */
 export function evalExpr(src: string): number {
@@ -41,7 +41,8 @@ export function evalExpr(src: string): number {
 /**
  * Parse a length and return inches, or null if it can't be read.
  * Accepts 12' 6 1/2", 12ft 6in, 150.5, 3.2m, 25mm, and arithmetic (10'+6).
- * Bare numbers are inches in ft-in / in mode and millimetres in mm mode.
+ * Bare numbers are read in the current unit: inches in ft-in and in modes, feet in ft, millimetres, centimetres or
+ * metres in those.
  */
 export function parseLen(str: string | null | undefined, u: UnitPrefs = getUnitPrefs()): number | null {
   if (str == null) return null;
@@ -58,7 +59,7 @@ export function parseLen(str: string | null | undefined, u: UnitPrefs = getUnitP
   let v: number;
   try { v = evalExpr(s); } catch { return null; }
   if (!isFinite(v)) return null;
-  if (u.unit === 'mm' && !hasUnit) v /= 25.4;
+  if (!hasUnit) v *= bareScale(u.unit);
   return v;
 }
 

package/src/units/prefs.ts

@@ -1,10 +1,12 @@
-export type Unit = 'ftin' | 'in' | 'mm';
+export type Unit = 'ftin' | 'in' | 'ft' | 'mm' | 'cm' | 'm';
 
 /** Display preferences. Geometry is always stored in inches; these only change how values read. */
 export interface UnitPrefs {
   unit: Unit;
   /** Fraction precision for imperial display: 16 → 1/16". */
   denom: number;
+  /** Whether lengths are typed and read with fractions (the fraction keys, Precision). Unset: feet-inches and inches are. */
+  fractions?: boolean;
 }
 
 let current: UnitPrefs = { unit: 'ftin', denom: 16 };
@@ -17,3 +19,13 @@ export function useUnitPrefs(p: UnitPrefs): void {
 export function getUnitPrefs(): UnitPrefs {
   return current;
 }
+
+/** Metric units: bare numbers, the grid and areas are metric. */
+export const isMetric = (unit: Unit): boolean => unit === 'mm' || unit === 'cm' || unit === 'm';
+
+/** Inches per unit typed as a bare number: what a number with no unit means in `unit`. */
+export const bareScale = (unit: Unit): number =>
+  unit === 'ft' ? 12 : unit === 'mm' ? 1 / 25.4 : unit === 'cm' ? 1 / 2.54 : unit === 'm' ? 1 / 0.0254 : 1;
+
+/** Whether lengths read with fractions (the fraction keys, Precision): as the prefs say, else for feet-inches and inches. */
+export const showFractions = (u: UnitPrefs = getUnitPrefs()): boolean => u.fractions ?? (u.unit === 'ftin' || u.unit === 'in');