fix: fix getter logic

qddegtya · Jan 30, 2021 · 82588c1 · 82588c1
1 parent 5b57f05
commit 82588c1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/__future__/trp.js b/__future__/trp.js
@@ -6,15 +6,15 @@ const TR = (o) => {
     binds = [],
     preOldVal = null,
     preNewVal = null,
-    latestVal = null
+    latestVal = _o
 
   return {
     bind(r) {
       binds.push(r)
     },
 
     get() {
-      return _o
+      return latestVal
     },
 
     observe(cb) {
@@ -35,6 +35,7 @@ const TR = (o) => {
       preNewVal = newVal
 
       // 深度优先
+      // TODO: 拓扑执行
       if (binds.length > 0) {
         binds.forEach((r) => r.change())
       }

diff --git a/dist/ajs.cjs.js b/dist/ajs.cjs.js
@@ -851,14 +851,14 @@ var TR = function TR(o) {
       binds = [],
       preOldVal = null,
       preNewVal = null,
-      latestVal = null;
+      latestVal = _o;
 
   return {
     bind: function bind(r) {
       binds.push(r);
     },
     get: function get() {
-      return _o;
+      return latestVal;
     },
     observe: function observe(cb) {
       notify = cb;
@@ -875,6 +875,7 @@ var TR = function TR(o) {
       if (preOldVal === oldVal && preNewVal === newVal) return;
       preOldVal = oldVal;
       preNewVal = newVal; // 深度优先
+      // TODO: 拓扑执行
 
       if (binds.length > 0) {
         binds.forEach(function (r) {

diff --git a/test/trp.test.js b/test/trp.test.js
@@ -33,4 +33,8 @@ setTimeout(() => {
   });
 }, 1000);
 
+console.log("before: ", count2.get());
+
 count2.change(() => 6);
+
+console.log("after: ", count2.get());