ropegeo-common 1.9.5 → 1.9.6

package/dist/classes/api/getRopewikiPageView/ropewikiPageView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ropewikiPageView.d.ts","sourceRoot":"","sources":["../../../../src/classes/api/getRopewikiPageView/ropewikiPageView.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ropewikiPageView.d.ts","sourceRoot":"","sources":["../../../../src/classes/api/getRopewikiPageView/ropewikiPageView.ts"],"names":[],"mappings":"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"}

package/dist/classes/api/getRopewikiPageView/ropewikiPageView.js

@@ -181,8 +181,10 @@ class RopewikiPageView {
         if (d.time !== null && d.time !== undefined && typeof d.time !== 'string') {
             throw new Error(`RopewikiPageView.${key}.time must be string or null`);
         }
-        if (d.risk !== null && d.risk !== undefined && typeof d.risk !== 'string') {
-            throw new Error(`RopewikiPageView.${key}.risk must be string or null`);
+        if (d.additionalRisk !== null &&
+            d.additionalRisk !== undefined &&
+            typeof d.additionalRisk !== 'string') {
+            throw new Error(`RopewikiPageView.${key}.additionalRisk must be string or null`);
         }
     }
     static assertPermit(obj, key) {

package/dist/classes/difficulty/acaDifficulty.d.ts

@@ -1,19 +1,20 @@
 import { Difficulty, DifficultyType } from './difficulty';
 import { AcaRiskRating, AcaTechnicalRating, AcaTimeRating, AcaWaterRating } from './acaRatings';
 /**
- * ACA canyon difficulty from DB strings. `risk` is the raw stored value; `effectiveRisk`
- * applies the technical default floor when `risk` is null or milder than that default.
+ * ACA canyon difficulty from DB strings. `additionalRisk` is the raw stored value (`riskRating`
+ * column); `effectiveRisk` applies the technical default floor when `additionalRisk` is null or
+ * milder than that default.
  */
 export declare class AcaDifficulty extends Difficulty {
     readonly difficultyType = DifficultyType.ACA;
     readonly technical: AcaTechnicalRating | null;
     readonly water: AcaWaterRating | null;
     readonly time: AcaTimeRating | null;
-    /** Raw risk from ropewiki (`riskRating` column), after enum parse; null if unset. */
-    readonly risk: AcaRiskRating | null;
+    /** Raw additional risk from ropewiki (`riskRating` column), after enum parse; null if unset. */
+    readonly additionalRisk: AcaRiskRating | null;
     /** Risk used for display and sorting (never milder than the default implied by technical). */
     readonly effectiveRisk: AcaRiskRating | null;
-    constructor(technicalRating: string | null | undefined, waterRating: string | null | undefined, timeRating: string | null | undefined, riskRating: string | null | undefined);
+    constructor(technicalRating: string | null | undefined, waterRating: string | null | undefined, timeRating: string | null | undefined, additionalRiskRating: string | null | undefined);
     getEffectiveRiskForDisplay(): AcaRiskRating | null;
     private static assignParts;
     private static defaultRiskFromTechnical;
@@ -21,7 +22,7 @@ export declare class AcaDifficulty extends Difficulty {
     private static parseField;
     /**
      * Parses JSON/API objects: `difficultyType: 'ACA'` (optional when dispatched via
-     * {@link Difficulty.fromResult}), `technical`, `water`, `time`, `risk` (raw), optional
+     * {@link Difficulty.fromResult}), `technical`, `water`, `time`, `additionalRisk` (raw), optional
      * `effectiveRisk` override.
      */
     static fromResult(result: unknown): AcaDifficulty;

package/dist/classes/difficulty/acaDifficulty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acaDifficulty.d.ts","sourceRoot":"","sources":["../../../src/classes/difficulty/acaDifficulty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAA4B,MAAM,cAAc,CAAC;AACpF,OAAO,EAEH,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,cAAc,EACjB,MAAM,cAAc,CAAC;AAUtB;;;GAGG;AACH,qBAAa,aAAc,SAAQ,UAAU;IACzC,QAAQ,CAAC,cAAc,sBAAsB;IAE7C,QAAQ,CAAC,SAAS,EAAG,kBAAkB,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAG,cAAc,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAG,aAAa,GAAG,IAAI,CAAC;IACrC,qFAAqF;IACrF,QAAQ,CAAC,IAAI,EAAG,aAAa,GAAG,IAAI,CAAC;IACrC,8FAA8F;IAC9F,QAAQ,CAAC,aAAa,EAAG,aAAa,GAAG,IAAI,CAAC;gBAG1C,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACtC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACrC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAiCzC,0BAA0B,IAAI,aAAa,GAAG,IAAI;IAIlD,OAAO,CAAC,MAAM,CAAC,WAAW;IAS1B,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAcvC,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAanC,OAAO,CAAC,MAAM,CAAC,UAAU;IAezB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,aAAa;IAuCjD,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAOtC"}
+{"version":3,"file":"acaDifficulty.d.ts","sourceRoot":"","sources":["../../../src/classes/difficulty/acaDifficulty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAA4B,MAAM,cAAc,CAAC;AACpF,OAAO,EAEH,aAAa,EACb,kBAAkB,EAClB,aAAa,EACb,cAAc,EACjB,MAAM,cAAc,CAAC;AAUtB;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,UAAU;IACzC,QAAQ,CAAC,cAAc,sBAAsB;IAE7C,QAAQ,CAAC,SAAS,EAAG,kBAAkB,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAG,cAAc,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAG,aAAa,GAAG,IAAI,CAAC;IACrC,gGAAgG;IAChG,QAAQ,CAAC,cAAc,EAAG,aAAa,GAAG,IAAI,CAAC;IAC/C,8FAA8F;IAC9F,QAAQ,CAAC,aAAa,EAAG,aAAa,GAAG,IAAI,CAAC;gBAG1C,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACtC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACrC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAoCnD,0BAA0B,IAAI,aAAa,GAAG,IAAI;IAIlD,OAAO,CAAC,MAAM,CAAC,WAAW;IAU1B,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAcvC,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAcnC,OAAO,CAAC,MAAM,CAAC,UAAU;IAezB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,aAAa;IAyCjD,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAOtC"}

package/dist/classes/difficulty/acaDifficulty.js

@@ -4,23 +4,24 @@ exports.AcaDifficulty = void 0;
 const difficulty_1 = require("./difficulty");
 const acaRatings_1 = require("./acaRatings");
 /**
- * ACA canyon difficulty from DB strings. `risk` is the raw stored value; `effectiveRisk`
- * applies the technical default floor when `risk` is null or milder than that default.
+ * ACA canyon difficulty from DB strings. `additionalRisk` is the raw stored value (`riskRating`
+ * column); `effectiveRisk` applies the technical default floor when `additionalRisk` is null or
+ * milder than that default.
  */
 class AcaDifficulty extends difficulty_1.Difficulty {
-    constructor(technicalRating, waterRating, timeRating, riskRating) {
+    constructor(technicalRating, waterRating, timeRating, additionalRiskRating) {
         super();
         this.difficultyType = difficulty_1.DifficultyType.ACA;
         const technical = AcaDifficulty.parseField(technicalRating, Object.values(acaRatings_1.AcaTechnicalRating), 'technical');
         const water = AcaDifficulty.parseField(waterRating, Object.values(acaRatings_1.AcaWaterRating), 'water');
         const time = AcaDifficulty.parseField(timeRating, Object.values(acaRatings_1.AcaTimeRating), 'time');
-        const parsedRisk = AcaDifficulty.parseField(riskRating, Object.values(acaRatings_1.AcaRiskRating), 'risk');
+        const parsedAdditionalRisk = AcaDifficulty.parseField(additionalRiskRating, Object.values(acaRatings_1.AcaRiskRating), 'additionalRisk');
         const parts = {
             technical,
             water,
             time,
-            risk: parsedRisk,
-            effectiveRisk: AcaDifficulty.computeEffectiveRisk(parsedRisk, technical),
+            additionalRisk: parsedAdditionalRisk,
+            effectiveRisk: AcaDifficulty.computeEffectiveRisk(parsedAdditionalRisk, technical),
         };
         AcaDifficulty.assignParts(this, parts);
     }
@@ -31,7 +32,8 @@ class AcaDifficulty extends difficulty_1.Difficulty {
         target.technical = parts.technical;
         target.water = parts.water;
         target.time = parts.time;
-        target.risk = parts.risk;
+        target.additionalRisk =
+            parts.additionalRisk;
         target.effectiveRisk =
             parts.effectiveRisk;
     }
@@ -46,12 +48,13 @@ class AcaDifficulty extends difficulty_1.Difficulty {
         }
         return null;
     }
-    static computeEffectiveRisk(rawRisk, technical) {
+    static computeEffectiveRisk(additionalRisk, technical) {
         const defaultRisk = AcaDifficulty.defaultRiskFromTechnical(technical);
-        if (rawRisk != null) {
-            return defaultRisk != null && acaRatings_1.ACA_RISK_ORDER[rawRisk] < acaRatings_1.ACA_RISK_ORDER[defaultRisk]
+        if (additionalRisk != null) {
+            return defaultRisk != null &&
+                acaRatings_1.ACA_RISK_ORDER[additionalRisk] < acaRatings_1.ACA_RISK_ORDER[defaultRisk]
                 ? defaultRisk
-                : rawRisk;
+                : additionalRisk;
         }
         return defaultRisk;
     }
@@ -66,7 +69,7 @@ class AcaDifficulty extends difficulty_1.Difficulty {
     }
     /**
      * Parses JSON/API objects: `difficultyType: 'ACA'` (optional when dispatched via
-     * {@link Difficulty.fromResult}), `technical`, `water`, `time`, `risk` (raw), optional
+     * {@link Difficulty.fromResult}), `technical`, `water`, `time`, `additionalRisk` (raw), optional
      * `effectiveRisk` override.
      */
     static fromResult(result) {
@@ -84,15 +87,15 @@ class AcaDifficulty extends difficulty_1.Difficulty {
         const tech = AcaDifficulty.coerceOptionalString(r.technical ?? r.Technical);
         const water = AcaDifficulty.coerceOptionalString(r.water ?? r.Water);
         const time = AcaDifficulty.coerceOptionalString(r.time ?? r.Time);
-        const riskRaw = AcaDifficulty.coerceOptionalString(r.risk ?? r.Risk);
+        const additionalRiskRaw = AcaDifficulty.coerceOptionalString(r.additionalRisk ?? r.AdditionalRisk);
         const effectiveRaw = AcaDifficulty.coerceOptionalString(r.effectiveRisk ?? r.EffectiveRisk);
         if (effectiveRaw !== null) {
-            const inst = new AcaDifficulty(tech, water, time, riskRaw);
+            const inst = new AcaDifficulty(tech, water, time, additionalRiskRaw);
             const effParsed = AcaDifficulty.parseField(effectiveRaw, Object.values(acaRatings_1.AcaRiskRating), 'effectiveRisk');
             inst.effectiveRisk = effParsed;
             return inst;
         }
-        return new AcaDifficulty(tech, water, time, riskRaw);
+        return new AcaDifficulty(tech, water, time, additionalRiskRaw);
     }
     static coerceOptionalString(v) {
         if (v === undefined || v === null || v === '')

package/dist/classes/mobile/savedPage.js

@@ -25,7 +25,7 @@ function pagePreviewToPlain(p) {
             technical: p.difficulty.technical,
             water: p.difficulty.water,
             time: p.difficulty.time,
-            risk: p.difficulty.risk,
+            additionalRisk: p.difficulty.additionalRisk,
             effectiveRisk: p.difficulty.effectiveRisk,
         }
         : {

package/dist/classes/previews/pagePreview.d.ts

@@ -60,7 +60,7 @@ export declare class PagePreview extends Preview {
     static fromDbRow(row: GetRopewikiPagePreviewRow, mapData: string | null, regions?: string[], aka?: string[]): PagePreview;
     /**
      * Validates result has page preview fields and applies PagePreview.prototype.
-     * Expects difficulty as plain object with technical, water, time, risk (optional).
+     * Expects difficulty as plain object with technical, water, time, additionalRisk (optional).
      */
     static fromResult(result: unknown): PagePreview;
     private static assertString;

package/dist/classes/previews/pagePreview.js

@@ -38,7 +38,7 @@ class PagePreview extends preview_1.Preview {
     }
     /**
      * Validates result has page preview fields and applies PagePreview.prototype.
-     * Expects difficulty as plain object with technical, water, time, risk (optional).
+     * Expects difficulty as plain object with technical, water, time, additionalRisk (optional).
      */
     static fromResult(result) {
         if (result == null || typeof result !== 'object') {
@@ -110,7 +110,7 @@ class PagePreview extends preview_1.Preview {
         strOrNull(d.technical, 'technical');
         strOrNull(d.water, 'water');
         strOrNull(d.time, 'time');
-        strOrNull(d.risk, 'risk');
+        strOrNull(d.additionalRisk, 'additionalRisk');
         strOrNull(d.effectiveRisk, 'effectiveRisk');
         const dtype = d.difficultyType ?? d.DifficultyType;
         if (dtype !== undefined &&

package/package.json

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