Feature/json-watcher

.gitignore

@@ -7,3 +7,4 @@ node_modules/
 build/
 dist/
 .vscode/tasks.json
+examples/test.eve

Cargo.toml

@@ -28,5 +28,11 @@ unicode-segmentation = "1.1.0"
 iron = "0.5"
 staticfile = "*"
 mount = "*"
+hyper = "0.11.2"
+hyper-tls = "0.1.2"
+futures = "0.1.14"
+tokio-core = "0.1.9"
+data-encoding = "1.2.0"
+urlencoding = "1.0.0"
 natord = "1.0.9"
 notify = "4.0.0"

examples/json-demo.eve

@@ -0,0 +1,159 @@
+# JSON Testing
+
+## Test Encoding
+
+commit
+  corey = [#person name: "Corey" | age: 31]
+  giselle = [#cat name: "Giselle" | age: 7]
+  twylah = [#cat name: "Twylah" | age: 7]
+  rachel = [#person name: "Rachel" | age: 28 cats: (giselle, twylah) husband: corey]
+end
+
+commit
+  [#system/timer resolution: 1000]
+end
+
+search
+  p = [#person name: "Rachel" age]
+  [#system/timer second]
+bind
+  p.time += second
+end
+
+search
+  p = [#person name: "Rachel"]
+bind
+  [#json/encode record: p]
+end
+
+commit
+  [#ui/button #change-record sort: -1 text: "Change"]
+  [#ui/button #add-record sort: -1 text: "Add"]
+end
+
+search
+  [#html/event/click element: [#change-record]]
+  p = [#person name: "Rachel"]
+commit
+  p.age := 29
+end
+
+search
+  [#html/event/click element: [#add-record]]
+  p = [#person name: "Rachel"]
+commit
+  p.foo := "Hello"
+end
+
+
+
+search
+  [#json/encode json-string]
+bind
+  [#html/div text: "Encoded JSON: {{json-string}}"]
+end
+
+## Test Decode
+
+Decode the record we just encoded
+
+//search
+  //[#json/encode json-string]
+//commit
+  //[#json/decode json: json-string]
+//end
+
+//search
+  //[#json/decode json-object]
+//commit
+  //[#html/div text: "Decoded JSON: {{json-object.name}} is {{json-object.age}} years old"]
+//end
+
+
+//commit
+  //[#ui/button #add-record text: "Add to record"]
+  //[#ui/button #remove-record text: "Remove From Record"]
+//end
+
+## Debug Display
+
+search
+  [#json/encode]
+  [#json/encode/record record json-string]
+  output = [#output]
+bind
+  output.children += [#html/div sort: json-string text: "Target: {{json-string}}"]
+end
+
+search
+  [#json/encode]  
+  [#json/encode/sub-target record json-string]
+  output = [#output]
+bind
+  output.children += [#html/div text: "Sub: {{json-string}}"]
+end
+
+search
+  [#json/encode]
+  [#completed/target record json-string]
+  output = [#application]
+bind
+  output.children += [#html/div text: "Completed {{json-string}}"]
+end
+
+search
+  [#json/encode]
+  encode = [#encode-eavs]
+  eav = [#json/encode/eav record attribute value]
+  entity? = if eav = [#json/encode/entity] then "entity"
+            else ""
+bind
+  encode <- [children:
+    [#html/div sort: 0 text: "Encode EAVs"]
+    [#html/table #eav-table | children:
+      [#html/tr #eav-row eav children: 
+        [#html/td sort:1 text: record]
+        [#html/td sort:2 text: attribute]
+        [#html/td sort:3 text: value]
+        [#html/td sort:4 text: entity?]
+      ]
+    ]
+
+  ]
+end
+
+search
+  [#json/encode]
+  encode = [#flatten]
+  [#json/encode/flatten record]
+bind
+  encode <- [children:
+    [#html/div sort: 0 text: "Flatten"]
+    [#html/div sort: 1 text: "{{record}}"]
+  ]
+end
+
+search
+  [#json/encode]
+commit
+  [#ui/column #application | children: 
+    [#ui/column #output | children: 
+      [#ui/button #next sort: -1 text: "Next"]
+    ]
+    [#ui/row #debug | children:
+      [#ui/column #encode-eavs]
+      [#ui/column #flatten]
+    ]
+  ]
+end
+
+commit
+  [#html/style text: "
+    td {padding: 10px;}
+    table {margin: 10px;}
+    .ui/column {padding: 10px;}
+    .ui/row {padding: 10px;}
+    .output {padding: 20px;}
+    .encode-eavs {min-width: 350px;}
+    "]
+end

libraries/html/html.eve

@@ -17,6 +17,12 @@ commit
     "li"
     "ul"
     "ol"
+    "audio"
+    "source"
+    "video"
+    "table"
+    "tr"
+    "td"
     )]
 end
 ~~~
@@ -373,3 +379,11 @@ watch client/websocket
   ("html/export triggers" element trigger)
 end
 ~~~
+
+Redirect to a url.
+~~~ eve
+search
+  [#html/redirect url]
+watch client/websocket
+  ("html/redirect" url)
+end

libraries/html/html.ts

@@ -1,6 +1,7 @@
 import md5 from "md5";
 import "setimmediate";
 import {Program, Library, createId, RawValue, RawEAV, RawMap, handleTuples} from "../../ts";
+import url from "url";
 
 const EMPTY:never[] = [];
 
@@ -99,23 +100,27 @@ export class HTML extends Library {
     this._dummy = document.createElement("div");
 
     window.addEventListener("resize", this._resizeEventHandler("resize-window"));
+
+    // Mouse events
     window.addEventListener("click", this._mouseEventHandler("click"));
     window.addEventListener("dblclick", this._mouseEventHandler("double-click"));
     window.addEventListener("mousedown", this._mouseEventHandler("mouse-down"));
     window.addEventListener("mouseup", this._mouseEventHandler("mouse-up"));
     window.addEventListener("contextmenu", this._captureContextMenuHandler());
+    document.body.addEventListener("mouseenter", this._hoverEventHandler("hover-in"), true);
+    document.body.addEventListener("mouseleave", this._hoverEventHandler("hover-out"), true);
 
+    // Form events
     window.addEventListener("change", this._changeEventHandler("change"));
     window.addEventListener("input", this._inputEventHandler("change"));
-    window.addEventListener("keydown", this._keyEventHandler("key-down"));
-    window.addEventListener("keyup", this._keyEventHandler("key-up"));
     window.addEventListener("focus", this._focusEventHandler("focus"), true);
     window.addEventListener("blur", this._focusEventHandler("blur"), true);
 
-    document.body.addEventListener("mouseenter", this._hoverEventHandler("hover-in"), true);
-    document.body.addEventListener("mouseleave", this._hoverEventHandler("hover-out"), true);
+    // Keyboard events
+    window.addEventListener("keydown", this._keyEventHandler("key-down"));
+    window.addEventListener("keyup", this._keyEventHandler("key-up"));
 
-    // window.addEventListener("hashchange", this._hashChangeHandler("url-change"));
+    this.getURL(window.location);
   }
 
   protected decorate(elem:Element, elemId:RawValue): Instance {
@@ -397,6 +402,11 @@ export class HTML extends Library {
         if(!instance.__capturedKeys) instance.__capturedKeys = {[code]: true};
         else instance.__capturedKeys[code] = true;
       }
+    }),
+    "redirect": handleTuples(({adds, removes}) => {
+      for(let [url] of adds || EMPTY) {
+        window.location.replace(`${url}`);
+      }
     })
   };
 
@@ -631,6 +641,28 @@ export class HTML extends Library {
       if(eavs.length) this._sendEvent(eavs);
     };
   }
+
+  getURL(location: Location) {
+    let {hash, host, hostname, href, pathname, port, protocol, search} = location;
+    let eavs:RawEAV[] = [];
+    let urlId = createId();
+    eavs.push(
+      [urlId, "tag", "html/url"],
+      [urlId, "host", `${host}`],
+      [urlId, "hostname", `${hostname}`],
+      [urlId, "href", `${href}`],
+      [urlId, "pathname", `${pathname}`],
+      [urlId, "port", `${port}`],
+      [urlId, "protocol", `${protocol}`],
+    );
+    if(hash !== "") {
+      eavs.push([urlId, "hash", `${hash.substring(1)}`]);
+    }
+    if(search !== "") {
+      eavs.push([urlId, "query", `${search.substring(1)}`]);
+    }
+    this._sendEvent(eavs);
+  }
 }
 
 Library.register(HTML.id, HTML);