@valbuild/core 0.15.0 → 0.17.0

package/dist/valbuild-core.cjs.dev.js

@@ -2,519 +2,40 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-9663f28a.cjs.dev.js');
-var createClass = require('./createClass-a436dbfe.cjs.dev.js');
+var index = require('./index-a6e642dd.cjs.dev.js');
+var ops = require('./ops-f3015423.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('./index-486c7fbf.cjs.dev.js');
 var result = require('./result-48320acd.cjs.dev.js');
-var ops = require('./ops-87cdbafc.cjs.dev.js');
 
-var ObjectSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(ObjectSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(ObjectSchema);
-  function ObjectSchema(items) {
-    var _this;
-    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    createClass._classCallCheck(this, ObjectSchema);
-    _this = _super.call(this);
-    _this.items = items;
-    _this.opt = opt;
-    return _this;
-  }
-  createClass._createClass(ObjectSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      if (this.opt && (src === null || src === undefined)) {
-        return true;
-      }
-      if (!src) {
-        return false;
-      }
-
-      // TODO: checks all props
-
-      return createClass._typeof(src) === "object" && !Array.isArray(src);
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new ObjectSchema(this.items, true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "object",
-        items: Object.fromEntries(Object.entries(this.items).map(function (_ref) {
-          var _ref2 = createClass._slicedToArray(_ref, 2),
-            key = _ref2[0],
-            schema = _ref2[1];
-          return [key, schema.serialize()];
-        })),
-        opt: this.opt
-      };
-    }
-  }]);
-  return ObjectSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
-var object = function object(schema) {
-  return new ObjectSchema(schema);
-};
-
-var ArraySchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(ArraySchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(ArraySchema);
-  function ArraySchema(item) {
+var NumberSchema = /*#__PURE__*/function (_Schema) {
+  index._inherits(NumberSchema, _Schema);
+  var _super = index._createSuper(NumberSchema);
+  function NumberSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    createClass._classCallCheck(this, ArraySchema);
+    index._classCallCheck(this, NumberSchema);
     _this = _super.call(this);
-    _this.item = item;
+    _this.options = options;
     _this.opt = opt;
     return _this;
   }
-  createClass._createClass(ArraySchema, [{
+  index._createClass(NumberSchema, [{
     key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
+    value: function validate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
-        return true;
-      }
-      if (!src) {
         return false;
       }
-
-      // TODO: checks all items
-      return createClass._typeof(src) === "object" && Array.isArray(src);
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new ArraySchema(this.item, true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "array",
-        item: this.item.serialize(),
-        opt: this.opt
-      };
-    }
-  }]);
-  return ArraySchema;
-}(expr_dist_valbuildCoreExpr.Schema);
-var array = function array(schema) {
-  return new ArraySchema(schema);
-};
-
-var I18nSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(I18nSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(I18nSchema);
-  function I18nSchema(locales, item) {
-    var _this;
-    var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    createClass._classCallCheck(this, I18nSchema);
-    _this = _super.call(this);
-    _this.locales = locales;
-    _this.item = item;
-    _this.opt = opt;
-    return _this;
-  }
-  createClass._createClass(I18nSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new I18nSchema(this.locales, this.item, true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "i18n",
-        item: this.item.serialize(),
-        locales: this.locales,
-        opt: this.opt
-      };
-    }
-  }]);
-  return I18nSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
-var i18n$1 = function i18n(locales) {
-  return function (schema) {
-    return new I18nSchema(locales, schema);
-  };
-};
-
-var UnionSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(UnionSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(UnionSchema);
-  function UnionSchema(key, items) {
-    var _this;
-    var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    createClass._classCallCheck(this, UnionSchema);
-    _this = _super.call(this);
-    _this.key = key;
-    _this.items = items;
-    _this.opt = opt;
-    return _this;
-  }
-  createClass._createClass(UnionSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "union",
-        key: this.key,
-        items: this.items.map(function (o) {
-          return o.serialize();
-        }),
-        opt: this.opt
-      };
-    }
-  }]);
-  return UnionSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
-var union = function union(key) {
-  for (var _len = arguments.length, objects = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    objects[_key - 1] = arguments[_key];
-  }
-  return new UnionSchema(key, objects);
-};
-
-var OneOfSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(OneOfSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(OneOfSchema);
-  function OneOfSchema(selector) {
-    var _this;
-    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    createClass._classCallCheck(this, OneOfSchema);
-    _this = _super.call(this);
-    _this.selector = selector;
-    _this.opt = opt;
-    return _this;
-  }
-  createClass._createClass(OneOfSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new OneOfSchema(this.selector, true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      var path = expr_dist_valbuildCoreExpr.getValPath(this.selector);
-      if (!path) {
-        throw new Error("Cannot serialize oneOf schema with empty selector. Make sure a Val module is used.");
-      }
-      return {
-        type: "oneOf",
-        selector: path,
-        opt: this.opt
-      };
-    }
-  }]);
-  return OneOfSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
-var oneOf = function oneOf(valModule) {
-  return new OneOfSchema(valModule);
-};
-
-var RichTextSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(RichTextSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(RichTextSchema);
-  function RichTextSchema() {
-    var _this;
-    var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    createClass._classCallCheck(this, RichTextSchema);
-    _this = _super.call(this);
-    _this.opt = opt;
-    return _this;
-  }
-  createClass._createClass(RichTextSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      // TODO:
-      return true;
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new RichTextSchema(true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "richtext",
-        opt: this.opt
-      };
-    }
-  }]);
-  return RichTextSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
-var richtext$1 = function richtext() {
-  return new RichTextSchema();
-};
-
-function content(
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-id,
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-schema,
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-source) {
-  return expr_dist_valbuildCoreExpr.newSelectorProxy(source, id, schema);
-}
-function getRawSource(valModule) {
-  var sourceOrExpr = valModule[expr_dist_valbuildCoreExpr.SourceOrExpr];
-  if (sourceOrExpr instanceof expr_dist_valbuildCoreExpr.Expr) {
-    throw Error("Cannot get raw source of an Expr");
-  }
-  var source = sourceOrExpr;
-  return source;
-}
-function splitModuleIdAndModulePath(path) {
-  return [path.slice(0, path.indexOf(".")), path.slice(path.indexOf(".") + 1)];
-}
-function isObjectSchema(schema) {
-  return schema instanceof ObjectSchema || createClass._typeof(schema) === "object" && "type" in schema && schema.type === "object";
-}
-function isArraySchema(schema) {
-  return schema instanceof ArraySchema || createClass._typeof(schema) === "object" && "type" in schema && schema.type === "array";
-}
-function isI18nSchema(schema) {
-  return schema instanceof I18nSchema || createClass._typeof(schema) === "object" && "type" in schema && schema.type === "i18n";
-}
-function isUnionSchema(schema) {
-  return schema instanceof UnionSchema || createClass._typeof(schema) === "object" && "type" in schema && schema.type === "union";
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function isRichTextSchema(schema) {
-  return schema instanceof RichTextSchema || createClass._typeof(schema) === "object" && "type" in schema && schema.type === "richtext";
-}
-function isImageSchema(schema) {
-  return schema instanceof expr_dist_valbuildCoreExpr.ImageSchema || createClass._typeof(schema) === "object" && "type" in schema && schema.type === "image";
-}
-function resolvePath(path, valModule, schema) {
-  var parts = parsePath(path);
-  var origParts = createClass._toConsumableArray(parts);
-  var resolvedSchema = schema;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  var resolvedSource = valModule;
-  var _loop = function _loop() {
-    var part = parts.shift();
-    if (part === undefined) {
-      throw Error("Unexpected undefined part");
-    }
-    if (isArraySchema(resolvedSchema)) {
-      if (Number.isNaN(Number(part))) {
-        throw Error("Invalid path: array schema ".concat(resolvedSchema, " must have ").concat(part, " a number as path"));
-      }
-      if (createClass._typeof(resolvedSource) !== "object" && !Array.isArray(resolvedSource)) {
-        throw Error("Schema type error: expected source to be type of array, but got ".concat(createClass._typeof(resolvedSource)));
-      }
-      if (!resolvedSource[part]) {
-        var _resolvedSource;
-        throw Error("Invalid path: array source (length: ".concat((_resolvedSource = resolvedSource) === null || _resolvedSource === void 0 ? void 0 : _resolvedSource.length, ") did not have index ").concat(part, " from path: ").concat(path));
-      }
-      resolvedSource = resolvedSource[part];
-      resolvedSchema = resolvedSchema.item;
-    } else if (isObjectSchema(resolvedSchema)) {
-      if (createClass._typeof(resolvedSource) !== "object") {
-        throw Error("Schema type error: expected source to be type of object, but got ".concat(createClass._typeof(resolvedSource)));
-      }
-      if (!resolvedSource[part]) {
-        throw Error("Invalid path: object source did not have key ".concat(part, " from path: ").concat(path));
-      }
-      resolvedSource = resolvedSource[part];
-      resolvedSchema = resolvedSchema.items[part];
-    } else if (isI18nSchema(resolvedSchema)) {
-      if (!resolvedSchema.locales.includes(part)) {
-        throw Error("Invalid path: i18n schema ".concat(resolvedSchema, " supports locales ").concat(resolvedSchema.locales.join(", "), ", but found: ").concat(part));
-      }
-      if (!Object.keys(resolvedSource).includes(part)) {
-        throw Error("Schema type error: expected source to be type of i18n with locale ".concat(part, ", but got ").concat(JSON.stringify(Object.keys(resolvedSource))));
-      }
-      resolvedSource = resolvedSource[part];
-      resolvedSchema = resolvedSchema.item;
-    } else if (isImageSchema(resolvedSchema)) {
-      return {
-        v: {
-          path: origParts.slice(0, origParts.length - parts.length - 1).map(function (p) {
-            return JSON.stringify(p);
-          }).join("."),
-          // TODO: create a function generate path from parts (not sure if this always works)
-          schema: resolvedSchema,
-          source: resolvedSource
-        }
-      };
-    } else if (isUnionSchema(resolvedSchema)) {
-      var _key = resolvedSchema.key;
-      var keyValue = resolvedSource[_key];
-      if (!keyValue) {
-        throw Error("Invalid path: union source ".concat(resolvedSchema, " did not have required key ").concat(_key, " in path: ").concat(path));
-      }
-      var schemaOfUnionKey = resolvedSchema.items.find(
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      function (child) {
-        var _child$items, _child$items$_key;
-        return (child === null || child === void 0 ? void 0 : (_child$items = child.items) === null || _child$items === void 0 ? void 0 : (_child$items$_key = _child$items[_key]) === null || _child$items$_key === void 0 ? void 0 : _child$items$_key.value) === keyValue;
-      });
-      if (!schemaOfUnionKey) {
-        throw Error("Invalid path: union schema ".concat(resolvedSchema, " did not have a child object with ").concat(_key, " of value ").concat(keyValue, " in path: ").concat(path));
-      }
-      resolvedSchema = schemaOfUnionKey.items[part];
-      resolvedSource = resolvedSource[part];
-    } else if (isRichTextSchema(resolvedSchema)) {
-      return {
-        v: {
-          path: origParts.slice(0, origParts.length - parts.length - 1).map(function (p) {
-            return JSON.stringify(p);
-          }).join("."),
-          // TODO: create a function generate path from parts (not sure if this always works)
-          schema: resolvedSchema,
-          source: resolvedSource
-        }
-      };
-    } else {
-      throw Error("Invalid path: ".concat(part, " resolved to an unexpected schema ").concat(JSON.stringify(resolvedSchema)));
-    }
-  };
-  while (parts.length > 0) {
-    var _ret = _loop();
-    if (createClass._typeof(_ret) === "object") return _ret.v;
-  }
-  if (parts.length > 0) {
-    throw Error("Invalid path: ".concat(parts.join("."), " is not a valid path"));
-  }
-  return {
-    path: path,
-    schema: resolvedSchema,
-    source: resolvedSource
-  };
-}
-function parsePath(input) {
-  var result = [];
-  var i = 0;
-  while (i < input.length) {
-    var part = "";
-    if (input[i] === '"') {
-      // Parse a quoted string
-      i++;
-      while (i < input.length && input[i] !== '"') {
-        if (input[i] === "\\" && input[i + 1] === '"') {
-          // Handle escaped double quotes
-          part += '"';
-          i++;
-        } else {
-          part += input[i];
-        }
-        i++;
-      }
-      if (input[i] !== '"') {
-        var _input$i;
-        throw new Error("Invalid input (".concat(JSON.stringify(input), "): Missing closing double quote: ").concat((_input$i = input[i]) !== null && _input$i !== void 0 ? _input$i : "at end of string", " (char: ").concat(i, "; length: ").concat(input.length, ")"));
-      }
-    } else {
-      // Parse a regular string
-      while (i < input.length && input[i] !== ".") {
-        part += input[i];
-        i++;
+      if (typeof src !== "number") {
+        return index._defineProperty({}, path, [{
+          message: "Expected 'number', got '".concat(index._typeof(src), "'"),
+          value: src
+        }]);
       }
-    }
-    if (part !== "") {
-      result.push(part);
-    }
-    i++;
-  }
-  return result;
-}
-
-/**
- * I18n sources cannot have nested remote sources.
- */
-
-/**
- * An i18n source is a map of locales to sources.
- *
- * Its selector will default to the underlying source. It is possible to call `.all` on i18n sources, which returns an object with all the locales
- *
- */
-
-function i18n(
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-locales) {
-  return function (source) {
-    return expr_dist_valbuildCoreExpr._objectSpread2(expr_dist_valbuildCoreExpr._objectSpread2({}, source), {}, expr_dist_valbuildCoreExpr._defineProperty({}, expr_dist_valbuildCoreExpr.VAL_EXTENSION, "i18n"));
-  };
-}
-
-var NumberSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(NumberSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(NumberSchema);
-  function NumberSchema(options) {
-    var _this;
-    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    createClass._classCallCheck(this, NumberSchema);
-    _this = _super.call(this);
-    _this.options = options;
-    _this.opt = opt;
-    return _this;
-  }
-  createClass._createClass(NumberSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
+      return false;
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       if (this.opt && (src === null || src === undefined)) {
         return true;
       }
@@ -536,31 +57,40 @@ var NumberSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
   return NumberSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
+}(index.Schema);
 var number = function number(options) {
   return new NumberSchema(options);
 };
 
 var StringSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(StringSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(StringSchema);
+  index._inherits(StringSchema, _Schema);
+  var _super = index._createSuper(StringSchema);
   function StringSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    createClass._classCallCheck(this, StringSchema);
+    index._classCallCheck(this, StringSchema);
     _this = _super.call(this);
     _this.options = options;
     _this.opt = opt;
     return _this;
   }
-  createClass._createClass(StringSchema, [{
+  index._createClass(StringSchema, [{
     key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (typeof src !== "string") {
+        return index._defineProperty({}, path, [{
+          message: "Expected 'string', got '".concat(index._typeof(src), "'"),
+          value: src
+        }]);
+      }
+      return false;
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       if (this.opt && (src === null || src === undefined)) {
         return true;
       }
@@ -582,30 +112,39 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
   return StringSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
+}(index.Schema);
 var string = function string(options) {
   return new StringSchema(options);
 };
 
 var BooleanSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(BooleanSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(BooleanSchema);
+  index._inherits(BooleanSchema, _Schema);
+  var _super = index._createSuper(BooleanSchema);
   function BooleanSchema() {
     var _this;
     var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    createClass._classCallCheck(this, BooleanSchema);
+    index._classCallCheck(this, BooleanSchema);
     _this = _super.call(this);
     _this.opt = opt;
     return _this;
   }
-  createClass._createClass(BooleanSchema, [{
+  index._createClass(BooleanSchema, [{
     key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (typeof src !== "boolean") {
+        return index._defineProperty({}, path, [{
+          message: "Expected 'boolean', got '".concat(index._typeof(src), "'"),
+          value: src
+        }]);
+      }
+      return false;
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       if (this.opt && (src === null || src === undefined)) {
         return true;
       }
@@ -626,31 +165,46 @@ var BooleanSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
   return BooleanSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
+}(index.Schema);
 var _boolean = function _boolean() {
   return new BooleanSchema();
 };
 
 var LiteralSchema = /*#__PURE__*/function (_Schema) {
-  expr_dist_valbuildCoreExpr._inherits(LiteralSchema, _Schema);
-  var _super = expr_dist_valbuildCoreExpr._createSuper(LiteralSchema);
+  index._inherits(LiteralSchema, _Schema);
+  var _super = index._createSuper(LiteralSchema);
   function LiteralSchema(value) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    createClass._classCallCheck(this, LiteralSchema);
+    index._classCallCheck(this, LiteralSchema);
     _this = _super.call(this);
     _this.value = value;
     _this.opt = opt;
     return _this;
   }
-  createClass._createClass(LiteralSchema, [{
+  index._createClass(LiteralSchema, [{
     key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (typeof src !== "string") {
+        return index._defineProperty({}, path, [{
+          message: "Expected 'string', got '".concat(index._typeof(src), "'"),
+          value: src
+        }]);
+      }
+      if (src !== this.value) {
+        return index._defineProperty({}, path, [{
+          message: "Expected literal '".concat(this.value, "', got '").concat(src, "'"),
+          value: src
+        }]);
+      }
+      return false;
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       if (this.opt && (src === null || src === undefined)) {
         return true;
       }
@@ -672,51 +226,38 @@ var LiteralSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
   return LiteralSchema;
-}(expr_dist_valbuildCoreExpr.Schema);
+}(index.Schema);
 var literal = function literal(value) {
   return new LiteralSchema(value);
 };
 
-function initSchema(locales) {
+// import type { F } from "ts-toolbelt";
+// import { i18n, I18n } from "./schema/future/i18n";
+// import { oneOf } from "./schema/future/oneOf";
+// export type InitSchemaLocalized<Locales extends readonly string[]> = {
+//   readonly i18n: I18n<Locales>;
+// };
+function initSchema() {
+  // locales: F.Narrow<Locales>
   return {
     string: string,
     "boolean": _boolean,
-    array: array,
-    object: object,
+    array: ops.array,
+    object: ops.object,
     number: number,
-    union: union,
-    oneOf: oneOf,
-    richtext: richtext$1,
-    image: expr_dist_valbuildCoreExpr.image,
-    literal: literal,
-    i18n: i18n$1(locales)
+    union: ops.union,
+    // oneOf,
+    richtext: ops.richtext,
+    image: index.image,
+    literal: literal
+    // i18n: i18n(locales),
   };
 }
 
-/**
- * Remote sources cannot include other remote sources.
- */
-
-var REMOTE_REF_PROP = "_ref"; // TODO: same as FILE_REF_PROP so use same prop?
-
-/**
- * A remote source is a hash that represents a remote object.
- *
- * It will be resolved into a ValRemote object.
- */
-
-function remote(ref) {
-  var _ref;
-  return _ref = {}, expr_dist_valbuildCoreExpr._defineProperty(_ref, REMOTE_REF_PROP, ref), expr_dist_valbuildCoreExpr._defineProperty(_ref, expr_dist_valbuildCoreExpr.VAL_EXTENSION, "remote"), _ref;
-}
-function isRemote(obj) {
-  return createClass._typeof(obj) === "object" && obj !== null && expr_dist_valbuildCoreExpr.VAL_EXTENSION in obj && obj[expr_dist_valbuildCoreExpr.VAL_EXTENSION] === "remote" && REMOTE_REF_PROP in obj && typeof obj[REMOTE_REF_PROP] === "string";
-}
-
 function richtext(data) {
   if (typeof data === "string") {
     var _ref;
-    return _ref = {}, expr_dist_valbuildCoreExpr._defineProperty(_ref, expr_dist_valbuildCoreExpr.VAL_EXTENSION, "richtext"), expr_dist_valbuildCoreExpr._defineProperty(_ref, "type", "root"), expr_dist_valbuildCoreExpr._defineProperty(_ref, "children", [{
+    return _ref = {}, index._defineProperty(_ref, index.VAL_EXTENSION, "richtext"), index._defineProperty(_ref, "type", "root"), index._defineProperty(_ref, "children", [{
       type: "paragraph",
       children: [{
         type: "text",
@@ -724,43 +265,58 @@ function richtext(data) {
       }]
     }]), _ref;
   }
-  return expr_dist_valbuildCoreExpr._objectSpread2(expr_dist_valbuildCoreExpr._objectSpread2({}, data), {}, expr_dist_valbuildCoreExpr._defineProperty({}, expr_dist_valbuildCoreExpr.VAL_EXTENSION, "richtext"));
+  return index._objectSpread2(index._objectSpread2({}, data), {}, index._defineProperty({}, index.VAL_EXTENSION, "richtext"));
 }
 
-var initVal = function initVal(options) {
-  var locales = options === null || options === void 0 ? void 0 : options.locales;
-  var s = initSchema(locales === null || locales === void 0 ? void 0 : locales.required);
-  if (locales !== null && locales !== void 0 && locales.required) {
-    console.error("Locales / i18n currently not implemented");
-    return {
-      val: {
-        content: content,
-        i18n: i18n,
-        remote: remote,
-        getPath: expr_dist_valbuildCoreExpr.getValPath,
-        file: expr_dist_valbuildCoreExpr.file,
-        richtext: richtext
-      },
-      s: s
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    };
-  }
-
+// import { i18n, I18n } from "./source/future/i18n";
+// import { remote } from "./source/future/remote";
+// type NarrowStrings<A> =
+//   | (A extends [] ? [] : never)
+//   | (A extends string ? A : never)
+//   | {
+//       [K in keyof A]: NarrowStrings<A[K]>;
+//     };
+// TODO: Rename to createValSystem (only to be used by internal things), we can then export * from '@valbuild/core' in the next package then.
+var initVal = function initVal() {
+  // const locales = options?.locales;
+  var s = initSchema();
+  // if (locales?.required) {
+  //   console.error("Locales / i18n currently not implemented");
+  //   return {
+  //     val: {
+  //       content,
+  //       i18n,
+  //       remote,
+  //       getPath,
+  //       file,
+  //       richtext,
+  //     },
+  //     s,
+  //     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  //   } as any;
+  // }
   return {
     val: {
-      content: content,
-      remote: remote,
-      getPath: expr_dist_valbuildCoreExpr.getValPath,
-      file: expr_dist_valbuildCoreExpr.file,
+      content: ops.content,
+      // remote,
+      getPath: index.getValPath,
+      file: index.file,
       richtext: richtext
     },
-    s: expr_dist_valbuildCoreExpr._objectSpread2(expr_dist_valbuildCoreExpr._objectSpread2({}, s), {}, {
-      i18n: undefined
-    })
+    s: index._objectSpread2({}, s)
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   };
 };
 
+/**
+ * Remote sources cannot include other remote sources.
+ */
+
+var REMOTE_REF_PROP = "_ref"; // TODO: same as FILE_REF_PROP so use same prop?
+function isRemote(obj) {
+  return index._typeof(obj) === "object" && obj !== null && index.VAL_EXTENSION in obj && obj[index.VAL_EXTENSION] === "remote" && REMOTE_REF_PROP in obj && typeof obj[REMOTE_REF_PROP] === "string";
+}
+
 function derefPath(path) {
   var dereffedPath = [];
   var referencedPath = null;
@@ -814,21 +370,21 @@ function derefPatch(patch, document, ops$1) {
         if (result.isErr(maybeDerefRes)) {
           return maybeDerefRes;
         }
-        var _maybeDerefRes$value = createClass._slicedToArray(maybeDerefRes.value, 2),
+        var _maybeDerefRes$value = index._slicedToArray(maybeDerefRes.value, 2),
           dereffedPath = _maybeDerefRes$value[0],
           referencedPath = _maybeDerefRes$value[1];
         if (referencedPath) {
           var maybeValue = ops$1.get(document, dereffedPath);
           if (result.isOk(maybeValue)) {
             var value = maybeValue.value;
-            if (expr_dist_valbuildCoreExpr.isFile(value)) {
+            if (index.isFile(value)) {
               if (referencedPath.length > 0) {
                 return result.err(new ops.PatchError("Cannot sub-reference file reference at path: ".concat(dereffedPath.join("/"))));
               }
               if (typeof op.value !== "string") {
                 return result.err(new ops.PatchError("Expected base64 encoded string value for file reference, got ".concat(JSON.stringify(op.value))));
               }
-              fileUpdates[value[expr_dist_valbuildCoreExpr.FILE_REF_PROP]] = op.value;
+              fileUpdates[value[index.FILE_REF_PROP]] = op.value;
             } else if (isRemote(value)) {
               if (!remotePatches[value[REMOTE_REF_PROP]]) {
                 remotePatches[value[REMOTE_REF_PROP]] = [];
@@ -852,7 +408,7 @@ function derefPatch(patch, document, ops$1) {
         if (result.isErr(_maybeDerefRes)) {
           return _maybeDerefRes;
         }
-        var _maybeDerefRes$value2 = createClass._slicedToArray(_maybeDerefRes.value, 2),
+        var _maybeDerefRes$value2 = index._slicedToArray(_maybeDerefRes.value, 2),
           _referencedPath = _maybeDerefRes$value2[1];
         if (_referencedPath) {
           throw new Error("Unimplemented operation: ".concat(JSON.stringify(op)));
@@ -872,63 +428,58 @@ function derefPatch(patch, document, ops$1) {
   });
 }
 
-function fetchVal(selector, locale) {
-  return Promise.resolve(getVal(selector));
-}
-function getVal(selector,
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-locale) {
+function getVal(selector) {
   return newValProxy(serializedValOfSelectorSource(selector));
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isArrayOrArraySelector(child) {
-  if (expr_dist_valbuildCoreExpr.isSelector(child)) {
-    return createClass._typeof(child[expr_dist_valbuildCoreExpr.SourceOrExpr]) === "object" && createClass._typeof(child[expr_dist_valbuildCoreExpr.SourceOrExpr]) !== null && Array.isArray(child[expr_dist_valbuildCoreExpr.SourceOrExpr]);
+  if (ops.isSelector(child)) {
+    return index._typeof(child[index.GetSource]) === "object" && index._typeof(child[index.GetSource]) !== null && Array.isArray(child[index.GetSource]);
   }
   return Array.isArray(child);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isObjectOrObjectSelector(child) {
-  if (expr_dist_valbuildCoreExpr.isSelector(child)) {
-    return createClass._typeof(child[expr_dist_valbuildCoreExpr.SourceOrExpr]) === "object" && createClass._typeof(child[expr_dist_valbuildCoreExpr.SourceOrExpr]) !== null && !Array.isArray(child[expr_dist_valbuildCoreExpr.SourceOrExpr]);
+  if (ops.isSelector(child)) {
+    return index._typeof(child[index.GetSource]) === "object" && index._typeof(child[index.GetSource]) !== null && !Array.isArray(child[index.GetSource]);
   }
-  return createClass._typeof(child) === "object";
+  return index._typeof(child) === "object";
 }
 function serializedValOfSelectorSource(selector) {
-  var wrappedSelector = expr_dist_valbuildCoreExpr.newSelectorProxy(selector); // NOTE: we do this if call-site uses a literal with selectors inside
+  var wrappedSelector = ops.newSelectorProxy(selector); // NOTE: we do this if call-site uses a literal with selectors inside
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function rec(child) {
     var isArray = isArrayOrArraySelector(child);
     var isObject = isObjectOrObjectSelector(child);
     if (isArray) {
-      var array = expr_dist_valbuildCoreExpr.SourceOrExpr in child ? child[expr_dist_valbuildCoreExpr.SourceOrExpr] : child;
-      var valPath = expr_dist_valbuildCoreExpr.Path in child ? child[expr_dist_valbuildCoreExpr.Path] : undefined;
+      var array = index.GetSource in child ? child[index.GetSource] : child;
+      var valPath = index.Path in child ? child[index.Path] : undefined;
       return {
         val: array.map(function (item, i) {
-          return rec(expr_dist_valbuildCoreExpr.isSelector(item) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
-          ? item : expr_dist_valbuildCoreExpr.newSelectorProxy(item, expr_dist_valbuildCoreExpr.createValPathOfItem(valPath, i)));
+          return rec(ops.isSelector(item) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
+          ? item : ops.newSelectorProxy(item, ops.createValPathOfItem(valPath, i)));
         }),
         valPath: valPath
       };
     } else if (isObject) {
-      var obj = expr_dist_valbuildCoreExpr.SourceOrExpr in child ? child[expr_dist_valbuildCoreExpr.SourceOrExpr] : child;
-      var _valPath = expr_dist_valbuildCoreExpr.Path in child ? child[expr_dist_valbuildCoreExpr.Path] : undefined;
+      var obj = index.GetSource in child ? child[index.GetSource] : child;
+      var _valPath = index.Path in child ? child[index.Path] : undefined;
       return {
         val: obj !== null && Object.fromEntries(Object.entries(obj).map(function (_ref) {
-          var _ref2 = createClass._slicedToArray(_ref, 2),
+          var _ref2 = index._slicedToArray(_ref, 2),
             key = _ref2[0],
             value = _ref2[1];
-          return [key, rec(expr_dist_valbuildCoreExpr.isSelector(value) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
-          ? value : expr_dist_valbuildCoreExpr.newSelectorProxy(value, expr_dist_valbuildCoreExpr.createValPathOfItem(_valPath, key)))];
+          return [key, rec(ops.isSelector(value) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
+          ? value : ops.newSelectorProxy(value, ops.createValPathOfItem(_valPath, key)))];
         })),
         valPath: _valPath
       };
-    } else if (expr_dist_valbuildCoreExpr.isSelector(child)) {
+    } else if (ops.isSelector(child)) {
       return {
-        val: rec(child[expr_dist_valbuildCoreExpr.SourceOrExpr]),
-        valPath: child[expr_dist_valbuildCoreExpr.Path]
+        val: rec(child[index.GetSource]),
+        valPath: child[index.Path]
       };
     } else {
       return child;
@@ -937,11 +488,11 @@ function serializedValOfSelectorSource(selector) {
   return rec(wrappedSelector);
 }
 function strip(value) {
-  var val = expr_dist_valbuildCoreExpr.isSerializedVal(value) ? value.val : value;
-  switch (createClass._typeof(val)) {
+  var val = index.isSerializedVal(value) ? value.val : value;
+  switch (index._typeof(val)) {
     case "function":
     case "symbol":
-      throw Error("Invalid val type: ".concat(createClass._typeof(val)));
+      throw Error("Invalid val type: ".concat(index._typeof(val)));
     case "object":
       if (val === null) {
         return null;
@@ -949,7 +500,7 @@ function strip(value) {
         return val.map(strip);
       } else {
         return Object.fromEntries(Object.entries(val).map(function (_ref3) {
-          var _ref4 = createClass._slicedToArray(_ref3, 2),
+          var _ref4 = index._slicedToArray(_ref3, 2),
             key = _ref4[0],
             value = _ref4[1];
           return [key, value && strip(value)];
@@ -964,10 +515,10 @@ function strip(value) {
 function newValProxy(val) {
   var _ref5;
   var source = val.val;
-  switch (createClass._typeof(source)) {
+  switch (index._typeof(source)) {
     case "function":
     case "symbol":
-      throw Error("Invalid val type: ".concat(createClass._typeof(source)));
+      throw Error("Invalid val type: ".concat(index._typeof(source)));
     case "object":
       if (source !== null) {
         // Handles both objects and arrays!
@@ -976,13 +527,13 @@ function newValProxy(val) {
             if (prop === "val") {
               return true;
             }
-            if (prop === expr_dist_valbuildCoreExpr.Path) {
+            if (prop === index.Path) {
               return true;
             }
             return hasOwn(target, prop);
           },
           get: function get(target, prop) {
-            if (prop === expr_dist_valbuildCoreExpr.Path) {
+            if (prop === index.Path) {
               return val.valPath;
             }
             if (prop === "val") {
@@ -995,7 +546,7 @@ function newValProxy(val) {
               var _Reflect$get$valPath, _Reflect$get;
               return newValProxy({
                 val: Reflect.get(target, prop).val,
-                valPath: (_Reflect$get$valPath = (_Reflect$get = Reflect.get(target, prop)) === null || _Reflect$get === void 0 ? void 0 : _Reflect$get.valPath) !== null && _Reflect$get$valPath !== void 0 ? _Reflect$get$valPath : expr_dist_valbuildCoreExpr.createValPathOfItem(val.valPath, Array.isArray(target) ? Number(prop) : prop)
+                valPath: (_Reflect$get$valPath = (_Reflect$get = Reflect.get(target, prop)) === null || _Reflect$get === void 0 ? void 0 : _Reflect$get.valPath) !== null && _Reflect$get$valPath !== void 0 ? _Reflect$get$valPath : ops.createValPathOfItem(val.valPath, Array.isArray(target) ? Number(prop) : prop)
               });
             }
             return Reflect.get(target, prop);
@@ -1005,30 +556,486 @@ function newValProxy(val) {
     // intentional fallthrough
     // eslint-disable-next-line no-fallthrough
     default:
-      return _ref5 = {}, expr_dist_valbuildCoreExpr._defineProperty(_ref5, expr_dist_valbuildCoreExpr.Path, val.valPath), expr_dist_valbuildCoreExpr._defineProperty(_ref5, "val", val.val), _ref5;
+      return _ref5 = {}, index._defineProperty(_ref5, index.Path, val.valPath), index._defineProperty(_ref5, "val", val.val), _ref5;
   }
 }
 function hasOwn(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
+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);
+    });
+  };
+}
+
+// TODO: move this to internal, only reason this is here is that react, ui and server all depend on it
+var ValApi = /*#__PURE__*/function () {
+  function ValApi(host) {
+    index._classCallCheck(this, ValApi);
+    this.host = host;
+  }
+  index._createClass(ValApi, [{
+    key: "getDisableUrl",
+    value: function getDisableUrl() {
+      return "".concat(this.host, "/disable");
+    }
+  }, {
+    key: "postPatches",
+    value: function postPatches(moduleId, patches, commit, headers) {
+      var params = "";
+      if (commit) {
+        var p = new URLSearchParams();
+        p.set("commit", commit);
+        params = "?".concat(p.toString());
+      }
+      return fetch("".concat(this.host, "/patches/~").concat(moduleId).concat(params), {
+        headers: headers || {
+          "Content-Type": "application/json"
+        },
+        method: "POST",
+        body: JSON.stringify(patches)
+      }).then(parse);
+    }
+  }, {
+    key: "getSession",
+    value: function getSession() {
+      return fetch("".concat(this.host, "/session")).then(parse);
+    }
+  }, {
+    key: "getModules",
+    value: function getModules(_ref) {
+      var _ref$patch = _ref.patch,
+        patch = _ref$patch === void 0 ? false : _ref$patch,
+        _ref$includeSchema = _ref.includeSchema,
+        includeSchema = _ref$includeSchema === void 0 ? false : _ref$includeSchema,
+        _ref$includeSource = _ref.includeSource,
+        includeSource = _ref$includeSource === void 0 ? false : _ref$includeSource,
+        _ref$treePath = _ref.treePath,
+        treePath = _ref$treePath === void 0 ? "/" : _ref$treePath,
+        headers = _ref.headers;
+      var params = new URLSearchParams();
+      params.set("patch", patch.toString());
+      params.set("schema", includeSchema.toString());
+      params.set("source", includeSource.toString());
+      return fetch("".concat(this.host, "/tree/~").concat(treePath, "?").concat(params.toString()), {
+        headers: headers
+      }).then(parse);
+    }
+  }]);
+  return ValApi;
+}();
+
+// TODO: validate
+function parse(_x) {
+  return _parse.apply(this, arguments);
+}
+function _parse() {
+  _parse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          if (!res.ok) {
+            _context.next = 9;
+            break;
+          }
+          _context.t0 = result.result;
+          _context.next = 5;
+          return res.json();
+        case 5:
+          _context.t1 = _context.sent;
+          return _context.abrupt("return", _context.t0.ok.call(_context.t0, _context.t1));
+        case 9:
+          _context.t2 = result.result;
+          _context.t3 = res.status;
+          _context.next = 13;
+          return res.text();
+        case 13:
+          _context.t4 = _context.sent;
+          _context.t5 = {
+            statusCode: _context.t3,
+            message: _context.t4
+          };
+          return _context.abrupt("return", _context.t2.err.call(_context.t2, _context.t5));
+        case 16:
+          _context.next = 21;
+          break;
+        case 18:
+          _context.prev = 18;
+          _context.t6 = _context["catch"](0);
+          return _context.abrupt("return", result.err({
+            message: _context.t6 instanceof Error ? _context.t6.message : "Unknown error"
+          }));
+        case 21:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 18]]);
+  }));
+  return _parse.apply(this, arguments);
+}
+
 var Internal = {
-  convertImageSource: expr_dist_valbuildCoreExpr.convertImageSource,
-  getSchema: expr_dist_valbuildCoreExpr.getSchema,
-  getValPath: expr_dist_valbuildCoreExpr.getValPath,
+  convertFileSource: index.convertFileSource,
+  getSchema: index.getSchema,
+  getValPath: index.getValPath,
   getVal: getVal,
-  getRawSource: getRawSource,
-  resolvePath: resolvePath,
-  splitModuleIdAndModulePath: splitModuleIdAndModulePath,
-  fetchVal: fetchVal,
-  isVal: expr_dist_valbuildCoreExpr.isVal
+  getSource: ops.getSource,
+  resolvePath: ops.resolvePath,
+  splitModuleIdAndModulePath: ops.splitModuleIdAndModulePath,
+  isVal: index.isVal,
+  createValPathOfItem: ops.createValPathOfItem,
+  createPatchJSONPath: function createPatchJSONPath(modulePath) {
+    return "/".concat(modulePath.split(".").map(function (segment) {
+      return JSON.parse(segment);
+    }).join("/"));
+  },
+  /**
+   * Enables draft mode: updates all Val modules with patches
+   */
+  VAL_DRAFT_MODE_COOKIE: "val_draft_mode",
+  /**
+   * Enables Val: show the overlay / menu
+   */
+  VAL_ENABLE_COOKIE_NAME: "val_enable",
+  VAL_STATE_COOKIE: "val_state",
+  VAL_SESSION_COOKIE: "val_session"
 };
 
-exports.FILE_REF_PROP = expr_dist_valbuildCoreExpr.FILE_REF_PROP;
-exports.GenericSelector = expr_dist_valbuildCoreExpr.GenericSelector;
-exports.Schema = expr_dist_valbuildCoreExpr.Schema;
-exports.VAL_EXTENSION = expr_dist_valbuildCoreExpr.VAL_EXTENSION;
+exports.FILE_REF_PROP = index.FILE_REF_PROP;
+exports.GenericSelector = index.GenericSelector;
+exports.Schema = index.Schema;
+exports.VAL_EXTENSION = index.VAL_EXTENSION;
 exports.expr = expr_dist_valbuildCoreExpr.index;
 exports.Internal = Internal;
+exports.ValApi = ValApi;
 exports.derefPatch = derefPatch;
 exports.initVal = initVal;