refactored message router; changed calculations of diffs

floodfx · Jan 25, 2022 · cca868a · cca868a
1 parent bd60a2a
commit cca868a
Show file tree

Hide file tree

Showing 11 changed files with 736 additions and 292 deletions.
diff --git a/coverage/clover.xml b/coverage/clover.xml
@@ -1,14 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1642888960109" clover="3.2.0">
-  <project timestamp="1642888960109" name="All files">
-    <metrics statements="5" coveredstatements="4" conditionals="1" coveredconditionals="0" methods="2" coveredmethods="2" elements="8" coveredelements="6" complexity="0" loc="5" ncloc="5" packages="1" files="1" classes="1"/>
-    <file name="data.ts" path="/Users/donnie/src/github.com/floodfx/liveviewjs-poc/src/server/live/autocomplete/data.ts">
-      <metrics statements="5" coveredstatements="4" conditionals="1" coveredconditionals="0" methods="2" coveredmethods="2"/>
-      <line num="3" count="1" type="stmt"/>
-      <line num="4" count="1" type="cond" truecount="0" falsecount="1"/>
-      <line num="5" count="0" type="stmt"/>
-      <line num="7" count="1001" type="stmt"/>
-      <line num="10" count="1" type="stmt"/>
+<coverage generated="1643089012034" clover="3.2.0">
+  <project timestamp="1643089012034" name="All files">
+    <metrics statements="45" coveredstatements="43" conditionals="17" coveredconditionals="16" methods="14" coveredmethods="12" elements="76" coveredelements="71" complexity="0" loc="45" ncloc="45" packages="1" files="1" classes="1"/>
+    <file name="index.ts" path="/Users/donnie/src/github.com/floodfx/liveviewjs/src/server/templates/index.ts">
+      <metrics statements="45" coveredstatements="43" conditionals="17" coveredconditionals="16" methods="14" coveredmethods="12"/>
+      <line num="8" count="1" type="stmt"/>
+      <line num="19" count="1" type="stmt"/>
+      <line num="21" count="1" type="stmt"/>
+      <line num="23" count="1" type="stmt"/>
+      <line num="24" count="4" type="cond" truecount="2" falsecount="1"/>
+      <line num="25" count="0" type="stmt"/>
+      <line num="27" count="4" type="cond" truecount="1" falsecount="0"/>
+      <line num="28" count="2" type="stmt"/>
+      <line num="31" count="2" type="stmt"/>
+      <line num="34" count="1" type="stmt"/>
+      <line num="35" count="0" type="stmt"/>
+      <line num="39" count="35" type="cond" truecount="1" falsecount="0"/>
+      <line num="40" count="9" type="stmt"/>
+      <line num="42" count="26" type="cond" truecount="1" falsecount="0"/>
+      <line num="43" count="1" type="stmt"/>
+      <line num="45" count="25" type="stmt"/>
+      <line num="48" count="1" type="stmt"/>
+      <line num="54" count="35" type="stmt"/>
+      <line num="55" count="35" type="stmt"/>
+      <line num="59" count="8" type="stmt"/>
+      <line num="60" count="18" type="cond" truecount="1" falsecount="0"/>
+      <line num="61" count="2" type="stmt"/>
+      <line num="63" count="16" type="cond" truecount="1" falsecount="0"/>
+      <line num="64" count="3" type="stmt"/>
+      <line num="67" count="13" type="stmt"/>
+      <line num="73" count="22" type="cond" truecount="1" falsecount="0"/>
+      <line num="74" count="10" type="stmt"/>
+      <line num="79" count="12" type="stmt"/>
+      <line num="80" count="48" type="cond" truecount="2" falsecount="0"/>
+      <line num="81" count="9" type="stmt"/>
+      <line num="85" count="39" type="cond" truecount="2" falsecount="0"/>
+      <line num="87" count="4" type="cond" truecount="2" falsecount="0"/>
+      <line num="88" count="2" type="stmt"/>
+      <line num="95" count="8" type="stmt"/>
+      <line num="98" count="8" type="stmt"/>
+      <line num="99" count="2" type="stmt"/>
+      <line num="105" count="35" type="stmt"/>
+      <line num="112" count="12" type="cond" truecount="1" falsecount="0"/>
+      <line num="113" count="4" type="stmt"/>
+      <line num="115" count="12" type="stmt"/>
+      <line num="119" count="22" type="stmt"/>
+      <line num="120" count="35" type="stmt"/>
+      <line num="121" count="35" type="stmt"/>
+      <line num="127" count="1" type="stmt"/>
+      <line num="128" count="30" type="stmt"/>
     </file>
   </project>
 </coverage>
diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
@@ -1,2 +1,2 @@
-{"/Users/donnie/src/github.com/floodfx/liveviewjs-poc/src/server/live/autocomplete/data.ts": {"path":"/Users/donnie/src/github.com/floodfx/liveviewjs-poc/src/server/live/autocomplete/data.ts","statementMap":{"0":{"start":{"line":4,"column":4},"end":{"line":6,"column":null}},"1":{"start":{"line":5,"column":6},"end":{"line":5,"column":null}},"2":{"start":{"line":7,"column":4},"end":{"line":7,"column":90}},"3":{"start":{"line":7,"column":37},"end":{"line":7,"column":88}},"4":{"start":{"line":3,"column":2},"end":{"line":3,"column":18}},"5":{"start":{"line":10,"column":15},"end":{"line":1012,"column":null}}},"fnMap":{"0":{"name":"suggest","decl":{"start":{"line":3,"column":18},"end":{"line":3,"column":25}},"loc":{"start":{"line":3,"column":40},"end":{"line":8,"column":3}}},"1":{"name":"(anonymous_1)","decl":{"start":{"line":7,"column":29},"end":{"line":7,"column":33}},"loc":{"start":{"line":7,"column":37},"end":{"line":7,"column":88}}}},"branchMap":{"0":{"loc":{"start":{"line":4,"column":4},"end":{"line":6,"column":null}},"type":"if","locations":[{"start":{"line":4,"column":4},"end":{"line":6,"column":null}}]}},"s":{"0":1,"1":0,"2":1,"3":1001,"4":1,"5":1},"f":{"0":1,"1":1001},"b":{"0":[0]}}
+{"/Users/donnie/src/github.com/floodfx/liveviewjs/src/server/templates/index.ts": {"path":"/Users/donnie/src/github.com/floodfx/liveviewjs/src/server/templates/index.ts","statementMap":{"0":{"start":{"line":8,"column":4},"end":{"line":17,"column":null}},"1":{"start":{"line":19,"column":16},"end":{"line":19,"column":56}},"2":{"start":{"line":21,"column":18},"end":{"line":21,"column":66}},"3":{"start":{"line":24,"column":2},"end":{"line":26,"column":null}},"4":{"start":{"line":25,"column":4},"end":{"line":25,"column":null}},"5":{"start":{"line":27,"column":2},"end":{"line":29,"column":null}},"6":{"start":{"line":28,"column":4},"end":{"line":28,"column":null}},"7":{"start":{"line":31,"column":2},"end":{"line":31,"column":null}},"8":{"start":{"line":23,"column":0},"end":{"line":23,"column":16}},"9":{"start":{"line":35,"column":2},"end":{"line":35,"column":null}},"10":{"start":{"line":34,"column":0},"end":{"line":34,"column":16}},"11":{"start":{"line":39,"column":2},"end":{"line":41,"column":null}},"12":{"start":{"line":40,"column":4},"end":{"line":40,"column":null}},"13":{"start":{"line":42,"column":2},"end":{"line":44,"column":null}},"14":{"start":{"line":43,"column":4},"end":{"line":43,"column":null}},"15":{"start":{"line":45,"column":2},"end":{"line":45,"column":null}},"16":{"start":{"line":45,"column":53},"end":{"line":45,"column":67}},"17":{"start":{"line":54,"column":4},"end":{"line":54,"column":null}},"18":{"start":{"line":55,"column":4},"end":{"line":55,"column":null}},"19":{"start":{"line":59,"column":4},"end":{"line":68,"column":null}},"20":{"start":{"line":60,"column":6},"end":{"line":62,"column":null}},"21":{"start":{"line":61,"column":8},"end":{"line":61,"column":null}},"22":{"start":{"line":63,"column":6},"end":{"line":65,"column":null}},"23":{"start":{"line":64,"column":8},"end":{"line":64,"column":null}},"24":{"start":{"line":67,"column":6},"end":{"line":67,"column":null}},"25":{"start":{"line":73,"column":4},"end":{"line":77,"column":null}},"26":{"start":{"line":74,"column":6},"end":{"line":76,"column":null}},"27":{"start":{"line":79,"column":18},"end":{"line":110,"column":40}},"28":{"start":{"line":80,"column":6},"end":{"line":109,"column":null}},"29":{"start":{"line":81,"column":8},"end":{"line":84,"column":null}},"30":{"start":{"line":85,"column":13},"end":{"line":109,"column":null}},"31":{"start":{"line":87,"column":8},"end":{"line":103,"column":null}},"32":{"start":{"line":88,"column":10},"end":{"line":91,"column":null}},"33":{"start":{"line":95,"column":20},"end":{"line":95,"column":67}},"34":{"start":{"line":95,"column":33},"end":{"line":95,"column":66}},"35":{"start":{"line":98,"column":20},"end":{"line":98,"column":46}},"36":{"start":{"line":98,"column":33},"end":{"line":98,"column":42}},"37":{"start":{"line":99,"column":10},"end":{"line":102,"column":null}},"38":{"start":{"line":105,"column":8},"end":{"line":108,"column":null}},"39":{"start":{"line":112,"column":4},"end":{"line":114,"column":null}},"40":{"start":{"line":113,"column":6},"end":{"line":113,"column":32}},"41":{"start":{"line":115,"column":4},"end":{"line":115,"column":null}},"42":{"start":{"line":119,"column":4},"end":{"line":122,"column":null}},"43":{"start":{"line":120,"column":16},"end":{"line":120,"column":37}},"44":{"start":{"line":121,"column":6},"end":{"line":121,"column":null}},"45":{"start":{"line":48,"column":0},"end":{"line":48,"column":13}},"46":{"start":{"line":128,"column":2},"end":{"line":128,"column":null}},"47":{"start":{"line":127,"column":0},"end":{"line":127,"column":24}}},"fnMap":{"0":{"name":"join","decl":{"start":{"line":23,"column":16},"end":{"line":23,"column":20}},"loc":{"start":{"line":23,"column":91},"end":{"line":32,"column":1}}},"1":{"name":"safe","decl":{"start":{"line":34,"column":16},"end":{"line":34,"column":20}},"loc":{"start":{"line":34,"column":35},"end":{"line":36,"column":1}}},"2":{"name":"escapehtml","decl":{"start":{"line":38,"column":9},"end":{"line":38,"column":19}},"loc":{"start":{"line":38,"column":35},"end":{"line":46,"column":1}}},"3":{"name":"(anonymous_3)","decl":{"start":{"line":45,"column":43},"end":{"line":45,"column":44}},"loc":{"start":{"line":45,"column":53},"end":{"line":45,"column":67}}},"4":{"name":"(anonymous_4)","decl":{"start":{"line":53,"column":2},"end":{"line":53,"column":14}},"loc":{"start":{"line":53,"column":70},"end":{"line":56,"column":3}}},"5":{"name":"(anonymous_5)","decl":{"start":{"line":58,"column":2},"end":{"line":58,"column":6}},"loc":{"start":{"line":58,"column":14},"end":{"line":69,"column":3}}},"6":{"name":"(anonymous_6)","decl":{"start":{"line":59,"column":30},"end":{"line":59,"column":31}},"loc":{"start":{"line":59,"column":36},"end":{"line":68,"column":5}}},"7":{"name":"(anonymous_7)","decl":{"start":{"line":71,"column":2},"end":{"line":71,"column":11}},"loc":{"start":{"line":71,"column":42},"end":{"line":116,"column":3}}},"8":{"name":"(anonymous_8)","decl":{"start":{"line":79,"column":40},"end":{"line":79,"column":41}},"loc":{"start":{"line":79,"column":105},"end":{"line":110,"column":5}}},"9":{"name":"(anonymous_9)","decl":{"start":{"line":95,"column":28},"end":{"line":95,"column":29}},"loc":{"start":{"line":95,"column":33},"end":{"line":95,"column":66}}},"10":{"name":"(anonymous_10)","decl":{"start":{"line":98,"column":28},"end":{"line":98,"column":29}},"loc":{"start":{"line":98,"column":33},"end":{"line":98,"column":42}}},"11":{"name":"(anonymous_11)","decl":{"start":{"line":118,"column":2},"end":{"line":118,"column":10}},"loc":{"start":{"line":118,"column":10},"end":{"line":123,"column":3}}},"12":{"name":"(anonymous_12)","decl":{"start":{"line":119,"column":31},"end":{"line":119,"column":32}},"loc":{"start":{"line":119,"column":48},"end":{"line":122,"column":5}}},"13":{"name":"escapeHtml","decl":{"start":{"line":127,"column":24},"end":{"line":127,"column":34}},"loc":{"start":{"line":127,"column":88},"end":{"line":129,"column":1}}}},"branchMap":{"0":{"loc":{"start":{"line":24,"column":2},"end":{"line":26,"column":null}},"type":"if","locations":[{"start":{"line":24,"column":2},"end":{"line":26,"column":null}}]},"1":{"loc":{"start":{"line":24,"column":6},"end":{"line":24,"column":51}},"type":"binary-expr","locations":[{"start":{"line":24,"column":6},"end":{"line":24,"column":29}},{"start":{"line":24,"column":33},"end":{"line":24,"column":51}}]},"2":{"loc":{"start":{"line":27,"column":2},"end":{"line":29,"column":null}},"type":"if","locations":[{"start":{"line":27,"column":2},"end":{"line":29,"column":null}}]},"3":{"loc":{"start":{"line":39,"column":2},"end":{"line":41,"column":null}},"type":"if","locations":[{"start":{"line":39,"column":2},"end":{"line":41,"column":null}}]},"4":{"loc":{"start":{"line":42,"column":2},"end":{"line":44,"column":null}},"type":"if","locations":[{"start":{"line":42,"column":2},"end":{"line":44,"column":null}}]},"5":{"loc":{"start":{"line":60,"column":6},"end":{"line":62,"column":null}},"type":"if","locations":[{"start":{"line":60,"column":6},"end":{"line":62,"column":null}}]},"6":{"loc":{"start":{"line":63,"column":6},"end":{"line":65,"column":null}},"type":"if","locations":[{"start":{"line":63,"column":6},"end":{"line":65,"column":null}}]},"7":{"loc":{"start":{"line":71,"column":12},"end":{"line":71,"column":42}},"type":"default-arg","locations":[{"start":{"line":71,"column":38},"end":{"line":71,"column":42}}]},"8":{"loc":{"start":{"line":73,"column":4},"end":{"line":77,"column":null}},"type":"if","locations":[{"start":{"line":73,"column":4},"end":{"line":77,"column":null}}]},"9":{"loc":{"start":{"line":80,"column":6},"end":{"line":109,"column":null}},"type":"if","locations":[{"start":{"line":80,"column":6},"end":{"line":109,"column":null}},{"start":{"line":85,"column":13},"end":{"line":109,"column":null}}]},"10":{"loc":{"start":{"line":85,"column":13},"end":{"line":109,"column":null}},"type":"if","locations":[{"start":{"line":85,"column":13},"end":{"line":109,"column":null}},{"start":{"line":104,"column":13},"end":{"line":109,"column":null}}]},"11":{"loc":{"start":{"line":87,"column":8},"end":{"line":103,"column":null}},"type":"if","locations":[{"start":{"line":87,"column":8},"end":{"line":103,"column":null}},{"start":{"line":93,"column":13},"end":{"line":103,"column":null}}]},"12":{"loc":{"start":{"line":112,"column":4},"end":{"line":114,"column":null}},"type":"if","locations":[{"start":{"line":112,"column":4},"end":{"line":114,"column":null}}]}},"s":{"0":1,"1":1,"2":1,"3":4,"4":0,"5":4,"6":2,"7":2,"8":1,"9":0,"10":1,"11":35,"12":9,"13":26,"14":1,"15":25,"16":0,"17":35,"18":35,"19":8,"20":18,"21":2,"22":16,"23":3,"24":13,"25":22,"26":10,"27":12,"28":48,"29":9,"30":39,"31":4,"32":2,"33":2,"34":8,"35":2,"36":8,"37":2,"38":35,"39":12,"40":4,"41":12,"42":22,"43":35,"44":35,"45":1,"46":30,"47":1},"f":{"0":4,"1":0,"2":35,"3":0,"4":35,"5":8,"6":18,"7":22,"8":48,"9":8,"10":8,"11":22,"12":35,"13":30},"b":{"0":[0],"1":[4,4],"2":[2],"3":[9],"4":[1],"5":[2],"6":[3],"7":[14],"8":[10],"9":[9,39],"10":[4,35],"11":[2,2],"12":[4]}}
 }
diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html
@@ -23,30 +23,30 @@ <h1>All files</h1>
         <div class='clearfix'>
 
             <div class='fl pad1y space-right2'>
-                <span class="strong">83.33% </span>
+                <span class="strong">93.75% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>5/6</span>
+                <span class='fraction'>45/48</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">94.11% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/1</span>
+                <span class='fraction'>16/17</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
+                <span class="strong">85.71% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>2/2</span>
+                <span class='fraction'>12/14</span>
             </div>
 
 
             <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
+                <span class="strong">95.55% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>4/5</span>
+                <span class='fraction'>43/45</span>
             </div>
 
 
@@ -79,18 +79,18 @@ <h1>All files</h1>
 </tr>
 </thead>
 <tbody><tr>
-	<td class="file medium" data-value="data.ts"><a href="data.ts.html">data.ts</a></td>
-	<td data-value="83.33" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 83%"></div><div class="cover-empty" style="width: 17%"></div></div>
+	<td class="file medium" data-value="index.ts"><a href="index.ts.html">index.ts</a></td>
+	<td data-value="93.75" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 93%"></div><div class="cover-empty" style="width: 7%"></div></div>
 	</td>
-	<td data-value="83.33" class="pct medium">83.33%</td>
-	<td data-value="6" class="abs medium">5/6</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="1" class="abs low">0/1</td>
-	<td data-value="100" class="pct high">100%</td>
-	<td data-value="2" class="abs high">2/2</td>
-	<td data-value="80" class="pct medium">80%</td>
-	<td data-value="5" class="abs medium">4/5</td>
+	<td data-value="93.75" class="pct medium">93.75%</td>
+	<td data-value="48" class="abs medium">45/48</td>
+	<td data-value="94.11" class="pct medium">94.11%</td>
+	<td data-value="17" class="abs medium">16/17</td>
+	<td data-value="85.71" class="pct medium">85.71%</td>
+	<td data-value="14" class="abs medium">12/14</td>
+	<td data-value="95.55" class="pct medium">95.55%</td>
+	<td data-value="45" class="abs medium">43/45</td>
 	</tr>
 
 </tbody>
@@ -101,7 +101,7 @@ <h1>All files</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Sat Jan 22 2022 15:02:40 GMT-0700 (Mountain Standard Time)
+                at Mon Jan 24 2022 22:36:52 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="prettify.js"></script>
         <script>