pass path instead of entityIdx as fnParam

Author: dbuezas

src/parse-config/defaults.ts

@@ -1,4 +1,5 @@
 import { parseColorScheme } from "./parse-color-scheme";
+import { getEntityIndex } from "./parse-config";
 
 export const defaultEntity = {
   entity: "",
@@ -8,31 +9,28 @@ export const defaultEntity = {
   line: {
     width: 1,
     shape: "hv",
-    color: ({ getFromConfig, entityIdx }) => {
+    color: ({ getFromConfig, path }) => {
       const color_scheme = parseColorScheme(getFromConfig("color_scheme"));
-      return color_scheme[entityIdx % color_scheme.length];
+      return color_scheme[getEntityIndex(path) % color_scheme.length];
     },
   },
   internal: false,
   offset: "0s",
   // extend_to_present: true unless using statistics. Defined inside parse-config.ts to avoid forward depndency
   unit_of_measurement: ({ meta }) => meta.unit_of_measurement || "",
-  name: ({ meta, entityIdx, getFromConfig }) => {
-    let name =
-      meta.friendly_name || getFromConfig(`entities.${entityIdx}.entity`);
-    const attribute = getFromConfig(`entities.${entityIdx}.attribute`);
+  name: ({ meta, getFromConfig }) => {
+    let name = meta.friendly_name || getFromConfig(`.entity`);
+    const attribute = getFromConfig(`.attribute`);
     if (attribute) name += ` (${attribute}) `;
     return name;
   },
-  hovertemplate: ({ getFromConfig, entityIdx }) =>
-    `<b>${getFromConfig(
-      `entities.${entityIdx}.name`
-    )}</b><br><i>%{x}</i><br>%{y} ${getFromConfig(
-      `entities.${entityIdx}.unit_of_measurement`
+  hovertemplate: ({ getFromConfig }) =>
+    `<b>${getFromConfig(".name")}</b><br><i>%{x}</i><br>%{y} ${getFromConfig(
+      ".unit_of_measurement"
     )}<extra></extra>`,
-  yaxis: ({ getFromConfig, entityIdx }) => {
+  yaxis: ({ getFromConfig, path }) => {
     const units: string[] = [];
-    for (let i = 0; i <= entityIdx; i++) {
+    for (let i = 0; i <= getEntityIndex(path); i++) {
       const unit = getFromConfig(`entities.${i}.unit_of_measurement`);
       const internal = getFromConfig(`entities.${i}.internal`);
       if (!internal && !units.includes(unit)) units.push(unit);
@@ -65,7 +63,8 @@ export const defaultYaml = {
       r: ({ getFromConfig }) => {
         const entities = getFromConfig(`entities`);
         const usesRightAxis = entities.some(({ yaxis }) => yaxis === "y2");
-        return usesRightAxis ? 60 : 30;
+        const usesShowValue = entities.some(({ show_value }) => show_value);
+        return usesRightAxis | usesShowValue ? 60 : 30;
       },
     },
   },

src/parse-config/parse-config.ts

@@ -65,8 +65,8 @@ class ConfigParser {
       // 2nd pass: evaluate functions
       this.fnParam = {
         vars: {},
+        path: "",
         hass: input.hass,
-        entityIdx: "",
         getFromConfig: () => "",
       };
       this.partiallyParsedConfig = {};
@@ -130,10 +130,10 @@ class ConfigParser {
   }) {
     errorIfDeprecated(path);
     if (path.match(/^defaults$/)) return;
-    this.fnParam.getFromConfig = (aPath: string) =>
-      this.getEvaledPath({ path: aPath, callingPath: path });
+    this.fnParam.path = path;
+    this.fnParam.getFromConfig = (pathQuery: string) =>
+      this.getEvaledPath(pathQuery, path /* caller */);
 
-    if (path.match(/^entities\.\d$/)) this.fnParam.entityIdx = key;
     if (
       path.match(/^entities\.\d+\./) && //isInsideEntity
       !path.match(
@@ -270,9 +270,10 @@ class ConfigParser {
       visible_range[1] - offset,
     ];
     const fetch_mask = this.fnParam.getFromConfig("fetch_mask");
+    const i = getEntityIndex(path);
     const data =
       // TODO: decide about minimal response
-      fetch_mask[this.fnParam.entityIdx] === false // also fetch if it is undefined. This means the entity is new
+      fetch_mask[i] === false // also fetch if it is undefined. This means the entity is new
         ? this.cache.getData(fetchConfig)
         : await this.cache.fetch(range_to_fetch, fetchConfig, this.hass!);
     const extend_to_present =
@@ -300,17 +301,23 @@ class ConfigParser {
   public resetObservedRange() {
     this.observed_range = [Date.now(), Date.now()];
   }
-  private getEvaledPath(p: { path: string; callingPath: string }) {
-    if (has(this.partiallyParsedConfig, p.path))
-      return get(this.partiallyParsedConfig, p.path);
+  private getEvaledPath(path: string, callingPath: string) {
+    if (path.startsWith("."))
+      path = callingPath
+        .split(".")
+        .slice(0, -1)
+        .concat(path.slice(1).split("."))
+        .join(".");
+    if (has(this.partiallyParsedConfig, path))
+      return get(this.partiallyParsedConfig, path);
 
     let value = this.inputConfig;
-    for (const key of p.path.split(".")) {
+    for (const key of path.split(".")) {
       if (value === undefined) return undefined;
       value = value[key];
       if (is$fn(value)) {
         throw new Error(
-          `Since [${p.path}] is a $fn, it has to be defined before [${p.callingPath}]`
+          `Since [${path}] is a $fn, it has to be defined before [${callingPath}]`
         );
       }
     }
@@ -387,7 +394,7 @@ type FnParam = {
   ) => ReturnType<InstanceType<typeof ConfigParser>["getEvaledPath"]>;
   hass: HomeAssistant;
   vars: Record<string, any>;
-  entityIdx: string;
+  path: string;
   xs?: Date[];
   ys?: YValue[];
   statistics?: StatisticValue[];
@@ -407,5 +414,6 @@ function errorIfDeprecated(path: string) {
       "minimal_response was removed, if you need attributes use the 'attribute' parameter instead."
     );
 }
-
+export const getEntityIndex = (path: string) =>
+  +path.match(/entities\.(\d+)/)![1];
 export { ConfigParser };