@valbuild/core 0.72.3 → 0.72.4

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

@@ -94,7 +94,7 @@ export declare function initSchema(): {
             a: boolean;
             img: boolean;
         }>;
-    }>>(options?: O | undefined) => import("./schema/index.js").Schema<import("./index.js").RichTextSource<O>>;
+    }>>(options?: O | undefined) => import("./schema/richtext.js").RichTextSchema<O, import("./index.js").RichTextSource<O>>;
     image: (options?: import("./schema/image.js").ImageOptions | undefined) => import("./schema/index.js").Schema<import("./index.js").ImageSource>;
     literal: <T_2 extends string>(value: T_2) => import("./schema/literal.js").LiteralSchema<T_2>;
     keyOf: <Src extends import("./selector/index.js").GenericSelector<import("./source/index.js").SourceObject, 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 import("./source/index.js").Source[] ? number : S_2 extends import("./source/index.js").SourceObject ? string extends keyof S_2 ? import("./schema/string.js").RawString : keyof S_2 : S_2 extends Record<string, import("./source/index.js").Source> ? import("./schema/string.js").RawString : never : never>;

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

@@ -2,17 +2,23 @@ import { Schema, SchemaAssertResult, SerializedSchema } from "./index.js";
 import { RichTextSource, RichTextOptions } from "../source/richtext.js";
 import { SourcePath } from "../val/index.js";
 import { ValidationErrors } from "./validation/ValidationError.js";
+type ValidationOptions = {
+    maxLength?: number;
+    minLength?: number;
+};
 export type SerializedRichTextSchema = {
     type: "richtext";
     opt: boolean;
-    options?: RichTextOptions;
+    options?: RichTextOptions & ValidationOptions;
 };
 export declare class RichTextSchema<O extends RichTextOptions, Src extends RichTextSource<O> | null> extends Schema<Src> {
-    readonly options: O;
+    readonly options: O & ValidationOptions;
     readonly opt: boolean;
-    constructor(options: O, opt?: boolean);
+    constructor(options: O & ValidationOptions, opt?: boolean);
+    maxLength(max: number): RichTextSchema<O, Src>;
+    minLength(min: number): RichTextSchema<O, Src>;
     validate(path: SourcePath, src: Src): ValidationErrors;
-    private recursiveValidate;
+    private internalValidate;
     assert(path: SourcePath, src: unknown): SchemaAssertResult<Src>;
     private recursiveAssert;
     nullable(): Schema<Src | null>;
@@ -38,4 +44,5 @@ export declare const richtext: <O extends Partial<{
         a: boolean;
         img: boolean;
     }>;
-}>>(options?: O | undefined) => Schema<RichTextSource<O>>;
+}>>(options?: O | undefined) => RichTextSchema<O, RichTextSource<O>>;
+export {};

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

@@ -28,8 +28,16 @@ export declare class StringSchema<Src extends string | null> extends Schema<Src>
     readonly opt: boolean;
     private readonly isRaw;
     constructor(options?: StringOptions | undefined, opt?: boolean, isRaw?: boolean);
+    /**
+     * @deprecated Use `minLength` instead
+     */
     min(minLength: number): StringSchema<Src>;
+    minLength(minLength: number): StringSchema<Src>;
+    /**
+     * @deprecated Use `maxLength` instead
+     */
     max(maxLength: number): StringSchema<Src>;
+    maxLength(maxLength: number): StringSchema<Src>;
     regexp(regexp: RegExp): StringSchema<Src>;
     validate(path: SourcePath, src: Src): ValidationErrors;
     assert(path: SourcePath, src: unknown): SchemaAssertResult<Src>;

package/dist/{index-380b80a1.cjs.prod.js → index-25ee166a.cjs.prod.js}

@@ -2101,6 +2101,20 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
   }
   _inherits(RichTextSchema, _Schema);
   return _createClass(RichTextSchema, [{
+    key: "maxLength",
+    value: function maxLength(max) {
+      return new RichTextSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
+        maxLength: max
+      }), this.opt);
+    }
+  }, {
+    key: "minLength",
+    value: function minLength(min) {
+      return new RichTextSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
+        minLength: min
+      }), this.opt);
+    }
+  }, {
     key: "validate",
     value: function validate(path, src) {
       var assertRes = this.assert(path, src);
@@ -2118,7 +2132,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
         }]);
       }
       var current = {};
-      var typeErrorRes = this.recursiveValidate(path, nodes, current);
+      var typeErrorRes = this.internalValidate(path, nodes, current);
       if (typeErrorRes) {
         return typeErrorRes;
       }
@@ -2128,148 +2142,194 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
       return false;
     }
   }, {
-    key: "recursiveValidate",
-    value: function recursiveValidate(rootPath, nodes, current) {
-      var addError = function addError(path, message, typeError) {
-        if (!current[path]) {
-          current[path] = [];
-        }
-        current[path].push({
-          message: message,
-          typeError: typeError
-        });
-      };
-      var _iterator = result._createForOfIteratorHelper(nodes),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var _this$options$block, _this$options$block2, _this$options$block3, _this$options$block4, _this$options$block5, _this$options$block6, _this$options$block7, _this$options$block8, _this$options$block9, _this$options$block10, _this$options$inline, _this$options$inline2;
-          var node = _step.value;
-          var path = unsafeCreateSourcePath(rootPath, nodes.indexOf(node));
-          if (typeof node === "string") {
-            continue;
-          }
-          if (_typeof(node) !== "object") {
-            return _defineProperty({}, path, [{
-              message: "Expected nodes of type 'object' or 'string', got '".concat(_typeof(node), "'"),
-              typeError: true
-            }]);
-          }
-          if (node === null) {
-            return _defineProperty({}, path, [{
-              message: "Expected nodes of type 'object' or 'string', got 'null'",
-              typeError: true
-            }]);
-          }
-          if (!("tag" in node)) {
-            return _defineProperty({}, path, [{
-              message: "Expected node to either have 'tag' or be of type 'string'",
-              typeError: true
-            }]);
-          }
-          if (typeof node.tag !== "string") {
-            return _defineProperty({}, path, [{
-              message: "Expected 'string', got '".concat(_typeof(node.tag), "'"),
-              typeError: true
-            }]);
-          }
-          if (node.tag === "h1" && !((_this$options$block = this.options.block) !== null && _this$options$block !== void 0 && _this$options$block.h1)) {
-            addError(path, "'h' block is not valid", false);
-          }
-          if (node.tag === "h2" && !((_this$options$block2 = this.options.block) !== null && _this$options$block2 !== void 0 && _this$options$block2.h2)) {
-            addError(path, "'h2' block is not valid", false);
-          }
-          if (node.tag === "h3" && !((_this$options$block3 = this.options.block) !== null && _this$options$block3 !== void 0 && _this$options$block3.h3)) {
-            addError(path, "'h3' block is not valid", false);
-          }
-          if (node.tag === "h4" && !((_this$options$block4 = this.options.block) !== null && _this$options$block4 !== void 0 && _this$options$block4.h4)) {
-            addError(path, "'h4' block is not valid", false);
-          }
-          if (node.tag === "h5" && !((_this$options$block5 = this.options.block) !== null && _this$options$block5 !== void 0 && _this$options$block5.h5)) {
-            addError(path, "'h5' block is not valid", false);
-          }
-          if (node.tag === "h6" && !((_this$options$block6 = this.options.block) !== null && _this$options$block6 !== void 0 && _this$options$block6.h6)) {
-            addError(path, "'h6' block is not valid", false);
-          }
-          if (node.tag === "ol" && !((_this$options$block7 = this.options.block) !== null && _this$options$block7 !== void 0 && _this$options$block7.ol)) {
-            addError(path, "'ol' block is not valid", false);
-          }
-          if (node.tag === "ul" && !((_this$options$block8 = this.options.block) !== null && _this$options$block8 !== void 0 && _this$options$block8.ul)) {
-            addError(path, "'ul' block is not valid", false);
-          }
-          if (node.tag === "li" && !((_this$options$block9 = this.options.block) !== null && _this$options$block9 !== void 0 && _this$options$block9.ul) && !((_this$options$block10 = this.options.block) !== null && _this$options$block10 !== void 0 && _this$options$block10.ol)) {
-            addError(path, "'li' tag is invalid since neither 'ul' nor 'ol' block is not valid", false);
-          }
-          if (node.tag === "a" && !((_this$options$inline = this.options.inline) !== null && _this$options$inline !== void 0 && _this$options$inline.a)) {
-            addError(path, "'a' inline is not valid", false);
-          }
-          if (node.tag === "img" && !((_this$options$inline2 = this.options.inline) !== null && _this$options$inline2 !== void 0 && _this$options$inline2.img)) {
-            addError(path, "'img' inline is not valid", false);
-          }
-          if ("styles" in node && node.tag !== "span") {
-            return _defineProperty({}, path, [{
-              message: "Cannot have styles on '".concat(node.tag, "'. This is only allowed on 'span'"),
-              typeError: true
-            }]);
+    key: "internalValidate",
+    value: function internalValidate(rootPath, nodes, current) {
+      var _this2 = this;
+      var length = 0;
+      var _recurse = function recurse(rootPath, nodes, current) {
+        var addError = function addError(path, message, typeError) {
+          if (!current[path]) {
+            current[path] = [];
           }
-          if ("styles" in node) {
-            if (!Array.isArray(node.styles)) {
+          current[path].push({
+            message: message,
+            typeError: typeError
+          });
+        };
+        var _iterator = result._createForOfIteratorHelper(nodes),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var _this2$options$block, _this2$options$block2, _this2$options$block3, _this2$options$block4, _this2$options$block5, _this2$options$block6, _this2$options$block7, _this2$options$block8, _this2$options$block9, _this2$options$block10, _this2$options$inline, _this2$options$inline2;
+            var node = _step.value;
+            var path = unsafeCreateSourcePath(rootPath, nodes.indexOf(node));
+            if (typeof node === "string") {
+              length += node.length;
+              continue;
+            }
+            if (_typeof(node) !== "object") {
               return _defineProperty({}, path, [{
-                message: "Expected 'array', got '".concat(_typeof(node.styles), "'"),
+                message: "Expected nodes of type 'object' or 'string', got '".concat(_typeof(node), "'"),
                 typeError: true
               }]);
             }
-            var stylesPath = unsafeCreateSourcePath(path, "styles");
-            for (var i = 0; i < node.styles.length; i++) {
-              var _this$options$style, _this$options$style2, _this$options$style3;
-              var style = node.styles[i];
-              var currentStylePath = unsafeCreateSourcePath(stylesPath, i);
-              if (typeof style !== "string") {
-                return _defineProperty({}, currentStylePath, [{
-                  message: "Expected 'string', got '".concat(_typeof(style), "'"),
-                  typeError: true
-                }]);
-              }
-              if (style === "bold" && !((_this$options$style = this.options.style) !== null && _this$options$style !== void 0 && _this$options$style.bold)) {
-                addError(currentStylePath, "Style 'bold' is not valid", false);
-              }
-              if (style === "italic" && !((_this$options$style2 = this.options.style) !== null && _this$options$style2 !== void 0 && _this$options$style2.italic)) {
-                addError(currentStylePath, "Style 'italic' is not valid", false);
-              }
-              if (style === "lineThrough" && !((_this$options$style3 = this.options.style) !== null && _this$options$style3 !== void 0 && _this$options$style3.lineThrough)) {
-                addError(currentStylePath, "Style 'lineThrough' is not valid", false);
-              }
+            if (node === null) {
+              return _defineProperty({}, path, [{
+                message: "Expected nodes of type 'object' or 'string', got 'null'",
+                typeError: true
+              }]);
             }
-          }
-          if ("children" in node) {
-            if (!Array.isArray(node.children)) {
+            if (!("tag" in node)) {
+              return _defineProperty({}, path, [{
+                message: "Expected node to either have 'tag' or be of type 'string'",
+                typeError: true
+              }]);
+            }
+            if (typeof node.tag !== "string") {
+              return _defineProperty({}, path, [{
+                message: "Expected 'string', got '".concat(_typeof(node.tag), "'"),
+                typeError: 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);
+            }
+            if (node.tag === "h2" && !((_this2$options$block2 = _this2.options.block) !== null && _this2$options$block2 !== void 0 && _this2$options$block2.h2)) {
+              addError(path, "'h2' block is not valid", false);
+            }
+            if (node.tag === "h3" && !((_this2$options$block3 = _this2.options.block) !== null && _this2$options$block3 !== void 0 && _this2$options$block3.h3)) {
+              addError(path, "'h3' block is not valid", false);
+            }
+            if (node.tag === "h4" && !((_this2$options$block4 = _this2.options.block) !== null && _this2$options$block4 !== void 0 && _this2$options$block4.h4)) {
+              addError(path, "'h4' block is not valid", false);
+            }
+            if (node.tag === "h5" && !((_this2$options$block5 = _this2.options.block) !== null && _this2$options$block5 !== void 0 && _this2$options$block5.h5)) {
+              addError(path, "'h5' block is not valid", false);
+            }
+            if (node.tag === "h6" && !((_this2$options$block6 = _this2.options.block) !== null && _this2$options$block6 !== void 0 && _this2$options$block6.h6)) {
+              addError(path, "'h6' block is not valid", false);
+            }
+            if (node.tag === "ol" && !((_this2$options$block7 = _this2.options.block) !== null && _this2$options$block7 !== void 0 && _this2$options$block7.ol)) {
+              addError(path, "'ol' block is not valid", false);
+            }
+            if (node.tag === "ul" && !((_this2$options$block8 = _this2.options.block) !== null && _this2$options$block8 !== void 0 && _this2$options$block8.ul)) {
+              addError(path, "'ul' block is not valid", false);
+            }
+            if (node.tag === "li" && !((_this2$options$block9 = _this2.options.block) !== null && _this2$options$block9 !== void 0 && _this2$options$block9.ul) && !((_this2$options$block10 = _this2.options.block) !== null && _this2$options$block10 !== void 0 && _this2$options$block10.ol)) {
+              addError(path, "'li' tag is invalid since neither 'ul' nor 'ol' block is not valid", false);
+            }
+            if (node.tag === "a" && !((_this2$options$inline = _this2.options.inline) !== null && _this2$options$inline !== void 0 && _this2$options$inline.a)) {
+              addError(path, "'a' inline is not valid", false);
+            }
+            if (node.tag === "img" && !((_this2$options$inline2 = _this2.options.inline) !== null && _this2$options$inline2 !== void 0 && _this2$options$inline2.img)) {
+              addError(path, "'img' inline is not valid", false);
+            }
+            if ("styles" in node && node.tag !== "span") {
               return _defineProperty({}, path, [{
-                message: "Expected 'array', got '".concat(_typeof(node.children), "'"),
+                message: "Cannot have styles on '".concat(node.tag, "'. This is only allowed on 'span'"),
                 typeError: true
               }]);
             }
-            var children = node.children;
-            for (var _i = 0; _i < children.length; _i++) {
-              var child = children[_i];
-              if (_typeof(child) === "object") {
-                var childPath = unsafeCreateSourcePath(path, "children");
-                var res = this.recursiveValidate(childPath, [child], current);
-                if (res) {
-                  return res;
+            if ("styles" in node) {
+              if (!Array.isArray(node.styles)) {
+                return _defineProperty({}, path, [{
+                  message: "Expected 'array', got '".concat(_typeof(node.styles), "'"),
+                  typeError: true
+                }]);
+              }
+              var stylesPath = unsafeCreateSourcePath(path, "styles");
+              for (var i = 0; i < node.styles.length; i++) {
+                var _this2$options$style, _this2$options$style2, _this2$options$style3;
+                var style = node.styles[i];
+                var currentStylePath = unsafeCreateSourcePath(stylesPath, i);
+                if (typeof style !== "string") {
+                  return _defineProperty({}, currentStylePath, [{
+                    message: "Expected 'string', got '".concat(_typeof(style), "'"),
+                    typeError: true
+                  }]);
+                }
+                if (style === "bold" && !((_this2$options$style = _this2.options.style) !== null && _this2$options$style !== void 0 && _this2$options$style.bold)) {
+                  addError(currentStylePath, "Style 'bold' is not valid", false);
+                }
+                if (style === "italic" && !((_this2$options$style2 = _this2.options.style) !== null && _this2$options$style2 !== void 0 && _this2$options$style2.italic)) {
+                  addError(currentStylePath, "Style 'italic' is not valid", false);
                 }
-              } else if (typeof child !== "string") {
+                if (style === "lineThrough" && !((_this2$options$style3 = _this2.options.style) !== null && _this2$options$style3 !== void 0 && _this2$options$style3.lineThrough)) {
+                  addError(currentStylePath, "Style 'lineThrough' is not valid", false);
+                }
+              }
+            }
+            if ("children" in node) {
+              if (!Array.isArray(node.children)) {
                 return _defineProperty({}, path, [{
-                  message: "Expected 'object' or 'string', got '".concat(_typeof(child), "'"),
+                  message: "Expected 'array', got '".concat(_typeof(node.children), "'"),
                   typeError: true
                 }]);
               }
+              var children = node.children;
+              for (var _i = 0; _i < children.length; _i++) {
+                var child = children[_i];
+                if (_typeof(child) === "object") {
+                  var childPath = unsafeCreateSourcePath(path, "children");
+                  var res = _recurse(childPath, [child], current);
+                  if (res) {
+                    return res;
+                  }
+                } else if (typeof child === "string") {
+                  length += child.length;
+                  continue;
+                } else {
+                  return _defineProperty({}, path, [{
+                    message: "Expected 'object' or 'string', got '".concat(_typeof(child), "'"),
+                    typeError: true
+                  }]);
+                }
+              }
             }
           }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+        return false;
+      };
+      var results = _recurse(rootPath, nodes, current);
+      var lengthErrors = [];
+      if (this.options.maxLength && length > this.options.maxLength) {
+        lengthErrors.push({
+          message: "Maximum length of ".concat(this.options.maxLength, " exceeded (current length: ").concat(length, ")"),
+          typeError: false
+        });
+      }
+      if (this.options.minLength && length < this.options.minLength) {
+        lengthErrors.push({
+          message: "Minimum length of ".concat(this.options.minLength, " not met (current length: ").concat(length, ")"),
+          typeError: false
+        });
+      }
+      if (results) {
+        if (lengthErrors.length > 0) {
+          var _results$rootPath;
+          if (!results[rootPath]) {
+            results[rootPath] = [];
+          }
+          (_results$rootPath = results[rootPath]).push.apply(_results$rootPath, lengthErrors);
+        }
+        return results;
+      }
+      if (Object.keys(current).length > 0) {
+        if (lengthErrors.length > 0) {
+          var _current$rootPath;
+          if (!current[rootPath]) {
+            current[rootPath] = [];
+          }
+          (_current$rootPath = current[rootPath]).push.apply(_current$rootPath, lengthErrors);
+        }
+        return current;
+      }
+      if (lengthErrors.length > 0) {
+        return _defineProperty({}, rootPath, lengthErrors);
       }
       return false;
     }
@@ -3085,19 +3145,37 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
     _this.isRaw = isRaw;
     return _this;
   }
+
+  /**
+   * @deprecated Use `minLength` instead
+   */
   _inherits(StringSchema, _Schema);
   return _createClass(StringSchema, [{
     key: "min",
     value: function min(minLength) {
+      return this.minLength(minLength);
+    }
+  }, {
+    key: "minLength",
+    value: function minLength(_minLength) {
       return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
-        minLength: minLength
+        minLength: _minLength
       }), this.opt, this.isRaw);
     }
+
+    /**
+     * @deprecated Use `maxLength` instead
+     */
   }, {
     key: "max",
     value: function max(maxLength) {
+      return this.maxLength(maxLength);
+    }
+  }, {
+    key: "maxLength",
+    value: function maxLength(_maxLength) {
       return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
-        maxLength: maxLength
+        maxLength: _maxLength
       }), this.opt, this.isRaw);
     }
   }, {