@graffiticode/basis 1.5.0 → 1.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graffiticode/basis",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "The basis library for creating Graffiticode languages",
   "main": "index.js",
   "scripts": {

package/src/compiler.js

@@ -541,17 +541,21 @@ export class Transformer extends Visitor {
   }
   RECORD(node, options, resume) {
     let err = [];
-    let val = {};
     let len = 0;
     if (node.elts.length === 0) {
       resume(err, val);
     } else {
+      const ndx = [];
       for (let elt of node.elts.reverse()) {
         // For historical reasons, the bindings are reversed in the AST.
         this.visit(elt, options, (e0, v0) => {
           err = err.concat(e0);
-          val[v0.key] = v0.val;
+          ndx[elt] = v0;
           if (++len === node.elts.length) {
+            // This is a little trickery to restore the original order of the,
+            // given that they may have been reordered do to the node being
+            // visited asynchronously.
+            const val = index.reduce((acc, v0) => ({...acc, [v0.key]: v0.val}), {});
             resume(err, val);
           }
         });
@@ -613,19 +617,15 @@ export class Transformer extends Visitor {
     resume(err, val);
   }
   DATA(node, options, resume) {
-    if (options.data && Object.keys(options.data).length !== 0) {
-      // Got external data, so use it.
-      const err = [];
-      const val = options.data;
-      resume(err, val);
-    } else {
-      // Otherwise, use the default data.
-      this.visit(node.elts[0], options, (e0, v0) => {
-        const err = e0;
-        const val = v0;
-        resume(err, val);
+    this.visit(node.elts[0], options, (e0, v0) => {
+      const data = options.data || {};
+      const err = e0;
+      const val = v0;
+      resume(err, {
+        ...val,
+        ...data,  // External data overrides internal data.
       });
-    }
+    });
   }
   PAREN(node, options, resume) {
     this.visit(node.elts[0], options, (e0, v0) => {

package/src/share.js

@@ -1,5 +1,3 @@
-/* -*- Mode: js; js-indent-level: 2; indent-tabs-mode: nil; tab-width: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 /*
  * Copyright 2013 Art Compiler LLC
  *
@@ -77,7 +75,6 @@
 
 */
 
-import Hashids from 'hashids';
 import https from 'https';
 
 export const messages = {};
@@ -116,76 +113,6 @@ export const reserveCodeRange = function (first, last, moduleName) {
   reservedCodes.push({first: first, last: last, name: moduleName});
 }
 
-const hashids = new Hashids("Art Compiler LLC");  // This string shall never change!
-export const decodeID = (id) => {
-  // console.log("[1] decodeID() >> " + id);
-  // 123456, 123+534653+0, Px4xO423c, 123+123456+0+Px4xO423c, Px4xO423c+Px4xO423c
-  if (id === undefined) {
-    id = "0";
-  }
-  if (Number.isInteger(id)) {
-    id = "" + id;
-  }
-  if (Array.isArray(id)) {
-    // Looks like it is already decoded.
-    assert(Number.isInteger(id[0]) && Number.isInteger(id[1]));
-    return id;
-  }
-  assert(typeof id === "string", "Invalid id " + id);
-  id = id.replace(/\+/g, " ");
-  let parts = id.split(" ");
-  let ids = [];
-  // Concatenate the first two integer ids and the last hash id. Everything
-  // else gets erased.
-  for (let i = 0; i < parts.length; i++) {
-    let n;
-    if (ids.length > 2) {
-      // Found the head, now skip to the last part to get the tail.
-      ids = ids.slice(0, 2);
-      i = parts.length - 1;
-    }
-    if (Number.isInteger(n = +parts[i])) {
-      ids.push(n);
-    } else {
-      ids = ids.concat(hashids.decode(parts[i]));
-    }
-  }
-  // Fix short ids.
-  if (ids.length === 1) {
-    ids = [0, ids[0], 0];
-  } else if (ids.length === 2) {
-    ids = [0, ids[0], 113, ids[1], 0];
-  } else if (ids.length === 3 && ids[2] !== 0) {
-    ids = [ids[0], ids[1], 113, ids[2], 0];
-  }
-  // console.log("[2] decodeID() << " + JSON.stringify(ids));
-  return ids;
-};
-
-export const encodeID = (ids) => {
-  // console.log("[1] encodeID() >> " + JSON.stringify(ids));
-  let length = ids.length;
-  if (length >= 3 &&
-      // [0,0,0] --> "0"
-      +ids[length - 3] === 0 &&
-      +ids[length - 2] === 0 &&
-      +ids[length - 1] === 0) {
-    ids = ids.slice(0, length - 2);
-    length = ids.length;
-  }
-  if (length === 1) {
-    if (+ids[0] === 0) {
-      return "0";
-    }
-    ids = [0, +ids[0], 0];
-  } else if (length === 2) {
-    ids = [0, +ids[0], 113, +ids[1], 0];
-  }
-  let id = hashids.encode(ids);
-  // console.log("[2] encodeID() << " + id);
-  return id;
-};
-
 function postAuth(path, data, resume) {
   let encodedData = JSON.stringify(data);
   var options = {