refactor(overmind-angular): refactor to new proxy-state-tree

Author: christianalfoni

packages/node_modules/overmind-angular/src/index.ts

@@ -11,7 +11,7 @@ export type TConnect<Config extends Configuration> = {
 }
 
 let nextComponentId = 0
-/*
+
 export const createConnect = <A extends Overmind<any>>(overmind: A) => () => {
   const componentId = nextComponentId++
   let componentInstanceId = 0
@@ -24,14 +24,21 @@ export const createConnect = <A extends Overmind<any>>(overmind: A) => () => {
     const targetNgAfterViewChecked = target.prototype.ngAfterViewChecked
 
     target.prototype.ngOnInit = function() {
+      const ngZ = new NgZone({ enableLongStackTrace: false })
+
+      this.__tree = overmind.proxyStateTree.getTrackingTree()
       this.overmind = {
-        state: overmind.state,
+        state: this.__tree.state,
         actions: overmind.actions,
       }
+      this.__shouldUpdatePaths = false
       this.__componentInstanceId = componentInstanceId++
-      this.__tree = false
-      this.__currentTrackId = null
-      this.__listener = null
+      this.__onUpdate = () => {
+        if (this.cdr) {
+          this.cdr.markForCheck()
+        }
+        ngZ.run(() => {})
+      }
 
       if (targetNgOnInit) {
         targetNgOnInit.apply(target)
@@ -49,46 +56,29 @@ export const createConnect = <A extends Overmind<any>>(overmind: A) => () => {
     }
 
     target.prototype.ngAfterContentInit = function() {
-      this.__currentTrackId = overmind.trackState()
+      this.__tree.track(this.__onUpdate)
 
       if (targetNgAfterContentInit) {
         targetNgAfterContentInit.apply(target)
       }
     }
 
     target.prototype.ngAfterViewInit = function() {
-      const ngZ = new NgZone({ enableLongStackTrace: false })
-      const paths = overmind.clearTrackState(this.__currentTrackId)
-
       overmind.eventHub.emitAsync(EventType.COMPONENT_ADD, {
         componentId,
         componentInstanceId: this.__componentInstanceId,
         name: this.constructor.name || '',
-        paths: Array.from(paths),
+        paths: Array.from(this.__tree.pathDependencies),
       })
-      this.__listener = overmind.addFlushListener(paths, (flushId) => {
-        this.__shouldUpdatePaths = true
-        if (this.cdr) {
-          this.cdr.markForCheck()
-        }
-        ngZ.run(() => {})
 
-        overmind.eventHub.emitAsync(EventType.COMPONENT_UPDATE, {
-          componentId,
-          componentInstanceId: this.__componentInstanceId,
-          name: this.constructor.name || '',
-          paths: Array.from(paths),
-          flushId,
-        })
-      })
       if (targetNgAfterViewInit) {
         targetNgAfterViewInit.apply(target)
       }
     }
 
     target.prototype.ngDoCheck = function() {
       if (this.__shouldUpdatePaths) {
-        this.__currentTrackId = overmind.trackState()
+        this.__tree.track(this.__onUpdate)
       }
       if (targetNgDoCheck) {
         targetNgDoCheck.apply(target)
@@ -97,14 +87,13 @@ export const createConnect = <A extends Overmind<any>>(overmind: A) => () => {
 
     target.prototype.ngAfterViewChecked = function() {
       if (this.__shouldUpdatePaths) {
-        const paths = overmind.clearTrackState(this.__currentTrackId)
-        this.__listener.update(paths)
         this.__shouldUpdatePaths = false
         overmind.eventHub.emitAsync(EventType.COMPONENT_UPDATE, {
           componentId,
           componentInstanceId: this.__componentInstanceId,
           name: this.constructor.name || '',
-          paths: Array.from(paths),
+          paths: Array.from(this.__tree.pathDependencies),
+          flushId,
         })
       }
       if (targetNgAfterViewChecked) {
@@ -123,10 +112,9 @@ export const createConnect = <A extends Overmind<any>>(overmind: A) => () => {
         componentInstanceId: this.__componentInstanceId,
         name: this.constructor.name || '',
       })
-      this.__listener.dispose()
+      overmind.proxyStateTree.disposeTree(this.__tree)
     }
 
     return target
   }
 }
-*/