@valbuild/core 0.48.1 → 0.50.0

package/dist/declarations/src/index.d.ts

@@ -2,6 +2,7 @@ export { initVal } from "./initVal.js";
 export type { InitVal, ValConfig, ValConstructor } from "./initVal.js";
 export { Schema, type SerializedSchema, type SelectorOfSchema } from "./schema/index.js";
 export type { ImageMetadata } from "./schema/image.js";
+export type { FileMetadata } from "./schema/file.js";
 export type { LinkSource } from "./source/link.js";
 export type { ValModule, SerializedModule, InferValModuleType } from "./module.js";
 export type { SourceObject, SourcePrimitive, Source } from "./source/index.js";
@@ -28,6 +29,7 @@ import { getVal } from "./future/fetchVal.js";
 import type { Json } from "./Json.js";
 import { SerializedSchema } from "./schema/index.js";
 import { PatchJSON } from "./patch/index.js";
+import { initSchema } from "./initSchema.js";
 export { ValApi } from "./ValApi.js";
 export { type SerializedArraySchema, ArraySchema } from "./schema/array.js";
 export { type SerializedObjectSchema, ObjectSchema } from "./schema/object.js";
@@ -36,6 +38,7 @@ export { type SerializedStringSchema, StringSchema } from "./schema/string.js";
 export { type SerializedNumberSchema, NumberSchema } from "./schema/number.js";
 export { type SerializedBooleanSchema, BooleanSchema } from "./schema/boolean.js";
 export { type SerializedImageSchema, ImageSchema } from "./schema/image.js";
+export { type SerializedFileSchema, FileSchema } from "./schema/file.js";
 export { type SerializedRichTextSchema, RichTextSchema, } from "./schema/richtext.js";
 export { type SerializedUnionSchema, UnionSchema } from "./schema/union.js";
 export { type SerializedLiteralSchema, LiteralSchema } from "./schema/literal.js";
@@ -92,6 +95,7 @@ declare const Internal: {
     isVal: typeof isVal;
     createValPathOfItem: typeof createValPathOfItem;
     getSHA256Hash: (bits: Uint8Array) => string;
+    initSchema: typeof initSchema;
     createPatchJSONPath: (modulePath: ModulePath) => string;
     VAL_ENABLE_COOKIE_NAME: "val_enable";
     VAL_STATE_COOKIE: "val_state";

package/dist/declarations/src/initSchema.d.ts

@@ -9,6 +9,7 @@ import { image } from "./schema/image.js";
 import { literal } from "./schema/literal.js";
 import { keyOf } from "./schema/keyOf.js";
 import { record } from "./schema/record.js";
+import { file } from "./schema/file.js";
 export type InitSchema = {
     readonly string: typeof string;
     readonly boolean: typeof boolean;
@@ -21,6 +22,7 @@ export type InitSchema = {
     readonly literal: typeof literal;
     readonly keyOf: typeof keyOf;
     readonly record: typeof record;
+    readonly file: typeof file;
 };
 export declare function initSchema(): {
     string: <T extends string>(options?: {
@@ -53,4 +55,5 @@ export declare function initSchema(): {
     literal: <T_2 extends string>(value: T_2) => import("./schema/index.js").Schema<T_2>;
     keyOf: <Src extends import("./selector/index.js").GenericSelector<import("./source/index.js").SourceObject | import("./source/index.js").SourceArray, undefined> & import("./module.js").ValModuleBrand>(valModule: Src) => import("./schema/index.js").Schema<Src extends import("./selector/index.js").GenericSelector<infer S_2 extends import("./source/index.js").Source, undefined> ? S_2 extends readonly any[] ? number : S_2 extends import("./source/index.js").SourceObject ? keyof S_2 : S_2 extends Record<string, any> ? string : never : never>;
     record: <S_3 extends import("./schema/index.js").Schema<import("./selector/index.js").SelectorSource>>(schema: S_3) => import("./schema/index.js").Schema<Record<string, import("./schema/index.js").SelectorOfSchema<S_3>>>;
+    file: (options?: import("./schema/file.js").FileOptions | undefined) => import("./schema/index.js").Schema<import("./index.js").FileSource<import("./schema/file.js").FileMetadata>>;
 };

package/dist/declarations/src/schema/file.d.ts

@@ -1,5 +1,28 @@
 import { Json } from "../Json.js";
 import { FileSource } from "../source/file.js";
+import { Schema, SerializedSchema } from "./index.js";
+import { SourcePath } from "../val/index.js";
+import { ValidationErrors } from "./validation/ValidationError.js";
+export type FileOptions = Record<string, never>;
+export type SerializedFileSchema = {
+    type: "file";
+    options?: FileOptions;
+    opt: boolean;
+};
+export type FileMetadata = {
+    sha256: string;
+    mimeType?: string;
+};
+export declare class FileSchema<Src extends FileSource<FileMetadata | undefined> | null> extends Schema<Src> {
+    readonly options?: FileOptions | undefined;
+    readonly opt: boolean;
+    constructor(options?: FileOptions | undefined, opt?: boolean);
+    validate(path: SourcePath, src: Src): ValidationErrors;
+    assert(src: Src): boolean;
+    optional(): Schema<Src | null>;
+    serialize(): SerializedSchema;
+}
+export declare const file: (options?: FileOptions) => Schema<FileSource<FileMetadata>>;
 export declare function convertFileSource<Metadata extends {
     readonly [key: string]: Json;
 } | undefined = {

package/dist/declarations/src/schema/index.d.ts

@@ -2,6 +2,7 @@ import { SelectorSource } from "../selector/index.js";
 import { SourcePath } from "../val/index.js";
 import { SerializedArraySchema } from "./array.js";
 import { SerializedBooleanSchema } from "./boolean.js";
+import { SerializedFileSchema } from "./file.js";
 import { SerializedImageSchema } from "./image.js";
 import { SerializedKeyOfSchema } from "./keyOf.js";
 import { SerializedLiteralSchema } from "./literal.js";
@@ -12,7 +13,7 @@ import { SerializedRichTextSchema } from "./richtext.js";
 import { SerializedStringSchema } from "./string.js";
 import { SerializedUnionSchema } from "./union.js";
 import { ValidationErrors } from "./validation/ValidationError.js";
-export type SerializedSchema = SerializedStringSchema | SerializedLiteralSchema | SerializedBooleanSchema | SerializedNumberSchema | SerializedObjectSchema | SerializedArraySchema | SerializedUnionSchema | SerializedRichTextSchema | SerializedRecordSchema | SerializedKeyOfSchema | SerializedImageSchema;
+export type SerializedSchema = SerializedStringSchema | SerializedLiteralSchema | SerializedBooleanSchema | SerializedNumberSchema | SerializedObjectSchema | SerializedArraySchema | SerializedUnionSchema | SerializedRichTextSchema | SerializedRecordSchema | SerializedKeyOfSchema | SerializedFileSchema | SerializedImageSchema;
 export declare abstract class Schema<Src extends SelectorSource> {
     abstract validate(path: SourcePath, src: Src): ValidationErrors;
     abstract assert(src: Src): boolean;

package/dist/declarations/src/schema/richtext.d.ts

@@ -2,9 +2,10 @@ import { Schema, SerializedSchema } from "./index.js";
 import { RichTextSource, RichTextOptions } from "../source/richtext.js";
 import { SourcePath } from "../val/index.js";
 import { ValidationErrors } from "./validation/ValidationError.js";
-export type SerializedRichTextSchema = RichTextOptions & {
+export type SerializedRichTextSchema = {
     type: "richtext";
     opt: boolean;
+    options: RichTextOptions;
 };
 export declare class RichTextSchema<O extends RichTextOptions, Src extends RichTextSource<O> | null> extends Schema<Src> {
     readonly options: O;

package/dist/declarations/src/schema/validation/ValidationFix.d.ts

@@ -1,2 +1,2 @@
-export declare const ValidationFix: readonly ["image:add-metadata", "image:replace-metadata"];
+export declare const ValidationFix: readonly ["image:add-metadata", "image:replace-metadata", "file:add-metadata", "file:check-metadata"];
 export type ValidationFix = (typeof ValidationFix)[number];

package/dist/declarations/src/selector/SelectorProxy.d.ts

@@ -1,7 +1,7 @@
 import { GenericSelector } from "./index.js";
 import { Source } from "../source/index.js";
-import { SourcePath } from "../val/index.js";
+import { ModulePath, SourcePath } from "../val/index.js";
 export declare function isSelector(source: any): source is GenericSelector<Source>;
 export declare function newSelectorProxy(source: any, path?: SourcePath, moduleSchema?: any): any;
-export declare function createValPathOfItem(arrayPath: SourcePath | undefined, prop: string | number | symbol): SourcePath | undefined;
+export declare function createValPathOfItem(arrayPath: SourcePath | ModulePath | undefined, prop: string | number | symbol): SourcePath | undefined;
 export declare function selectorToVal(s: any): any;

package/dist/declarations/src/source/richtext.d.ts

@@ -36,7 +36,7 @@ export type BrNode = {
 export type SpanNode<O extends RichTextOptions> = {
     tag: "span";
     classes: Classes<O>[];
-    children: [string | SpanNode<O>];
+    children: [string];
 };
 type ImageTagNode = {
     tag: "img";

package/dist/{index-7b467ee6.cjs.prod.js → index-0391a11a.cjs.prod.js}

@@ -28,24 +28,24 @@ function _typeof(o) {
   }, _typeof(o);
 }
 
-function _toPrimitive(input, hint) {
-  if (typeof input !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (typeof res !== "object") return res;
+function toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
     throw new TypeError("@@toPrimitive must return a primitive value.");
   }
-  return (hint === "string" ? String : Number)(input);
+  return ("string" === r ? String : Number)(t);
 }
 
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return typeof key === "symbol" ? key : String(key);
+function toPropertyKey(t) {
+  var i = toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : String(i);
 }
 
 function _defineProperty(obj, key, value) {
-  key = _toPropertyKey(key);
+  key = toPropertyKey(key);
   if (key in obj) {
     Object.defineProperty(obj, key, {
       value: value,
@@ -133,7 +133,7 @@ function _defineProperties(target, props) {
     descriptor.enumerable = descriptor.enumerable || false;
     descriptor.configurable = true;
     if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
+    Object.defineProperty(target, toPropertyKey(descriptor.key), descriptor);
   }
 }
 function _createClass(Constructor, protoProps, staticProps) {
@@ -145,31 +145,6 @@ function _createClass(Constructor, protoProps, staticProps) {
   return Constructor;
 }
 
-function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-    o.__proto__ = p;
-    return o;
-  };
-  return _setPrototypeOf(o, p);
-}
-
-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, {
-    constructor: {
-      value: subClass,
-      writable: true,
-      configurable: true
-    }
-  });
-  Object.defineProperty(subClass, "prototype", {
-    writable: false
-  });
-  if (superClass) _setPrototypeOf(subClass, superClass);
-}
-
 function _getPrototypeOf(o) {
   _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
     return o.__proto__ || Object.getPrototypeOf(o);
@@ -178,15 +153,12 @@ function _getPrototypeOf(o) {
 }
 
 function _isNativeReflectConstruct() {
-  if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-  if (Reflect.construct.sham) return false;
-  if (typeof Proxy === "function") return true;
   try {
-    Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
-    return true;
-  } catch (e) {
-    return false;
-  }
+    var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+  } catch (t) {}
+  return (_isNativeReflectConstruct = function () {
+    return !!t;
+  })();
 }
 
 function _assertThisInitialized(self) {
@@ -205,25 +177,40 @@ function _possibleConstructorReturn(self, call) {
   return _assertThisInitialized(self);
 }
 
-function _createSuper(Derived) {
-  var hasNativeReflectConstruct = _isNativeReflectConstruct();
-  return function _createSuperInternal() {
-    var Super = _getPrototypeOf(Derived),
-      result;
-    if (hasNativeReflectConstruct) {
-      var NewTarget = _getPrototypeOf(this).constructor;
-      result = Reflect.construct(Super, arguments, NewTarget);
-    } else {
-      result = Super.apply(this, arguments);
-    }
-    return _possibleConstructorReturn(this, result);
+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 _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, {
+    constructor: {
+      value: subClass,
+      writable: true,
+      configurable: true
+    }
+  });
+  Object.defineProperty(subClass, "prototype", {
+    writable: false
+  });
+  if (superClass) _setPrototypeOf(subClass, superClass);
 }
 
 // import { RemoteCompatibleSource, RemoteSource } from "../source/remote";
 
 // import { SerializedI18nSchema } from "./future/i18n";
 // import { SerializedOneOfSchema } from "./future/oneOf";
+
 var Schema = /*#__PURE__*/function () {
   function Schema() {
     _classCallCheck(this, Schema);
@@ -309,11 +296,10 @@ var Expr = /*#__PURE__*/_createClass(function Expr(span) {
 });
 var StringLiteral = /*#__PURE__*/function (_Expr) {
   _inherits(StringLiteral, _Expr);
-  var _super = _createSuper(StringLiteral);
   function StringLiteral(value, span) {
     var _this;
     _classCallCheck(this, StringLiteral);
-    _this = _super.call(this, span);
+    _this = _callSuper(this, StringLiteral, [span]);
     _defineProperty(_assertThisInitialized(_this), "type", "StringLiteral");
     _this.value = value;
     return _this;
@@ -328,11 +314,10 @@ var StringLiteral = /*#__PURE__*/function (_Expr) {
 }(Expr);
 var Sym = /*#__PURE__*/function (_Expr2) {
   _inherits(Sym, _Expr2);
-  var _super2 = _createSuper(Sym);
   function Sym(value, span) {
     var _this2;
     _classCallCheck(this, Sym);
-    _this2 = _super2.call(this, span);
+    _this2 = _callSuper(this, Sym, [span]);
     _defineProperty(_assertThisInitialized(_this2), "type", "Sym");
     _this2.value = value;
     return _this2;
@@ -348,11 +333,10 @@ var Sym = /*#__PURE__*/function (_Expr2) {
 var NilSym = new Sym("()");
 var StringTemplate = /*#__PURE__*/function (_Expr3) {
   _inherits(StringTemplate, _Expr3);
-  var _super3 = _createSuper(StringTemplate);
   function StringTemplate(children, span) {
     var _this3;
     _classCallCheck(this, StringTemplate);
-    _this3 = _super3.call(this, span);
+    _this3 = _callSuper(this, StringTemplate, [span]);
     _defineProperty(_assertThisInitialized(_this3), "type", "StringTemplate");
     _this3.children = children;
     return _this3;
@@ -373,11 +357,10 @@ var StringTemplate = /*#__PURE__*/function (_Expr3) {
 }(Expr);
 var Call = /*#__PURE__*/function (_Expr4) {
   _inherits(Call, _Expr4);
-  var _super4 = _createSuper(Call);
   function Call(children, isAnon, span) {
     var _this4;
     _classCallCheck(this, Call);
-    _this4 = _super4.call(this, span);
+    _this4 = _callSuper(this, Call, [span]);
     _defineProperty(_assertThisInitialized(_this4), "type", "Call");
     _this4.children = children;
     _this4.isAnon = isAnon;
@@ -422,25 +405,102 @@ var FILE_REF_PROP = "_ref";
  *
  */
 
-function file(ref, metadata) {
+function file$1(ref, metadata) {
   return _defineProperty(_defineProperty(_defineProperty({}, FILE_REF_PROP, ref), VAL_EXTENSION, "file"), "metadata", 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;
+    _classCallCheck(this, FileSchema);
+    _this = _callSuper(this, FileSchema);
+    _this.options = options;
+    _this.opt = opt;
+    return _this;
+  }
+  _createClass(FileSchema, [{
+    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 file was null or undefined.",
+          value: src
+        }]);
+      }
+      if (typeof src[FILE_REF_PROP] !== "string") {
+        return _defineProperty({}, path, [{
+          message: "File 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: "File did not have the valid file extension type. Got: ".concat(src[VAL_EXTENSION]),
+          value: src
+        }]);
+      }
+      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).",
+          // 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"]
+        }]);
+      }
+      return _defineProperty({}, path, [{
+        message: "Missing File metadata.",
+        value: src,
+        fixes: ["file:add-metadata"]
+      }]);
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      return (src === null || src === void 0 ? void 0 : src[FILE_REF_PROP]) === "file" && (src === null || src === void 0 ? void 0 : src[VAL_EXTENSION]) === "file";
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new FileSchema(this.options, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return {
+        type: "file",
+        options: this.options,
+        opt: this.opt
+      };
+    }
+  }]);
+  return FileSchema;
+}(Schema);
+var file = function file(options) {
+  return new FileSchema(options);
+};
 function convertFileSource(src) {
-  var _src$metadata2;
+  var _src$metadata3, _src$metadata4;
   // TODO: /public should be configurable
   if (!src[FILE_REF_PROP].startsWith("/public")) {
-    var _src$metadata;
+    var _src$metadata, _src$metadata2;
     return {
-      url: src[FILE_REF_PROP] + "?sha256=".concat((_src$metadata = src.metadata) === null || _src$metadata === void 0 ? void 0 : _src$metadata.sha256),
+      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) : ""),
       metadata: src.metadata
     };
   }
   return {
-    url: src[FILE_REF_PROP].slice("/public".length) + "?sha256=".concat((_src$metadata2 = src.metadata) === null || _src$metadata2 === void 0 ? void 0 : _src$metadata2.sha256),
+    url: src[FILE_REF_PROP].slice("/public".length) + ((_src$metadata3 = src.metadata) !== null && _src$metadata3 !== void 0 && _src$metadata3.sha256 ? "?sha256=".concat((_src$metadata4 = src.metadata) === null || _src$metadata4 === void 0 ? void 0 : _src$metadata4.sha256) : ""),
     metadata: src.metadata
   };
 }
@@ -480,6 +540,7 @@ function getValPath(valOrSelector) {
 exports.Call = Call;
 exports.Expr = Expr;
 exports.FILE_REF_PROP = FILE_REF_PROP;
+exports.FileSchema = FileSchema;
 exports.GenericSelector = GenericSelector;
 exports.GetSchema = GetSchema;
 exports.GetSource = GetSource;
@@ -490,9 +551,9 @@ exports.StringLiteral = StringLiteral;
 exports.StringTemplate = StringTemplate;
 exports.Sym = Sym;
 exports.VAL_EXTENSION = VAL_EXTENSION;
+exports._callSuper = _callSuper;
 exports._classCallCheck = _classCallCheck;
 exports._createClass = _createClass;
-exports._createSuper = _createSuper;
 exports._defineProperty = _defineProperty;
 exports._inherits = _inherits;
 exports._objectSpread2 = _objectSpread2;
@@ -501,6 +562,7 @@ exports._toConsumableArray = _toConsumableArray;
 exports._typeof = _typeof;
 exports.convertFileSource = convertFileSource;
 exports.file = file;
+exports.file$1 = file$1;
 exports.getSchema = getSchema;
 exports.getValPath = getValPath;
 exports.isFile = isFile;

package/dist/{index-799bcf49.esm.js → index-14edbcc8.esm.js}

@@ -1,4 +1,4 @@
-import { p as _objectSpread2, h as _slicedToArray, c as _createClass, b as _classCallCheck, q as Sym, C as Call, r as StringLiteral, s as StringTemplate, e as _typeof, k as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, l as convertFileSource, d as _defineProperty, E as Expr, S as Schema, t as _toConsumableArray, N as NilSym } from './index-5750c299.esm.js';
+import { r as _objectSpread2, i as _slicedToArray, c as _createClass, a as _classCallCheck, s as Sym, C as Call, t as StringLiteral, u as StringTemplate, e as _typeof, l as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, m as convertFileSource, d as _defineProperty, E as Expr, S as Schema, v as _toConsumableArray, N as NilSym } from './index-a038a0f3.esm.js';
 import { i as isErr, e as err, o as ok, a as isOk } from './result-b96df128.esm.js';
 
 var WHITE_SPACE = ["\n", "\r", "\t", " "];