merge master into app-loading

Author: joshuafcole

css/ide.css

@@ -89,6 +89,7 @@ body { justify-content: stretch; }
 .main-pane .notices > .notice > .time { margin-right: 10px;  }
 
 .main-pane .notices > .notice.error { background: rgb(255, 216, 222); }
+.main-pane .notices > .notice.warning { background: rgb(255, 247, 217); }
 
 /****************************************************************************\
  * Editor

examples/CRM.eve

@@ -248,7 +248,7 @@ bind @browser
     [#h2 text: "Learn more about Eve"]
     [#ul children:
       [#li children: [#a href: "http://witheve.com" text: "Homepage"]]
-      [#li children: [#a href: "https://witheve.github.io/docs/guides/quickstart/" text: "Quick Start Tutorial"]]
+      [#li children: [#a href: "https://witheve.github.io/docs/tutorials/quickstart/" text: "Quick Start Tutorial"]]
       [#li children: [#a href: "http://github.com/witheve" text: "GitHub Repository"]]]
     [#h2 text: "Join the Community"]
     [#ul children:

src/client.ts

@@ -224,7 +224,7 @@ export class EveClient {
   }
 
   onClose() {
-
+    this.ide.injectNotice("warning", "The editor has lost connection to the Eve server. All changes will be made locally.");
   }
 
   onMessage(event) {

src/ide.ts

@@ -2021,9 +2021,10 @@ export class IDE {
     let items = [];
     for(let notice of this.notices) {
       let time = new Date(notice.time);
-
+      let formattedMinutes = time.getMinutes() >= 10 ? time.getMinutes() : `0${time.getMinutes()}`;
+      let formattedSeconds = time.getSeconds() >= 10 ? time.getMinutes() : `0${time.getSeconds()}`;
       items.push({c: `notice ${notice.type} flex-row`, children: [
-        {c: "time", text: `${time.getHours()}:${time.getMinutes()}:${time.getSeconds()}`},
+        {c: "time", text: `${time.getHours()}:${formattedMinutes}:${formattedSeconds}`},
         {c: "message", text: notice.message}
       ]});
     }

src/renderer.ts

@@ -41,18 +41,216 @@ export var activeIds = {};
 export var activeElements:{[id : string]: RecordElement|null, root: RecordElement} = {"root": document.createElement("div")};
 activeElements.root.className = "program";
 
-var supportedTags = {
-  "div": true, "span": true, "input": true, "ul": true, "li": true, "label": true, "button": true, "header": true, "footer": true, "a": true, "strong": true,
-  "h1": true, "h2": true, "h3": true, "h4": true, "h5": true, "h6": true,
-  "ol": true, "p": true, "pre": true, "em": true, "img": true, "canvas": true, "script": true, "style": true, "video": true,
-  "table": true, "tbody": true, "thead": true, "tr": true, "th": true, "td": true,
-  "form": true, "optgroup": true, "option": true, "select": true, "textarea": true,
-  "title": true, "meta": true, "link": true,
-  "svg": true, "circle": true, "line": true, "rect": true, "polygon":true, "text": true, "image": true, "defs": true, "pattern": true, "linearGradient": true, "g": true, "path": true
-};
-var svgs = {"svg": true, "circle": true, "line": true, "rect": true, "polygon":true, "text": true, "image": true, "defs": true, "pattern": true, "linearGradient": true, "g": true, "path": true};
-// Map of input entities to a queue of their values which originated from the client and have not been received from the server yet.
+// Obtained from http://w3c.github.io/html-reference/elements.html
+var supportedTagsArr = [
+  "a",
+  "abbr",
+  "address",
+  "area",
+  "article",
+  "aside",
+  "audio",
+  "b",
+  "base",
+  "bdi",
+  "bdo",
+  "blockquote",
+  "body",
+  "br",
+  "button",
+  "canvas",
+  "caption",
+  "cite",
+  "code",
+  "col",
+  "colgroup",
+  "command",
+  "datalist",
+  "dd",
+  "del",
+  "details",
+  "dfn",
+  "div",
+  "dl",
+  "dt",
+  "em",
+  "embed",
+  "fieldset",
+  "figcaption",
+  "figure",
+  "footer",
+  "form",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "head",
+  "header",
+  "hgroup",
+  "hr",
+  "html",
+  "i",
+  "iframe",
+  "img",
+  "input",
+  "ins",
+  "kbd",
+  "keygen",
+  "label",
+  "legend",
+  "li",
+  "link",
+  "map",
+  "mark",
+  "menu",
+  "meta",
+  "meter",
+  "nav",
+  "noscript",
+  "object",
+  "ol",
+  "optgroup",
+  "option",
+  "output",
+  "p",
+  "param",
+  "pre",
+  "progress",
+  "q",
+  "rp",
+  "rt",
+  "ruby",
+  "s",
+  "samp",
+  "script",
+  "section",
+  "select",
+  "small",
+  "source",
+  "span",
+  "strong",
+  "style",
+  "sub",
+  "summary",
+  "sup",
+  "table",
+  "tbody",
+  "td",
+  "textarea",
+  "tfoot",
+  "th",
+  "thead",
+  "time",
+  "title",
+  "tr",
+  "track",
+  "u",
+  "ul",
+  "var",
+  "video",
+  "wbr"
+];
+
+// Obtained from https://www.w3.org/TR/SVG/eltindex.html
+var svgsArr = [
+  "a",
+  "altGlyph",
+  "altGlyphDef",
+  "altGlyphItem",
+  "animate",
+  "animateColor",
+  "animateMotion",
+  "animateTransform",
+  "circle",
+  "clipPath",
+  "color-profile",
+  "cursor",
+  "defs",
+  "desc",
+  "ellipse",
+  "feBlend",
+  "feColorMatrix",
+  "feComponentTransfer",
+  "feComposite",
+  "feConvolveMatrix",
+  "feDiffuseLighting",
+  "feDisplacementMap",
+  "feDistantLight",
+  "feFlood",
+  "feFuncA",
+  "feFuncB",
+  "feFuncG",
+  "feFuncR",
+  "feGaussianBlur",
+  "feImage",
+  "feMerge",
+  "feMergeNode",
+  "feMorphology",
+  "feOffset",
+  "fePointLight",
+  "feSpecularLighting",
+  "feSpotLight",
+  "feTile",
+  "feTurbulence",
+  "filter",
+  "font",
+  "font-face",
+  "font-face-format",
+  "font-face-name",
+  "font-face-src",
+  "font-face-uri",
+  "foreignObject",
+  "g",
+  "glyph",
+  "glyphRef",
+  "hkern",
+  "image",
+  "line",
+  "linearGradient",
+  "marker",
+  "mask",
+  "metadata",
+  "missing-glyph",
+  "mpath",
+  "path",
+  "pattern",
+  "polygon",
+  "polyline",
+  "radialGradient",
+  "rect",
+  "script",
+  "set",
+  "stop",
+  "style",
+  "svg",
+  "switch",
+  "symbol",
+  "text",
+  "textPath",
+  "title",
+  "tref",
+  "tspan",
+  "use",
+  "view",
+  "vkern"
+];
+
+supportedTagsArr.push.apply(supportedTagsArr, svgsArr);
+
+function toKeys(arr) {
+  var obj = {};
+  for (var el of arr) {
+    obj[el] = true;
+  }
+  return obj
+}
 
+var supportedTags = toKeys(supportedTagsArr);
+var svgs = toKeys(svgsArr);
+
+// Map of input entities to a queue of their values which originated from the client and have not been received from the server yet.
 var lastFocusPath:string[]|null = null;
 var selectableTypes = {"": true, undefined: true, text: true, search: true, password: true, tel: true, url: true};
 
@@ -127,7 +325,14 @@ export function renderRecords() {
         }
         elem.entity = entityId;
         activeElements[entityId] = elem;
-        elem.sort = entity.sort || entity["eve-auto-index"] || "";
+        if(entity.sort && entity.sort.length > 1) console.error("Unable to set 'sort' multiple times on entity", entity, entity.sort);
+        if(entity.sort !== undefined && entity.sort[0] !== undefined) {
+          elem.sort = entity.sort[0];
+        } else if(entity["eve-auto-index"] !== undefined && entity["eve-auto-index"][0] !== undefined) {
+          elem.sort = entity["eve-auto-index"][0];
+        } else {
+          elem.sort = "";
+        }
         if(parent) insertSorted(parent, elem)
 
 
@@ -140,7 +345,13 @@ export function renderRecords() {
         elem.entity = entityId;
         activeElements[entityId] = elem;
         if(entity.sort && entity.sort.length > 1) console.error("Unable to set 'sort' multiple times on entity", entity, entity.sort);
-        elem.sort = (entity.sort && entity.sort[0]) || (entity["eve-auto-index"] && entity["eve-auto-index"][0]) || "";
+        if(entity.sort !== undefined && entity.sort[0] !== undefined) {
+          elem.sort = entity.sort[0];
+        } else if(entity["eve-auto-index"] !== undefined && entity["eve-auto-index"][0] !== undefined) {
+          elem.sort = entity["eve-auto-index"][0];
+        } else {
+          elem.sort = "";
+        }
         let parent = activeElements[activeChildren[entityId] || "root"];
         if(parent) insertSorted(parent, elem);
       }
@@ -204,7 +415,7 @@ export function renderRecords() {
         } else if(value.length > 1) {
           console.error("Unable to set 'value' multiple times on entity", entity, JSON.stringify(value));
         } else {
-          input.value = value[0]; // @FIXME: Should this really be setAttribute?
+          input.setAttribute('value', value[0]);
         }
 
       } else if(attribute === "checked") {
@@ -527,3 +738,4 @@ function injectProgram(node, elem) {
 export function renderEve() {
   renderer.render([{c: "application-container", postRender: injectProgram}]);
 }
+

src/runtime/databases/system.ts

@@ -11,7 +11,7 @@ import {Evaluation, Database} from "../runtime"
 
 class TimeAgent {
 
-  static attributeOrdering = ["year", "month", "day", "hours", "hours-24", "ampm", "minutes", "time-string", "seconds", "frames"];
+  static attributeOrdering = ["year", "month", "day", "hours", "hours-24", "ampm", "minutes", "time-string", "seconds", "timestamp", "frames"];
   static updateIntervals = {
     "year": 1000 * 60 * 60,
     "month": 1000 * 60 * 60,

src/runtime/parser.ts

@@ -1414,9 +1414,9 @@ export function parseDoc(doc, docId = `doc|${docIx++}`) {
   let parsedBlocks = [];
   let allErrors = [];
   for(let block of blocks) {
+    extraInfo[block.id] = {info: block.info};
     if(block.info !== "" && block.info.indexOf("eve") === -1) continue;
     let {results, lex, errors} = parseBlock(block.literal, block.id, block.startOffset, spans, extraInfo);
-    extraInfo[block.id] = {info: block.info};
     // if this block is disabled, we want the parsed spans and such, but we don't want
     // the block to be in the set sent to the builder
     if(block.info.indexOf("disabled") > -1) {

src/runtime/server.ts

@@ -189,7 +189,6 @@ function IDEMessageHandler(client:SocketRuntimeClient, message) {
       if(content) path = eveSource.getRelativePath(config.path, workspace);
     }
 
-
     if(!content && config.internal) {
       content = eveSource.get("quickstart.eve", "examples");
       if(content) path = eveSource.getRelativePath("quickstart.eve", "examples");

src/runtime/util/eavs.ts

@@ -5,11 +5,14 @@
 import {Changes} from "../changes";
 import {TripleIndex} from "../indexes";
 
+const JSON_NULL_ID = "external|json|null";
+
 //---------------------------------------------------------------------
 // JS conversion
 //---------------------------------------------------------------------
 
 export function fromJS(changes: Changes, json: any, node: string, scope: string, idPrefix: string = "js") {
+  if(json === null || json === undefined) return JSON_NULL_ID;
   if(json.constructor === Array) {
     let arrayId = `${idPrefix}|array`;
     changes.store(scope, arrayId, "tag", "array", node);
@@ -26,10 +29,15 @@ export function fromJS(changes: Changes, json: any, node: string, scope: string,
     let objectId = `${idPrefix}|object`;
     for(let key of Object.keys(json)) {
       let value = json[key];
-      if(value.constructor === Array || typeof value === "object") {
-        value = fromJS(changes, value, node, scope, `${objectId}|${key}`);
+      if(value === null || value === undefined) {
+        changes.store(scope, JSON_NULL_ID, "tag", "json-null", node);
+        changes.store(scope, objectId, key, JSON_NULL_ID, node);
+      } else {
+        if(value.constructor === Array || typeof value === "object") {
+          value = fromJS(changes, value, node, scope, `${objectId}|${key}`);
+        }
+        changes.store(scope, objectId, key, value, node);
       }
-      changes.store(scope, objectId, key, value, node);
     }
     return objectId;
   } else {
@@ -39,6 +47,7 @@ export function fromJS(changes: Changes, json: any, node: string, scope: string,
 
 export function toJS(index: TripleIndex, recordId) {
   let result;
+  if(recordId === JSON_NULL_ID) return null;
   let isArray = index.lookup(recordId, "tag", "array");
   if(isArray !== undefined) {
     result = [];

test/eavs.ts

@@ -48,3 +48,11 @@ test("converting nested js objects and arrays", (assert) => {
   }, assert);
   assert.end();
 })
+
+test("converting with null roundtrips", (assert) => {
+  convert({
+    beep: null,
+    foo: [1, null, 2]
+  }, assert);
+  assert.end();
+})