@valbuild/core 0.93.0 → 0.95.0

package/dist/{index-d1491224.esm.js → index-1e99dc98.esm.js}

@@ -1,44 +1,4 @@
-import { _ as _unsupportedIterableToArray, a as _arrayLikeToArray, b as _createForOfIteratorHelper, i as isErr, c as isOk, e as err, o as ok } from './result-daff1cae.esm.js';
-
-function _arrayWithHoles(r) {
-  if (Array.isArray(r)) return r;
-}
-
-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();
-}
+import { _ as _arrayLikeToArray, a as _unsupportedIterableToArray, b as _createForOfIteratorHelper, i as isErr, c as isOk, e as err, o as ok } from './result-4bd63123.esm.js';
 
 function _arrayWithoutHoles(r) {
   if (Array.isArray(r)) return _arrayLikeToArray(r);
@@ -113,6 +73,46 @@ function _objectSpread2(e) {
   return e;
 }
 
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+
+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 _classCallCheck(a, n) {
   if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
 }
@@ -129,55 +129,6 @@ function _createClass(e, r, t) {
   }), e;
 }
 
-function _getPrototypeOf(t) {
-  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
-    return t.__proto__ || Object.getPrototypeOf(t);
-  }, _getPrototypeOf(t);
-}
-
-function _isNativeReflectConstruct() {
-  try {
-    var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
-  } catch (t) {}
-  return (_isNativeReflectConstruct = function () {
-    return !!t;
-  })();
-}
-
-function _assertThisInitialized(e) {
-  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  return e;
-}
-
-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(t, e) {
-  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
-    return t.__proto__ = e, t;
-  }, _setPrototypeOf(t, e);
-}
-
-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: t,
-      writable: !0,
-      configurable: !0
-    }
-  }), Object.defineProperty(t, "prototype", {
-    writable: !1
-  }), e && _setPrototypeOf(t, e);
-}
-
 // import { RemoteCompatibleSource, RemoteSource } from "../source/remote";
 
 // import { SerializedI18nSchema } from "./future/i18n";
@@ -274,6 +225,55 @@ var Schema = /*#__PURE__*/function () {
 
 // TODO: SourceError<"Could not determine type of Schema">
 
+function _getPrototypeOf(t) {
+  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+    return t.__proto__ || Object.getPrototypeOf(t);
+  }, _getPrototypeOf(t);
+}
+
+function _isNativeReflectConstruct() {
+  try {
+    var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+  } catch (t) {}
+  return (_isNativeReflectConstruct = function () {
+    return !!t;
+  })();
+}
+
+function _assertThisInitialized(e) {
+  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  return e;
+}
+
+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(t, e) {
+  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+    return t.__proto__ = e, t;
+  }, _setPrototypeOf(t, e);
+}
+
+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: t,
+      writable: !0,
+      configurable: !0
+    }
+  }), Object.defineProperty(t, "prototype", {
+    writable: !1
+  }), e && _setPrototypeOf(t, e);
+}
+
 /**
  * @internal
  */
@@ -376,30 +376,65 @@ 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";
 }
 
+function isVal(val) {
+  return _typeof(val) === "object" && val !== null && val !== undefined && Path in val && "val" in val;
+}
+
+/**
+ * The path of the source value.
+ *
+ * @example
+ * '/app/blogs.val.ts?p=0.text' // the text property of the first element of the /app/blogs module
+ */
+
+/**
+ * The path inside the module.
+ *
+ * @example
+ * '0."text"' // the text property of the first element of the module
+ */
+
+/**
+ * The path of the module.
+ *
+ * @example
+ * '/app/blogs.val.ts'
+ */
+
+/**
+ * The patchId of the parent patch, or "head" if there is no parent patch.
+ */
+
+function getValPath(valOrSelector) {
+  return valOrSelector[Path];
+}
+
 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;
     var customValidateFunctions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+    var moduleMetadata = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
     _classCallCheck(this, FileSchema);
     _this = _callSuper(this, FileSchema);
     _this.options = options;
     _this.opt = opt;
     _this.isRemote = isRemote;
     _this.customValidateFunctions = customValidateFunctions;
+    _this.moduleMetadata = moduleMetadata;
     return _this;
   }
   _inherits(FileSchema, _Schema);
   return _createClass(FileSchema, [{
     key: "remote",
     value: function remote() {
-      return new FileSchema(this.options, this.opt, true);
+      return new FileSchema(this.options, this.opt, true, this.customValidateFunctions, this.moduleMetadata);
     }
   }, {
     key: "validate",
     value: function validate(validationFunction) {
-      return new FileSchema(this.options, this.opt, this.isRemote, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+      return new FileSchema(this.options, this.opt, this.isRemote, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.moduleMetadata);
     }
   }, {
     key: "executeValidate",
@@ -560,18 +595,20 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "nullable",
     value: function nullable() {
-      return new FileSchema(this.options, true);
+      return new FileSchema(this.options, true, this.isRemote, this.customValidateFunctions, this.moduleMetadata);
     }
   }, {
     key: "executeSerialize",
     value: function executeSerialize() {
       var _this$customValidateF;
+      var modulePaths = this.moduleMetadata ? Object.keys(this.moduleMetadata) : [];
       return {
         type: "file",
         options: this.options,
         opt: this.opt,
         remote: this.isRemote,
-        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0,
+        referencedModule: modulePaths.length > 0 ? modulePaths[0] : undefined
       };
     }
   }, {
@@ -582,6 +619,19 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
   }]);
 }(Schema);
 var file = function file(options) {
+  var isModule = !!options && !!Internal.getValPath(options);
+  if (isModule) {
+    var allModules = {};
+    for (var _i = 0, _arr = [options]; _i < _arr.length; _i++) {
+      var valModule = _arr[_i];
+      var modulePath = getValPath(valModule);
+      if (modulePath === undefined) {
+        throw new Error("Invalid argument passed to s.file(). Expected a ValModule constructed through c.define, but got an object without a valid module path.");
+      }
+      allModules[modulePath] = getSource(valModule);
+    }
+    return new FileSchema({}, false, false, [], allModules);
+  }
   return new FileSchema(options);
 };
 function convertFileSource(src) {
@@ -604,39 +654,6 @@ function convertFileSource(src) {
   };
 }
 
-function isVal(val) {
-  return _typeof(val) === "object" && val !== null && val !== undefined && Path in val && "val" in val;
-}
-
-/**
- * The path of the source value.
- *
- * @example
- * '/app/blogs.val.ts?p=0.text' // the text property of the first element of the /app/blogs module
- */
-
-/**
- * The path inside the module.
- *
- * @example
- * '0."text"' // the text property of the first element of the module
- */
-
-/**
- * The path of the module.
- *
- * @example
- * '/app/blogs.val.ts'
- */
-
-/**
- * The patchId of the parent patch, or "head" if there is no parent patch.
- */
-
-function getValPath(valOrSelector) {
-  return valOrSelector[Path];
-}
-
 function createValPathOfItem(arrayPath, prop) {
   if (_typeof(prop) === "symbol") {
     throw Error("Cannot create val path of array item with symbol prop: ".concat(prop.toString()));
@@ -736,6 +753,12 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
       if (this.opt && (src === null || src === undefined)) {
         return errors.length > 0 ? _defineProperty({}, path, errors) : false;
       }
+      if (!this.opt && (src === null || src === undefined)) {
+        return _defineProperty({}, path, [{
+          message: "Expected 'string', got '".concat(src === null ? "null" : "undefined", "'"),
+          value: src
+        }]);
+      }
       if (typeof src !== "string") {
         return _defineProperty({}, path, [{
           message: "Expected 'string', got '".concat(_typeof(src), "'"),
@@ -1715,28 +1738,31 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var isRemote = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var customValidateFunctions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+    var moduleMetadata = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
     _classCallCheck(this, ImageSchema);
     _this = _callSuper(this, ImageSchema);
     _this.options = options;
     _this.opt = opt;
     _this.isRemote = isRemote;
     _this.customValidateFunctions = customValidateFunctions;
+    _this.moduleMetadata = moduleMetadata;
     return _this;
   }
   _inherits(ImageSchema, _Schema);
   return _createClass(ImageSchema, [{
     key: "remote",
     value: function remote() {
-      return new ImageSchema(this.options, this.opt, true);
+      return new ImageSchema(this.options, this.opt, true, this.customValidateFunctions, this.moduleMetadata);
     }
   }, {
     key: "validate",
     value: function validate(validationFunction) {
-      return new ImageSchema(this.options, this.opt, this.isRemote, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+      return new ImageSchema(this.options, this.opt, this.isRemote, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.moduleMetadata);
     }
   }, {
     key: "executeValidate",
     value: function executeValidate(path, src) {
+      var _src$metadata$mimeTyp, _src$metadata;
       var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
         path: path
       });
@@ -1784,8 +1810,7 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
       }
       var _ref8 = this.options || {},
         accept = _ref8.accept;
-      var _ref9 = src.metadata || {},
-        mimeType = _ref9.mimeType;
+      var mimeType = (_src$metadata$mimeTyp = (_src$metadata = src.metadata) === null || _src$metadata === void 0 ? void 0 : _src$metadata.mimeType) !== null && _src$metadata$mimeTyp !== void 0 ? _src$metadata$mimeTyp : "";
       if (accept && mimeType && !mimeType.includes("/")) {
         return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Invalid mime type format. Got: '".concat(mimeType, "'"),
@@ -1846,6 +1871,13 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
           fixes: ["image:check-metadata"]
         }]));
       }
+      var isReferencedModule = Object.keys(this.moduleMetadata).length > 0;
+      if (src.metadata === undefined && isReferencedModule) {
+        if (customValidationErrors.length === 0) {
+          return false;
+        }
+        return _defineProperty({}, path, _toConsumableArray(customValidationErrors));
+      }
       return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
         message: "Could not validate Image metadata.",
         value: src,
@@ -1905,18 +1937,20 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "nullable",
     value: function nullable() {
-      return new ImageSchema(this.options, true, this.isRemote);
+      return new ImageSchema(this.options, true, this.isRemote, this.customValidateFunctions, this.moduleMetadata);
     }
   }, {
     key: "executeSerialize",
     value: function executeSerialize() {
       var _this$customValidateF;
+      var modulePaths = this.moduleMetadata ? Object.keys(this.moduleMetadata) : [];
       return {
         type: "image",
         options: this.options,
         opt: this.opt,
         remote: this.isRemote,
-        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0,
+        referencedModule: modulePaths.length > 0 ? modulePaths[0] : undefined
       };
     }
   }, {
@@ -1927,6 +1961,19 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
   }]);
 }(Schema);
 var image = function image(options) {
+  var isModule = !!options && !!Internal.getValPath(options);
+  if (isModule) {
+    var allModules = {};
+    for (var _i = 0, _arr = [options]; _i < _arr.length; _i++) {
+      var valModule = _arr[_i];
+      var modulePath = getValPath(valModule);
+      if (modulePath === undefined) {
+        throw new Error("Invalid argument passed to s.image(). Expected a ValModule constructed through c.define, but got an object without a valid module path.");
+      }
+      allModules[modulePath] = getSource(valModule);
+    }
+    return new ImageSchema({}, false, false, [], allModules);
+  }
   return new ImageSchema(options);
 };
 
@@ -2198,6 +2245,10 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
                   }])
                 };
               }
+              var supportedTags = ["p", "span", "h1", "h2", "h3", "h4", "h5", "h6", "ol", "ul", "li", "a", "img", "br"];
+              if (!supportedTags.includes(node.tag)) {
+                addError(path, "Tag '".concat(node.tag, "' is not supported. Supported tags: ").concat(supportedTags.join(", ")), true);
+              }
               if (node.tag === "h1" && !((_this2$options$block = _this2.options.block) !== null && _this2$options$block !== void 0 && _this2$options$block.h1)) {
                 addError(path, "'h' block is not valid", false);
               }
@@ -2270,7 +2321,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
                 if (!((_this2$options$inline4 = _this2.options.inline) !== null && _this2$options$inline4 !== void 0 && _this2$options$inline4.img)) {
                   addError(path, "'img' inline is not valid", false);
                 } else if ((_this2$options$inline5 = _this2.options.inline) !== null && _this2$options$inline5 !== void 0 && _this2$options$inline5.img) {
-                  var _this2$options$inline6, _this2$options$inline7;
+                  var _this2$options$inline6;
                   if (!("src" in node)) {
                     return {
                       v: _defineProperty({}, path, [{
@@ -2280,7 +2331,8 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
                     };
                   }
                   var srcPath = unsafeCreateSourcePath(path, "src");
-                  var imageValidationErrors = _typeof((_this2$options$inline6 = _this2.options.inline) === null || _this2$options$inline6 === void 0 ? void 0 : _this2$options$inline6.img) === "object" ? (_this2$options$inline7 = _this2.options.inline) === null || _this2$options$inline7 === void 0 ? void 0 : _this2$options$inline7.img["executeValidate"](srcPath, node.src) : new ImageSchema({}, false, false)["executeValidate"](srcPath, node.src);
+                  var imgSchema = (_this2$options$inline6 = _this2.options.inline) === null || _this2$options$inline6 === void 0 ? void 0 : _this2$options$inline6.img;
+                  var imageValidationErrors = _typeof(imgSchema) === "object" ? imgSchema["executeValidate"](srcPath, node.src) : new ImageSchema({}, false, false)["executeValidate"](srcPath, node.src);
                   if (imageValidationErrors) {
                     for (var _validationErrorPathS in imageValidationErrors) {
                       var _current$_validationE;
@@ -2614,6 +2666,39 @@ var richtext = function richtext(options) {
   return new RichTextSchema(options !== null && options !== void 0 ? options : {});
 };
 
+var RegEx = /^(https?:\/\/[^/]+)\/file\/p\/([^/]+)\/b\/([^/]+)\/v\/([^/]+)\/h\/([^/]+)\/f\/([^/]+)\/p\/(.+)$/;
+function splitRemoteRef(ref) {
+  if (ref[0] === "/") {
+    return {
+      status: "error",
+      error: "Not a remote ref: " + 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 RecordSchema = /*#__PURE__*/function (_Schema) {
   function RecordSchema(item) {
     var _this;
@@ -2621,6 +2706,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var currentRouter = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
     var keySchema = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+    var mediaOptions = arguments.length > 5 ? arguments[5] : undefined;
     _classCallCheck(this, RecordSchema);
     _this = _callSuper(this, RecordSchema);
     _defineProperty(_this, "renderInput", null);
@@ -2629,13 +2715,14 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     _this.customValidateFunctions = customValidateFunctions;
     _this.currentRouter = currentRouter;
     _this.keySchema = keySchema;
+    _this.mediaOptions = mediaOptions;
     return _this;
   }
   _inherits(RecordSchema, _Schema);
   return _createClass(RecordSchema, [{
     key: "validate",
     value: function validate(validationFunction) {
-      return new RecordSchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.currentRouter, this.keySchema);
+      return new RecordSchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.currentRouter, this.keySchema, this.mediaOptions);
     }
   }, {
     key: "executeValidate",
@@ -2679,6 +2766,40 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
       } finally {
         _iterator.f();
       }
+      if (this.mediaOptions) {
+        var checkFix = this.mediaOptions.type === "images" ? "images:check-unique-folder" : "files:check-unique-folder";
+        var uniqueCheckError = {
+          message: "Gallery directory '".concat(this.mediaOptions.directory, "' must be unique across all galleries"),
+          value: {
+            directory: this.mediaOptions.directory,
+            type: this.mediaOptions.type
+          },
+          fixes: [checkFix]
+        };
+        if (error) {
+          if (error[path]) {
+            error[path] = [].concat(_toConsumableArray(error[path]), [uniqueCheckError]);
+          } else {
+            error = _objectSpread2(_objectSpread2({}, error), {}, _defineProperty({}, path, [uniqueCheckError]));
+          }
+        } else {
+          error = _defineProperty({}, path, [uniqueCheckError]);
+        }
+        var allFilesCheckFix = this.mediaOptions.type === "images" ? "images:check-all-files" : "files:check-all-files";
+        var allFilesCheckError = {
+          message: "Directory '".concat(this.mediaOptions.directory, "' may have files not tracked by this gallery"),
+          value: {
+            directory: this.mediaOptions.directory,
+            type: this.mediaOptions.type
+          },
+          fixes: [allFilesCheckFix]
+        };
+        if (error[path]) {
+          error[path] = [].concat(_toConsumableArray(error[path]), [allFilesCheckError]);
+        } else {
+          error = _objectSpread2(_objectSpread2({}, error), {}, _defineProperty({}, path, [allFilesCheckError]));
+        }
+      }
       Object.entries(src).forEach(function (_ref5) {
         var _ref6 = _slicedToArray(_ref5, 2),
           key = _ref6[0],
@@ -2712,6 +2833,16 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           error = _this2.appendValidationError(error, path, "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(elem),
           // Should! never happen
           src);
+        } else if (_this2.mediaOptions) {
+          // Media collection: validate key (path/URL) and entry (metadata)
+          var keyErr = _this2.validateMediaKey(subPath, key);
+          if (keyErr) {
+            error = error ? _objectSpread2(_objectSpread2({}, error), keyErr) : keyErr;
+          }
+          var entryErr = _this2.validateMediaEntry(subPath, elem);
+          if (entryErr) {
+            error = error ? _objectSpread2(_objectSpread2({}, error), entryErr) : entryErr;
+          }
         } else {
           var subError = _this2.item["executeValidate"](subPath, elem);
           if (subError && error) {
@@ -2723,6 +2854,176 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
       });
       return error;
     }
+  }, {
+    key: "isRemoteUrl",
+    value: function isRemoteUrl(url) {
+      return url.startsWith("https://") || url.startsWith("http://");
+    }
+  }, {
+    key: "validateMediaKey",
+    value: function validateMediaKey(path, key) {
+      if (!this.mediaOptions) {
+        return false;
+      }
+      var _this$mediaOptions = this.mediaOptions,
+        directory = _this$mediaOptions.directory,
+        isRemote = _this$mediaOptions.remote,
+        type = _this$mediaOptions.type;
+      var mediaLabel = type === "images" ? "images" : "files";
+      var checkRemoteFix = type === "images" ? "images:check-remote" : "files:check-remote";
+      var isRemoteUrl = this.isRemoteUrl(key);
+      var isLocalPath = key === directory || key.startsWith(directory + "/");
+      if (isRemote) {
+        // When remote is enabled, accept either remote URLs or local paths
+        if (isRemoteUrl) {
+          // Validate remote URL format using splitRemoteRef
+          var remoteResult = splitRemoteRef(key);
+          if (remoteResult.status === "error") {
+            return _defineProperty({}, path, [{
+              message: "Invalid remote URL format. Use Val tooling (CLI, VS Code extension, or Val Studio) to upload ".concat(mediaLabel, ". Got: ").concat(key),
+              value: key,
+              fixes: [checkRemoteFix]
+            }]);
+          }
+          // Check that the file path in the remote URL matches our directory constraint
+          var remotePath = "/" + remoteResult.filePath;
+          if (remotePath !== directory && !remotePath.startsWith(directory + "/")) {
+            return _defineProperty({}, path, [{
+              message: "Remote file path '".concat(remotePath, "' is not in expected directory '").concat(directory, "'. Use Val tooling to upload ").concat(mediaLabel, " to the correct directory."),
+              value: key,
+              fixes: [checkRemoteFix]
+            }]);
+          }
+          return false;
+        }
+        if (!isLocalPath) {
+          return _defineProperty({}, path, [{
+            message: "Expected a remote URL (https://...) or a local path starting with ".concat(directory, "/. Got: ").concat(key),
+            value: key
+          }]);
+        }
+      } else {
+        // When remote is disabled, only accept local paths
+        if (isRemoteUrl) {
+          return _defineProperty({}, path, [{
+            message: "Remote URLs are not allowed. Use .remote() to enable remote ".concat(mediaLabel, ". Got: ").concat(key),
+            value: key,
+            fixes: [checkRemoteFix]
+          }]);
+        }
+        if (!isLocalPath) {
+          return _defineProperty({}, path, [{
+            message: "File path must be within the ".concat(directory, "/ directory. Got: ").concat(key),
+            value: key
+          }]);
+        }
+      }
+      return false;
+    }
+  }, {
+    key: "validateMediaEntry",
+    value: function validateMediaEntry(path, entry) {
+      if (!this.mediaOptions) {
+        return false;
+      }
+      var _this$mediaOptions2 = this.mediaOptions,
+        type = _this$mediaOptions2.type,
+        accept = _this$mediaOptions2.accept,
+        altSchema = _this$mediaOptions2.altSchema;
+      if (_typeof(entry) !== "object" || entry === null) {
+        return _defineProperty({}, path, [{
+          message: "Expected 'object', got '".concat(_typeof(entry), "'"),
+          value: entry
+        }]);
+      }
+      var entryObj = entry;
+      var errors = [];
+      if (type === "images") {
+        // Validate width
+        if (typeof entryObj.width !== "number" || entryObj.width <= 0) {
+          errors.push({
+            message: "Expected 'width' to be a positive number, got '".concat(entryObj.width, "'"),
+            value: entry
+          });
+        }
+
+        // Validate height
+        if (typeof entryObj.height !== "number" || entryObj.height <= 0) {
+          errors.push({
+            message: "Expected 'height' to be a positive number, got '".concat(entryObj.height, "'"),
+            value: entry
+          });
+        }
+      }
+
+      // Validate mimeType
+      if (typeof entryObj.mimeType !== "string") {
+        errors.push({
+          message: "Expected 'mimeType' to be a string, got '".concat(_typeof(entryObj.mimeType), "'"),
+          value: entry
+        });
+      } else {
+        var mimeTypeError = this.validateMediaMimeType(entryObj.mimeType, accept);
+        if (mimeTypeError) {
+          errors.push({
+            message: mimeTypeError,
+            value: entry
+          });
+        }
+      }
+      if (type === "images") {
+        // Validate hotspot if present
+        if (entryObj.hotspot !== undefined) {
+          var hs = entryObj.hotspot;
+          if (_typeof(entryObj.hotspot) !== "object" || typeof hs.x !== "number" || typeof hs.y !== "number") {
+            errors.push({
+              message: "Hotspot must be an object with x and y as numbers.",
+              value: entry
+            });
+          }
+        }
+
+        // Validate alt using the alt schema
+        var altPath = createValPathOfItem(path, "alt");
+        if (altPath && altSchema) {
+          var altError = altSchema["executeValidate"](altPath, entryObj.alt);
+          if (altError) {
+            return errors.length > 0 ? _objectSpread2(_objectSpread2({}, altError), {}, _defineProperty({}, path, errors)) : altError;
+          }
+        }
+      }
+      if (errors.length > 0) {
+        return _defineProperty({}, path, errors);
+      }
+      return false;
+    }
+  }, {
+    key: "validateMediaMimeType",
+    value: function validateMediaMimeType(mimeType, accept) {
+      if (!mimeType.includes("/")) {
+        return "Invalid mime type format. Got: '".concat(mimeType, "'");
+      }
+      var acceptedTypes = accept.split(",").map(function (type) {
+        return type.trim();
+      });
+      var isValidMimeType = acceptedTypes.some(function (acceptedType) {
+        if (acceptedType === "*/*") {
+          return true;
+        }
+        if (acceptedType === "image/*") {
+          return mimeType.startsWith("image/");
+        }
+        if (acceptedType.endsWith("/*")) {
+          var baseType = acceptedType.slice(0, -2);
+          return mimeType.startsWith(baseType);
+        }
+        return acceptedType === mimeType;
+      });
+      if (!isValidMimeType) {
+        return "Mime type mismatch. Found '".concat(mimeType, "' but schema accepts '").concat(accept, "'");
+      }
+      return null;
+    }
   }, {
     key: "executeAssert",
     value: function executeAssert(path, src) {
@@ -2732,6 +3033,15 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           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,
@@ -2758,12 +3068,19 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "nullable",
     value: function nullable() {
-      return new RecordSchema(this.item, true, this.customValidateFunctions, this.currentRouter, this.keySchema);
+      return new RecordSchema(this.item, true, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions);
     }
   }, {
     key: "router",
     value: function router(_router) {
-      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router, this.keySchema);
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router, this.keySchema, this.mediaOptions);
+    }
+  }, {
+    key: "remote",
+    value: function remote() {
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions ? _objectSpread2(_objectSpread2({}, this.mediaOptions), {}, {
+        remote: true
+      }) : undefined);
     }
   }, {
     key: "getRouterValidations",
@@ -2811,7 +3128,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     key: "executeSerialize",
     value: function executeSerialize() {
       var _this$keySchema, _this$currentRouter, _this$customValidateF;
-      return {
+      var result = {
         type: "record",
         item: this.item["executeSerialize"](),
         key: (_this$keySchema = this.keySchema) === null || _this$keySchema === void 0 ? void 0 : _this$keySchema["executeSerialize"](),
@@ -2819,6 +3136,16 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
         router: (_this$currentRouter = this.currentRouter) === null || _this$currentRouter === void 0 ? void 0 : _this$currentRouter.getRouterId(),
         customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
+      if (this.mediaOptions) {
+        result.mediaType = this.mediaOptions.type;
+        result.accept = this.mediaOptions.accept;
+        result.directory = this.mediaOptions.directory;
+        result.remote = this.mediaOptions.remote;
+        if (this.mediaOptions.altSchema) {
+          result.alt = this.mediaOptions.altSchema["executeSerialize"]();
+        }
+      }
+      return result;
     }
   }, {
     key: "executeRender",
@@ -2855,10 +3182,10 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
             data: {
               layout: "list",
               parent: "record",
-              items: Object.entries(src).map(function (_ref8) {
-                var _ref9 = _slicedToArray(_ref8, 2),
-                  key = _ref9[0],
-                  val = _ref9[1];
+              items: Object.entries(src).map(function (_ref13) {
+                var _ref14 = _slicedToArray(_ref13, 2),
+                  key = _ref14[0],
+                  val = _ref14[1];
                 // NB NB: display is actually defined by the user
                 var _prepare = prepare({
                     key: key,
@@ -2913,14 +3240,11 @@ function record(keyOrSchema, schema) {
 
 function define(id,
 // TODO: `/${string}`
-
 schema, source) {
   return _defineProperty(_defineProperty(_defineProperty({}, GetSource, source), GetSchema, schema), Path, id);
 }
 function getSource(valModule) {
-  var sourceOrExpr = valModule[GetSource];
-  var source = sourceOrExpr;
-  return source;
+  return valModule[GetSource];
 }
 function splitModuleFilePathAndModulePath(path) {
   var pathOfSep = path.indexOf(ModuleFilePathSep);
@@ -3851,6 +4175,44 @@ var keyOf = function keyOf(valModule) {
   return new KeyOfSchema(serializedRefSchema, getValPath(valModule));
 };
 
+/**
+ * Options for s.files()
+ */
+
+/**
+ * Metadata for a file entry in the files record
+ */
+
+/**
+ * Define a collection of files.
+ *
+ * @example
+ * ```typescript
+ * const schema = s.files({
+ *   accept: "application/pdf",
+ *   directory: "/public/val/documents",
+ * });
+ * export default c.define("/content/documents.val.ts", schema, {
+ *   "/public/val/documents/report.pdf": {
+ *     mimeType: "application/pdf",
+ *   },
+ * });
+ * ```
+ */
+var files = function files(options) {
+  var _options$directory, _options$remote;
+  var directory = (_options$directory = options.directory) !== null && _options$directory !== void 0 ? _options$directory : "/public/val";
+  var itemSchema = new ObjectSchema({
+    mimeType: new StringSchema({}, false)
+  }, false);
+  return new RecordSchema(itemSchema, false, [], null, null, {
+    type: "files",
+    accept: options.accept,
+    directory: directory,
+    remote: (_options$remote = options.remote) !== null && _options$remote !== void 0 ? _options$remote : false
+  });
+};
+
 var DateSchema = /*#__PURE__*/function (_Schema) {
   function DateSchema(options) {
     var _this;
@@ -3999,6 +4361,59 @@ function router(router, item) {
   return recordSchema;
 }
 
+/**
+ * Alt schema type - can be a string, nullable string, or a record of locale to string
+ */
+
+/**
+ * Options for s.images()
+ */
+
+/**
+ * Metadata for an image entry in the images record
+ */
+
+// Item schema types for images (alt simplified to string | null for typing)
+
+/**
+ * Define a collection of images.
+ *
+ * @example
+ * ```typescript
+ * const schema = s.images({
+ *   accept: "image/webp",
+ *   directory: "/public/val/images",
+ *   alt: s.string().minLength(4),
+ * });
+ * export default c.define("/content/images.val.ts", schema, {
+ *   "/public/val/images/hero.webp": {
+ *     width: 1920,
+ *     height: 1080,
+ *     mimeType: "image/webp",
+ *     alt: "Hero image",
+ *   },
+ * });
+ * ```
+ */
+var images = function images(options) {
+  var _options$directory, _options$alt, _options$remote;
+  var directory = (_options$directory = options.directory) !== null && _options$directory !== void 0 ? _options$directory : "/public/val";
+  var altSchema = (_options$alt = options.alt) !== null && _options$alt !== void 0 ? _options$alt : string().nullable();
+  var itemSchema = new ObjectSchema({
+    width: new NumberSchema(undefined, false),
+    height: new NumberSchema(undefined, false),
+    mimeType: new StringSchema({}, false),
+    alt: altSchema
+  }, false);
+  return new RecordSchema(itemSchema, false, [], null, null, {
+    type: "images",
+    accept: options.accept,
+    directory: directory,
+    remote: (_options$remote = options.remote) !== null && _options$remote !== void 0 ? _options$remote : false,
+    altSchema: altSchema
+  });
+};
+
 // import type { F } from "ts-toolbelt";
 // import { i18n, I18n } from "./schema/future/i18n";
 // import { oneOf } from "./schema/future/oneOf";
@@ -4022,9 +4437,11 @@ function initSchema() {
     keyOf: keyOf,
     record: record,
     file: file,
+    files: files,
     date: date,
     route: route,
-    router: router
+    router: router,
+    images: images
     // i18n: i18n(locales),
   };
 }
@@ -4173,33 +4590,6 @@ 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) {
@@ -5432,7 +5822,7 @@ function getFileHash(text) {
 }
 
 function deserializeSchema(serialized) {
-  var _serialized$options, _serialized$options2;
+  var _serialized$options, _serialized$options2, _serialized$accept, _serialized$directory, _serialized$remote;
   switch (serialized.type) {
     case "string":
       return new StringSchema(_objectSpread2(_objectSpread2({}, serialized.options), {}, {
@@ -5475,7 +5865,13 @@ function deserializeSchema(serialized) {
         return new RichTextSchema(deserializedOptions, serialized.opt);
       }
     case "record":
-      return new RecordSchema(deserializeSchema(serialized.item), serialized.opt, [], null, serialized.key ? deserializeSchema(serialized.key) : null);
+      return new RecordSchema(deserializeSchema(serialized.item), serialized.opt, [], null, serialized.key ? deserializeSchema(serialized.key) : null, serialized.mediaType ? {
+        type: serialized.mediaType,
+        accept: (_serialized$accept = serialized.accept) !== null && _serialized$accept !== void 0 ? _serialized$accept : "*/*",
+        directory: (_serialized$directory = serialized.directory) !== null && _serialized$directory !== void 0 ? _serialized$directory : "/public/val",
+        remote: (_serialized$remote = serialized.remote) !== null && _serialized$remote !== void 0 ? _serialized$remote : false,
+        altSchema: serialized.alt ? deserializeSchema(serialized.alt) : undefined
+      } : undefined);
     case "keyOf":
       return new KeyOfSchema(serialized.schema, serialized.path, serialized.opt);
     case "route":
@@ -5721,6 +6117,37 @@ function parseNextJsRoutePattern(moduleFilePath) {
   return [];
 }
 
+/**
+ * Given a URL pathname (e.g. "/blogs/blog-1") and all serialized module schemas,
+ * finds the matching next-app-router module and returns the module file path
+ * and the source path for that route's content.
+ *
+ * External routers (e.g. external-url-router) are intentionally skipped.
+ * Returns null if no next-app-router module matches the pathname.
+ */
+function getSourcePathFromRoute(pathname, schemas) {
+  for (var _i = 0, _arr = Object.entries(schemas); _i < _arr.length; _i++) {
+    var _arr$_i = _slicedToArray(_arr[_i], 2),
+      moduleFilePath = _arr$_i[0],
+      schema = _arr$_i[1];
+    if (schema.type !== "record" || schema.router !== "next-app-router") {
+      continue;
+    }
+    var routePattern = parseNextJsRoutePattern(moduleFilePath);
+    var _validateUrlAgainstPa = validateUrlAgainstPattern(pathname, routePattern),
+      isValid = _validateUrlAgainstPa.isValid;
+    if (isValid) {
+      var sourcePath = "".concat(moduleFilePath, "?p=").concat(JSON.stringify(pathname));
+      return {
+        moduleFilePath: moduleFilePath,
+        sourcePath: sourcePath,
+        route: pathname
+      };
+    }
+  }
+  return null;
+}
+
 var ModuleFilePathSep = "?p=";
 var FATAL_ERROR_TYPES = ["no-schema", "no-source", "invalid-id", "no-module", "invalid-patch"];
 var DEFAULT_CONTENT_HOST = "https://content.val.build";
@@ -5824,4 +6251,4 @@ function tryJsonParse(str) {
   }
 }
 
-export { ArraySchema as A, BooleanSchema as B, DEFAULT_CONTENT_HOST as D, FATAL_ERROR_TYPES as F, GenericSelector as G, Internal as I, KeyOfSchema as K, LiteralSchema as L, ModuleFilePathSep as M, NumberSchema as N, ObjectSchema as O, PatchError as P, RecordSchema as R, Schema as S, UnionSchema as U, VAL_EXTENSION as V, _typeof as _, _slicedToArray as a, _createClass as b, _classCallCheck as c, _toConsumableArray as d, DEFAULT_APP_HOST as e, DEFAULT_VAL_REMOTE_HOST as f, FILE_REF_PROP as g, FILE_REF_SUBTYPE_TAG as h, initVal as i, derefPatch as j, StringSchema as k, ImageSchema as l, modules as m, FileSchema as n, DateSchema as o, RouteSchema as p, RichTextSchema as q, deserializeSchema as r, splitModuleFilePathAndModulePath as s };
+export { ArraySchema as A, BooleanSchema as B, DEFAULT_CONTENT_HOST as D, FATAL_ERROR_TYPES as F, GenericSelector as G, Internal as I, KeyOfSchema as K, LiteralSchema as L, ModuleFilePathSep as M, NumberSchema as N, ObjectSchema as O, PatchError as P, RecordSchema as R, Schema as S, UnionSchema as U, VAL_EXTENSION as V, _typeof as _, _slicedToArray as a, _createClass as b, _classCallCheck as c, _toConsumableArray as d, DEFAULT_APP_HOST as e, DEFAULT_VAL_REMOTE_HOST as f, FILE_REF_PROP as g, FILE_REF_SUBTYPE_TAG as h, initVal as i, derefPatch as j, StringSchema as k, ImageSchema as l, modules as m, FileSchema as n, DateSchema as o, RouteSchema as p, RichTextSchema as q, deserializeSchema as r, splitModuleFilePathAndModulePath as s, getSourcePathFromRoute as t };