@valbuild/core 0.64.0 → 0.65.2

package/dist/{index-4240c6a6.esm.js → index-65ec1d74.esm.js}

@@ -1,21 +1,61 @@
-import { _ as _arrayLikeToArray, a as _unsupportedIterableToArray, i as isErr, e as err, o as ok, b as isOk, c as _createForOfIteratorHelper } from './result-a8316efa.esm.js';
+import { _ as _unsupportedIterableToArray, a as _arrayLikeToArray, i as isErr, e as err, o as ok, b as isOk, c as _createForOfIteratorHelper } from './result-168dfc1d.esm.js';
 import * as marked from 'marked';
 import { VAL_EXTENSION as VAL_EXTENSION$1, FILE_REF_SUBTYPE_TAG as FILE_REF_SUBTYPE_TAG$1 } from '@valbuild/core';
 
-function _arrayWithoutHoles(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
 }
 
-function _iterableToArray(iter) {
-  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+function _iterableToArrayLimit(r, l) {
+  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
+    try {
+      if (i = (t = t.call(r)).next, 0 === l) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      o = !0, n = r;
+    } finally {
+      try {
+        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
+      } finally {
+        if (o) throw n;
+      }
+    }
+    return a;
+  }
+}
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _slicedToArray(r, e) {
+  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+}
+
+function _arrayWithoutHoles(r) {
+  if (Array.isArray(r)) return _arrayLikeToArray(r);
+}
+
+function _iterableToArray(r) {
+  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
 }
 
 function _nonIterableSpread() {
   throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-function _toConsumableArray(arr) {
-  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+function _toConsumableArray(r) {
+  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
 }
 
 function _typeof(o) {
@@ -28,7 +68,7 @@ function _typeof(o) {
   }, _typeof(o);
 }
 
-function toPrimitive(t, r) {
+function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
   if (void 0 !== e) {
@@ -39,24 +79,18 @@ function toPrimitive(t, r) {
   return ("string" === r ? String : Number)(t);
 }
 
-function toPropertyKey(t) {
-  var i = toPrimitive(t, "string");
-  return "symbol" == typeof i ? i : String(i);
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : i + "";
 }
 
-function _defineProperty(obj, key, value) {
-  key = toPropertyKey(key);
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
+function _defineProperty(e, r, t) {
+  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[r] = t, e;
 }
 
 function ownKeys(e, r) {
@@ -81,75 +115,26 @@ function _objectSpread2(e) {
   return e;
 }
 
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-
-function _iterableToArrayLimit(r, l) {
-  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (null != t) {
-    var e,
-      n,
-      i,
-      u,
-      a = [],
-      f = !0,
-      o = !1;
-    try {
-      if (i = (t = t.call(r)).next, 0 === l) {
-        if (Object(t) !== t) return;
-        f = !1;
-      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
-    } catch (r) {
-      o = !0, n = r;
-    } finally {
-      try {
-        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
-      } finally {
-        if (o) throw n;
-      }
-    }
-    return a;
-  }
-}
-
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-function _slicedToArray(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+function _classCallCheck(a, n) {
+  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
 }
 
-function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
+function _defineProperties(e, r) {
+  for (var t = 0; t < r.length; t++) {
+    var o = r[t];
+    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
   }
 }
-
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, toPropertyKey(descriptor.key), descriptor);
-  }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
+function _createClass(e, r, t) {
+  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
+    writable: !1
+  }), e;
 }
 
-function _getPrototypeOf(o) {
-  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-    return o.__proto__ || Object.getPrototypeOf(o);
-  };
-  return _getPrototypeOf(o);
+function _getPrototypeOf(t) {
+  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+    return t.__proto__ || Object.getPrototypeOf(t);
+  }, _getPrototypeOf(t);
 }
 
 function _isNativeReflectConstruct() {
@@ -161,49 +146,38 @@ function _isNativeReflectConstruct() {
   })();
 }
 
-function _assertThisInitialized(self) {
-  if (self === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
-  return self;
+function _assertThisInitialized(e) {
+  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  return e;
 }
 
-function _possibleConstructorReturn(self, call) {
-  if (call && (typeof call === "object" || typeof call === "function")) {
-    return call;
-  } else if (call !== void 0) {
-    throw new TypeError("Derived constructors may only return object or undefined");
-  }
-  return _assertThisInitialized(self);
+function _possibleConstructorReturn(t, e) {
+  if (e && ("object" == typeof e || "function" == typeof e)) return e;
+  if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+  return _assertThisInitialized(t);
 }
 
 function _callSuper(t, o, e) {
   return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
 }
 
-function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-    o.__proto__ = p;
-    return o;
-  };
-  return _setPrototypeOf(o, p);
+function _setPrototypeOf(t, e) {
+  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+    return t.__proto__ = e, t;
+  }, _setPrototypeOf(t, e);
 }
 
-function _inherits(subClass, superClass) {
-  if (typeof superClass !== "function" && superClass !== null) {
-    throw new TypeError("Super expression must either be null or a function");
-  }
-  subClass.prototype = Object.create(superClass && superClass.prototype, {
+function _inherits(t, e) {
+  if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+  t.prototype = Object.create(e && e.prototype, {
     constructor: {
-      value: subClass,
-      writable: true,
-      configurable: true
+      value: t,
+      writable: !0,
+      configurable: !0
     }
-  });
-  Object.defineProperty(subClass, "prototype", {
-    writable: false
-  });
-  if (superClass) _setPrototypeOf(subClass, superClass);
+  }), Object.defineProperty(t, "prototype", {
+    writable: !1
+  }), e && _setPrototypeOf(t, e);
 }
 
 // import { RemoteCompatibleSource, RemoteSource } from "../source/remote";
@@ -215,7 +189,7 @@ var Schema = /*#__PURE__*/function () {
   function Schema() {
     _classCallCheck(this, Schema);
   }
-  _createClass(Schema, [{
+  return _createClass(Schema, [{
     key: "appendValidationError",
     value:
     // remote(): Src extends RemoteCompatibleSource
@@ -248,7 +222,6 @@ var Schema = /*#__PURE__*/function () {
       }
     }
   }]);
-  return Schema;
 }();
 
 // TODO: SourceError<"Could not determine type of Schema">
@@ -295,53 +268,51 @@ var Expr = /*#__PURE__*/_createClass(function Expr(span) {
   this.span = span;
 });
 var StringLiteral = /*#__PURE__*/function (_Expr) {
-  _inherits(StringLiteral, _Expr);
   function StringLiteral(value, span) {
     var _this;
     _classCallCheck(this, StringLiteral);
     _this = _callSuper(this, StringLiteral, [span]);
-    _defineProperty(_assertThisInitialized(_this), "type", "StringLiteral");
+    _defineProperty(_this, "type", "StringLiteral");
     _this.value = value;
     return _this;
   }
-  _createClass(StringLiteral, [{
+  _inherits(StringLiteral, _Expr);
+  return _createClass(StringLiteral, [{
     key: "transpile",
     value: function transpile() {
       return "'".concat(this.value, "'");
     }
   }]);
-  return StringLiteral;
 }(Expr);
 var Sym = /*#__PURE__*/function (_Expr2) {
-  _inherits(Sym, _Expr2);
   function Sym(value, span) {
     var _this2;
     _classCallCheck(this, Sym);
     _this2 = _callSuper(this, Sym, [span]);
-    _defineProperty(_assertThisInitialized(_this2), "type", "Sym");
+    _defineProperty(_this2, "type", "Sym");
     _this2.value = value;
     return _this2;
   }
-  _createClass(Sym, [{
+  _inherits(Sym, _Expr2);
+  return _createClass(Sym, [{
     key: "transpile",
     value: function transpile() {
       return this.value;
     }
   }]);
-  return Sym;
 }(Expr);
 var NilSym = new Sym("()");
 var StringTemplate = /*#__PURE__*/function (_Expr3) {
-  _inherits(StringTemplate, _Expr3);
   function StringTemplate(children, span) {
     var _this3;
     _classCallCheck(this, StringTemplate);
     _this3 = _callSuper(this, StringTemplate, [span]);
-    _defineProperty(_assertThisInitialized(_this3), "type", "StringTemplate");
+    _defineProperty(_this3, "type", "StringTemplate");
     _this3.children = children;
     return _this3;
   }
-  _createClass(StringTemplate, [{
+  _inherits(StringTemplate, _Expr3);
+  return _createClass(StringTemplate, [{
     key: "transpile",
     value: function transpile() {
       return "'".concat(this.children.map(function (child) {
@@ -353,20 +324,19 @@ var StringTemplate = /*#__PURE__*/function (_Expr3) {
       }).join(""), "'");
     }
   }]);
-  return StringTemplate;
 }(Expr);
 var Call = /*#__PURE__*/function (_Expr4) {
-  _inherits(Call, _Expr4);
   function Call(children, isAnon, span) {
     var _this4;
     _classCallCheck(this, Call);
     _this4 = _callSuper(this, Call, [span]);
-    _defineProperty(_assertThisInitialized(_this4), "type", "Call");
+    _defineProperty(_this4, "type", "Call");
     _this4.children = children;
     _this4.isAnon = isAnon;
     return _this4;
   }
-  _createClass(Call, [{
+  _inherits(Call, _Expr4);
+  return _createClass(Call, [{
     key: "transpile",
     value: function transpile() {
       if (this.isAnon) {
@@ -379,7 +349,6 @@ var Call = /*#__PURE__*/function (_Expr4) {
       }).join(" "), ")");
     }
   }]);
-  return Call;
 }(Expr);
 
 /* Branded extension types: file, remote, i18n  */
@@ -406,15 +375,49 @@ var FILE_REF_SUBTYPE_TAG = "_tag"; // TODO: used earlier by c.rt.image, when we
  *
  */
 
-function file$1(ref, metadata) {
-  return _defineProperty(_defineProperty(_defineProperty({}, FILE_REF_PROP, ref), VAL_EXTENSION, "file"), "metadata", metadata);
-}
+var initFile = function initFile(config) {
+  var _config$files$directo, _config$files;
+  (_config$files$directo = config === null || config === void 0 || (_config$files = config.files) === null || _config$files === void 0 ? void 0 : _config$files.directory) !== null && _config$files$directo !== void 0 ? _config$files$directo : "/public/val";
+  function file(ref, metadata) {
+    return _defineProperty(_defineProperty(_defineProperty({}, FILE_REF_PROP, ref), VAL_EXTENSION, "file"), "metadata", metadata);
+  }
+  return file;
+};
+
+// type Directory =
+//   | (typeof config extends { files: { directory: infer D } } ? D : never)
+//   | `/public/val`;
+// console.log("path", config);
+// const userSpecifiedDirectory: Directory = config ?? "/public/val";
+
+// const directory = userSpecifiedDirectory;
+
+// export function file<Metadata extends { readonly [key: string]: Json }>(
+//   ref: `${typeof directory}/${string}`,
+//   metadata: Metadata
+// ): FileSource<Metadata>;
+// export function file(
+//   ref: `${typeof directory}/${string}`,
+//   metadata?: undefined
+// ): FileSource<undefined>;
+// export function file<
+//   Metadata extends { readonly [key: string]: Json } | undefined
+// >(
+//   ref: `${typeof directory}/${string}`,
+//   metadata?: Metadata
+// ): FileSource<Metadata> {
+//   return {
+//     [FILE_REF_PROP]: ref,
+//     [VAL_EXTENSION]: "file",
+//     metadata,
+//   } as FileSource<Metadata>;
+// }
+
 function isFile(obj) {
   return _typeof(obj) === "object" && obj !== null && VAL_EXTENSION in obj && obj[VAL_EXTENSION] === "file" && FILE_REF_PROP in obj && typeof obj[FILE_REF_PROP] === "string";
 }
 
 var FileSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(FileSchema, _Schema);
   function FileSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -424,7 +427,8 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(FileSchema, [{
+  _inherits(FileSchema, _Schema);
+  return _createClass(FileSchema, [{
     key: "validate",
     value: function validate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
@@ -494,7 +498,7 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
       }
       if (src.metadata) {
         return _defineProperty({}, path, [{
-          message: "Found metadata, but it could not be validated. File metadata must be an object with the required props: width (positive number), height (positive number) and sha256 (string of length 64 of the base16 hash).",
+          message: "Found metadata, but it could not be validated. File metadata must be an object with the mimeType.",
           // 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: ["file:check-metadata"]
@@ -571,25 +575,26 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return FileSchema;
 }(Schema);
 var file = function file(options) {
   return new FileSchema(options);
 };
 function convertFileSource(src) {
-  var _src$metadata4, _src$metadata5, _src$metadata6;
   // TODO: /public should be configurable
   if (!src[FILE_REF_PROP].startsWith("/public")) {
-    var _src$metadata, _src$metadata2, _src$metadata3;
     return {
-      url: src[FILE_REF_PROP] + ((_src$metadata = src.metadata) !== null && _src$metadata !== void 0 && _src$metadata.sha256 ? "?sha256=".concat((_src$metadata2 = src.metadata) === null || _src$metadata2 === void 0 ? void 0 : _src$metadata2.sha256) : "") + (
-      // TODO: remove sha256? we do not need anymore
-      src.patch_id ? "".concat((_src$metadata3 = src.metadata) !== null && _src$metadata3 !== void 0 && _src$metadata3.sha256 ? "&" : "?", "patch_id=").concat(src["patch_id"]) : ""),
+      url: src[FILE_REF_PROP] + (src.patch_id ? "?patch_id=".concat(src["patch_id"]) : ""),
+      metadata: src.metadata
+    };
+  }
+  if (src.patch_id) {
+    return {
+      url: "/api/val/files" + src[FILE_REF_PROP] + "?patch_id=".concat(src["patch_id"]),
       metadata: src.metadata
     };
   }
   return {
-    url: src[FILE_REF_PROP].slice("/public".length) + ((_src$metadata4 = src.metadata) !== null && _src$metadata4 !== void 0 && _src$metadata4.sha256 ? "?sha256=".concat((_src$metadata5 = src.metadata) === null || _src$metadata5 === void 0 ? void 0 : _src$metadata5.sha256) : "") + (src.patch_id ? "".concat((_src$metadata6 = src.metadata) !== null && _src$metadata6 !== void 0 && _src$metadata6.sha256 ? "&" : "?", "patch_id=").concat(src["patch_id"]) : ""),
+    url: src[FILE_REF_PROP].slice("/public".length),
     metadata: src.metadata
   };
 }
@@ -790,7 +795,6 @@ function unValify$1(valueOrSelector) {
 }
 
 var ObjectSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(ObjectSchema, _Schema);
   function ObjectSchema(items) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -800,7 +804,8 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(ObjectSchema, [{
+  _inherits(ObjectSchema, _Schema);
+  return _createClass(ObjectSchema, [{
     key: "validate",
     value: function validate(path, src) {
       var _this2 = this;
@@ -927,7 +932,6 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return ObjectSchema;
 }(Schema);
 var object = function object(schema) {
   return new ObjectSchema(schema);
@@ -960,7 +964,7 @@ function tokenize(input) {
       });
       cursor++;
     } else if (_char === "'" || _char === "}") {
-      var _start = cursor;
+      var start = cursor;
       var value = "";
       var unescapedValue = "";
       var escaped = false;
@@ -1003,7 +1007,7 @@ function tokenize(input) {
       if (value) {
         tokens.push(_objectSpread2({
           type: "string",
-          span: [_start + 1, cursor - cursorOffset],
+          span: [start + 1, cursor - cursorOffset],
           value: value
         }, unescapedValue !== value && {
           unescapedValue: unescapedValue
@@ -1021,17 +1025,17 @@ function tokenize(input) {
         });
       }
     } else if (WHITE_SPACE.includes(_char)) {
-      var _start2 = cursor;
+      var _start = cursor;
       while (WHITE_SPACE.includes(input[cursor]) && cursor < input.length) {
         cursor++;
       }
       tokens.push({
         type: "ws",
-        span: [_start2, cursor - 1]
+        span: [_start, cursor - 1]
       });
     } else {
       var _value = "";
-      var _start3 = cursor;
+      var _start2 = cursor;
       do {
         _char = input[cursor];
         peek = input[cursor + 1];
@@ -1040,7 +1044,7 @@ function tokenize(input) {
       } while (!WHITE_SPACE.includes(peek) && peek !== ")" && peek !== "'" && cursor < input.length);
       tokens.push({
         type: "token",
-        span: [_start3, cursor - 1],
+        span: [_start2, cursor - 1],
         value: _value
       });
     }
@@ -1379,13 +1383,12 @@ var EvalError = /*#__PURE__*/function () {
     this.message = message;
     this.expr = expr;
   }
-  _createClass(EvalError, [{
+  return _createClass(EvalError, [{
     key: "toString",
     value: function toString() {
       return "".concat(this.message, " in: ").concat(this.expr.transpile());
     }
   }]);
-  return EvalError;
 }();
 var MAX_STACK_SIZE = 100; // an arbitrary semi-large number
 function evaluateSync(expr, getSource, stack) {
@@ -1404,8 +1407,8 @@ function evaluateSync(expr, getSource, stack) {
           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);
+          var path = expr.children[1].value;
+          return newSelectorProxy(getSource(path), path);
         } else {
           throw new EvalError("argument of 'val' must be a string literal", expr);
         }
@@ -1472,8 +1475,8 @@ function evaluateSync(expr, getSource, stack) {
         if (expr.children[0] instanceof Sym) {
           if (expr.children[0].value === "val") {
             if (expr.children[1] instanceof StringLiteral) {
-              var _path2 = expr.children[1].value;
-              return newSelectorProxy(getSource(_path2), _path2);
+              var _path = expr.children[1].value;
+              return newSelectorProxy(getSource(_path), _path);
             } else {
               throw new EvalError("argument of 'val' must be a string literal", expr);
             }
@@ -1563,7 +1566,6 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 var ArraySchema = /*#__PURE__*/function (_Schema) {
-  _inherits(ArraySchema, _Schema);
   function ArraySchema(item) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -1573,7 +1575,8 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(ArraySchema, [{
+  _inherits(ArraySchema, _Schema);
+  return _createClass(ArraySchema, [{
     key: "validate",
     value: function validate(path, src) {
       var assertRes = this.assert(path, src);
@@ -1655,14 +1658,12 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return ArraySchema;
 }(Schema);
 var array = function array(schema) {
   return new ArraySchema(schema);
 };
 
 var LiteralSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(LiteralSchema, _Schema);
   function LiteralSchema(value) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -1672,7 +1673,8 @@ var LiteralSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(LiteralSchema, [{
+  _inherits(LiteralSchema, _Schema);
+  return _createClass(LiteralSchema, [{
     key: "validate",
     value: function validate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
@@ -1739,14 +1741,12 @@ var LiteralSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return LiteralSchema;
 }(Schema);
 var literal = function literal(value) {
   return new LiteralSchema(value);
 };
 
 var UnionSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(UnionSchema, _Schema);
   function UnionSchema(key, items) {
     var _this;
     var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -1757,7 +1757,8 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(UnionSchema, [{
+  _inherits(UnionSchema, _Schema);
+  return _createClass(UnionSchema, [{
     key: "validate",
     value: function validate(path, src) {
       var unknownSrc = src;
@@ -2071,7 +2072,6 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return UnionSchema;
 }(Schema);
 var union = function union(key) {
   for (var _len = arguments.length, objects = new Array(_len > 1 ? _len - 1 : 0), _key3 = 1; _key3 < _len; _key3++) {
@@ -2081,7 +2081,6 @@ var union = function union(key) {
 };
 
 var RichTextSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(RichTextSchema, _Schema);
   function RichTextSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -2091,7 +2090,8 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(RichTextSchema, [{
+  _inherits(RichTextSchema, _Schema);
+  return _createClass(RichTextSchema, [{
     key: "validate",
     value: function validate(path, src) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -2259,14 +2259,12 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return RichTextSchema;
 }(Schema);
 var richtext$1 = function richtext(options) {
   return new RichTextSchema(options !== null && options !== void 0 ? options : {});
 };
 
 var ImageSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(ImageSchema, _Schema);
   function ImageSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -2276,7 +2274,8 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(ImageSchema, [{
+  _inherits(ImageSchema, _Schema);
+  return _createClass(ImageSchema, [{
     key: "validate",
     value: function validate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
@@ -2346,7 +2345,7 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
       }
       if (src.metadata) {
         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 sha256 (string of length 64 of the base16 hash).",
+          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:replace-metadata"]
@@ -2423,14 +2422,12 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return ImageSchema;
 }(Schema);
 var image$1 = function image(options) {
   return new ImageSchema(options);
 };
 
 var RecordSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(RecordSchema, _Schema);
   function RecordSchema(item) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -2440,7 +2437,8 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(RecordSchema, [{
+  _inherits(RecordSchema, _Schema);
+  return _createClass(RecordSchema, [{
     key: "validate",
     value: function validate(path, src) {
       var _this2 = this;
@@ -2530,7 +2528,6 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return RecordSchema;
 }(Schema);
 var record = function record(schema) {
   return new RecordSchema(schema);
@@ -2561,7 +2558,12 @@ function splitModuleFilePathAndModulePath(path) {
   }
   return [path.slice(0, pathOfSep), path.slice(pathOfSep + ModuleFilePathSep.length)];
 }
-var ModuleFilePathSep = "?p=";
+function joinModuleFilePathAndModulePath(moduleFilePath, modulePath) {
+  if (modulePath === "") {
+    return moduleFilePath;
+  }
+  return "".concat(moduleFilePath).concat(ModuleFilePathSep).concat(modulePath);
+}
 function isObjectSchema(schema) {
   return schema instanceof ObjectSchema || _typeof(schema) === "object" && "type" in schema && schema.type === "object";
 }
@@ -2605,8 +2607,7 @@ function isImageSchema(schema) {
 // }
 
 function resolvePath(path, valModule, schema) {
-  // TODO: use schema assert while resolving (and emit errors if any)
-  var parts = parsePath(path);
+  var parts = splitModulePath(path);
   var origParts = _toConsumableArray(parts);
   var resolvedSchema = schema;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -2623,10 +2624,6 @@ function resolvePath(path, valModule, schema) {
         if (_typeof(resolvedSource) !== "object" && !Array.isArray(resolvedSource)) {
           throw Error("Schema type error: expected source to be type of array, but got ".concat(_typeof(resolvedSource)));
         }
-        if (resolvedSource[part] === undefined) {
-          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 (isRecordSchema(resolvedSchema)) {
@@ -2645,10 +2642,10 @@ function resolvePath(path, valModule, schema) {
         if (_typeof(resolvedSource) !== "object") {
           throw Error("Schema type error: expected source to be type of object, but got ".concat(_typeof(resolvedSource)));
         }
-        if (!resolvedSource[part]) {
+        if (resolvedSource !== null && resolvedSource[part] === undefined) {
           throw Error("Invalid path: object source did not have key ".concat(part, " from path: ").concat(path));
         }
-        resolvedSource = resolvedSource[part];
+        resolvedSource = resolvedSource === null ? resolvedSource : resolvedSource[part];
         resolvedSchema = resolvedSchema.items[part];
         // } else if (isI18nSchema(resolvedSchema)) {
         //   if (!resolvedSchema.locales.includes(part)) {
@@ -2748,7 +2745,11 @@ function resolvePath(path, valModule, schema) {
     source: resolvedSource
   };
 }
-function parsePath(input) {
+function splitModuleFilePath(input) {
+  var parts = input.split("/").slice(1);
+  return parts;
+}
+function splitModulePath(input) {
   var result = [];
   var i = 0;
   while (i < input.length) {
@@ -2784,9 +2785,32 @@ function parsePath(input) {
   }
   return result;
 }
+function splitJoinedSourcePaths(input) {
+  // TODO: This is a very simple implementation that does not handle escaped commas
+  return input.split(",");
+}
+function parentOfSourcePath(sourcePath) {
+  var _splitModuleFilePathA = splitModuleFilePathAndModulePath(sourcePath),
+    _splitModuleFilePathA2 = _slicedToArray(_splitModuleFilePathA, 2),
+    moduleFilePath = _splitModuleFilePathA2[0],
+    modulePath = _splitModuleFilePathA2[1];
+  var modulePathParts = splitModulePath(modulePath).slice(0, -1);
+  if (modulePathParts.length > 0) {
+    return joinModuleFilePathAndModulePath(moduleFilePath, patchPathToModulePath(modulePathParts));
+  }
+  return moduleFilePath;
+}
+function patchPathToModulePath(patchPath) {
+  return patchPath.map(function (segment) {
+    // TODO: I am worried that something is lost here: what if the segment is a string that happens to be a parsable as a number? We could make those keys illegal?
+    if (Number.isInteger(Number(segment))) {
+      return segment;
+    }
+    return JSON.stringify(segment);
+  }).join(".");
+}
 
 var NumberSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(NumberSchema, _Schema);
   function NumberSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -2796,7 +2820,8 @@ var NumberSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(NumberSchema, [{
+  _inherits(NumberSchema, _Schema);
+  return _createClass(NumberSchema, [{
     key: "validate",
     value: function validate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
@@ -2857,14 +2882,12 @@ var NumberSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return NumberSchema;
 }(Schema);
 var number = function number(options) {
   return new NumberSchema(options);
 };
 
 var StringSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(StringSchema, _Schema);
   function StringSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -2876,7 +2899,8 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
     _this.isRaw = isRaw;
     return _this;
   }
-  _createClass(StringSchema, [{
+  _inherits(StringSchema, _Schema);
+  return _createClass(StringSchema, [{
     key: "min",
     value: function min(minLength) {
       return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
@@ -2986,14 +3010,12 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return StringSchema;
 }(Schema);
 var string = function string(options) {
   return new StringSchema(options);
 };
 
 var BooleanSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(BooleanSchema, _Schema);
   function BooleanSchema() {
     var _this;
     var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -3002,7 +3024,8 @@ var BooleanSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(BooleanSchema, [{
+  _inherits(BooleanSchema, _Schema);
+  return _createClass(BooleanSchema, [{
     key: "validate",
     value: function validate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
@@ -3062,14 +3085,12 @@ var BooleanSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return BooleanSchema;
 }(Schema);
 var _boolean = function _boolean() {
   return new BooleanSchema();
 };
 
 var KeyOfSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(KeyOfSchema, _Schema);
   function KeyOfSchema(schema, sourcePath) {
     var _this;
     var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -3080,7 +3101,8 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(KeyOfSchema, [{
+  _inherits(KeyOfSchema, _Schema);
+  return _createClass(KeyOfSchema, [{
     key: "validate",
     value: function validate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
@@ -3092,19 +3114,14 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
         }]);
       }
       var serializedSchema = this.schema;
-      if (!(serializedSchema.type === "array" || serializedSchema.type === "object" || serializedSchema.type === "record")) {
+      if (!(serializedSchema.type === "object" || serializedSchema.type === "record")) {
         return _defineProperty({}, path, [{
-          message: "Schema in keyOf must be an 'array', 'object' or 'record'. Found '".concat(serializedSchema.type, "'")
+          message: "Schema in keyOf must be an 'object' or 'record'. Found '".concat(serializedSchema.type, "'")
         }]);
       }
       if (serializedSchema.opt && (src === null || src === undefined)) {
         return false;
       }
-      if (serializedSchema.type === "array" && typeof src !== "number") {
-        return _defineProperty({}, path, [{
-          message: "Type of value in keyof (array) must be 'number'"
-        }]);
-      }
       if (serializedSchema.type === "record" && typeof src !== "string") {
         return _defineProperty({}, path, [{
           message: "Type of value in keyof (record) must be 'string'"
@@ -3149,7 +3166,7 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
         };
       }
       var serializedSchema = schema;
-      if (!(serializedSchema.type === "array" || serializedSchema.type === "object" || serializedSchema.type === "record")) {
+      if (!(serializedSchema.type === "object" || serializedSchema.type === "record")) {
         return {
           success: false,
           errors: _defineProperty({}, path, [{
@@ -3158,15 +3175,6 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
           }])
         };
       }
-      if (serializedSchema.type === "array" && typeof src !== "number") {
-        return {
-          success: false,
-          errors: _defineProperty({}, path, [{
-            message: "Value of keyOf (array) must be 'number', got '".concat(_typeof(src), "'"),
-            typeError: true
-          }])
-        };
-      }
       if (serializedSchema.type === "record" && typeof src !== "string") {
         return {
           success: false,
@@ -3206,7 +3214,7 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
     value: function serialize() {
       var path = this.sourcePath;
       if (!path) {
-        throw new Error("Cannot serialize keyOf schema with empty selector. TIP: keyOf must be used with a Val Module.");
+        throw new Error("Cannot serialize keyOf schema with empty selector. TIP: keyOf must be used with a Val Module of record schema.");
       }
       var serializedSchema = this.schema;
       if (!serializedSchema) {
@@ -3214,9 +3222,6 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
       }
       var values;
       switch (serializedSchema.type) {
-        case "array":
-          values = "number";
-          break;
         case "record":
           values = "string";
           break;
@@ -3235,7 +3240,6 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return KeyOfSchema;
 }(Schema);
 var keyOf = function keyOf(valModule) {
   var _valModule$GetSchema;
@@ -3243,7 +3247,6 @@ var keyOf = function keyOf(valModule) {
 };
 
 var DateSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(DateSchema, _Schema);
   function DateSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -3253,7 +3256,8 @@ var DateSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     return _this;
   }
-  _createClass(DateSchema, [{
+  _inherits(DateSchema, _Schema);
+  return _createClass(DateSchema, [{
     key: "validate",
     value: function validate(path, src) {
       var _this$options, _this$options2, _this$options3, _this$options4;
@@ -3365,7 +3369,6 @@ var DateSchema = /*#__PURE__*/function (_Schema) {
       };
     }
   }]);
-  return DateSchema;
 }(Schema);
 var date = function date(options) {
   return new DateSchema(options);
@@ -3689,7 +3692,7 @@ var initVal = function initVal(config) {
     c: {
       define: define,
       // remote,
-      file: file$1,
+      file: initFile(config),
       richtext: richtext,
       rt: {
         image: image,
@@ -4056,7 +4059,7 @@ var Hash = /*#__PURE__*/function () {
     this._word = new Int32Array(sharedBuffer, sharedOffset, N.allocWords);
     sharedOffset += N.allocBytes;
   }
-  _createClass(Hash, [{
+  return _createClass(Hash, [{
     key: "update",
     value: function update(data) {
       // data: string
@@ -4273,7 +4276,6 @@ var Hash = /*#__PURE__*/function () {
       return _byte.slice(0, 32);
     }
   }]);
-  return Hash;
 }();
 var W = new Int32Array(N.workWords);
 var sharedBuffer;
@@ -5092,6 +5094,7 @@ function deserializeSchema(serialized) {
   }
 }
 
+var ModuleFilePathSep = "?p=";
 var FATAL_ERROR_TYPES = ["no-schema", "no-source", "invalid-id", "no-module", "invalid-patch"];
 var Internal = {
   VERSION: {
@@ -5111,6 +5114,7 @@ var Internal = {
   getSource: getSource,
   resolvePath: resolvePath,
   splitModuleFilePathAndModulePath: splitModuleFilePathAndModulePath,
+  joinModuleFilePathAndModulePath: joinModuleFilePathAndModulePath,
   isVal: isVal,
   createValPathOfItem: createValPathOfItem,
   getSHA256Hash: getSHA256Hash,
@@ -5133,20 +5137,39 @@ var Internal = {
     }).join("/"));
   },
   createPatchPath: function createPatchPath(modulePath) {
-    return parsePath(modulePath);
-  },
-  patchPathToModulePath: function patchPathToModulePath(patchPath) {
-    return patchPath.map(function (segment) {
-      // TODO: I am worried that something is lost here: what if the segment is a string that happens to be a parsable as a number? We could make those keys illegal?
-      if (Number.isInteger(Number(segment))) {
-        return segment;
-      }
-      return JSON.stringify(segment);
-    }).join(".");
+    return splitModulePath(modulePath);
   },
+  splitModulePath: splitModulePath,
+  splitModuleFilePath: splitModuleFilePath,
+  splitJoinedSourcePaths: splitJoinedSourcePaths,
+  parentOfSourcePath: parentOfSourcePath,
+  patchPathToModulePath: patchPathToModulePath,
   VAL_ENABLE_COOKIE_NAME: "val_enable",
   VAL_STATE_COOKIE: "val_state",
-  VAL_SESSION_COOKIE: "val_session"
+  VAL_SESSION_COOKIE: "val_session",
+  createFilename: function createFilename(data, filename, metadata, sha256) {
+    var _Internal$getMimeType, _Internal$mimeTypeToF;
+    if (!metadata) {
+      return filename;
+    }
+    if (!data) {
+      return filename;
+    }
+    var shaSuffix = sha256.slice(0, 5);
+    var mimeType = (_Internal$getMimeType = Internal.getMimeType(data)) !== null && _Internal$getMimeType !== void 0 ? _Internal$getMimeType : "unknown";
+    var newExt = (_Internal$mimeTypeToF = Internal.mimeTypeToFileExt(mimeType)) !== null && _Internal$mimeTypeToF !== void 0 ? _Internal$mimeTypeToF : "unknown"; // Don't trust the file extension
+    if (filename) {
+      var cleanFilename = filename.split(".").slice(0, -1).join(".") || filename; // remove extension if it exists
+      var maybeShaSuffixPos = cleanFilename.lastIndexOf("_");
+      var currentShaSuffix = cleanFilename.slice(maybeShaSuffixPos + 1, cleanFilename.length);
+      if (currentShaSuffix === shaSuffix) {
+        cleanFilename = cleanFilename.slice(0, maybeShaSuffixPos);
+      }
+      var escapedFilename = encodeURIComponent(cleanFilename).replace(/%[0-9A-Fa-f]{2}/g, "").toLowerCase();
+      return "".concat(escapedFilename, "_").concat(shaSuffix, ".").concat(newExt);
+    }
+    return "".concat(sha256, ".").concat(newExt);
+  }
 };
 function tryJsonParse(str) {
   try {
@@ -5156,4 +5179,4 @@ function tryJsonParse(str) {
   }
 }
 
-export { ArraySchema as A, BooleanSchema as B, Call as C, DateSchema as D, Expr as E, FATAL_ERROR_TYPES as F, GenericSelector as G, Internal as I, KeyOfSchema as K, LiteralSchema as L, NilSym as N, ObjectSchema as O, PatchError as P, RT_IMAGE_TAG as R, StringLiteral as S, UnionSchema as U, VAL_EXTENSION as V, _typeof as _, _slicedToArray as a, _createClass as b, _classCallCheck as c, _toConsumableArray as d, StringTemplate as e, Sym as f, evaluate as g, initVal as h, index as i, Schema as j, FILE_REF_PROP as k, FILE_REF_SUBTYPE_TAG as l, modules as m, derefPatch as n, RecordSchema as o, parse as p, StringSchema as q, NumberSchema as r, splitModuleFilePathAndModulePath as s, ImageSchema as t, FileSchema as u, RichTextSchema as v, deserializeSchema as w };
+export { ArraySchema as A, BooleanSchema as B, Call as C, DateSchema as D, Expr as E, FATAL_ERROR_TYPES as F, GenericSelector as G, Internal as I, KeyOfSchema as K, LiteralSchema as L, ModuleFilePathSep as M, NilSym as N, ObjectSchema as O, PatchError as P, RT_IMAGE_TAG as R, StringLiteral as S, UnionSchema as U, VAL_EXTENSION as V, _typeof as _, _slicedToArray as a, _createClass as b, _classCallCheck as c, _toConsumableArray as d, StringTemplate as e, Sym as f, evaluate as g, initVal as h, index as i, Schema as j, FILE_REF_PROP as k, FILE_REF_SUBTYPE_TAG as l, modules as m, derefPatch as n, RecordSchema as o, parse as p, StringSchema as q, NumberSchema as r, splitModuleFilePathAndModulePath as s, ImageSchema as t, FileSchema as u, RichTextSchema as v, deserializeSchema as w };