optimize: grouped usage of new Set

Author: jorenrui

lib/entity/data.js

@@ -29,13 +29,23 @@ export class Data {
   init() {
     this._getAttributesVariables()
     this._getEventVariables()
+    this._removeDuplicateVariables()
     this._initVariables()
   }
 
   initAttributeVariables(attr) {
     const expr = this.entity.element.getAttribute(attr)
     if (!expr) return
 
+    const variables = this.getAttributeVariables()
+
+    if (variables.length) {
+      variables.forEach((variable) => {
+        this.remove(variable, attr)
+      })
+      this._attributes.set(attr, [])
+    }
+
     if (attr === 'each') {
       const [_, variable] = expr.split(' in ')
 
@@ -85,21 +95,32 @@ export class Data {
     })
   }
 
+  _removeDuplicateVariables() {
+    this._variables.forEach((attributes, variable) => {
+      this._variables.set(variable, [...new Set(attributes)])
+    })
+
+    this._attributes.forEach((variables, attribute) => {
+      this._attributes.set(attribute, [...new Set(variables)])
+    })
+  }
+
   _initVariables() {
     const entityID = this.entity.id
+    const state = this.entity.base.state
 
     this.variables.forEach((variable) => {
       if (State.isElState(variable)) {
         this.entity.setAsGroup()
 
         if (window[entityID] == null)
-          window[entityID] = this.entity.base.state.create({}, entityID)
+          window[entityID] = state.create({}, entityID)
 
-        this.entity.base.state.addVariable(entityID, entityID)
+        state.addVariable(entityID, entityID)
 
         if (variable !== State.EL_STATE) {
           const [_, varName] = variable.split('.')
-          this.entity.base.state.addEntityVariable(entityID, varName, entityID)
+          state.addEntityVariable(entityID, varName, entityID)
         }
       } else if (State.isGroupState(variable)) {
         if (this.entity.group == null)
@@ -112,39 +133,37 @@ export class Data {
         const groupID = this.entity.group?.id
 
         if (window[groupID] == null) {
-          window[groupID] = this.entity.base.state.create({}, groupID)
+          window[groupID] = state.create({}, groupID)
         }
 
-        this.entity.base.state.addVariable(groupID, entityID)
+        state.addVariable(groupID, entityID)
 
         if (variable !== State.GROUP_STATE) {
           const [_, varName] = variable.split('.')
-          this.entity.base.state.addEntityVariable(groupID, varName, entityID)
+          state.addEntityVariable(groupID, varName, entityID)
         }
       } else if (typeof window[variable] === 'function') {
         this.deleteVariable(variable)
       } else {
         try {
           const [identifier] = variable.split('.')
-          window[identifier] = this.entity.base.state.getState(identifier)
-          this.entity.base.state.addVariable(identifier, entityID)
+          window[identifier] = state.getState(identifier)
+          state.addVariable(identifier, entityID)
         } catch (error) {
           console.error('Failed to initialize variable:', variable, error)
         }
       }
     })
+
+    state.removeDuplicateVariables()
   }
 
   add(variable, attribute) {
     const currentAttributes = this._variables.get(variable) ?? []
-    this._variables.set(variable, [
-      ...new Set(currentAttributes.concat([attribute])),
-    ])
+    this._variables.set(variable, [...currentAttributes, attribute])
 
     const currentVariables = this._attributes.get(attribute) ?? []
-    this._attributes.set(attribute, [
-      ...new Set(currentVariables.concat([variable])),
-    ])
+    this._attributes.set(attribute, [...currentVariables, variable])
   }
 
   remove(variable, attributes) {

lib/state.js

@@ -79,13 +79,23 @@ export class State {
 
   addVariable(variable, entityID) {
     const variables = this.variables.get(variable) || []
-    this.variables.set(variable, [...new Set(variables), entityID])
+    this.variables.set(variable, [...variables, entityID])
   }
 
   addEntityVariable(groupID, variable, entityID) {
     const key = `${groupID}.${variable}`
     const variables = this.entityVariables.get(key) || []
-    this.entityVariables.set(key, [...new Set(variables), entityID])
+    this.entityVariables.set(key, [...variables, entityID])
+  }
+
+  removeDuplicateVariables() {
+    this.variables.forEach((entityIDs, variable) => {
+      this.variables.set(variable, [...new Set(entityIDs)])
+    })
+
+    this.entityVariables.forEach((entityIDs, variable) => {
+      this.entityVariables.set(variable, [...new Set(entityIDs)])
+    })
   }
 
   create(object, entityID = null) {