global: snapshot

website/scripts/options/distribution/prices.js

@@ -19,47 +19,9 @@ import { baseline, price } from "../series.js";
 import { Unit } from "../../utils/units.js";
 
 /**
- * @param {{ realized: { realizedPrice: ActivePricePattern, investorPrice: ActivePricePattern, lowerPriceBand: ActivePricePattern, upperPriceBand: ActivePricePattern } }} tree
- * @param {(metric: string) => string} title
- * @returns {PartialChartOption}
- */
-function createCompareChart(tree, title) {
-  return {
-    name: "Compare",
-    title: title("Prices"),
-    top: [
-      price({
-        metric: tree.realized.realizedPrice,
-        name: "Realized",
-        color: colors.realized,
-      }),
-      price({
-        metric: tree.realized.investorPrice,
-        name: "Investor",
-        color: colors.investor,
-      }),
-      price({
-        metric: tree.realized.upperPriceBand,
-        name: "I²/R",
-        color: colors.stat.max,
-        style: 2,
-        defaultActive: false,
-      }),
-      price({
-        metric: tree.realized.lowerPriceBand,
-        name: "R²/I",
-        color: colors.stat.min,
-        style: 2,
-        defaultActive: false,
-      }),
-    ],
-  };
-}
-
-/**
- * Create prices section for cohorts with full ActivePriceRatioPattern
- * (CohortAll, CohortFull, CohortWithPercentiles)
- * @param {{ cohort: CohortAll | CohortFull | CohortWithPercentiles, title: (metric: string) => string }} args
+ * Create prices section for cohorts with full ratio patterns
+ * (CohortAll, CohortFull, CohortLongTerm)
+ * @param {{ cohort: CohortAll | CohortFull | CohortLongTerm, title: (metric: string) => string }} args
  * @returns {PartialOptionsGroup}
  */
 export function createPricesSectionFull({ cohort, title }) {
@@ -67,14 +29,23 @@ export function createPricesSectionFull({ cohort, title }) {
   return {
     name: "Prices",
     tree: [
-      createCompareChart(tree, title),
+      {
+        name: "Compare",
+        title: title("Prices"),
+        top: [
+          price({ metric: tree.realized.price, name: "Realized", color: colors.realized }),
+          price({ metric: tree.realized.investor.price, name: "Investor", color: colors.investor }),
+          price({ metric: tree.realized.investor.upperPriceBand, name: "I²/R", color: colors.stat.max, style: 2, defaultActive: false }),
+          price({ metric: tree.realized.investor.lowerPriceBand, name: "R²/I", color: colors.stat.min, style: 2, defaultActive: false }),
+        ],
+      },
       {
         name: "Realized",
         tree: createPriceRatioCharts({
           context: cohort.name,
           legend: "Realized",
-          pricePattern: tree.realized.realizedPrice,
-          ratio: { ...tree.realized.realizedPriceExtra, ...tree.realized.realizedPriceRatioExt },
+          pricePattern: tree.realized.price,
+          ratio: tree.realized.price,
           color,
           priceTitle: title("Realized Price"),
           titlePrefix: "Realized Price",
@@ -82,52 +53,19 @@ export function createPricesSectionFull({ cohort, title }) {
       },
       {
         name: "Investor",
-        tree: createPriceRatioCharts({
-          context: cohort.name,
-          legend: "Investor",
-          pricePattern: tree.realized.investorPrice,
-          ratio: { ...tree.realized.investorPriceExtra, ...tree.realized.investorPriceRatioExt },
-          color,
-          priceTitle: title("Investor Price"),
-          titlePrefix: "Investor Price",
-        }),
-      },
-    ],
-  };
-}
-
-/**
- * Create prices section for cohorts with basic ratio patterns only
- * (CohortWithAdjusted, CohortBasic, CohortAddress, CohortWithoutRelative)
- * @param {{ cohort: CohortWithAdjusted | CohortBasic | CohortAddress | CohortWithoutRelative, title: (metric: string) => string }} args
- * @returns {PartialOptionsGroup}
- */
-export function createPricesSectionBasic({ cohort, title }) {
-  const { tree, color } = cohort;
-  return {
-    name: "Prices",
-    tree: [
-      createCompareChart(tree, title),
-      {
-        name: "Realized",
         tree: [
           {
             name: "Price",
-            title: title("Realized Price"),
-            top: [
-              price({
-                metric: tree.realized.realizedPrice,
-                name: "Realized",
-                color,
-              }),
-            ],
+            title: title("Investor Price"),
+            top: [price({ metric: tree.realized.investor.price, name: "Investor", color })],
           },
           {
             name: "Ratio",
-            title: title("Realized Price Ratio"),
+            title: title("Investor Price Ratio"),
+            top: [price({ metric: tree.realized.investor.price, name: "Investor", color })],
             bottom: [
               baseline({
-                metric: tree.realized.realizedPriceExtra.ratio,
+                metric: tree.realized.investor.price.ratio,
                 name: "Ratio",
                 unit: Unit.ratio,
                 base: 1,
@@ -136,27 +74,36 @@ export function createPricesSectionBasic({ cohort, title }) {
           },
         ],
       },
+    ],
+  };
+}
+
+/**
+ * Create prices section for cohorts with basic ratio patterns only
+ * (CohortWithAdjusted, CohortBasic, CohortAddress, CohortWithoutRelative)
+ * @param {{ cohort: CohortWithAdjusted | CohortBasic | CohortAddress | CohortWithoutRelative | CohortAgeRange, title: (metric: string) => string }} args
+ * @returns {PartialOptionsGroup}
+ */
+export function createPricesSectionBasic({ cohort, title }) {
+  const { tree, color } = cohort;
+  return {
+    name: "Prices",
+    tree: [
       {
-        name: "Investor",
+        name: "Realized",
         tree: [
           {
             name: "Price",
-            title: title("Investor Price"),
-            top: [
-              price({
-                metric: tree.realized.investorPrice,
-                name: "Investor",
-                color,
-              }),
-            ],
+            title: title("Realized Price"),
+            top: [price({ metric: tree.realized.price, name: "Realized", color })],
           },
           {
             name: "Ratio",
-            title: title("Investor Price Ratio"),
+            title: title("Realized Price Ratio"),
             bottom: [
               baseline({
-                metric: tree.realized.investorPriceExtra.ratio,
-                name: "Ratio",
+                metric: tree.realized.mvrv,
+                name: "MVRV",
                 unit: Unit.ratio,
                 base: 1,
               }),
@@ -184,40 +131,15 @@ export function createGroupedPricesSection({ list, all, title }) {
             name: "Price",
             title: title("Realized Price"),
             top: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-              price({ metric: tree.realized.realizedPrice, name, color }),
+              price({ metric: tree.realized.price, name, color }),
             ),
           },
           {
             name: "Ratio",
-            title: title("Realized Price Ratio"),
+            title: title("MVRV"),
             bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
               baseline({
-                metric: tree.realized.realizedPriceExtra.ratio,
-                name,
-                color,
-                unit: Unit.ratio,
-                base: 1,
-              }),
-            ),
-          },
-        ],
-      },
-      {
-        name: "Investor",
-        tree: [
-          {
-            name: "Price",
-            title: title("Investor Price"),
-            top: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-              price({ metric: tree.realized.investorPrice, name, color }),
-            ),
-          },
-          {
-            name: "Ratio",
-            title: title("Investor Price Ratio"),
-            bottom: mapCohortsWithAll(list, all, ({ name, color, tree }) =>
-              baseline({
-                metric: tree.realized.investorPriceExtra.ratio,
+                metric: tree.realized.mvrv,
                 name,
                 color,
                 unit: Unit.ratio,