test double arrows, sequences, and chains; bump to 2.4

StoneCypher · Jun 5, 2017 · e502974 · e502974
1 parent fe1528c
commit e502974
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 25 deletions.
diff --git a/dist/jssm.es5.cjs.js b/dist/jssm.es5.cjs.js
diff --git a/dist/jssm.es5.cjs.min.js b/dist/jssm.es5.cjs.min.js
diff --git a/docs/lib/index.html b/docs/lib/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset='utf-8' />
-  <title>jssm 2.3.0 | Documentation</title>
+  <title>jssm 2.4.0 | Documentation</title>
   <meta name='viewport' content='width=device-width,initial-scale=1'>
   <link href='assets/bass.css' type='text/css' rel='stylesheet' />
   <link href='assets/style.css' type='text/css' rel='stylesheet' />
@@ -14,7 +14,7 @@
       <div class='fixed xs-hide fix-3 overflow-auto max-height-100'>
         <div class='py1 px2'>
           <h3 class='mb0 no-anchor'>jssm</h3>
-          <div class='mb1'><code>2.3.0</code></div>
+          <div class='mb1'><code>2.4.0</code></div>
           <input
             placeholder='Filter'
             id='filter-input'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jssm",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "engines": {
     "node": ">=6.0.0"
   },

diff --git a/src/js/tests/parse.js b/src/js/tests/parse.js
@@ -9,26 +9,65 @@ const jssm = require('../../../build/jssm.es5.js');
 
 describe('parse/1', async it => {
 
-  const AtoB = [{"from": "a","se": {"kind": "->","to": "b"}}],
-        AdB  = [{"from": "a","se": {"kind": "->","to": "b","ldesc": [{"text":"c","value":"d"}]}}],
-        ABd  = [{"from": "a","se": {"kind": "->","to": "b","rdesc": [{"text":"c","value":"d"}]}}],
-        AdBd = [{"from": "a","se": {"kind": "->","to": "b","ldesc": [{"text":"c","value":"d"}],"rdesc": [{"text":"e","value":"f"}]}}];
-
-  it('a->b;',   t => t.deepEqual(AtoB, jssm.parse('a->b;')   ));
-  it('a ->b;',  t => t.deepEqual(AtoB, jssm.parse('a ->b;')  ));
-  it('a-> b;',  t => t.deepEqual(AtoB, jssm.parse('a-> b;')  ));
-  it('a -> b;', t => t.deepEqual(AtoB, jssm.parse('a -> b;') ));
-
-  it('a{}->b;',   t => t.deepEqual(AtoB, jssm.parse('a{}->b;')   ));
-  it('a->{}b;',   t => t.deepEqual(AtoB, jssm.parse('a->{}b;')   ));
-  it('a{}->{}b;', t => t.deepEqual(AtoB, jssm.parse('a{}->{}b;') ));
-
-  it('a{c:d}->b;',     t => t.deepEqual(AdB,  jssm.parse('a{c:d;}->b;')       ));
-  it('a{c:"d"}->b;',   t => t.deepEqual(AdB,  jssm.parse('a{c:"d";}->b;')     ));
-  it('a{"c":d}->b;',   t => t.deepEqual(AdB,  jssm.parse('a{"c":d;}->b;')     ));
-  it('a{"c":"d"}->b;', t => t.deepEqual(AdB,  jssm.parse('a{"c":"d";}->b;')   ));
-  it('a{c:d}->b;',     t => t.deepEqual(ABd,  jssm.parse('a->{c:d;}b;')       ));
-  it('a{c:d}->b;',     t => t.deepEqual(AdBd, jssm.parse('a{c:d;}->{e:f;}b;') ));
+    describe('forward arrow', async it => {
+
+      const AtoB = [{"from": "a","se": {"kind": "->","to": "b"}}],
+            AdB  = [{"from": "a","se": {"kind": "->","to": "b","ldesc": [{"text":"c","value":"d"}]}}],
+            ABd  = [{"from": "a","se": {"kind": "->","to": "b","rdesc": [{"text":"c","value":"d"}]}}],
+            AdBd = [{"from": "a","se": {"kind": "->","to": "b","ldesc": [{"text":"c","value":"d"}],"rdesc": [{"text":"e","value":"f"}]}}];
+
+      it('a->b;',   t => t.deepEqual(AtoB, jssm.parse('a->b;')   ));
+      it('a ->b;',  t => t.deepEqual(AtoB, jssm.parse('a ->b;')  ));
+      it('a-> b;',  t => t.deepEqual(AtoB, jssm.parse('a-> b;')  ));
+      it('a -> b;', t => t.deepEqual(AtoB, jssm.parse('a -> b;') ));
+
+      it('a{}->b;',   t => t.deepEqual(AtoB, jssm.parse('a{}->b;')   ));
+      it('a->{}b;',   t => t.deepEqual(AtoB, jssm.parse('a->{}b;')   ));
+      it('a{}->{}b;', t => t.deepEqual(AtoB, jssm.parse('a{}->{}b;') ));
+
+      it('a{c:d}->b;',     t => t.deepEqual(AdB,  jssm.parse('a{c:d;}->b;')       ));
+      it('a{c:"d"}->b;',   t => t.deepEqual(AdB,  jssm.parse('a{c:"d";}->b;')     ));
+      it('a{"c":d}->b;',   t => t.deepEqual(AdB,  jssm.parse('a{"c":d;}->b;')     ));
+      it('a{"c":"d"}->b;', t => t.deepEqual(AdB,  jssm.parse('a{"c":"d";}->b;')   ));
+      it('a{c:d}->b;',     t => t.deepEqual(ABd,  jssm.parse('a->{c:d;}b;')       ));
+      it('a{c:d}->b;',     t => t.deepEqual(AdBd, jssm.parse('a{c:d;}->{e:f;}b;') ));
+
+    });
+
+    describe('double arrow', async it => {
+
+      const AtoB = [{"from": "a","se": {"kind": "<->","to": "b"}}],
+            AdB  = [{"from": "a","se": {"kind": "<->","to": "b","ldesc": [{"text":"c","value":"d"}]}}],
+            ABd  = [{"from": "a","se": {"kind": "<->","to": "b","rdesc": [{"text":"c","value":"d"}]}}],
+            AdBd = [{"from": "a","se": {"kind": "<->","to": "b","ldesc": [{"text":"c","value":"d"}],"rdesc": [{"text":"e","value":"f"}]}}];
+
+      it('a<->b;',   t => t.deepEqual(AtoB, jssm.parse('a<->b;')   ));
+      it('a <->b;',  t => t.deepEqual(AtoB, jssm.parse('a <->b;')  ));
+      it('a<-> b;',  t => t.deepEqual(AtoB, jssm.parse('a<-> b;')  ));
+      it('a <-> b;', t => t.deepEqual(AtoB, jssm.parse('a <-> b;') ));
+
+      it('a{}<->b;',   t => t.deepEqual(AtoB, jssm.parse('a{}<->b;')   ));
+      it('a<->{}b;',   t => t.deepEqual(AtoB, jssm.parse('a<->{}b;')   ));
+      it('a{}<->{}b;', t => t.deepEqual(AtoB, jssm.parse('a{}<->{}b;') ));
+
+      it('a{c:d}<->b;',     t => t.deepEqual(AdB,  jssm.parse('a{c:d;}<->b;')       ));
+      it('a{c:"d"}<->b;',   t => t.deepEqual(AdB,  jssm.parse('a{c:"d";}<->b;')     ));
+      it('a{"c":d}<->b;',   t => t.deepEqual(AdB,  jssm.parse('a{"c":d;}<->b;')     ));
+      it('a{"c":"d"}<->b;', t => t.deepEqual(AdB,  jssm.parse('a{"c":"d";}<->b;')   ));
+      it('a{c:d}<->b;',     t => t.deepEqual(ABd,  jssm.parse('a<->{c:d;}b;')       ));
+      it('a{c:d}<->b;',     t => t.deepEqual(AdBd, jssm.parse('a{c:d;}<->{e:f;}b;') ));
+
+    });
+
+    describe('chain', async it => {
+      const AtoBtoC = [{"from":"a","se":{"kind":"->","to":"b","se":{"kind":"->","to":"c"}}}];
+      it('a->b->c;', t => t.deepEqual(AtoBtoC, jssm.parse('a->b->c;') ));
+    });
+
+    describe('sequence', async it => {
+      const AtoB_CtoD = [{"from":"a","se":{"kind":"->","to":"b"}},{"from":"c","se":{"kind":"->","to":"d"}}];
+      it('a->b;c->d;', t => t.deepEqual(AtoB_CtoD, jssm.parse('a->b;c->d;') ));
+    });
 
 });