fix: missing group variables

Author: jorenrui

lib/entity/attributes.js

@@ -93,6 +93,7 @@ export class Attributes {
   }
 
   async evaluate() {
+    await this.evaluateAttribute(':group')
     await this.evaluateClass()
     await this.evaluateText()
     await this.evaluateValue()

lib/entity/data.js

@@ -8,16 +8,13 @@ export class Data {
     this.entity = entity
     this._variables = new Map() // key: variable, value: attributes
     this._attributes = new Map() // key: attribute, value: variables
+    this.groupVariables = []
   }
 
   get variables() {
     return Array.from(this._variables.keys())
   }
 
-  get groupVariables() {
-    return this.variables.filter((variable) => State.isGroupState(variable))
-  }
-
   getAttributeVariables(attr) {
     return this._attributes.get(attr) ?? []
   }
@@ -37,7 +34,7 @@ export class Data {
     const expr = this.entity.element.getAttribute(attr)
     if (!expr) return
 
-    const variables = this.getAttributeVariables()
+    const variables = this.getAttributeVariables(attr)
 
     if (variables.length) {
       variables.forEach((variable) => {
@@ -60,14 +57,16 @@ export class Data {
     }
 
     const lexer = new Lexer(expr)
+    const isGroupAttr = attr === ':group'
 
     lexer.identifiers.forEach((variable) => {
       if (IGNORED_IDS.includes(variable)) return
 
       const object = variable.split('.')[0]
       if (object in this.entity.state) return
 
-      this.add(variable, attr)
+      if (isGroupAttr) this.groupVariables.push(variable)
+      else this.add(variable, attr)
     })
   }
 

lib/state.js

@@ -205,8 +205,7 @@ export class State {
   }
 
   evaluate() {
-    Array.from(this.entities.values()).forEach((entity) => {
-      entity.attributes.evaluateAttribute(':group')
+    Array.from(this.entities.values()).forEach(async (entity) => {
       entity.attributes.evaluate()
     })