Test expression-eval

Author: pyrochlore

examples/TestPieChart.md

@@ -5,8 +5,8 @@ searchType: tag
 searchTarget: meditation
 pie:
     title: Pie
-	data: 2,4,6,8,10
-	dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-	ratioInnerRadius: 0.5
+    data: '{{sum}}*1,{{sum}}*2,{{sum}}*3,{{sum}}*4,{{sum}}*5'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+    ratioInnerRadius: 0.5
 ```
 

package.json

@@ -31,6 +31,7 @@
   "dependencies": {
     "d3": "^6.5.0",
     "d3-interpolate": "^3.0.1",
+    "expression-eval": "^5.0.0",
     "obsidian-daily-notes-interface": "^0.9.1"
   }
 }

src/expr.ts

@@ -2,6 +2,7 @@ import { RenderInfo } from "./data";
 import * as d3 from "d3";
 import { Moment } from "moment";
 import * as helper from "./helper";
+import { parse, eval as evaluate } from "expression-eval";
 
 let fnSet = {
     // min value of a dataset
@@ -520,3 +521,12 @@ export function resolveTemplate(template: string, renderInfo: RenderInfo) {
 
     return template;
 }
+
+export function resolve(s: string, renderInfo: RenderInfo) {
+    console.log(s);
+    s = resolveTemplate(s, renderInfo);
+    console.log(s);
+    const ast = parse(s);
+    const value = evaluate(ast, {});
+    return value;
+}

src/pie.ts

@@ -14,6 +14,7 @@ import {
 } from "./data";
 import * as helper from "./helper";
 import * as d3 from "d3";
+import * as expr from "./expr";
 
 function createAreas(
     chartElements: ChartElements,
@@ -85,7 +86,7 @@ function renderTitle(
     renderInfo: RenderInfo,
     pieInfo: PieInfo
 ) {
-    // console.log("renderTitle")
+    // console.log("renderTitle");
     // under graphArea
 
     if (!renderInfo || !pieInfo) return;
@@ -100,10 +101,18 @@ function renderPie(
     renderInfo: RenderInfo,
     pieInfo: PieInfo
 ) {
+    // console.log("renderPie");
+    // console.log(renderInfo);
+
     let radius = renderInfo.dataAreaSize.width * 0.5 * 0.8;
-    let data = pieInfo.data.map(function (v) {
-        return parseFloat(v);
+
+    // data
+    let data = pieInfo.data.map(function (s) {
+        let value = expr.resolve(s, renderInfo);
+        return value;
     });
+
+    // scale
     let colorScale = d3.scaleOrdinal().range(pieInfo.dataColor);
 
     let sectorsGroup = chartElements.dataArea.append("g");
@@ -149,8 +158,6 @@ export function renderPieChart(
     // console.log(renderInfo);
     if (!renderInfo || !pieInfo) return;
 
-    return "Under construction";
-
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, pieInfo);