Skip to content

Commit 80790bd

Browse files
committed
commit
1 parent beff4b1 commit 80790bd

File tree

6 files changed

+78
-15
lines changed

6 files changed

+78
-15
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "timeengine",
3-
"version": "6.2.4",
3+
"version": "6.5.0",
44
"description": "TimeEngine is a tiny, simple yet versatile library that provides first class reactive value 'over time' with smart dependency resolving capability in JavaScript. Built for a programming paradigm: Dependency driven Functional Reactive Programming (DFRP)",
55
"main": "timeengine.js",
66
"scripts": {
7-
"test": "babel timeengine.es -o timeengine.js; babel-node test.js",
7+
"test": "node test.js",
88
"jsx": "./node_modules/.bin/babel ./react-test/index.jsx -o ./react-test/index.js"
99
},
1010
"repository": {
@@ -30,13 +30,13 @@
3030
},
3131
"homepage": "http://timeengine.github.io",
3232
"devDependencies": {
33-
"babel-cli": "^6.4.0",
34-
"babel-preset-es2015": "^6.3.13",
35-
"babel-preset-react": "^6.3.13",
36-
"eslint": "^1.10.3",
37-
"eslint-plugin-react": "^3.15.0",
38-
"react": "^0.14.6",
39-
"react-dom": "^0.14.6",
33+
"babel-cli": "^6.9.0",
34+
"babel-preset-es2015": "^6.9.0",
35+
"babel-preset-react": "^6.5.0",
36+
"eslint": "^2.10.2",
37+
"eslint-plugin-react": "^5.1.1",
38+
"react": "^15.1.0",
39+
"react-dom": "^15.1.0",
4040
"timeengine-react": "*"
4141
},
4242
"dependencies": {

test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(() => {
22
'use strict';
33

4-
const __ = require('./timeengine.js');
4+
const __ = require('./timeengine.es');
55
const Immutable = require('immutable');
66

77

test2.js

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,47 @@
11
(() => {
22
'use strict';
33

4-
const __ = require('./timeengine.js');
4+
const __ = require('./timeengine.es');
55
const Immutable = require('immutable');
66

7-
(() => {
8-
const __a = __();
7+
(() => {
8+
const __delay = __
9+
.intervalSeq(Immutable
10+
.Seq.of("----------------------------------"), 100)
11+
.log()
12+
.__(() => {
13+
const __a = __(); //constructor
14+
const __b = __([__a]) //constructor
15+
.__(([a]) => (a + 1))
16+
.log();
17+
; //
18+
19+
const __log1 = __a.log("__a");
20+
const __log2 = __b.log("__b");
21+
22+
__a.t = 1;
23+
24+
__.log.t = __b.t;
25+
});
926
})();
1027

28+
(() => {
29+
const __delay = __
30+
.intervalSeq(Immutable
31+
.Seq.of("----------------------------------"), 200)
32+
.log()
33+
.__(() => {
34+
35+
const __x = __(true);
36+
__x.t = 99;
1137

38+
__x.t = __x.t + 1;
39+
40+
__.log.t = __x[0]; //99
41+
__.log.t = __x[1]; //100
42+
43+
44+
});
45+
})();
1246

1347
})();

test3.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
(() => {
2+
'use strict';
3+
4+
const __ = require('./timeengine.es');
5+
const Immutable = require('immutable');
6+
7+
(() => {
8+
const __delay = __
9+
.intervalSeq(Immutable
10+
.Seq.of("----------------------------------"), 100)
11+
.log()
12+
.__(() => {
13+
const __a = __(); //constructor
14+
15+
const __d = __a
16+
.__((x) => (__.log.t = x + 1));
17+
18+
19+
__a.t = 9;
20+
21+
__.log.t = __a.t;
22+
});
23+
})();
24+
25+
26+
27+
})();

timeengine.es

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
seq.eqs = [];
3030
seq.addEq = (eq) => (seq.eqs[seq.eqs.length] = eq);
3131
seq.evalEqs = (val) => {
32+
const val0 = val;
3233
seq.eqs.map((eq) => (val = eq(val)));
33-
return val;
34+
return (seq.us.length === 0) ? val0 : val;
3435
};
3536
//api-----------------
3637
Object.keys(__.api).map((api) => {

timeengine.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@
4040
return seq.eqs[seq.eqs.length] = eq;
4141
};
4242
seq.evalEqs = function (val) {
43+
var val0 = val;
4344
seq.eqs.map(function (eq) {
4445
return val = eq(val);
4546
});
46-
return val;
47+
return seq.us.length === 0 ? val0 : val;
4748
};
4849
//api-----------------
4950
Object.keys(__.api).map(function (api) {

0 commit comments

Comments
 (0)