ropegeo-common 1.20.0 → 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/dist/models/previews/offlinePagePreview.d.ts

@@ -1,8 +1,16 @@
 import { PagePreview } from './pagePreview';
+import { DownloadJob } from '../../download/downloadJob';
+import type { DownloadJobConfig } from '../../download/types';
 export declare class OfflinePagePreview extends PagePreview {
     readonly fetchType: "offline";
     downloadedImagePath: string | null;
     constructor(id: string, source: import('../pageDataSource').PageDataSource, downloadedImagePath: string | null, rating: number | null, ratingCount: number | null, title: string, regions: string[], aka: string[], difficultyRating: import('../difficulty/difficultyRating').DifficultyRating, mapData: string | null, externalLink: string | null, permit: import('../permitStatus').PermitStatus | null);
+    /**
+     * Re-downloads the page bundle by id/source (fetch-page-json path). Offline previews carry no
+     * `downloadFolder`, so this always uses the page-JSON fetch phase. Enables re-downloading a saved
+     * page whose bundle was removed (its preview stays offline while `downloadedPageViewPath` is null).
+     */
+    toDownloadJob(config: DownloadJobConfig): DownloadJob;
     static fromResult(result: unknown): OfflinePagePreview;
 }
 //# sourceMappingURL=offlinePagePreview.d.ts.map

package/dist/models/previews/offlinePagePreview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offlinePagePreview.d.ts","sourceRoot":"","sources":["../../../src/models/previews/offlinePagePreview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA6B,MAAM,eAAe,CAAC;AAEvE,qBAAa,kBAAmB,SAAQ,WAAW;IAC/C,QAAQ,CAAC,SAAS,EAAG,SAAS,CAAU;IACxC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;gBAG/B,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,OAAO,mBAAmB,EAAE,cAAc,EAClD,mBAAmB,EAAE,MAAM,GAAG,IAAI,EAClC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAAE,EACjB,GAAG,EAAE,MAAM,EAAE,EACb,gBAAgB,EAAE,OAAO,gCAAgC,EAAE,gBAAgB,EAC3E,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,MAAM,EAAE,OAAO,iBAAiB,EAAE,YAAY,GAAG,IAAI;IAkBzD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,kBAAkB;CAUzD"}
+{"version":3,"file":"offlinePagePreview.d.ts","sourceRoot":"","sources":["../../../src/models/previews/offlinePagePreview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA6B,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAS9D,qBAAa,kBAAmB,SAAQ,WAAW;IAC/C,QAAQ,CAAC,SAAS,EAAG,SAAS,CAAU;IACxC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;gBAG/B,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,OAAO,mBAAmB,EAAE,cAAc,EAClD,mBAAmB,EAAE,MAAM,GAAG,IAAI,EAClC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAAE,EACjB,GAAG,EAAE,MAAM,EAAE,EACb,gBAAgB,EAAE,OAAO,gCAAgC,EAAE,gBAAgB,EAC3E,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,MAAM,EAAE,OAAO,iBAAiB,EAAE,YAAY,GAAG,IAAI;IAkBzD;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW;IAyBrD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,kBAAkB;CAUzD"}

package/dist/models/previews/offlinePagePreview.js

@@ -2,12 +2,47 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfflinePagePreview = void 0;
 const pagePreview_1 = require("./pagePreview");
+const downloadJob_1 = require("../../download/downloadJob");
+const downloadPhase_1 = require("../../download/downloadPhase");
+const downloadPhaseTitles_1 = require("../../download/helpers/downloadPhaseTitles");
+const downloadDependencyKeys_1 = require("../../download/dependencies/downloadDependencyKeys");
+const fetchPageJsonTaskDependency_1 = require("../../download/dependencies/fetchPageJsonTaskDependency");
+const fetchPageJsonTask_1 = require("../../download/tasks/fetchPageJsonTask");
+const pageDataSource_1 = require("../pageDataSource");
+const pageViewType_1 = require("../pageViews/pageViewType");
 class OfflinePagePreview extends pagePreview_1.PagePreview {
     constructor(id, source, downloadedImagePath, rating, ratingCount, title, regions, aka, difficultyRating, mapData, externalLink, permit) {
         super(id, source, rating, ratingCount, title, regions, aka, difficultyRating, mapData, externalLink, permit);
         this.fetchType = 'offline';
         this.downloadedImagePath = downloadedImagePath;
     }
+    /**
+     * Re-downloads the page bundle by id/source (fetch-page-json path). Offline previews carry no
+     * `downloadFolder`, so this always uses the page-JSON fetch phase. Enables re-downloading a saved
+     * page whose bundle was removed (its preview stays offline while `downloadedPageViewPath` is null).
+     */
+    toDownloadJob(config) {
+        const pageViewType = this.source === pageDataSource_1.PageDataSource.Ropewiki
+            ? pageViewType_1.PageViewType.Ropewiki
+            : null;
+        if (pageViewType == null) {
+            throw new Error(`Unsupported page preview source "${String(this.source)}"`);
+        }
+        const fetchPageTask = new fetchPageJsonTask_1.FetchPageJsonTask();
+        const fetchPagePhase = new downloadPhase_1.DownloadPhase({
+            title: (0, downloadPhaseTitles_1.titleForPhase)([fetchPageTask]),
+            tasks: [fetchPageTask],
+        });
+        return new downloadJob_1.DownloadJob({
+            pageId: this.id,
+            pageViewType,
+            config,
+            phases: [(0, downloadPhaseTitles_1.buildDeleteStoredPagePhase)(), fetchPagePhase],
+            taskDependencies: {
+                [downloadDependencyKeys_1.DownloadDependencyKeys.FetchPageJson]: fetchPageJsonTaskDependency_1.FetchPageJsonTaskDependency.fromPreview(this, config),
+            },
+        });
+    }
     static fromResult(result) {
         if (result == null || typeof result !== 'object') {
             throw new Error('OfflinePagePreview result must be an object');

package/package.json

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