ropegeo-common 1.20.1 → 1.20.2

package/dist/models/measurements/timeMeasurement.d.ts

@@ -17,6 +17,11 @@ export declare class TimeMeasurement extends Measurement {
     constructor(value: number, unit: TimeMeasurementUnit);
     toMeasurementSystem(system: TimeMeasurementSystem, unitName?: string): TimeMeasurement;
     protected abbreviate(): string;
+    /**
+     * Renders the value in a human-friendly unit derived from the stored unit and magnitude
+     * (e.g. 90 minutes → `1.5h`) without changing {@link unit}.
+     */
+    toString(showUnitName?: boolean): string;
     private toFreedom;
     static fromResult(json: unknown): TimeMeasurement;
     static coerce(value: unknown, defaultUnit: TimeMeasurementUnit): TimeMeasurement | null;

package/dist/models/measurements/timeMeasurement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeMeasurement.d.ts","sourceRoot":"","sources":["../../../src/models/measurements/timeMeasurement.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,WAAW,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IACzB,iBAAiB,EAAE,UAAU,CAAC;IAC9B,IAAI,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;CACtC,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,aAAa,CAAC;AACjE,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,SAAS,CAAC;AAE3D,2EAA2E;AAC3E,eAAO,MAAM,OAAO,EAAE,cAAmE,CAAC;AAC1F,eAAO,MAAM,KAAK,EAAE,cAAiE,CAAC;AACtF,eAAO,MAAM,IAAI,EAAE,cAAgE,CAAC;AA8CpF,0FAA0F;AAC1F,qBAAa,eAAgB,SAAQ,WAAW;IAC5C,QAAQ,CAAC,eAAe,EAAG,MAAM,CAAU;IAC3C,SAAiB,IAAI,EAAE,mBAAmB,CAAC;gBAE/B,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB;IAIpD,mBAAmB,CAAC,MAAM,EAAE,qBAAqB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,eAAe;IAgBtF,SAAS,CAAC,UAAU,IAAI,MAAM;IAa9B,OAAO,CAAC,SAAS;IAcjB,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe;IAkBjD,MAAM,CAAC,MAAM,CACT,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,mBAAmB,GACjC,eAAe,GAAG,IAAI;CAiB5B"}
+{"version":3,"file":"timeMeasurement.d.ts","sourceRoot":"","sources":["../../../src/models/measurements/timeMeasurement.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,WAAW,EAAE,MAAM,eAAe,CAAC;AAExE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IACzB,iBAAiB,EAAE,UAAU,CAAC;IAC9B,IAAI,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;CACtC,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,aAAa,CAAC;AACjE,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,SAAS,CAAC;AAE3D,2EAA2E;AAC3E,eAAO,MAAM,OAAO,EAAE,cAAmE,CAAC;AAC1F,eAAO,MAAM,KAAK,EAAE,cAAiE,CAAC;AACtF,eAAO,MAAM,IAAI,EAAE,cAAgE,CAAC;AA8CpF,0FAA0F;AAC1F,qBAAa,eAAgB,SAAQ,WAAW;IAC5C,QAAQ,CAAC,eAAe,EAAG,MAAM,CAAU;IAC3C,SAAiB,IAAI,EAAE,mBAAmB,CAAC;gBAE/B,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB;IAIpD,mBAAmB,CAAC,MAAM,EAAE,qBAAqB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,eAAe;IAgBtF,SAAS,CAAC,UAAU,IAAI,MAAM;IAI9B;;;OAGG;IACH,QAAQ,CAAC,YAAY,UAAO,GAAG,MAAM;IAYrC,OAAO,CAAC,SAAS;IAcjB,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe;IAkBjD,MAAM,CAAC,MAAM,CACT,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,mBAAmB,GACjC,eAAe,GAAG,IAAI;CAiB5B"}

package/dist/models/measurements/timeMeasurement.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeMeasurement = exports.DAYS = exports.HOURS = exports.MINUTES = void 0;
 const measurement_1 = require("./measurement");
+const measurementValue_1 = require("./measurementValue");
 /** Convenience unit descriptors for the units RopeWiki stores times in. */
 exports.MINUTES = { measurementSystem: 'Standard', name: 'minutes' };
 exports.HOURS = { measurementSystem: 'Standard', name: 'hours' };
@@ -61,16 +62,22 @@ class TimeMeasurement extends measurement_1.Measurement {
         return new TimeMeasurement(value, { measurementSystem: 'Standard', name: targetName });
     }
     abbreviate() {
-        switch (this.unit.name) {
-            case 'minutes':
-                return 'min';
-            case 'hours':
-                return 'h';
-            case 'days':
-                return 'd';
-            default:
-                return this.unit.name;
+        return abbreviateStandardUnit(this.unit.name);
+    }
+    /**
+     * Renders the value in a human-friendly unit derived from the stored unit and magnitude
+     * (e.g. 90 minutes → `1.5h`) without changing {@link unit}.
+     */
+    toString(showUnitName = true) {
+        if (this.unit.measurementSystem === measurement_1.FREEDOM_MEASUREMENT_SYSTEM) {
+            return super.toString(showUnitName);
+        }
+        const { value, unit } = displayUnitAndValue(this.value, this.unit.name);
+        const formatted = (0, measurementValue_1.formatMeasurementValue)(value);
+        if (!showUnitName) {
+            return formatted;
         }
+        return `${formatted}${abbreviateStandardUnit(unit)}`;
     }
     toFreedom(unit, unitName) {
         const seconds = this.value * SECONDS_PER_UNIT[unit.name];
@@ -115,6 +122,45 @@ class TimeMeasurement extends measurement_1.Measurement {
     }
 }
 exports.TimeMeasurement = TimeMeasurement;
+function abbreviateStandardUnit(name) {
+    switch (name) {
+        case 'minutes':
+            return 'min';
+        case 'hours':
+            return 'h';
+        case 'days':
+            return 'd';
+    }
+}
+/** Picks a display unit and scaled value for {@link TimeMeasurement.toString}. */
+function displayUnitAndValue(value, baseUnit) {
+    switch (baseUnit) {
+        case 'minutes':
+            if (value >= 60 * 24) {
+                return { value: value / (60 * 24), unit: 'days' };
+            }
+            if (value >= 60) {
+                return { value: value / 60, unit: 'hours' };
+            }
+            return { value, unit: 'minutes' };
+        case 'hours':
+            if (value >= 24) {
+                return { value: value / 24, unit: 'days' };
+            }
+            if (value < 1) {
+                return { value: value * 60, unit: 'minutes' };
+            }
+            return { value, unit: 'hours' };
+        case 'days':
+            if (value < 1 / 24) {
+                return { value: value * 24 * 60, unit: 'minutes' };
+            }
+            if (value < 1) {
+                return { value: value * 24, unit: 'hours' };
+            }
+            return { value, unit: 'days' };
+    }
+}
 function assertStandardUnit(name) {
     if (!STANDARD_NAMES.includes(name)) {
         throw new Error(`TimeMeasurement: "${name}" is not a valid Standard unit (expected one of [${STANDARD_NAMES.join(', ')}])`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ropegeo-common",
-    "version": "1.20.1",
+    "version": "1.20.2",
     "description": "Shared domain models and helpers for RopeGeo and WebScraper",
     "license": "ISC",
     "repository": {