@valbuild/core 0.13.6 → 0.13.8

package/dist/{index-43176a0e.cjs.dev.js → index-9663f28a.cjs.dev.js}

@@ -430,8 +430,7 @@ function newSelectorProxy(source, path, moduleSchema) {
     if (isSelector(source)) {
       return source;
     } else if (isSerializedVal(source)) {
-      var _source$valPath;
-      return newSelectorProxy(source.val, (_source$valPath = source.valPath) !== null && _source$valPath !== void 0 ? _source$valPath : undefined);
+      return newSelectorProxy(source.val, source.valPath);
     }
   }
   if (source && source[FILE_REF_PROP] && source[VAL_EXTENSION] === "file") {
@@ -816,339 +815,6 @@ function parse(input) {
   return parseTokens(tokens);
 }
 
-function _regeneratorRuntime() {
-  _regeneratorRuntime = function () {
-    return exports;
-  };
-  var exports = {},
-    Op = Object.prototype,
-    hasOwn = Op.hasOwnProperty,
-    defineProperty = Object.defineProperty || function (obj, key, desc) {
-      obj[key] = desc.value;
-    },
-    $Symbol = "function" == typeof Symbol ? Symbol : {},
-    iteratorSymbol = $Symbol.iterator || "@@iterator",
-    asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator",
-    toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
-  function define(obj, key, value) {
-    return Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: !0,
-      configurable: !0,
-      writable: !0
-    }), obj[key];
-  }
-  try {
-    define({}, "");
-  } catch (err) {
-    define = function (obj, key, value) {
-      return obj[key] = value;
-    };
-  }
-  function wrap(innerFn, outerFn, self, tryLocsList) {
-    var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator,
-      generator = Object.create(protoGenerator.prototype),
-      context = new Context(tryLocsList || []);
-    return defineProperty(generator, "_invoke", {
-      value: makeInvokeMethod(innerFn, self, context)
-    }), generator;
-  }
-  function tryCatch(fn, obj, arg) {
-    try {
-      return {
-        type: "normal",
-        arg: fn.call(obj, arg)
-      };
-    } catch (err) {
-      return {
-        type: "throw",
-        arg: err
-      };
-    }
-  }
-  exports.wrap = wrap;
-  var ContinueSentinel = {};
-  function Generator() {}
-  function GeneratorFunction() {}
-  function GeneratorFunctionPrototype() {}
-  var IteratorPrototype = {};
-  define(IteratorPrototype, iteratorSymbol, function () {
-    return this;
-  });
-  var getProto = Object.getPrototypeOf,
-    NativeIteratorPrototype = getProto && getProto(getProto(values([])));
-  NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype);
-  var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
-  function defineIteratorMethods(prototype) {
-    ["next", "throw", "return"].forEach(function (method) {
-      define(prototype, method, function (arg) {
-        return this._invoke(method, arg);
-      });
-    });
-  }
-  function AsyncIterator(generator, PromiseImpl) {
-    function invoke(method, arg, resolve, reject) {
-      var record = tryCatch(generator[method], generator, arg);
-      if ("throw" !== record.type) {
-        var result = record.arg,
-          value = result.value;
-        return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) {
-          invoke("next", value, resolve, reject);
-        }, function (err) {
-          invoke("throw", err, resolve, reject);
-        }) : PromiseImpl.resolve(value).then(function (unwrapped) {
-          result.value = unwrapped, resolve(result);
-        }, function (error) {
-          return invoke("throw", error, resolve, reject);
-        });
-      }
-      reject(record.arg);
-    }
-    var previousPromise;
-    defineProperty(this, "_invoke", {
-      value: function (method, arg) {
-        function callInvokeWithMethodAndArg() {
-          return new PromiseImpl(function (resolve, reject) {
-            invoke(method, arg, resolve, reject);
-          });
-        }
-        return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
-      }
-    });
-  }
-  function makeInvokeMethod(innerFn, self, context) {
-    var state = "suspendedStart";
-    return function (method, arg) {
-      if ("executing" === state) throw new Error("Generator is already running");
-      if ("completed" === state) {
-        if ("throw" === method) throw arg;
-        return doneResult();
-      }
-      for (context.method = method, context.arg = arg;;) {
-        var delegate = context.delegate;
-        if (delegate) {
-          var delegateResult = maybeInvokeDelegate(delegate, context);
-          if (delegateResult) {
-            if (delegateResult === ContinueSentinel) continue;
-            return delegateResult;
-          }
-        }
-        if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) {
-          if ("suspendedStart" === state) throw state = "completed", context.arg;
-          context.dispatchException(context.arg);
-        } else "return" === context.method && context.abrupt("return", context.arg);
-        state = "executing";
-        var record = tryCatch(innerFn, self, context);
-        if ("normal" === record.type) {
-          if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue;
-          return {
-            value: record.arg,
-            done: context.done
-          };
-        }
-        "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg);
-      }
-    };
-  }
-  function maybeInvokeDelegate(delegate, context) {
-    var methodName = context.method,
-      method = delegate.iterator[methodName];
-    if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel;
-    var record = tryCatch(method, delegate.iterator, context.arg);
-    if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel;
-    var info = record.arg;
-    return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel);
-  }
-  function pushTryEntry(locs) {
-    var entry = {
-      tryLoc: locs[0]
-    };
-    1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry);
-  }
-  function resetTryEntry(entry) {
-    var record = entry.completion || {};
-    record.type = "normal", delete record.arg, entry.completion = record;
-  }
-  function Context(tryLocsList) {
-    this.tryEntries = [{
-      tryLoc: "root"
-    }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0);
-  }
-  function values(iterable) {
-    if (iterable) {
-      var iteratorMethod = iterable[iteratorSymbol];
-      if (iteratorMethod) return iteratorMethod.call(iterable);
-      if ("function" == typeof iterable.next) return iterable;
-      if (!isNaN(iterable.length)) {
-        var i = -1,
-          next = function next() {
-            for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next;
-            return next.value = undefined, next.done = !0, next;
-          };
-        return next.next = next;
-      }
-    }
-    return {
-      next: doneResult
-    };
-  }
-  function doneResult() {
-    return {
-      value: undefined,
-      done: !0
-    };
-  }
-  return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", {
-    value: GeneratorFunctionPrototype,
-    configurable: !0
-  }), defineProperty(GeneratorFunctionPrototype, "constructor", {
-    value: GeneratorFunction,
-    configurable: !0
-  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) {
-    var ctor = "function" == typeof genFun && genFun.constructor;
-    return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name));
-  }, exports.mark = function (genFun) {
-    return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun;
-  }, exports.awrap = function (arg) {
-    return {
-      __await: arg
-    };
-  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
-    return this;
-  }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) {
-    void 0 === PromiseImpl && (PromiseImpl = Promise);
-    var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl);
-    return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
-      return result.done ? result.value : iter.next();
-    });
-  }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () {
-    return this;
-  }), define(Gp, "toString", function () {
-    return "[object Generator]";
-  }), exports.keys = function (val) {
-    var object = Object(val),
-      keys = [];
-    for (var key in object) keys.push(key);
-    return keys.reverse(), function next() {
-      for (; keys.length;) {
-        var key = keys.pop();
-        if (key in object) return next.value = key, next.done = !1, next;
-      }
-      return next.done = !0, next;
-    };
-  }, exports.values = values, Context.prototype = {
-    constructor: Context,
-    reset: function (skipTempReset) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined);
-    },
-    stop: function () {
-      this.done = !0;
-      var rootRecord = this.tryEntries[0].completion;
-      if ("throw" === rootRecord.type) throw rootRecord.arg;
-      return this.rval;
-    },
-    dispatchException: function (exception) {
-      if (this.done) throw exception;
-      var context = this;
-      function handle(loc, caught) {
-        return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught;
-      }
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i],
-          record = entry.completion;
-        if ("root" === entry.tryLoc) return handle("end");
-        if (entry.tryLoc <= this.prev) {
-          var hasCatch = hasOwn.call(entry, "catchLoc"),
-            hasFinally = hasOwn.call(entry, "finallyLoc");
-          if (hasCatch && hasFinally) {
-            if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
-            if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
-          } else if (hasCatch) {
-            if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
-          } else {
-            if (!hasFinally) throw new Error("try statement without catch or finally");
-            if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
-          }
-        }
-      }
-    },
-    abrupt: function (type, arg) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
-          var finallyEntry = entry;
-          break;
-        }
-      }
-      finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null);
-      var record = finallyEntry ? finallyEntry.completion : {};
-      return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record);
-    },
-    complete: function (record, afterLoc) {
-      if ("throw" === record.type) throw record.arg;
-      return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel;
-    },
-    finish: function (finallyLoc) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel;
-      }
-    },
-    catch: function (tryLoc) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.tryLoc === tryLoc) {
-          var record = entry.completion;
-          if ("throw" === record.type) {
-            var thrown = record.arg;
-            resetTryEntry(entry);
-          }
-          return thrown;
-        }
-      }
-      throw new Error("illegal catch attempt");
-    },
-    delegateYield: function (iterable, resultName, nextLoc) {
-      return this.delegate = {
-        iterator: values(iterable),
-        resultName: resultName,
-        nextLoc: nextLoc
-      }, "next" === this.method && (this.arg = undefined), ContinueSentinel;
-    }
-  }, exports;
-}
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-function _asyncToGenerator(fn) {
-  return function () {
-    var self = this,
-      args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-      _next(undefined);
-    });
-  };
-}
-
 var EvalError = /*#__PURE__*/function () {
   function EvalError(message, expr) {
     createClass._classCallCheck(this, EvalError);
@@ -1164,354 +830,166 @@ var EvalError = /*#__PURE__*/function () {
   return EvalError;
 }();
 var MAX_STACK_SIZE = 100; // an arbitrary semi-large number
-function evaluateAsync(_x, _x2, _x3) {
-  return _evaluateAsync.apply(this, arguments);
-}
-function _evaluateAsync() {
-  _evaluateAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(expr, getSource, stack) {
-    var path, source, value, valObj, valPath, serialized, _serialized$valPath, parsedValue, res, prop, obj, maybeFunction, _path, _source, args, _maybeFunction, maybeValue, _stack$Number, _expr$value$slice$spl, _expr$value$slice$spl2, i, j, rest, stackValue;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          if (!(stack.length > MAX_STACK_SIZE)) {
-            _context2.next = 2;
-            break;
-          }
-          throw new EvalError("Stack overflow. Final frames: ".concat(stack.slice(-10).map(function (frame, i) {
-            return frame.map(function (s, j) {
-              return "@[".concat(i, ",").concat(j, "]: ").concat(JSON.stringify(s));
-            }).join(", ");
-          }).join(" -> ")), expr);
-        case 2:
-          if (!(expr instanceof Call)) {
-            _context2.next = 96;
-            break;
-          }
-          if (!(expr.children[0] instanceof Sym)) {
-            _context2.next = 50;
-            break;
-          }
-          if (!(expr.children[0].value === "val")) {
-            _context2.next = 18;
-            break;
-          }
-          if (!expr.isAnon) {
-            _context2.next = 7;
-            break;
-          }
+function evaluateSync(expr, getSource, stack) {
+  // TODO: amount of evaluates should be limited?
+  if (stack.length > MAX_STACK_SIZE) {
+    throw new EvalError("Stack overflow. Final frames: ".concat(stack.slice(-10).map(function (frame, i) {
+      return frame.map(function (s, j) {
+        return "@[".concat(i, ",").concat(j, "]: ").concat(JSON.stringify(s));
+      }).join(", ");
+    }).join(" -> ")), expr);
+  }
+  if (expr instanceof Call) {
+    if (expr.children[0] instanceof Sym) {
+      if (expr.children[0].value === "val") {
+        if (expr.isAnon) {
           throw new EvalError("cannot call 'val' as anonymous function", expr);
-        case 7:
-          if (!(expr.children[1] instanceof StringLiteral)) {
-            _context2.next = 15;
-            break;
-          }
-          path = expr.children[1].value;
-          _context2.next = 11;
-          return getSource(path);
-        case 11:
-          source = _context2.sent;
-          return _context2.abrupt("return", newSelectorProxy(source, path));
-        case 15:
+        }
+        if (expr.children[1] instanceof StringLiteral) {
+          var _path = expr.children[1].value;
+          return newSelectorProxy(getSource(_path), _path);
+        } else {
           throw new EvalError("argument of 'val' must be a string literal", expr);
-        case 16:
-          _context2.next = 50;
-          break;
-        case 18:
-          if (!(expr.children[0].value === "json")) {
-            _context2.next = 43;
-            break;
-          }
-          if (!(expr.children.length !== 2)) {
-            _context2.next = 21;
-            break;
-          }
+        }
+      } else if (expr.children[0].value === "json") {
+        if (expr.children.length !== 2) {
           throw new EvalError("must call 'json' with exactly one argument", expr);
-        case 21:
-          _context2.next = 23;
-          return evaluateAsync(expr.children[1], getSource, stack);
-        case 23:
-          value = _context2.sent;
-          valObj = value[SourceOrExpr];
-          valPath = value[Path];
-          if (!(typeof valObj !== "string")) {
-            _context2.next = 28;
-            break;
-          }
+        }
+        var value = evaluateSync(expr.children[1], getSource, stack);
+        var valObj = value[SourceOrExpr];
+        var valPath = value[Path];
+        if (typeof valObj !== "string") {
           throw new EvalError("cannot parse JSON: ".concat(JSON.stringify(valObj), ", expected string"), expr.children[1]);
-        case 28:
-          _context2.prev = 28;
-          serialized = JSON.parse(valObj);
-          if (!isSerializedVal(serialized)) {
-            _context2.next = 32;
-            break;
-          }
-          return _context2.abrupt("return", newSelectorProxy(serialized.val, (_serialized$valPath = serialized.valPath) !== null && _serialized$valPath !== void 0 ? _serialized$valPath : undefined));
-        case 32:
-          parsedValue = newSelectorProxy(JSON.parse(valObj), valPath);
-          return _context2.abrupt("return", parsedValue);
-        case 36:
-          _context2.prev = 36;
-          _context2.t0 = _context2["catch"](28);
-          if (!(_context2.t0 instanceof SyntaxError)) {
-            _context2.next = 40;
-            break;
-          }
-          throw new EvalError("cannot parse JSON: ".concat(valObj, ", ").concat(_context2.t0.message, " - value: ").concat(JSON.stringify(value)), expr.children[1]);
-        case 40:
-          throw _context2.t0;
-        case 41:
-          _context2.next = 50;
-          break;
-        case 43:
-          if (!(expr.children[0].value === "stringify")) {
-            _context2.next = 50;
-            break;
+        }
+        try {
+          var serialized = JSON.parse(valObj);
+          if (isSerializedVal(serialized)) {
+            return newSelectorProxy(serialized.val, serialized.valPath);
           }
-          if (!(expr.children.length !== 2)) {
-            _context2.next = 46;
-            break;
+          var parsedValue = newSelectorProxy(JSON.parse(valObj), valPath);
+          return parsedValue;
+        } catch (e) {
+          if (e instanceof SyntaxError) {
+            throw new EvalError("cannot parse JSON: ".concat(valObj, ", ").concat(e.message, " - value: ").concat(JSON.stringify(value)), expr.children[1]);
           }
+          throw e;
+        }
+      } else if (expr.children[0].value === "stringify") {
+        // TODO: remove stringify
+        if (expr.children.length !== 2) {
           throw new EvalError("must call 'stringify' with exactly one argument", expr);
-        case 46:
-          _context2.next = 48;
-          return evaluateAsync(expr.children[1], getSource, stack);
-        case 48:
-          res = _context2.sent;
-          return _context2.abrupt("return", newSelectorProxy(JSON.stringify(res[SourceOrExpr])));
-        case 50:
-          _context2.next = 52;
-          return evaluateAsync(expr.children[0], getSource, stack);
-        case 52:
-          _context2.t1 = SourceOrExpr;
-          prop = _context2.sent[_context2.t1];
-          if (!(expr.children.length === 1)) {
-            _context2.next = 56;
-            break;
-          }
-          return _context2.abrupt("return", newSelectorProxy(prop));
-        case 56:
-          _context2.next = 58;
-          return evaluateAsync(expr.children[1], getSource, stack);
-        case 58:
-          obj = _context2.sent;
-          if (!(typeof prop !== "string" && typeof prop !== "number")) {
-            _context2.next = 61;
-            break;
-          }
-          throw new EvalError("cannot access ".concat(JSON.stringify(obj), " with property ").concat(JSON.stringify(prop), ": is not a string or number"), expr);
-        case 61:
-          if (!(prop in obj)) {
-            _context2.next = 94;
-            break;
-          }
-          if (!expr.isAnon) {
-            _context2.next = 73;
-            break;
-          }
-          // anon functions:
-          maybeFunction = obj[prop];
-          if (!(typeof maybeFunction !== "function")) {
-            _context2.next = 66;
-            break;
-          }
+        }
+        var res = evaluateSync(expr.children[1], getSource, stack);
+        return newSelectorProxy(JSON.stringify(res[SourceOrExpr]));
+      }
+    }
+    var prop = evaluateSync(expr.children[0], getSource, stack)[SourceOrExpr];
+    if (expr.children.length === 1) {
+      // TODO: return if literal only?
+      return newSelectorProxy(prop);
+    }
+    var obj = evaluateSync(expr.children[1], getSource, stack);
+    if (typeof prop !== "string" && typeof prop !== "number") {
+      throw new EvalError("cannot access ".concat(JSON.stringify(obj), " with property ").concat(JSON.stringify(prop), ": is not a string or number"), expr);
+    }
+    if (prop in obj) {
+      if (expr.isAnon) {
+        // anon functions:
+        var maybeFunction = obj[prop];
+        if (typeof maybeFunction !== "function") {
           throw new EvalError("cannot access property ".concat(JSON.stringify(prop), " of ").concat(JSON.stringify(obj), ": required higher ordered function got ").concat(createClass._typeof(obj[prop])), expr);
-        case 66:
-          if (!(expr.children[0] instanceof Sym)) {
-            _context2.next = 70;
-            break;
-          }
-          return _context2.abrupt("return", maybeFunction(function () {
+        }
+        if (expr.children[0] instanceof Sym) {
+          return maybeFunction(function () {
             for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
               args[_key] = arguments[_key];
             }
-            return evaluateAsync(expr.children[2], getSource, stack.concat([args]));
-          }));
-        case 70:
+            return evaluateSync(expr.children[2], getSource, stack.concat([args]));
+          });
+        } else {
           throw new EvalError("cannot call an expression that is not a symbol, got: '".concat(expr.children[0].type, "'"), expr);
-        case 71:
-          _context2.next = 94;
-          break;
-        case 73:
-          if (!(expr.children[0] instanceof Sym)) {
-            _context2.next = 84;
-            break;
-          }
-          if (!(expr.children[0].value === "val")) {
-            _context2.next = 84;
-            break;
-          }
-          if (!(expr.children[1] instanceof StringLiteral)) {
-            _context2.next = 83;
-            break;
-          }
-          _path = expr.children[1].value;
-          _context2.next = 79;
-          return getSource(_path);
-        case 79:
-          _source = _context2.sent;
-          return _context2.abrupt("return", newSelectorProxy(_source, _path));
-        case 83:
-          throw new EvalError("argument of 'val' must be a string literal", expr);
-        case 84:
-          args = expr.children.slice(2);
-          if (!(args.length > 0)) {
-            _context2.next = 90;
-            break;
-          }
-          _maybeFunction = obj[prop];
-          if (!(typeof _maybeFunction !== "function")) {
-            _context2.next = 89;
-            break;
+        }
+      } else {
+        // non-anon functions:
+        if (expr.children[0] instanceof Sym) {
+          if (expr.children[0].value === "val") {
+            if (expr.children[1] instanceof StringLiteral) {
+              var _path2 = expr.children[1].value;
+              return newSelectorProxy(getSource(_path2), _path2);
+            } else {
+              throw new EvalError("argument of 'val' must be a string literal", expr);
+            }
           }
-          throw new EvalError("cannot access property ".concat(JSON.stringify(prop), " of ").concat(JSON.stringify(obj), ": required function got ").concat(createClass._typeof(obj[prop])), expr);
-        case 89:
-          return _context2.abrupt("return", _maybeFunction.apply(void 0, createClass._toConsumableArray(args.map(function (arg) {
-            return evaluateAsync(arg, getSource, stack);
-          }))));
-        case 90:
-          maybeValue = obj[prop];
-          if (!(typeof maybeValue === "function")) {
-            _context2.next = 93;
-            break;
+        }
+        var args = expr.children.slice(2);
+        if (args.length > 0) {
+          var _maybeFunction = obj[prop];
+          if (typeof _maybeFunction !== "function") {
+            throw new EvalError("cannot access property ".concat(JSON.stringify(prop), " of ").concat(JSON.stringify(obj), ": required function got ").concat(createClass._typeof(obj[prop])), expr);
           }
+          return _maybeFunction.apply(void 0, createClass._toConsumableArray(args.map(function (arg) {
+            return evaluateSync(arg, getSource, stack);
+          })));
+        }
+        var maybeValue = obj[prop];
+        if (typeof maybeValue === "function") {
           throw new EvalError("cannot access property ".concat(JSON.stringify(prop), " of ").concat(JSON.stringify(obj), ": required value got ").concat(createClass._typeof(obj[prop])), expr);
-        case 93:
-          return _context2.abrupt("return", maybeValue);
-        case 94:
-          _context2.next = 122;
-          break;
-        case 96:
-          if (!(expr instanceof Sym)) {
-            _context2.next = 112;
-            break;
-          }
-          if (!expr.value.startsWith("@")) {
-            _context2.next = 107;
-            break;
-          }
-          _expr$value$slice$spl = expr.value.slice(2, -1).split(","), _expr$value$slice$spl2 = createClass._slicedToArray(_expr$value$slice$spl, 3), i = _expr$value$slice$spl2[0], j = _expr$value$slice$spl2[1], rest = _expr$value$slice$spl2[2];
-          if (!rest) {
-            _context2.next = 101;
-            break;
-          }
-          throw new EvalError("cannot access stack: too many indices", expr);
-        case 101:
-          stackValue = (_stack$Number = stack[Number(i)]) === null || _stack$Number === void 0 ? void 0 : _stack$Number[Number(j)];
-          if (!(stackValue === undefined)) {
-            _context2.next = 104;
-            break;
-          }
-          throw new EvalError("cannot access stack: out of bounds", expr);
-        case 104:
-          return _context2.abrupt("return", stackValue);
-        case 107:
-          if (!(expr.value === "()")) {
-            _context2.next = 109;
-            break;
-          }
-          return _context2.abrupt("return", newSelectorProxy(null));
-        case 109:
-          return _context2.abrupt("return", newSelectorProxy(expr.value));
-        case 112:
-          if (!(expr instanceof StringLiteral)) {
-            _context2.next = 116;
-            break;
-          }
-          return _context2.abrupt("return", newSelectorProxy(expr.value));
-        case 116:
-          if (!(expr instanceof StringTemplate)) {
-            _context2.next = 122;
-            break;
-          }
-          _context2.t2 = newSelectorProxy;
-          _context2.next = 120;
-          return Promise.all(expr.children.map( /*#__PURE__*/function () {
-            var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(child) {
-              var evalRes;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    if (!(child instanceof Sym && child.value === "()")) {
-                      _context.next = 2;
-                      break;
-                    }
-                    return _context.abrupt("return", "null");
-                  case 2:
-                    _context.next = 4;
-                    return evaluateAsync(child, getSource, stack);
-                  case 4:
-                    evalRes = _context.sent;
-                    if (!(child.type === "StringLiteral" || child.type === "StringTemplate")) {
-                      _context.next = 7;
-                      break;
-                    }
-                    return _context.abrupt("return", evalRes[SourceOrExpr]);
-                  case 7:
-                    if (!(Path in evalRes)) {
-                      _context.next = 9;
-                      break;
-                    }
-                    return _context.abrupt("return", JSON.stringify({
-                      val: evalRes[SourceOrExpr],
-                      valPath: evalRes[Path]
-                    }));
-                  case 9:
-                    return _context.abrupt("return", JSON.stringify(evalRes[SourceOrExpr]));
-                  case 10:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }));
-            return function (_x7) {
-              return _ref.apply(this, arguments);
-            };
-          }()).join(""));
-        case 120:
-          _context2.t3 = _context2.sent;
-          return _context2.abrupt("return", (0, _context2.t2)(_context2.t3));
-        case 122:
-          throw new EvalError("could not evaluate", expr);
-        case 123:
-        case "end":
-          return _context2.stop();
+        }
+        return maybeValue;
       }
-    }, _callee2, null, [[28, 36]]);
-  }));
-  return _evaluateAsync.apply(this, arguments);
-}
-function evaluate(_x4, _x5, _x6) {
-  return _evaluate.apply(this, arguments);
-}
-function _evaluate() {
-  _evaluate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(expr, source, stack) {
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          _context3.prev = 0;
-          _context3.t0 = result.result;
-          _context3.next = 4;
-          return evaluateAsync(expr, source, stack);
-        case 4:
-          _context3.t1 = _context3.sent;
-          return _context3.abrupt("return", _context3.t0.ok.call(_context3.t0, _context3.t1));
-        case 8:
-          _context3.prev = 8;
-          _context3.t2 = _context3["catch"](0);
-          if (!(_context3.t2 instanceof EvalError)) {
-            _context3.next = 12;
-            break;
-          }
-          return _context3.abrupt("return", result.err(_context3.t2));
-        case 12:
-          throw _context3.t2;
-        case 13:
-        case "end":
-          return _context3.stop();
+    }
+  } else if (expr instanceof Sym) {
+    if (expr.value.startsWith("@")) {
+      var _stack$Number;
+      var _expr$value$slice$spl = expr.value.slice(2, -1).split(","),
+        _expr$value$slice$spl2 = createClass._slicedToArray(_expr$value$slice$spl, 3),
+        i = _expr$value$slice$spl2[0],
+        j = _expr$value$slice$spl2[1],
+        rest = _expr$value$slice$spl2[2];
+      if (rest) {
+        throw new EvalError("cannot access stack: too many indices", expr);
+      }
+      var stackValue = (_stack$Number = stack[Number(i)]) === null || _stack$Number === void 0 ? void 0 : _stack$Number[Number(j)];
+      if (stackValue === undefined) {
+        throw new EvalError("cannot access stack: out of bounds", expr);
+      }
+      return stackValue;
+    } else if (expr.value === "()") {
+      return newSelectorProxy(null);
+    }
+    return newSelectorProxy(expr.value);
+  } else if (expr instanceof StringLiteral) {
+    return newSelectorProxy(expr.value);
+  } else if (expr instanceof StringTemplate) {
+    return newSelectorProxy(expr.children.map(function (child) {
+      if (child instanceof Sym && child.value === "()") {
+        return "null";
+      }
+      var evalRes = evaluateSync(child, getSource, stack);
+      if (child.type === "StringLiteral" || child.type === "StringTemplate") {
+        return evalRes[SourceOrExpr];
       }
-    }, _callee3, null, [[0, 8]]);
-  }));
-  return _evaluate.apply(this, arguments);
+      if (Path in evalRes) {
+        // a selector, so serialize to Val
+        return JSON.stringify({
+          val: evalRes[SourceOrExpr],
+          valPath: evalRes[Path]
+        });
+      }
+      return JSON.stringify(evalRes[SourceOrExpr]);
+    }).join(""));
+  }
+  throw new EvalError("could not evaluate", expr);
+}
+function evaluate(expr, source, stack) {
+  try {
+    return result.ok(evaluateSync(expr, source, stack));
+  } catch (err) {
+    if (err instanceof EvalError) {
+      return result.err(err);
+    }
+    throw err;
+  }
 }
 
 var index = /*#__PURE__*/Object.freeze({