@@ -2,6 +2,7 @@ import { Interpreter, ClassInterpreter } from './generators/interpreter'
22import { Lexer } from './generators/lexer'
33import { Events } from './entity/events'
44import { Attributes } from './entity/attributes'
5+ import { State } from './state'
56
67export default class Entity {
78 constructor ( el ) {
@@ -12,8 +13,11 @@ export default class Entity {
1213
1314 this . events = new Events ( this )
1415 this . attributes = new Attributes ( this )
16+ MiniJS . state . addEntity ( this )
1517
1618 if ( MiniJS . debug ) this . element . dataset . entityId = this . id
19+
20+ this . attributes . evaluateParent ( )
1721 }
1822
1923 setAsParent ( ) {
@@ -25,6 +29,10 @@ export default class Entity {
2529 return ! ! this . uuid
2630 }
2731
32+ isExists ( ) {
33+ return document . documentElement . contains ( this . element )
34+ }
35+
2836 getVariables ( ) {
2937 this . _getVariablesFromAttributes ( )
3038 this . _getVariablesFromEvents ( )
@@ -86,44 +94,60 @@ export default class Entity {
8694
8795 _initVariables ( ) {
8896 this . variables = [ ...new Set ( this . variables ) ]
89- MiniJS . variables = [ ...new Set ( MiniJS . variables . concat ( this . variables ) ) ]
9097
9198 this . variables . forEach ( ( variable ) => {
92- if ( variable . startsWith ( 'el.' ) ) {
99+ if ( State . isElState ( variable ) ) {
93100 this . setAsParent ( )
94101
95- if ( ! this . parent ) this . parent = this . getParent ( )
102+ if ( window [ this . id ] == null ) {
103+ window [ this . id ] = MiniJS . state . create ( { } , this . id )
104+ }
96105
97- const varName = variable . replace ( 'el.' , '' )
106+ MiniJS . state . addVariable ( this . id , this . id )
98107
99- if ( ! window [ this . uuid ] ) window [ this . uuid ] = { }
108+ if ( variable !== 'el' ) {
109+ const [ _ , varName ] = variable . split ( '.' )
110+ MiniJS . state . addEntityVariable ( this . id , varName , this . id )
111+ }
112+ } else if ( State . isParentState ( variable ) ) {
113+ if ( ! this . parent ) this . parent = this . getParent ( )
100114
101- // ! FIXME: Any changes to el.varName isn't being watched
102- window [ this . uuid ] [ varName ] = MiniJS . tryFromLocal (
103- variable . replace ( 'el.' , this . uuid + '.' )
104- )
115+ if ( window [ this . parent . id ] == null ) {
116+ window [ this . parent . id ] = MiniJS . state . create ( { } , this . parent . id )
117+ }
118+
119+ MiniJS . state . addVariable ( this . parent . id , this . id )
105120
106- if ( ! this . variables . includes ( this . uuid ) ) this . variables . push ( this . uuid )
121+ if ( variable !== 'parent' ) {
122+ const [ _ , varName ] = variable . split ( '.' )
123+ MiniJS . state . addEntityVariable ( this . parent . id , varName , this . id )
124+ }
107125 } else if ( typeof window [ variable ] === 'function' ) {
108126 this . variables . splice ( this . variables . indexOf ( variable ) , 1 )
109- MiniJS . variables . splice ( MiniJS . variables . indexOf ( variable ) , 1 )
110127 } else {
111- window [ variable ] = variable . startsWith ( '$' )
112- ? MiniJS . tryFromLocal ( variable )
113- : window [ variable ]
128+ const [ identifier ] = variable . split ( '.' )
129+
130+ window [ identifier ] = variable . startsWith ( '$' )
131+ ? MiniJS . tryFromLocal ( identifier )
132+ : window [ identifier ]
133+
134+ MiniJS . state . addVariable ( identifier , this . id )
114135 }
115136 } )
116137 }
117138
118139 async _interpret ( expr , options = { } ) {
119140 const Engine = options . isClass ? ClassInterpreter : Interpreter
120141 const engine = new Engine ( expr , options )
121- const ids = { $ : 'document.querySelector' }
142+ const ids = {
143+ $ : 'document.querySelector' ,
144+ el : `proxyWindow['${ this . id } ,
145+ }
122146
123- if ( this . parent ?. uuid ) ids . el = `proxyWindow['${ this . parent . uuid }
147+ if ( this . parent ) ids . parent = `proxyWindow['${ this . parent . id }
124148
125149 this . variables . forEach ( ( variable ) => {
126- if ( variable . startsWith ( 'el.' ) || variable === 'el' ) return
150+ if ( State . isElState ( variable ) || State . isParentState ( variable ) ) return
127151
128152 ids [ variable ] = `proxyWindow-${ variable }
129153 } )
@@ -133,8 +157,6 @@ export default class Entity {
133157 return await engine . interpret ( this )
134158 }
135159
136- /* Note: I don't this getParent() is needed,
137- since el. variables should use the current element's uuid instead. */
138160 getParent ( ) {
139161 if ( this . isParent ( ) ) {
140162 return this
@@ -145,24 +167,20 @@ export default class Entity {
145167 currentElement = parentNode
146168 parentNode = currentElement . parentNode
147169 }
148- const entity = MiniJS . elements . find (
149- ( e ) => e . uuid == parentNode . dataset . uuid
150- )
170+ const entities = Array . from ( MiniJS . state . entities . values ( ) )
171+ const entity = entities . find ( ( e ) => e . uuid == parentNode . dataset . uuid )
151172 return entity
152173 }
153174 }
154175
155176 generateEntityUUID ( ) {
156- // Suggestion: we can use crypto.randomUUID(). Tho crypto only works in secure contexts
157177 return 'Entity' + Date . now ( ) + Math . floor ( Math . random ( ) * 10000 )
158178 }
159179
160180 async init ( ) {
161181 this . getVariables ( )
162182 this . events . apply ( )
163183 await this . attributes . evaluate ( )
164-
165- MiniJS . elements . push ( this )
166184 }
167185
168186 initChildren ( ) {
@@ -183,47 +201,31 @@ export default class Entity {
183201
184202 dispose ( ) {
185203 const elements = [ this . element , ...this . element . querySelectorAll ( '*' ) ]
204+ const entities = Array . from ( MiniJS . state . entities . values ( ) )
186205 const variables = [ ]
187206
188207 // Remove event bindings
189208 for ( const element of elements ) {
190209 if ( element . nodeType !== 1 ) continue
191210
192- const entity = MiniJS . elements . find (
193- ( entity ) => entity . element === element
194- )
211+ const entity = MiniJS . state . getEntityByElement ( element , entities )
212+
195213 if ( ! entity ) continue
196214
197215 variables . push ( ...entity . variables )
198216 entity . events . dispose ( )
217+ MiniJS . state . removeEntity ( entity )
199218 }
200219
201- // Remove disposed elements
202- MiniJS . elements = MiniJS . elements . filter (
203- ( entity ) => ! elements . includes ( entity . element )
204- )
205-
206220 // Clean up unused variables
207- const usedVariables = MiniJS . elements . reduce (
208- ( acc , entity ) => acc . concat ( entity . variables ) ,
209- [ ]
210- )
221+ const usedVariables = entities
222+ . filter ( ( entity ) => ! elements . includes ( entity . element ) )
223+ . reduce ( ( acc , entity ) => acc . concat ( entity . variables ) , [ ] )
211224
212225 const unusedVariables = variables . filter (
213226 ( variable ) => ! usedVariables . includes ( variable )
214227 )
215228
216- MiniJS . variables = MiniJS . variables . filter (
217- ( variable ) => ! unusedVariables . includes ( variable )
218- )
219-
220- unusedVariables . forEach ( ( variable ) => {
221- if ( variable . startsWith ( 'el.' ) ) {
222- const varName = variable . replace ( 'el.' , '' )
223- if ( window [ this . uuid ] ?. [ varName ] ) delete window [ this . uuid ]
224- } else {
225- delete window [ variable ]
226- }
227- } )
229+ MiniJS . state . disposeVariables ( this . id , unusedVariables )
228230 }
229231}
0 commit comments