@valbuild/core 0.72.4 → 0.73.1

package/dist/{index-a49a4c82.cjs.dev.js → index-f6fd3df3.cjs.dev.js}

@@ -229,12 +229,12 @@ var Schema = /*#__PURE__*/function () {
 /**
  * @internal
  */
-var GetSchema$1 = Symbol("GetSchema");
+var GetSchema = Symbol("GetSchema");
 /**
 /**
  * @internal
  */
-var Path$1 = Symbol("Path");
+var Path = Symbol("Path");
 /**
  * @internal
  */
@@ -245,10 +245,10 @@ var GetSource = Symbol("GetSource");
 var ValError = Symbol("ValError");
 var GenericSelector = /*#__PURE__*/_createClass(function GenericSelector(valOrExpr, path, schema, error) {
   _classCallCheck(this, GenericSelector);
-  this[Path$1] = path;
+  this[Path] = path;
   this[GetSource] = valOrExpr;
   this[ValError] = error;
-  this[GetSchema$1] = schema;
+  this[GetSchema] = schema;
 });
 
 /**
@@ -258,99 +258,9 @@ var GenericSelector = /*#__PURE__*/_createClass(function GenericSelector(valOrEx
  **/
 
 function getSchema(selector) {
-  return selector[GetSchema$1];
+  return selector[GetSchema];
 }
 
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-var Expr = /*#__PURE__*/_createClass(function Expr(span) {
-  _classCallCheck(this, Expr);
-  this.span = span;
-});
-var StringLiteral = /*#__PURE__*/function (_Expr) {
-  function StringLiteral(value, span) {
-    var _this;
-    _classCallCheck(this, StringLiteral);
-    _this = _callSuper(this, StringLiteral, [span]);
-    _defineProperty(_this, "type", "StringLiteral");
-    _this.value = value;
-    return _this;
-  }
-  _inherits(StringLiteral, _Expr);
-  return _createClass(StringLiteral, [{
-    key: "transpile",
-    value: function transpile() {
-      return "'".concat(this.value, "'");
-    }
-  }]);
-}(Expr);
-var Sym = /*#__PURE__*/function (_Expr2) {
-  function Sym(value, span) {
-    var _this2;
-    _classCallCheck(this, Sym);
-    _this2 = _callSuper(this, Sym, [span]);
-    _defineProperty(_this2, "type", "Sym");
-    _this2.value = value;
-    return _this2;
-  }
-  _inherits(Sym, _Expr2);
-  return _createClass(Sym, [{
-    key: "transpile",
-    value: function transpile() {
-      return this.value;
-    }
-  }]);
-}(Expr);
-var NilSym = new Sym("()");
-var StringTemplate = /*#__PURE__*/function (_Expr3) {
-  function StringTemplate(children, span) {
-    var _this3;
-    _classCallCheck(this, StringTemplate);
-    _this3 = _callSuper(this, StringTemplate, [span]);
-    _defineProperty(_this3, "type", "StringTemplate");
-    _this3.children = children;
-    return _this3;
-  }
-  _inherits(StringTemplate, _Expr3);
-  return _createClass(StringTemplate, [{
-    key: "transpile",
-    value: function transpile() {
-      return "'".concat(this.children.map(function (child) {
-        if (child instanceof StringLiteral) {
-          return child.value;
-        } else {
-          return "${".concat(child.transpile(), "}");
-        }
-      }).join(""), "'");
-    }
-  }]);
-}(Expr);
-var Call = /*#__PURE__*/function (_Expr4) {
-  function Call(children, isAnon, span) {
-    var _this4;
-    _classCallCheck(this, Call);
-    _this4 = _callSuper(this, Call, [span]);
-    _defineProperty(_this4, "type", "Call");
-    _this4.children = children;
-    _this4.isAnon = isAnon;
-    return _this4;
-  }
-  _inherits(Call, _Expr4);
-  return _createClass(Call, [{
-    key: "transpile",
-    value: function transpile() {
-      if (this.isAnon) {
-        return "!(".concat(this.children.map(function (child) {
-          return child.transpile();
-        }).join(" "), ")");
-      }
-      return "(".concat(this.children.map(function (child) {
-        return child.transpile();
-      }).join(" "), ")");
-    }
-  }]);
-}(Expr);
-
 /* Branded extension types: file, remote, i18n  */
 var VAL_EXTENSION = "_type";
 
@@ -421,14 +331,21 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
   function FileSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var isRemote = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     _classCallCheck(this, FileSchema);
     _this = _callSuper(this, FileSchema);
     _this.options = options;
     _this.opt = opt;
+    _this.isRemote = isRemote;
     return _this;
   }
   _inherits(FileSchema, _Schema);
   return _createClass(FileSchema, [{
+    key: "remote",
+    value: function remote() {
+      return new FileSchema(this.options, this.opt, true);
+    }
+  }, {
     key: "validate",
     value: function validate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
@@ -446,6 +363,27 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
           value: src
         }]);
       }
+      if (this.isRemote && src[VAL_EXTENSION] !== "remote") {
+        return _defineProperty({}, path, [{
+          message: "Expected a remote file, but got a local file.",
+          value: src,
+          fixes: ["file:upload-remote"]
+        }]);
+      }
+      if (this.isRemote && src[VAL_EXTENSION] === "remote") {
+        return _defineProperty({}, path, [{
+          message: "Remote file was not checked.",
+          value: src,
+          fixes: ["file:check-remote"]
+        }]);
+      }
+      if (!this.isRemote && src[VAL_EXTENSION] === "remote") {
+        return _defineProperty({}, path, [{
+          message: "Expected locale file, but found remote.",
+          value: src,
+          fixes: ["file:download-remote"]
+        }]);
+      }
       if (src[VAL_EXTENSION] !== "file") {
         return _defineProperty({}, path, [{
           message: "File did not have the valid file extension type. Got: ".concat(src[VAL_EXTENSION]),
@@ -453,10 +391,10 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
           fixes: ["file:change-extension", "file:check-metadata"]
         }]);
       }
-      var _ref4 = this.options || {},
-        accept = _ref4.accept;
-      var _ref5 = src.metadata || {},
-        mimeType = _ref5.mimeType;
+      var _ref7 = this.options || {},
+        accept = _ref7.accept;
+      var _ref8 = src.metadata || {},
+        mimeType = _ref8.mimeType;
       if (accept && mimeType && !mimeType.includes("/")) {
         return _defineProperty({}, path, [{
           message: "Invalid mime type format. Got: ".concat(mimeType),
@@ -576,7 +514,8 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
       return {
         type: "file",
         options: this.options,
-        opt: this.opt
+        opt: this.opt,
+        remote: this.isRemote
       };
     }
   }]);
@@ -604,11 +543,8 @@ function convertFileSource(src) {
   };
 }
 
-function isSerializedVal(val) {
-  return _typeof(val) === "object" && val !== null && val !== undefined && ("val" in val || "valPath" in val);
-}
 function isVal(val) {
-  return _typeof(val) === "object" && val !== null && val !== undefined && Path$1 in val && "val" in val;
+  return _typeof(val) === "object" && val !== null && val !== undefined && Path in val && "val" in val;
 }
 
 /**
@@ -637,136 +573,9 @@ function isVal(val) {
  */
 
 function getValPath(valOrSelector) {
-  return valOrSelector[Path$1];
+  return valOrSelector[Path];
 }
 
-function hasOwn$2(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-function _andThen$1(f, source, path) {
-  if (source) {
-    return newSelectorProxy$1(f(newSelectorProxy$1(source, path)));
-  }
-  return newSelectorProxy$1(source, path);
-}
-function isSelector$1(source) {
-  return _typeof(source) === "object" && source !== null && (GetSource in source || Path$1 in source);
-}
-function newSelectorProxy$1(source, path, moduleSchema) {
-  if (_typeof(source) === "object") {
-    if (isSelector$1(source)) {
-      return source;
-    } else if (isSerializedVal(source)) {
-      return newSelectorProxy$1(source.val, source.valPath);
-    }
-  }
-  if (source && source[FILE_REF_PROP] && source[VAL_EXTENSION] === "file") {
-    var fileRef = source[FILE_REF_PROP];
-    if (typeof fileRef !== "string") {
-      throw Error("Invalid file ref: " + fileRef);
-    }
-    return newSelectorProxy$1(convertFileSource(source), path, moduleSchema);
-  }
-  switch (_typeof(source)) {
-    case "function":
-    case "symbol":
-      throw Error("Invalid selector type: ".concat(_typeof(source), ": ").concat(source));
-    case "object":
-      // Handles both objects and arrays!
-      if (source !== null) {
-        return new Proxy(source, {
-          // TODO: see proxy docs if we want more traps
-          has: function has(target, prop) {
-            if (prop === GetSource) {
-              return true;
-            }
-            if (prop === Path$1) {
-              return true;
-            }
-            if (prop === "andThen") {
-              return true;
-            }
-            if (prop === GetSchema$1) {
-              return true;
-            }
-            return prop in target;
-          },
-          get: function get(target, prop) {
-            if (prop === GetSource) {
-              return source;
-            }
-            if (prop === Path$1) {
-              return path;
-            }
-            if (prop === GetSchema$1) {
-              return moduleSchema;
-            }
-            if (prop === "andThen") {
-              return function (f) {
-                return _andThen$1(f, source, path);
-              };
-            }
-            if (Array.isArray(target)) {
-              if (prop === "filter") {
-                return function (f) {
-                  var filtered = target.map(function (a, i) {
-                    return newSelectorProxy$1(a, createValPathOfItem(path, i), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item);
-                  }).filter(function (a) {
-                    if (f && f instanceof Schema) {
-                      return f.assert(path || "", unValify$1(a)).success;
-                    } else {
-                      return unValify$1(f(a));
-                    }
-                  });
-                  return newSelectorProxy$1(filtered, path, moduleSchema);
-                };
-              } else if (prop === "map") {
-                return function (f) {
-                  var filtered = target.map(function (a, i) {
-                    var valueOrSelector = f(newSelectorProxy$1(a, createValPathOfItem(path, i), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item), newSelectorProxy$1(i));
-                    if (isSelector$1(valueOrSelector)) {
-                      return valueOrSelector;
-                    }
-                    return newSelectorProxy$1(valueOrSelector);
-                  });
-                  return newSelectorProxy$1(filtered, path, moduleSchema);
-                };
-              }
-            }
-            if (Array.isArray(target) && prop === "length") {
-              return newSelectorProxy$1(target.length);
-            }
-            var reflectedValue = Reflect.get(target, prop);
-            if (hasOwn$2(source, prop)) {
-              if (!Number.isNaN(Number(prop))) {
-                return newSelectorProxy$1(reflectedValue, createValPathOfItem(path, Number(prop)), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item);
-              }
-              return newSelectorProxy$1(reflectedValue, createValPathOfItem(path, prop), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.items[prop]);
-            }
-            return reflectedValue;
-          }
-        });
-      }
-    // intentional fallthrough
-    // eslint-disable-next-line no-fallthrough
-    default:
-      return _defineProperty(_defineProperty(_defineProperty({
-        eq: function eq(other) {
-          var otherValue = other;
-          if (isSelector$1(other)) {
-            otherValue = other[GetSource];
-            if (otherValue instanceof Expr) {
-              throw Error("TODO: Cannot evaluate equality with an Expr");
-            }
-          }
-          return newSelectorProxy$1(source === otherValue, undefined);
-        },
-        andThen: function andThen(f) {
-          return _andThen$1(f, source === undefined ? null : source, path);
-        }
-      }, GetSource, source === undefined ? null : source), Path$1, path), GetSchema$1, moduleSchema);
-  }
-}
 function createValPathOfItem(arrayPath, prop) {
   if (_typeof(prop) === "symbol") {
     throw Error("Cannot create val path of array item with symbol prop: ".concat(prop.toString()));
@@ -794,15 +603,6 @@ function unsafeCreateSourcePath(path, itemKey) {
   return "".concat(path).concat(Internal.ModuleFilePathSep).concat(JSON.stringify(itemKey));
 }
 
-// TODO: could we do .val on the objects instead?
-function unValify$1(valueOrSelector) {
-  if (_typeof(valueOrSelector) === "object" && (GetSource in valueOrSelector || Path$1 in valueOrSelector)) {
-    var selectorValue = valueOrSelector[GetSource];
-    return selectorValue;
-  }
-  return valueOrSelector;
-}
-
 var ObjectSchema = /*#__PURE__*/function (_Schema) {
   function ObjectSchema(items) {
     var _this;
@@ -946,634 +746,6 @@ var object = function object(schema) {
   return new ObjectSchema(schema);
 };
 
-var WHITE_SPACE = ["\n", "\r", "\t", " "];
-function tokenize(input) {
-  var tokens = [];
-  var cursor = 0;
-  while (cursor < input.length) {
-    var _char = input[cursor];
-    var peek = input[cursor + 1];
-    // TODO: remove this not used any more
-    if (_char === "!" && peek === "(") {
-      tokens.push({
-        type: "!(",
-        span: [cursor, cursor + 1]
-      });
-      cursor += 2;
-    } else if (_char === "(") {
-      tokens.push({
-        type: "(",
-        span: [cursor, cursor]
-      });
-      cursor++;
-    } else if (_char === ")") {
-      tokens.push({
-        type: ")",
-        span: [cursor, cursor]
-      });
-      cursor++;
-    } else if (_char === "'" || _char === "}") {
-      var start = cursor;
-      var value = "";
-      var unescapedValue = "";
-      var escaped = false;
-      if (_char === "}") {
-        tokens.push({
-          type: "}",
-          span: [cursor, cursor]
-        });
-      } else if (_char === "'") {
-        tokens.push({
-          type: "'",
-          span: [cursor, cursor]
-        });
-      }
-      while (cursor < input.length) {
-        if (_char === "\\") {
-          escaped = !escaped;
-        } else {
-          escaped = false;
-        }
-        if (peek === "'" && !escaped) {
-          cursor += 2;
-          break;
-        } else if (_char === "$" && peek === "{") {
-          cursor += 2;
-          break;
-        }
-        cursor++;
-        _char = input[cursor];
-        peek = input[cursor + 1];
-        if (!(_char === "$" && peek === "{") && cursor < input.length) {
-          if (!(_char === "\\" && !escaped // counter-intuitive, but escape just became false if this was a backslash we want to escape
-          )) {
-            value += _char;
-          }
-          unescapedValue += _char;
-        }
-      }
-      var cursorOffset = peek === "'" && !escaped ? 2 : _char === "$" && peek === "{" ? 3 : 1;
-      if (value) {
-        tokens.push(_objectSpread2({
-          type: "string",
-          span: [start + 1, cursor - cursorOffset],
-          value: value
-        }, unescapedValue !== value && {
-          unescapedValue: unescapedValue
-        }));
-      }
-      if (peek === "'" && !escaped) {
-        tokens.push({
-          type: "'",
-          span: [cursor - 1, cursor - 1]
-        });
-      } else if (_char === "$" && peek === "{") {
-        tokens.push({
-          type: "${",
-          span: [cursor - cursorOffset + 1, cursor - 1]
-        });
-      }
-    } else if (WHITE_SPACE.includes(_char)) {
-      var _start = cursor;
-      while (WHITE_SPACE.includes(input[cursor]) && cursor < input.length) {
-        cursor++;
-      }
-      tokens.push({
-        type: "ws",
-        span: [_start, cursor - 1]
-      });
-    } else {
-      var _value = "";
-      var _start2 = cursor;
-      do {
-        _char = input[cursor];
-        peek = input[cursor + 1];
-        _value += _char;
-        cursor++;
-      } while (!WHITE_SPACE.includes(peek) && peek !== ")" && peek !== "'" && cursor < input.length);
-      tokens.push({
-        type: "token",
-        span: [_start2, cursor - 1],
-        value: _value
-      });
-    }
-  }
-  return [tokens, cursor];
-}
-
-var ParserError = /*#__PURE__*/_createClass(function ParserError(message, span) {
-  _classCallCheck(this, ParserError);
-  this.message = message;
-  this.span = span;
-});
-function parseTokens(inputTokens) {
-  var tokens = inputTokens.slice();
-  function slurpCall(first, isAnon) {
-    var _tokens$, _tokens$2, _tokens$3, _tokens$7, _tokens$8, _args$slice$0$span;
-    // peek
-    if (((_tokens$ = tokens[0]) === null || _tokens$ === void 0 ? void 0 : _tokens$.type) === "ws" && ((_tokens$2 = tokens[1]) === null || _tokens$2 === void 0 ? void 0 : _tokens$2.type) === ")" || ((_tokens$3 = tokens[0]) === null || _tokens$3 === void 0 ? void 0 : _tokens$3.type) === ")") {
-      slurpWs();
-      tokens.shift();
-      return result.ok(new Sym("()", [first.span[0], first.span[1] + 1]));
-    }
-    var args = [];
-    var completed = false;
-    while (!completed) {
-      var _res = slurp();
-      if (result.isOk(_res)) {
-        var _tokens$4, _tokens$5, _tokens$6;
-        args.push(_res.value);
-        completed = ((_tokens$4 = tokens[0]) === null || _tokens$4 === void 0 ? void 0 : _tokens$4.type) !== "ws" || ((_tokens$5 = tokens[0]) === null || _tokens$5 === void 0 ? void 0 : _tokens$5.type) === "ws" && ((_tokens$6 = tokens[1]) === null || _tokens$6 === void 0 ? void 0 : _tokens$6.type) === ")";
-      } else {
-        return _res;
-      }
-    }
-    if (((_tokens$7 = tokens[0]) === null || _tokens$7 === void 0 ? void 0 : _tokens$7.type) === "ws" && ((_tokens$8 = tokens[1]) === null || _tokens$8 === void 0 ? void 0 : _tokens$8.type) === ")") {
-      tokens.shift();
-    }
-    var last = tokens.shift();
-    if ((last === null || last === void 0 ? void 0 : last.type) !== ")") {
-      return result.err(new ParserError("unbalanced parens: missing a ')'", [first.span[0], first.span[1] + 1]));
-    }
-    return result.ok(new Call(args, isAnon, [first.span[0], ((_args$slice$0$span = args.slice(-1)[0].span) === null || _args$slice$0$span === void 0 ? void 0 : _args$slice$0$span[1]) || -1]));
-  }
-  function slurpWs() {
-    while (((_tokens$9 = tokens[0]) === null || _tokens$9 === void 0 ? void 0 : _tokens$9.type) === "ws") {
-      var _tokens$9;
-      tokens.shift();
-    }
-  }
-  function slurpTemplate(first) {
-    var children = [];
-    while (tokens.length > 0) {
-      var _tokens$10;
-      if (((_tokens$10 = tokens[0]) === null || _tokens$10 === void 0 ? void 0 : _tokens$10.type) === "'") {
-        break;
-      }
-      var nextToken = tokens.shift();
-      if ((nextToken === null || nextToken === void 0 ? void 0 : nextToken.type) === "${") {
-        var _res2 = slurp();
-        if (result.isOk(_res2)) {
-          children.push(_res2.value);
-          var _last = tokens.shift();
-          if (!_last) {
-            var _children$slice$0$spa;
-            return result.err(new ParserError("unbalanced string template: missing a '}'", [first.span[0], (_children$slice$0$spa = children.slice(-1)[0].span) === null || _children$slice$0$spa === void 0 ? void 0 : _children$slice$0$spa[1]]));
-          } else if (_last.type !== "}") {
-            return result.err(new ParserError("unbalanced string template: expected '}'", _last.span));
-          }
-        } else {
-          return _res2;
-        }
-      } else if ((nextToken === null || nextToken === void 0 ? void 0 : nextToken.type) === "string") {
-        children.push(new StringLiteral(nextToken.unescapedValue || nextToken.value || "", nextToken.span));
-      }
-    }
-    var last = tokens.shift();
-    if (!last) {
-      var _children$slice$0$spa2;
-      return result.err(new ParserError("unbalanced string template: missing a '''", [first.span[0], (_children$slice$0$spa2 = children.slice(-1)[0].span) === null || _children$slice$0$spa2 === void 0 ? void 0 : _children$slice$0$spa2[1]]));
-    } else if (last.type !== "'") {
-      return result.err(new ParserError("unbalanced string template: expected '''", last.span));
-    }
-    return result.ok(new StringTemplate(children, [first.span[0], last.span[1]]));
-  }
-  function slurpString(first) {
-    var _tokens$11, _tokens$12, _tokens$13;
-    if (((_tokens$11 = tokens[0]) === null || _tokens$11 === void 0 ? void 0 : _tokens$11.type) === "string" && ((_tokens$12 = tokens[1]) === null || _tokens$12 === void 0 ? void 0 : _tokens$12.type) === "'") {
-      var stringToken = tokens.shift();
-      var last = tokens.shift();
-      if (!last || !stringToken) {
-        throw Error("Unexpected error: stringToken or last is undefined");
-      }
-      return result.ok(new StringLiteral(stringToken.unescapedValue || stringToken.value || "", [first.span[0], last.span[1]]));
-    } else if (((_tokens$13 = tokens[0]) === null || _tokens$13 === void 0 ? void 0 : _tokens$13.type) === "'") {
-      var _last2 = tokens.shift();
-      if (!_last2) {
-        throw Error("Unexpected error: last is undefined");
-      }
-      return result.ok(new StringLiteral("", [first.span[0], _last2.span[1]]));
-    } else {
-      return slurpTemplate(first);
-    }
-  }
-  function slurp() {
-    slurpWs();
-    var first = tokens.shift();
-    if (!first) {
-      return result.err(new ParserError("expected '(', '!(', string or literal", [0, 0]));
-    }
-    if (first.type === "(" || first.type === "!(") {
-      return slurpCall(first, first.type === "!(");
-    } else if (first.type === "'") {
-      return slurpString(first);
-    } else if (first.type === "token") {
-      var _first$value, _first$value2, _first$value3, _first$value4, _first$value5, _first$value6;
-      if ((_first$value = first.value) !== null && _first$value !== void 0 && _first$value.includes("(") || (_first$value2 = first.value) !== null && _first$value2 !== void 0 && _first$value2.includes(")")) {
-        return result.err(new ParserError("unexpected token: '(' and ')' are not allowed in tokens", first.span));
-      }
-      if ((_first$value3 = first.value) !== null && _first$value3 !== void 0 && _first$value3.includes("'")) {
-        return result.err(new ParserError('unexpected token: "\'" is not allowed in tokens', first.span));
-      }
-      if ((_first$value4 = first.value) !== null && _first$value4 !== void 0 && _first$value4.includes(".")) {
-        return result.err(new ParserError('unexpected token: "." is not allowed in tokens', first.span));
-      }
-      if ((_first$value5 = first.value) !== null && _first$value5 !== void 0 && _first$value5.includes("{") || (_first$value6 = first.value) !== null && _first$value6 !== void 0 && _first$value6.includes("}")) {
-        return result.err(new ParserError("unexpected token: '{' and '}' are not allowed in tokens", first.span));
-      }
-      return result.ok(new Sym(first.value || "", first.span));
-    } else {
-      return result.err(new ParserError("expected '(', '!(' or literal or token".concat(first.value || first.type ? ", got: '".concat(first.value || first.type, "'") : ""), first.span));
-    }
-  }
-  var res = slurp();
-  slurpWs();
-  if (result.isErr(res)) {
-    return res;
-  }
-  if (tokens.length > 0) {
-    return result.err(new ParserError("expected end of input, superfluous tokens", [tokens[0].span[0], tokens.slice(-1)[0].span[1]]));
-  }
-  return res;
-}
-function parse(input) {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  var _tokenize = tokenize(input),
-    _tokenize2 = _slicedToArray(_tokenize, 2),
-    tokens = _tokenize2[0];
-    _tokenize2[1]; // TODO: we can use cursor to improve error messages / spans
-  return parseTokens(tokens);
-}
-
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-/**
- * Selectors can be used to select parts of a Val module.
- * Unlike queries, joins, aggregates etc is and will not be supported.
- *
- * They are designed to be be used as if they were "normal" JSON data,
- * though some concessions had to be made because of TypeScript limitations.
- *
- * Selectors works equally on source content, defined in code, and remote content.
- *
- * @example
- * // Select the title of a document
- * const titles = useVal(docsVal.map((doc) => doc.title));
- *
- * @example
- * // Match on a union type
- * const titles = useVal(docsVal.map((doc) => doc.fold("type")({
- *   newsletter: (newsletter) => newsletter.title,
- *   email: (email) => email.subject,
- * }));
- *
- */
-
-/**
- * @internal
- */
-var GetSchema = Symbol("GetSchema");
-/**
-/**
- * @internal
- */
-var Path = Symbol("Path");
-/**
- * @internal
- */
-var SourceOrExpr = Symbol("SourceOrExpr");
-
-/**
- * Use this type to convert types that accepts both Source and Selectors
- *
- * An example would be where literals are supported like in most higher order functions (e.g. map in array)
- **/
-
-function hasOwn$1(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-function _andThen(f, source, path) {
-  if (source) {
-    return newSelectorProxy(f(newSelectorProxy(source, path)));
-  }
-  return newSelectorProxy(source, path);
-}
-function isSelector(source) {
-  return _typeof(source) === "object" && source !== null && (SourceOrExpr in source || Path in source);
-}
-function newSelectorProxy(source, path, moduleSchema) {
-  if (_typeof(source) === "object") {
-    if (isSelector(source)) {
-      return source;
-    } else if (isSerializedVal(source)) {
-      return newSelectorProxy(source.val, source.valPath);
-    }
-  }
-  if (source && source[FILE_REF_PROP] && source[VAL_EXTENSION] === "file") {
-    var fileRef = source[FILE_REF_PROP];
-    if (typeof fileRef !== "string") {
-      throw Error("Invalid file ref: " + fileRef);
-    }
-    return newSelectorProxy(convertFileSource(source), path, moduleSchema);
-  }
-  switch (_typeof(source)) {
-    case "function":
-    case "symbol":
-      throw Error("Invalid selector type: ".concat(_typeof(source), ": ").concat(source));
-    case "object":
-      // Handles both objects and arrays!
-      if (source !== null) {
-        return new Proxy(source, {
-          // TODO: see proxy docs if we want more traps
-          has: function has(target, prop) {
-            if (prop === SourceOrExpr) {
-              return true;
-            }
-            if (prop === Path) {
-              return true;
-            }
-            if (prop === "andThen") {
-              return true;
-            }
-            if (prop === GetSchema) {
-              return true;
-            }
-            return prop in target;
-          },
-          get: function get(target, prop) {
-            if (prop === SourceOrExpr) {
-              return source;
-            }
-            if (prop === Path) {
-              return path;
-            }
-            if (prop === GetSchema) {
-              return moduleSchema;
-            }
-            if (prop === "andThen") {
-              return function (f) {
-                return _andThen(f, source, path);
-              };
-            }
-            if (Array.isArray(target)) {
-              if (prop === "filter") {
-                return function (f) {
-                  var filtered = target.map(function (a, i) {
-                    return newSelectorProxy(a, createValPathOfItem(path, i), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item);
-                  }).filter(function (a) {
-                    if (f && f instanceof Schema) {
-                      return f.assert(path || "", unValify(a)).success;
-                    } else {
-                      return unValify(f(a));
-                    }
-                  });
-                  return newSelectorProxy(filtered, path, moduleSchema);
-                };
-              } else if (prop === "map") {
-                return function (f) {
-                  var filtered = target.map(function (a, i) {
-                    var valueOrSelector = f(newSelectorProxy(a, createValPathOfItem(path, i), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item), newSelectorProxy(i));
-                    if (isSelector(valueOrSelector)) {
-                      return valueOrSelector;
-                    }
-                    return newSelectorProxy(valueOrSelector);
-                  });
-                  return newSelectorProxy(filtered, path, moduleSchema);
-                };
-              }
-            }
-            if (Array.isArray(target) && prop === "length") {
-              return newSelectorProxy(target.length);
-            }
-            var reflectedValue = Reflect.get(target, prop);
-            if (hasOwn$1(source, prop)) {
-              if (!Number.isNaN(Number(prop))) {
-                return newSelectorProxy(reflectedValue, createValPathOfItem(path, Number(prop)), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item);
-              }
-              return newSelectorProxy(reflectedValue, createValPathOfItem(path, prop), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.items[prop]);
-            }
-            return reflectedValue;
-          }
-        });
-      }
-    // intentional fallthrough
-    // eslint-disable-next-line no-fallthrough
-    default:
-      return _defineProperty(_defineProperty(_defineProperty({
-        eq: function eq(other) {
-          var otherValue = other;
-          if (isSelector(other)) {
-            otherValue = other[SourceOrExpr];
-            if (otherValue instanceof Expr) {
-              throw Error("TODO: Cannot evaluate equality with an Expr");
-            }
-          }
-          return newSelectorProxy(source === otherValue, undefined);
-        },
-        andThen: function andThen(f) {
-          return _andThen(f, source === undefined ? null : source, path);
-        }
-      }, SourceOrExpr, source === undefined ? null : source), Path, path), GetSchema, moduleSchema);
-  }
-}
-
-// TODO: could we do .val on the objects instead?
-function unValify(valueOrSelector) {
-  if (_typeof(valueOrSelector) === "object" && (SourceOrExpr in valueOrSelector || Path in valueOrSelector)) {
-    var selectorValue = valueOrSelector[SourceOrExpr];
-    return selectorValue;
-  }
-  return valueOrSelector;
-}
-
-var EvalError = /*#__PURE__*/function () {
-  function EvalError(message, expr) {
-    _classCallCheck(this, EvalError);
-    this.message = message;
-    this.expr = expr;
-  }
-  return _createClass(EvalError, [{
-    key: "toString",
-    value: function toString() {
-      return "".concat(this.message, " in: ").concat(this.expr.transpile());
-    }
-  }]);
-}();
-var MAX_STACK_SIZE = 100; // an arbitrary semi-large number
-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);
-        }
-        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);
-        }
-      } else if (expr.children[0].value === "json") {
-        if (expr.children.length !== 2) {
-          throw new EvalError("must call 'json' with exactly one argument", expr);
-        }
-        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]);
-        }
-        try {
-          var serialized = JSON.parse(valObj);
-          if (isSerializedVal(serialized)) {
-            return newSelectorProxy(serialized.val, serialized.valPath);
-          }
-          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);
-        }
-        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(_typeof(obj[prop])), expr);
-        }
-        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 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);
-        }
-      } else {
-        // non-anon functions:
-        if (expr.children[0] instanceof Sym) {
-          if (expr.children[0].value === "val") {
-            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);
-            }
-          }
-        }
-        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(_typeof(obj[prop])), expr);
-          }
-          return _maybeFunction.apply(void 0, _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(_typeof(obj[prop])), expr);
-        }
-        return maybeValue;
-      }
-    }
-  } 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 = _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];
-      }
-      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({
-  __proto__: null,
-  parse: parse,
-  Call: Call,
-  Expr: Expr,
-  NilSym: NilSym,
-  StringLiteral: StringLiteral,
-  StringTemplate: StringTemplate,
-  Sym: Sym,
-  evaluate: evaluate
-});
-
 var ArraySchema = /*#__PURE__*/function (_Schema) {
   function ArraySchema(item) {
     var _this;
@@ -2089,7 +1261,212 @@ var union = function union(key) {
   return new UnionSchema(key, objects);
 };
 
-var RichTextSchema = /*#__PURE__*/function (_Schema) {
+var ImageSchema = /*#__PURE__*/function (_Schema) {
+  function ImageSchema(options) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var isRemote = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    _classCallCheck(this, ImageSchema);
+    _this = _callSuper(this, ImageSchema);
+    _this.options = options;
+    _this.opt = opt;
+    _this.isRemote = isRemote;
+    return _this;
+  }
+  _inherits(ImageSchema, _Schema);
+  return _createClass(ImageSchema, [{
+    key: "remote",
+    value: function remote() {
+      return new ImageSchema(this.options, this.opt, true);
+    }
+  }, {
+    key: "validate",
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (src === null || src === undefined) {
+        return _defineProperty({}, path, [{
+          message: "Non-optional image was null or undefined.",
+          value: src
+        }]);
+      }
+      if (this.isRemote && src[VAL_EXTENSION] !== "remote") {
+        return _defineProperty({}, path, [{
+          message: "Expected a remote image, but got a local image.",
+          value: src,
+          fixes: ["image:upload-remote"]
+        }]);
+      }
+      if (this.isRemote && src[VAL_EXTENSION] === "remote") {
+        return _defineProperty({}, path, [{
+          message: "Remote image was not checked.",
+          value: src,
+          fixes: ["image:check-remote"]
+        }]);
+      }
+      if (!this.isRemote && src[VAL_EXTENSION] === "remote") {
+        return _defineProperty({}, path, [{
+          message: "Expected locale image, but found remote.",
+          value: src,
+          fixes: ["image:download-remote"]
+        }]);
+      }
+      if (typeof src[FILE_REF_PROP] !== "string") {
+        return _defineProperty({}, path, [{
+          message: "Image did not have a file reference string. Got: ".concat(_typeof(src[FILE_REF_PROP])),
+          value: src
+        }]);
+      }
+      if (src[VAL_EXTENSION] !== "file") {
+        return _defineProperty({}, path, [{
+          message: "Image did not have the valid file extension type. Got: ".concat(src[VAL_EXTENSION]),
+          value: src,
+          fixes: ["image:change-extension", "image:check-metadata"]
+        }]);
+      }
+      var _ref7 = this.options || {},
+        accept = _ref7.accept;
+      var _ref8 = src.metadata || {},
+        mimeType = _ref8.mimeType;
+      if (accept && mimeType && !mimeType.includes("/")) {
+        return _defineProperty({}, path, [{
+          message: "Invalid mime type format. Got: '".concat(mimeType, "'"),
+          value: src,
+          fixes: ["image:check-metadata"]
+        }]);
+      }
+      if (accept && mimeType && mimeType.includes("/")) {
+        var acceptedTypes = accept.split(",").map(function (type) {
+          return type.trim();
+        });
+        var isValidMimeType = acceptedTypes.some(function (acceptedType) {
+          if (acceptedType === "*/*") {
+            return true;
+          }
+          if (acceptedType.endsWith("/*")) {
+            var baseType = acceptedType.slice(0, -2);
+            return mimeType.startsWith(baseType);
+          }
+          return acceptedType === mimeType;
+        });
+        if (!isValidMimeType) {
+          return _defineProperty({}, path, [{
+            message: "Mime type mismatch. Found '".concat(mimeType, "' but schema accepts '").concat(accept, "'"),
+            value: src,
+            fixes: ["image:check-metadata"]
+          }]);
+        }
+      }
+      var fileMimeType = Internal.filenameToMimeType(src[FILE_REF_PROP]);
+      if (!fileMimeType) {
+        return _defineProperty({}, path, [{
+          message: "Could not determine mime type from file extension. Got: ".concat(src[FILE_REF_PROP]),
+          value: src,
+          fixes: ["image:check-metadata"]
+        }]);
+      }
+      if (fileMimeType && mimeType && fileMimeType !== mimeType) {
+        return _defineProperty({}, path, [{
+          message: "Mime type and file extension not matching. Mime type is '".concat(mimeType, "' but file extension is '").concat(fileMimeType, "'"),
+          value: src,
+          fixes: ["image:check-metadata"]
+        }]);
+      }
+      if (src.metadata) {
+        if (src.metadata.hotspot) {
+          if (_typeof(src.metadata.hotspot) !== "object" || typeof src.metadata.hotspot.x !== "number" || typeof src.metadata.hotspot.y !== "number") {
+            return _defineProperty({}, path, [{
+              message: "Hotspot must be an object with x and y as numbers.",
+              value: src
+            }]);
+          }
+        }
+        return _defineProperty({}, path, [{
+          message: "Found metadata, but it could not be validated. Image metadata must be an object with the required props: width (positive number), height (positive number) and the mime type.",
+          // These validation errors will have to be picked up by logic outside of this package and revalidated. Reasons: 1) we have to read files to verify the metadata, which is handled differently in different runtimes (Browser, QuickJS, Node.js); 2) we want to keep this package dependency free.
+          value: src,
+          fixes: ["image:check-metadata"]
+        }]);
+      }
+      return _defineProperty({}, path, [{
+        message: "Could not validate Image metadata.",
+        value: src,
+        fixes: ["image:add-metadata"]
+      }]);
+    }
+  }, {
+    key: "assert",
+    value: function assert(path, src) {
+      if (this.opt && src === null) {
+        return {
+          success: true,
+          data: src
+        };
+      }
+      if (src === null) {
+        return {
+          success: false,
+          errors: _defineProperty({}, path, [{
+            message: "Expected 'object', got 'null'",
+            typeError: true
+          }])
+        };
+      }
+      if (_typeof(src) !== "object") {
+        return {
+          success: false,
+          errors: _defineProperty({}, path, [{
+            message: "Expected 'object', got '".concat(_typeof(src), "'"),
+            typeError: true
+          }])
+        };
+      }
+      if (!(FILE_REF_PROP in src)) {
+        return {
+          success: false,
+          errors: _defineProperty({}, path, [{
+            message: "Value of this schema must use: 'c.image' (error type: missing_ref_prop)",
+            typeError: true
+          }])
+        };
+      }
+      if (!(VAL_EXTENSION in src && src[VAL_EXTENSION] === "file")) {
+        return {
+          success: false,
+          errors: _defineProperty({}, path, [{
+            message: "Value of this schema must use: 'c.image' (error type: missing_file_extension)",
+            typeError: true
+          }])
+        };
+      }
+      return {
+        success: true,
+        data: src
+      };
+    }
+  }, {
+    key: "nullable",
+    value: function nullable() {
+      return new ImageSchema(this.options, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return {
+        type: "image",
+        options: this.options,
+        opt: this.opt,
+        remote: this.isRemote
+      };
+    }
+  }]);
+}(Schema);
+var image = function image(options) {
+  return new ImageSchema(options);
+};
+
+var RichTextSchema = /*#__PURE__*/function (_Schema) {
   function RichTextSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -2160,7 +1537,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
           _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var _this2$options$block, _this2$options$block2, _this2$options$block3, _this2$options$block4, _this2$options$block5, _this2$options$block6, _this2$options$block7, _this2$options$block8, _this2$options$block9, _this2$options$block10, _this2$options$inline, _this2$options$inline2;
+            var _this2$options$block, _this2$options$block2, _this2$options$block3, _this2$options$block4, _this2$options$block5, _this2$options$block6, _this2$options$block7, _this2$options$block8, _this2$options$block9, _this2$options$block10, _this2$options$inline;
             var node = _step.value;
             var path = unsafeCreateSourcePath(rootPath, nodes.indexOf(node));
             if (typeof node === "string") {
@@ -2221,8 +1598,31 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
             if (node.tag === "a" && !((_this2$options$inline = _this2.options.inline) !== null && _this2$options$inline !== void 0 && _this2$options$inline.a)) {
               addError(path, "'a' inline is not valid", false);
             }
-            if (node.tag === "img" && !((_this2$options$inline2 = _this2.options.inline) !== null && _this2$options$inline2 !== void 0 && _this2$options$inline2.img)) {
-              addError(path, "'img' inline is not valid", false);
+            if (node.tag === "img") {
+              var _this2$options$inline2, _this2$options$inline3;
+              if (!((_this2$options$inline2 = _this2.options.inline) !== null && _this2$options$inline2 !== void 0 && _this2$options$inline2.img)) {
+                addError(path, "'img' inline is not valid", false);
+              } else if ((_this2$options$inline3 = _this2.options.inline) !== null && _this2$options$inline3 !== void 0 && _this2$options$inline3.img) {
+                var _this2$options$inline4, _this2$options$inline5;
+                if (!("src" in node)) {
+                  return _defineProperty({}, path, [{
+                    message: "Expected 'src' in 'img'",
+                    typeError: true
+                  }]);
+                }
+                var srcPath = unsafeCreateSourcePath(path, "src");
+                var imageValidationErrors = _typeof((_this2$options$inline4 = _this2.options.inline) === null || _this2$options$inline4 === void 0 ? void 0 : _this2$options$inline4.img) === "object" ? (_this2$options$inline5 = _this2.options.inline) === null || _this2$options$inline5 === void 0 ? void 0 : _this2$options$inline5.img.validate(srcPath, node.src) : new ImageSchema({}, false, false).validate(srcPath, node.src);
+                if (imageValidationErrors) {
+                  for (var validationErrorPathS in imageValidationErrors) {
+                    var _current$validationEr;
+                    var validationErrorPath = validationErrorPathS;
+                    if (!current[validationErrorPath]) {
+                      current[validationErrorPath] = [];
+                    }
+                    (_current$validationEr = current[validationErrorPath]).push.apply(_current$validationEr, _toConsumableArray(imageValidationErrors[validationErrorPath]));
+                  }
+                }
+              }
             }
             if ("styles" in node && node.tag !== "span") {
               return _defineProperty({}, path, [{
@@ -2326,282 +1726,12 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
           }
           (_current$rootPath = current[rootPath]).push.apply(_current$rootPath, lengthErrors);
         }
-        return current;
-      }
-      if (lengthErrors.length > 0) {
-        return _defineProperty({}, rootPath, lengthErrors);
-      }
-      return false;
-    }
-  }, {
-    key: "assert",
-    value: function assert(path, src) {
-      if (this.opt && src === null) {
-        return {
-          success: true,
-          data: src
-        };
-      }
-      if (src === null && !this.opt) {
-        return {
-          success: false,
-          errors: _defineProperty({}, path, [{
-            message: "Expected 'array', got 'null'",
-            typeError: true
-          }])
-        };
-      }
-      if (!Array.isArray(src)) {
-        return {
-          success: false,
-          errors: _defineProperty({}, path, [{
-            message: "Expected 'array', got '".concat(_typeof(src), "'"),
-            typeError: true
-          }])
-        };
-      }
-      var errors = {};
-      for (var i = 0; i < src.length; i++) {
-        this.recursiveAssert(unsafeCreateSourcePath(path, i), src[i], errors);
-      }
-      if (Object.keys(errors).length > 0) {
-        return {
-          success: false,
-          errors: errors
-        };
-      }
-      // TODO: validate options
-      return {
-        success: true,
-        data: src
-      };
-    }
-  }, {
-    key: "recursiveAssert",
-    value: function recursiveAssert(path, node, errors) {
-      if (_typeof(node) !== "object") {
-        if (!errors[path]) {
-          errors[path] = [];
-        }
-        errors[path].push({
-          message: "Expected 'object', got '".concat(_typeof(node), "'"),
-          typeError: true
-        });
-        return;
-      }
-      if (Array.isArray(node)) {
-        if (!errors[path]) {
-          errors[path] = [];
-        }
-        errors[path].push({
-          message: "Expected 'object', got 'array'",
-          typeError: true
-        });
-        return;
-      }
-      if (node === null) {
-        if (!errors[path]) {
-          errors[path] = [];
-        }
-        errors[path].push({
-          message: "Expected 'object', got 'null'",
-          typeError: true
-        });
-        return;
-      }
-      if ("tag" in node) {
-        if (typeof node.tag !== "string") {
-          if (!errors[path]) {
-            errors[path] = [];
-          }
-          errors[path].push({
-            message: "Expected 'string', got '".concat(_typeof(node.tag), "'"),
-            typeError: true
-          });
-          return;
-        }
-      }
-      if ("children" in node) {
-        if (!Array.isArray(node.children)) {
-          if (!errors[path]) {
-            errors[path] = [];
-          }
-          errors[path].push({
-            message: "Expected 'array', got '".concat(_typeof(node.children), "'"),
-            typeError: true
-          });
-          return;
-        } else {
-          for (var i = 0; i < node.children.length; i++) {
-            var child = node.children[i];
-            var pathAtError = unsafeCreateSourcePath(unsafeCreateSourcePath(path, "children"), i);
-            if (_typeof(child) === "object") {
-              this.recursiveAssert(pathAtError, child, errors);
-            } else if (typeof child === "string") {
-              continue;
-            } else {
-              if (!errors[pathAtError]) {
-                errors[pathAtError] = [];
-              }
-              errors[pathAtError].push({
-                message: "Expected 'object' or 'string', got '".concat(_typeof(child), "'"),
-                typeError: true
-              });
-            }
-          }
-        }
-      }
-      if ("styles" in node) {
-        if (!Array.isArray(node.styles)) {
-          if (!errors[path]) {
-            errors[path] = [];
-          }
-          errors[path].push({
-            message: "Expected 'array', got '".concat(_typeof(node.styles), "'"),
-            typeError: true
-          });
-        } else {
-          for (var _i2 = 0; _i2 < node.styles.length; _i2++) {
-            var style = node.styles[_i2];
-            if (typeof style !== "string") {
-              var _pathAtError = unsafeCreateSourcePath(path, _i2);
-              if (!errors[_pathAtError]) {
-                errors[_pathAtError] = [];
-              }
-              errors[_pathAtError].push({
-                message: "Expected 'string', got '".concat(_typeof(style), "'"),
-                typeError: true
-              });
-            }
-          }
-        }
-      }
-    }
-  }, {
-    key: "nullable",
-    value: function nullable() {
-      return new RichTextSchema(this.options, true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "richtext",
-        opt: this.opt,
-        options: this.options
-      };
-    }
-  }]);
-}(Schema);
-var richtext = function richtext(options) {
-  return new RichTextSchema(options !== null && options !== void 0 ? options : {});
-};
-
-var ImageSchema = /*#__PURE__*/function (_Schema) {
-  function ImageSchema(options) {
-    var _this;
-    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    _classCallCheck(this, ImageSchema);
-    _this = _callSuper(this, ImageSchema);
-    _this.options = options;
-    _this.opt = opt;
-    return _this;
-  }
-  _inherits(ImageSchema, _Schema);
-  return _createClass(ImageSchema, [{
-    key: "validate",
-    value: function validate(path, src) {
-      if (this.opt && (src === null || src === undefined)) {
-        return false;
-      }
-      if (src === null || src === undefined) {
-        return _defineProperty({}, path, [{
-          message: "Non-optional image was null or undefined.",
-          value: src
-        }]);
-      }
-      if (typeof src[FILE_REF_PROP] !== "string") {
-        return _defineProperty({}, path, [{
-          message: "Image did not have a file reference string. Got: ".concat(_typeof(src[FILE_REF_PROP])),
-          value: src
-        }]);
-      }
-      if (src[VAL_EXTENSION] !== "file") {
-        return _defineProperty({}, path, [{
-          message: "Image did not have the valid file extension type. Got: ".concat(src[VAL_EXTENSION]),
-          value: src,
-          fixes: ["image:change-extension", "image:check-metadata"]
-        }]);
-      }
-      var _ref4 = this.options || {},
-        accept = _ref4.accept;
-      var _ref5 = src.metadata || {},
-        mimeType = _ref5.mimeType;
-      if (accept && mimeType && !mimeType.includes("/")) {
-        return _defineProperty({}, path, [{
-          message: "Invalid mime type format. Got: '".concat(mimeType, "'"),
-          value: src,
-          fixes: ["image:check-metadata"]
-        }]);
-      }
-      if (accept && mimeType && mimeType.includes("/")) {
-        var acceptedTypes = accept.split(",").map(function (type) {
-          return type.trim();
-        });
-        var isValidMimeType = acceptedTypes.some(function (acceptedType) {
-          if (acceptedType === "*/*") {
-            return true;
-          }
-          if (acceptedType.endsWith("/*")) {
-            var baseType = acceptedType.slice(0, -2);
-            return mimeType.startsWith(baseType);
-          }
-          return acceptedType === mimeType;
-        });
-        if (!isValidMimeType) {
-          return _defineProperty({}, path, [{
-            message: "Mime type mismatch. Found '".concat(mimeType, "' but schema accepts '").concat(accept, "'"),
-            value: src,
-            fixes: ["image:check-metadata"]
-          }]);
-        }
-      }
-      var fileMimeType = Internal.filenameToMimeType(src[FILE_REF_PROP]);
-      if (!fileMimeType) {
-        return _defineProperty({}, path, [{
-          message: "Could not determine mime type from file extension. Got: ".concat(src[FILE_REF_PROP]),
-          value: src,
-          fixes: ["image:check-metadata"]
-        }]);
-      }
-      if (fileMimeType && mimeType && fileMimeType !== mimeType) {
-        return _defineProperty({}, path, [{
-          message: "Mime type and file extension not matching. Mime type is '".concat(mimeType, "' but file extension is '").concat(fileMimeType, "'"),
-          value: src,
-          fixes: ["image:check-metadata"]
-        }]);
-      }
-      if (src.metadata) {
-        if (src.metadata.hotspot) {
-          if (_typeof(src.metadata.hotspot) !== "object" || typeof src.metadata.hotspot.x !== "number" || typeof src.metadata.hotspot.y !== "number") {
-            return _defineProperty({}, path, [{
-              message: "Hotspot must be an object with x and y as numbers.",
-              value: src
-            }]);
-          }
-        }
-        return _defineProperty({}, path, [{
-          message: "Found metadata, but it could not be validated. Image metadata must be an object with the required props: width (positive number), height (positive number) and the mime type.",
-          // These validation errors will have to be picked up by logic outside of this package and revalidated. Reasons: 1) we have to read files to verify the metadata, which is handled differently in different runtimes (Browser, QuickJS, Node.js); 2) we want to keep this package dependency free.
-          value: src,
-          fixes: ["image:check-metadata"]
-        }]);
+        return current;
       }
-      return _defineProperty({}, path, [{
-        message: "Could not validate Image metadata.",
-        value: src,
-        fixes: ["image:add-metadata"]
-      }]);
+      if (lengthErrors.length > 0) {
+        return _defineProperty({}, rootPath, lengthErrors);
+      }
+      return false;
     }
   }, {
     key: "assert",
@@ -2612,40 +1742,32 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
           data: src
         };
       }
-      if (src === null) {
+      if (src === null && !this.opt) {
         return {
           success: false,
           errors: _defineProperty({}, path, [{
-            message: "Expected 'object', got 'null'",
+            message: "Expected 'array', got 'null'",
             typeError: true
           }])
         };
       }
-      if (_typeof(src) !== "object") {
+      if (!Array.isArray(src)) {
         return {
           success: false,
           errors: _defineProperty({}, path, [{
-            message: "Expected 'object', got '".concat(_typeof(src), "'"),
+            message: "Expected 'array', got '".concat(_typeof(src), "'"),
             typeError: true
           }])
         };
       }
-      if (!(FILE_REF_PROP in src)) {
-        return {
-          success: false,
-          errors: _defineProperty({}, path, [{
-            message: "Value of this schema must use: 'c.image' (error type: missing_ref_prop)",
-            typeError: true
-          }])
-        };
+      var errors = {};
+      for (var i = 0; i < src.length; i++) {
+        this.recursiveAssert(unsafeCreateSourcePath(path, i), src[i], errors);
       }
-      if (!(VAL_EXTENSION in src && src[VAL_EXTENSION] === "file")) {
+      if (Object.keys(errors).length > 0) {
         return {
           success: false,
-          errors: _defineProperty({}, path, [{
-            message: "Value of this schema must use: 'c.image' (error type: missing_file_extension)",
-            typeError: true
-          }])
+          errors: errors
         };
       }
       return {
@@ -2653,24 +1775,133 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
         data: src
       };
     }
+  }, {
+    key: "recursiveAssert",
+    value: function recursiveAssert(path, node, errors) {
+      if (_typeof(node) !== "object") {
+        if (!errors[path]) {
+          errors[path] = [];
+        }
+        errors[path].push({
+          message: "Expected 'object', got '".concat(_typeof(node), "'"),
+          typeError: true
+        });
+        return;
+      }
+      if (Array.isArray(node)) {
+        if (!errors[path]) {
+          errors[path] = [];
+        }
+        errors[path].push({
+          message: "Expected 'object', got 'array'",
+          typeError: true
+        });
+        return;
+      }
+      if (node === null) {
+        if (!errors[path]) {
+          errors[path] = [];
+        }
+        errors[path].push({
+          message: "Expected 'object', got 'null'",
+          typeError: true
+        });
+        return;
+      }
+      if ("tag" in node) {
+        if (typeof node.tag !== "string") {
+          if (!errors[path]) {
+            errors[path] = [];
+          }
+          errors[path].push({
+            message: "Expected 'string', got '".concat(_typeof(node.tag), "'"),
+            typeError: true
+          });
+          return;
+        }
+      }
+      if ("children" in node) {
+        if (!Array.isArray(node.children)) {
+          if (!errors[path]) {
+            errors[path] = [];
+          }
+          errors[path].push({
+            message: "Expected 'array', got '".concat(_typeof(node.children), "'"),
+            typeError: true
+          });
+          return;
+        } else {
+          for (var i = 0; i < node.children.length; i++) {
+            var child = node.children[i];
+            var pathAtError = unsafeCreateSourcePath(unsafeCreateSourcePath(path, "children"), i);
+            if (_typeof(child) === "object") {
+              this.recursiveAssert(pathAtError, child, errors);
+            } else if (typeof child === "string") {
+              continue;
+            } else {
+              if (!errors[pathAtError]) {
+                errors[pathAtError] = [];
+              }
+              errors[pathAtError].push({
+                message: "Expected 'object' or 'string', got '".concat(_typeof(child), "'"),
+                typeError: true
+              });
+            }
+          }
+        }
+      }
+      if ("styles" in node) {
+        if (!Array.isArray(node.styles)) {
+          if (!errors[path]) {
+            errors[path] = [];
+          }
+          errors[path].push({
+            message: "Expected 'array', got '".concat(_typeof(node.styles), "'"),
+            typeError: true
+          });
+        } else {
+          for (var _i2 = 0; _i2 < node.styles.length; _i2++) {
+            var style = node.styles[_i2];
+            if (typeof style !== "string") {
+              var _pathAtError = unsafeCreateSourcePath(path, _i2);
+              if (!errors[_pathAtError]) {
+                errors[_pathAtError] = [];
+              }
+              errors[_pathAtError].push({
+                message: "Expected 'string', got '".concat(_typeof(style), "'"),
+                typeError: true
+              });
+            }
+          }
+        }
+      }
+    }
   }, {
     key: "nullable",
     value: function nullable() {
-      return new ImageSchema(this.options, true);
+      return new RichTextSchema(this.options, true);
     }
   }, {
     key: "serialize",
     value: function serialize() {
+      var serializedOptions = {
+        style: this.options.style,
+        block: this.options.block,
+        inline: this.options.inline && {
+          a: this.options.inline.a,
+          img: this.options.inline.img && _typeof(this.options.inline.img) === "object" ? this.options.inline.img.serialize() : this.options.inline.img
+        }
+      };
       return {
-        type: "image",
-        options: this.options,
-        opt: this.opt
+        type: "richtext",
+        opt: this.opt,
+        options: serializedOptions
       };
     }
   }]);
 }(Schema);
-var image = function image(options) {
-  return new ImageSchema(options);
+var richtext = function richtext(options) {
+  return new RichTextSchema(options !== null && options !== void 0 ? options : {});
 };
 
 var RecordSchema = /*#__PURE__*/function (_Schema) {
@@ -2787,13 +2018,10 @@ id,
 schema,
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 source) {
-  return _defineProperty(_defineProperty(_defineProperty({}, GetSource, source), GetSchema$1, schema), Path$1, id);
+  return _defineProperty(_defineProperty(_defineProperty({}, GetSource, source), GetSchema, schema), Path, id);
 }
 function getSource(valModule) {
   var sourceOrExpr = valModule[GetSource];
-  if (sourceOrExpr instanceof Expr) {
-    throw Error("Cannot get raw source of an Expr");
-  }
   var source = sourceOrExpr;
   return source;
 }
@@ -2956,16 +2184,11 @@ function resolvePath(path, valModule, schema) {
         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
-          }
-        };
+        if ("src" in resolvedSource && "tag" in resolvedSource && resolvedSource.tag === "img" && parts.length === 0) {
+          var _resolvedSchema$optio, _resolvedSchema$optio2;
+          resolvedSchema = (_resolvedSchema$optio = resolvedSchema.options) !== null && _resolvedSchema$optio !== void 0 && (_resolvedSchema$optio = _resolvedSchema$optio.inline) !== null && _resolvedSchema$optio !== void 0 && _resolvedSchema$optio.img && typeof ((_resolvedSchema$optio2 = resolvedSchema.options) === null || _resolvedSchema$optio2 === void 0 || (_resolvedSchema$optio2 = _resolvedSchema$optio2.inline) === null || _resolvedSchema$optio2 === void 0 ? void 0 : _resolvedSchema$optio2.img) !== "boolean" ? resolvedSchema.options.inline.img : resolvedSchema;
+        }
+        resolvedSource = resolvedSource[part];
       } else {
         throw Error("Invalid path: ".concat(part, " resolved to an unexpected schema ").concat(JSON.stringify(resolvedSchema)));
       }
@@ -3522,7 +2745,7 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
 }(Schema);
 var keyOf = function keyOf(valModule) {
   var _valModule$GetSchema;
-  return new KeyOfSchema(valModule === null || valModule === void 0 || (_valModule$GetSchema = valModule[GetSchema$1]) === null || _valModule$GetSchema === void 0 ? void 0 : _valModule$GetSchema.serialize(), getValPath(valModule));
+  return new KeyOfSchema(valModule === null || valModule === void 0 || (_valModule$GetSchema = valModule[GetSchema]) === null || _valModule$GetSchema === void 0 ? void 0 : _valModule$GetSchema.serialize(), getValPath(valModule));
 };
 
 var DateSchema = /*#__PURE__*/function (_Schema) {
@@ -3737,6 +2960,28 @@ var initImage = function initImage(config) {
   return image;
 };
 
+/**
+ * A remote source represents data that is not stored locally.
+ */
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+var initRemote = function initRemote(config) {
+  function remote(ref, metadata) {
+    return _defineProperty(_defineProperty(_defineProperty({}, FILE_REF_PROP, ref), VAL_EXTENSION, "remote"), "metadata", metadata);
+  }
+  return remote;
+};
+function createRemoteRef(remoteHost, _ref2) {
+  var publicProjectId = _ref2.publicProjectId,
+    coreVersion = _ref2.coreVersion,
+    validationHash = _ref2.validationHash,
+    fileHash = _ref2.fileHash,
+    filePath = _ref2.filePath,
+    bucket = _ref2.bucket;
+  // NOTE: the core version is part of the validation hash, but it is also in the uri to make it easier to understand which version the remote file was validated against.
+  return "".concat(remoteHost, "/file/p/").concat(publicProjectId, "/b/").concat(bucket, "/v/").concat(coreVersion, "/h/").concat(validationHash, "/f/").concat(fileHash, "/p/").concat(filePath);
+}
+
 /* eslint-disable @typescript-eslint/ban-types */
 // import { i18n, I18n } from "./source/future/i18n";
 // import { remote } from "./source/future/remote";
@@ -3774,7 +3019,7 @@ var initVal = function initVal(config) {
     },
     c: {
       define: define,
-      // remote,
+      remote: initRemote(),
       file: initFile(config),
       image: initImage(config)
     },
@@ -3803,6 +3048,52 @@ function modules(config, modules) {
   };
 }
 
+var RegEx = /^(https?:\/\/[^/]+)\/file\/p\/([^/]+)\/b\/([^/]+)\/v\/([^/]+)\/h\/([^/]+)\/f\/([^/]+)\/p\/(.+)$/;
+function splitRemoteRef(ref) {
+  var match = ref.match(RegEx);
+  if (!match) {
+    return {
+      status: "error",
+      error: "Invalid remote ref: " + ref
+    };
+  }
+  if (match[7].indexOf("public/val/") !== 0) {
+    return {
+      status: "error",
+      error: "Invalid remote ref: " + ref
+    };
+  }
+  return {
+    status: "success",
+    remoteHost: match[1],
+    projectId: match[2],
+    bucket: match[3],
+    version: match[4],
+    validationHash: match[5],
+    fileHash: match[6],
+    filePath: match[7]
+  };
+}
+
+var DEFAULT_VAL_REMOTE_HOST = "https://remote.val.build";
+function convertRemoteSource(src) {
+  if (src !== null && src !== void 0 && src.patch_id) {
+    var splitRemoteRefDataRes = splitRemoteRef(src[FILE_REF_PROP]);
+    if (splitRemoteRefDataRes.status === "success") {
+      return {
+        url: "/api/val/files/" + splitRemoteRefDataRes.filePath + "?patch_id=".concat(src["patch_id"], "&remote=true"),
+        metadata: src.metadata
+      };
+    } else {
+      console.warn("Internal Val error: failed to split remote ref: ".concat(src[FILE_REF_PROP], ". The data format is different than what is expected. Check Val versions for mismatches."), splitRemoteRefDataRes.error);
+    }
+  }
+  return {
+    url: src[FILE_REF_PROP],
+    metadata: src.metadata
+  };
+}
+
 var PatchError = /*#__PURE__*/_createClass(function PatchError(message) {
   _classCallCheck(this, PatchError);
   this.message = message;
@@ -3929,140 +3220,6 @@ function derefPatch(patch, document, ops) {
   });
 }
 
-function getVal(selector) {
-  return newValProxy(serializedValOfSelectorSource(selector));
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isArrayOrArraySelector(child) {
-  if (isSelector$1(child)) {
-    return _typeof(child[GetSource]) === "object" && child[GetSource] !== null && Array.isArray(child[GetSource]);
-  }
-  return Array.isArray(child);
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isObjectOrObjectSelector(child) {
-  if (isSelector$1(child)) {
-    return _typeof(child[GetSource]) === "object" && child[GetSource] !== null && !Array.isArray(child[GetSource]);
-  }
-  return _typeof(child) === "object";
-}
-function serializedValOfSelectorSource(selector) {
-  var wrappedSelector = newSelectorProxy$1(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 = GetSource in child ? child[GetSource] : child;
-      var valPath = Path$1 in child ? child[Path$1] : undefined;
-      return {
-        val: array.map(function (item, i) {
-          return rec(isSelector$1(item) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
-          ? item : newSelectorProxy$1(item, createValPathOfItem(valPath, i)));
-        }),
-        valPath: valPath
-      };
-    } else if (isObject) {
-      var obj = GetSource in child ? child[GetSource] : child;
-      var _valPath = Path$1 in child ? child[Path$1] : undefined;
-      return {
-        val: obj !== null && Object.fromEntries(Object.entries(obj).map(function (_ref) {
-          var _ref2 = _slicedToArray(_ref, 2),
-            key = _ref2[0],
-            value = _ref2[1];
-          return [key, rec(isSelector$1(value) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
-          ? value : newSelectorProxy$1(value, createValPathOfItem(_valPath, key)))];
-        })),
-        valPath: _valPath
-      };
-    } else if (isSelector$1(child)) {
-      return {
-        val: rec(child[GetSource]),
-        valPath: child[Path$1]
-      };
-    } else {
-      return child;
-    }
-  }
-  return rec(wrappedSelector);
-}
-function strip(value) {
-  var val = isSerializedVal(value) ? value.val : value;
-  switch (_typeof(val)) {
-    case "function":
-    case "symbol":
-      throw Error("Invalid val type: ".concat(_typeof(val)));
-    case "object":
-      if (val === null) {
-        return null;
-      } else if (Array.isArray(val)) {
-        return val.map(strip);
-      } else {
-        return Object.fromEntries(Object.entries(val).map(function (_ref3) {
-          var _ref4 = _slicedToArray(_ref3, 2),
-            key = _ref4[0],
-            value = _ref4[1];
-          return [key, value && strip(value)];
-        }));
-      }
-    // intentional fallthrough
-    // eslint-disable-next-line no-fallthrough
-    default:
-      return val;
-  }
-}
-function newValProxy(val) {
-  var source = val.val;
-  switch (_typeof(source)) {
-    case "function":
-    case "symbol":
-      throw Error("Invalid val type: ".concat(_typeof(source)));
-    case "object":
-      if (source !== null) {
-        // Handles both objects and arrays!
-        return new Proxy(source, {
-          has: function has(target, prop) {
-            if (prop === "val") {
-              return true;
-            }
-            if (prop === Path$1) {
-              return true;
-            }
-            return hasOwn(target, prop);
-          },
-          get: function get(target, prop) {
-            if (prop === Path$1) {
-              return val.valPath;
-            }
-            if (prop === "val") {
-              return strip(val);
-            }
-            if (Array.isArray(target) && prop === "length") {
-              return target.length;
-            }
-            if (hasOwn(source, prop)) {
-              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 : createValPathOfItem(val.valPath, Array.isArray(target) ? Number(prop) : prop)
-              });
-            }
-            return Reflect.get(target, prop);
-          }
-        });
-      }
-    // intentional fallthrough
-    // eslint-disable-next-line no-fallthrough
-    default:
-      return _defineProperty(_defineProperty({}, Path$1, val.valPath), "val", val.val);
-  }
-}
-function hasOwn(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-
 /**
  * From: https://github.com/kawanet/sha256-uint8array/commit/a035f83824c319d01ca1e7559fdcf1632c0cd6c4
  *
@@ -5117,6 +4274,36 @@ function filenameToMimeType(filename) {
   }
 }
 
+/**
+ * The validation basis is used in remote refs to determine if the remote content needs to be re-validated.
+ *
+ * If the validation basis changes, we need to re-validate the remote content.
+ *
+ * NOTE: We do not care if the file path is different as long as the extension is the same.
+ *       This way we can rename a file, without having to re-validate it.
+ *       The version is outside of the validation hash, so that it is possible to manually fix the version without having to re-validate.
+ */
+function getValidationBasis(coreVersion, schema, fileExt, metadata, fileHash) {
+  var metadataValidationBasis = "".concat((metadata === null || metadata === void 0 ? void 0 : metadata.width) || "").concat((metadata === null || metadata === void 0 ? void 0 : metadata.height) || "").concat(metadata === null || metadata === void 0 ? void 0 : metadata.mimeType);
+  var schemaValidationBasis = {
+    type: schema.type,
+    opt: schema.opt,
+    options: _objectSpread2({}, schema.options)
+  };
+  return coreVersion + JSON.stringify(schemaValidationBasis) + fileExt + metadataValidationBasis + fileHash;
+}
+function getValidationHash(coreVersion, schema, fileExt, metadata, fileHash, textEncoder) {
+  return getSHA256Hash(textEncoder.encode(getValidationBasis(coreVersion, schema, fileExt, metadata, fileHash))).slice(0, 4); // we do not need a lot of bits for the validation hash, since it is only used to identify the validation basis
+}
+
+function hashToRemoteFileHash(hash) {
+  return hash.slice(0, 12 // 12 hex characters = 6 bytes = 48 bits = 2^48 = 281474976710656 possibilities or 1 in 281474976710656 or using birthday problem estimate with 10K files: p = (k, n) => (k*k)/(2x2**n) and p(10_000,12*4) = 1.7763568394002505e-7 chance of collision which should be good enough
+  );
+}
+function getFileHash(text) {
+  return hashToRemoteFileHash(getSHA256Hash(new Uint8Array(text)));
+}
+
 function deserializeSchema(serialized) {
   var _serialized$options;
   switch (serialized.type) {
@@ -5149,7 +4336,16 @@ function deserializeSchema(serialized) {
       // TODO: we do not really need any here - right?
       serialized.opt);
     case "richtext":
-      return new RichTextSchema(serialized.options || {}, serialized.opt);
+      {
+        var _serialized$options2, _serialized$options3;
+        var deserializedOptions = _objectSpread2(_objectSpread2({}, serialized.options || {}), {}, {
+          inline: _typeof((_serialized$options2 = serialized.options) === null || _serialized$options2 === void 0 || (_serialized$options2 = _serialized$options2.inline) === null || _serialized$options2 === void 0 ? void 0 : _serialized$options2.img) === "object" ? {
+            a: serialized.options.inline.a,
+            img: deserializeSchema(serialized.options.inline.img)
+          } : (_serialized$options3 = serialized.options) === null || _serialized$options3 === void 0 ? void 0 : _serialized$options3.inline
+        });
+        return new RichTextSchema(deserializedOptions, serialized.opt);
+      }
     case "record":
       return new RecordSchema(deserializeSchema(serialized.item), serialized.opt);
     case "keyOf":
@@ -5187,14 +4383,23 @@ var Internal = {
     }()
   },
   convertFileSource: convertFileSource,
+  convertRemoteSource: convertRemoteSource,
   getSchema: getSchema,
   getValPath: getValPath,
-  getVal: getVal,
   getSource: getSource,
   resolvePath: resolvePath,
   splitModuleFilePathAndModulePath: splitModuleFilePathAndModulePath,
   joinModuleFilePathAndModulePath: joinModuleFilePathAndModulePath,
+  remote: {
+    createRemoteRef: createRemoteRef,
+    getValidationBasis: getValidationBasis,
+    getValidationHash: getValidationHash,
+    getFileHash: getFileHash,
+    hashToRemoteFileHash: hashToRemoteFileHash,
+    splitRemoteRef: splitRemoteRef
+  },
   isVal: isVal,
+  isFile: isFile,
   createValPathOfItem: createValPathOfItem,
   getSHA256Hash: getSHA256Hash,
   initSchema: initSchema,
@@ -5260,9 +4465,8 @@ function tryJsonParse(str) {
 
 exports.ArraySchema = ArraySchema;
 exports.BooleanSchema = BooleanSchema;
-exports.Call = Call;
+exports.DEFAULT_VAL_REMOTE_HOST = DEFAULT_VAL_REMOTE_HOST;
 exports.DateSchema = DateSchema;
-exports.Expr = Expr;
 exports.FATAL_ERROR_TYPES = FATAL_ERROR_TYPES;
 exports.FILE_REF_PROP = FILE_REF_PROP;
 exports.FILE_REF_SUBTYPE_TAG = FILE_REF_SUBTYPE_TAG;
@@ -5273,17 +4477,13 @@ exports.Internal = Internal;
 exports.KeyOfSchema = KeyOfSchema;
 exports.LiteralSchema = LiteralSchema;
 exports.ModuleFilePathSep = ModuleFilePathSep;
-exports.NilSym = NilSym;
 exports.NumberSchema = NumberSchema;
 exports.ObjectSchema = ObjectSchema;
 exports.PatchError = PatchError;
 exports.RecordSchema = RecordSchema;
 exports.RichTextSchema = RichTextSchema;
 exports.Schema = Schema;
-exports.StringLiteral = StringLiteral;
 exports.StringSchema = StringSchema;
-exports.StringTemplate = StringTemplate;
-exports.Sym = Sym;
 exports.UnionSchema = UnionSchema;
 exports.VAL_EXTENSION = VAL_EXTENSION;
 exports._classCallCheck = _classCallCheck;
@@ -5293,9 +4493,6 @@ exports._toConsumableArray = _toConsumableArray;
 exports._typeof = _typeof;
 exports.derefPatch = derefPatch;
 exports.deserializeSchema = deserializeSchema;
-exports.evaluate = evaluate;
-exports.index = index;
 exports.initVal = initVal;
 exports.modules = modules;
-exports.parse = parse;
 exports.splitModuleFilePathAndModulePath = splitModuleFilePathAndModulePath;