@valbuild/core 0.97.4 → 0.97.7

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

@@ -86,6 +86,15 @@ export declare abstract class Schema<Src extends SelectorSource> {
     protected abstract executeRender(sourcePath: SourcePath | ModuleFilePath, src: Src): ReifiedRender;
     /** MUTATES! since internal and perf sensitive */
     protected appendValidationError(current: ValidationErrors, path: SourcePath, message: string, value: unknown, schemaError?: boolean): ValidationErrors;
+    /**
+     * Merges two sets of validation errors path-wise: errors on the same path are
+     * concatenated, not overwritten. Object spread cannot be used for this, since
+     * it replaces the array of the colliding path. A record, for example, validates
+     * the key and the item on the same path, so both sets must survive.
+     *
+     * MUTATES! since internal and perf sensitive
+     */
+    protected mergeValidationErrors(current: ValidationErrors, incoming: ValidationErrors): ValidationErrors;
 }
 export type SelectorOfSchema<T extends Schema<SelectorSource>> = T extends Schema<infer Src> ? Src : never;
 export {};

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

@@ -2,4 +2,5 @@ import { Schema, SelectorOfSchema } from "./index.js";
 import { ValRouter } from "../router.js";
 import { SelectorSource } from "../selector/index.js";
 import { RecordSchema } from "./record.js";
-export declare function router<T extends Schema<SelectorSource>, Src extends Record<string, SelectorOfSchema<T>>>(router: ValRouter, item: T): RecordSchema<T, Schema<string>, Src>;
+export declare function router<K extends Schema<string>, T extends Schema<SelectorSource>>(router: ValRouter, key: K, item: T): RecordSchema<T, K, Record<SelectorOfSchema<K>, SelectorOfSchema<T>>>;
+export declare function router<T extends Schema<SelectorSource>>(router: ValRouter, item: T): RecordSchema<T, Schema<string>, Record<string, SelectorOfSchema<T>>>;

package/dist/{index-30ac56b6.cjs.prod.js → index-139e0a7d.cjs.prod.js}

@@ -222,6 +222,34 @@ var Schema = /*#__PURE__*/function () {
         }]);
       }
     }
+
+    /**
+     * Merges two sets of validation errors path-wise: errors on the same path are
+     * concatenated, not overwritten. Object spread cannot be used for this, since
+     * it replaces the array of the colliding path. A record, for example, validates
+     * the key and the item on the same path, so both sets must survive.
+     *
+     * MUTATES! since internal and perf sensitive
+     */
+  }, {
+    key: "mergeValidationErrors",
+    value: function mergeValidationErrors(current, incoming) {
+      if (!incoming) {
+        return current;
+      }
+      if (!current) {
+        return incoming;
+      }
+      for (var pathS in incoming) {
+        var _path = pathS;
+        if (current[_path]) {
+          current[_path] = current[_path].concat(incoming[_path]);
+        } else {
+          current[_path] = incoming[_path];
+        }
+      }
+      return current;
+    }
   }]);
 }();
 
@@ -1007,11 +1035,7 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
           src);
         } else {
           var subError = schema["executeValidate"](subPath, src[_key]);
-          if (subError && error) {
-            error = _objectSpread2(_objectSpread2({}, subError), error);
-          } else if (subError) {
-            error = subError;
-          }
+          error = this.mergeValidationErrors(error, subError);
         }
       }
       return error;
@@ -1185,7 +1209,7 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
       if (assertRes.data === null) {
         return false;
       }
-      var error = {};
+      var error = false;
       for (var _i = 0, _Object$entries = Object.entries(assertRes.data); _i < _Object$entries.length; _i++) {
         var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
           idx = _Object$entries$_i[0],
@@ -1193,12 +1217,7 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
         var subPath = unsafeCreateSourcePath(path, Number(idx));
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         var subError = this.item["executeValidate"](subPath, i);
-        if (subError) {
-          error = _objectSpread2(_objectSpread2({}, subError), error);
-        }
-      }
-      if (Object.keys(error).length === 0) {
-        return false;
+        error = this.mergeValidationErrors(error, subError);
       }
       return error;
     }
@@ -2981,9 +3000,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
         }]));
       }
       var routerValidations = this.getRouterValidations(path, src);
-      if (routerValidations) {
-        return routerValidations;
-      }
+      error = this.mergeValidationErrors(error, routerValidations);
       var _iterator = result._createForOfIteratorHelper(customValidationErrors),
         _step;
       try {
@@ -3047,15 +3064,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
                 keyError: true
               });
             });
-            if (error) {
-              if (error[keyPath]) {
-                error[keyPath] = [].concat(_toConsumableArray(error[keyPath]), _toConsumableArray(keyError[keyPath]));
-              } else {
-                error[keyPath] = keyError[keyPath];
-              }
-            } else {
-              error = keyError;
-            }
+            error = _this2.mergeValidationErrors(error, keyError);
           }
         }
         var subPath = createValPathOfItem(path, key);
@@ -3070,20 +3079,16 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           var keyErr = _this2.validateMediaKey(subPath, key);
           if (keyErr) {
             _this2.markKeyErrorsAtPath(keyErr, subPath);
-            error = error ? _objectSpread2(_objectSpread2({}, error), keyErr) : keyErr;
           }
+          error = _this2.mergeValidationErrors(error, keyErr);
           var entryErr = _this2.validateMediaEntry(subPath, elem);
           if (entryErr) {
             _this2.markKeyErrorsAtPath(entryErr, subPath);
-            error = error ? _objectSpread2(_objectSpread2({}, error), entryErr) : entryErr;
           }
+          error = _this2.mergeValidationErrors(error, entryErr);
         } else {
           var subError = _this2.item["executeValidate"](subPath, elem);
-          if (subError && error) {
-            error = _objectSpread2(_objectSpread2({}, subError), error);
-          } else if (subError) {
-            error = subError;
-          }
+          error = _this2.mergeValidationErrors(error, subError);
         }
       });
       return error;
@@ -4907,10 +4912,11 @@ var datetime = function datetime(options) {
   return new DateTimeSchema(options);
 };
 
-function router(router, item) {
-  var keySchema = string();
-  var recordSchema = new RecordSchema(item, false, [], router, keySchema);
-  return recordSchema;
+function router(router, keyOrItem, maybeItem) {
+  if (maybeItem) {
+    return new RecordSchema(maybeItem, false, [], router, keyOrItem);
+  }
+  return new RecordSchema(keyOrItem, false, [], router, string());
 }
 
 /**

package/dist/{index-a169d6a7.cjs.dev.js → index-24fcc47f.cjs.dev.js}

@@ -222,6 +222,34 @@ var Schema = /*#__PURE__*/function () {
         }]);
       }
     }
+
+    /**
+     * Merges two sets of validation errors path-wise: errors on the same path are
+     * concatenated, not overwritten. Object spread cannot be used for this, since
+     * it replaces the array of the colliding path. A record, for example, validates
+     * the key and the item on the same path, so both sets must survive.
+     *
+     * MUTATES! since internal and perf sensitive
+     */
+  }, {
+    key: "mergeValidationErrors",
+    value: function mergeValidationErrors(current, incoming) {
+      if (!incoming) {
+        return current;
+      }
+      if (!current) {
+        return incoming;
+      }
+      for (var pathS in incoming) {
+        var _path = pathS;
+        if (current[_path]) {
+          current[_path] = current[_path].concat(incoming[_path]);
+        } else {
+          current[_path] = incoming[_path];
+        }
+      }
+      return current;
+    }
   }]);
 }();
 
@@ -1007,11 +1035,7 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
           src);
         } else {
           var subError = schema["executeValidate"](subPath, src[_key]);
-          if (subError && error) {
-            error = _objectSpread2(_objectSpread2({}, subError), error);
-          } else if (subError) {
-            error = subError;
-          }
+          error = this.mergeValidationErrors(error, subError);
         }
       }
       return error;
@@ -1185,7 +1209,7 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
       if (assertRes.data === null) {
         return false;
       }
-      var error = {};
+      var error = false;
       for (var _i = 0, _Object$entries = Object.entries(assertRes.data); _i < _Object$entries.length; _i++) {
         var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
           idx = _Object$entries$_i[0],
@@ -1193,12 +1217,7 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
         var subPath = unsafeCreateSourcePath(path, Number(idx));
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         var subError = this.item["executeValidate"](subPath, i);
-        if (subError) {
-          error = _objectSpread2(_objectSpread2({}, subError), error);
-        }
-      }
-      if (Object.keys(error).length === 0) {
-        return false;
+        error = this.mergeValidationErrors(error, subError);
       }
       return error;
     }
@@ -2981,9 +3000,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
         }]));
       }
       var routerValidations = this.getRouterValidations(path, src);
-      if (routerValidations) {
-        return routerValidations;
-      }
+      error = this.mergeValidationErrors(error, routerValidations);
       var _iterator = result._createForOfIteratorHelper(customValidationErrors),
         _step;
       try {
@@ -3047,15 +3064,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
                 keyError: true
               });
             });
-            if (error) {
-              if (error[keyPath]) {
-                error[keyPath] = [].concat(_toConsumableArray(error[keyPath]), _toConsumableArray(keyError[keyPath]));
-              } else {
-                error[keyPath] = keyError[keyPath];
-              }
-            } else {
-              error = keyError;
-            }
+            error = _this2.mergeValidationErrors(error, keyError);
           }
         }
         var subPath = createValPathOfItem(path, key);
@@ -3070,20 +3079,16 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           var keyErr = _this2.validateMediaKey(subPath, key);
           if (keyErr) {
             _this2.markKeyErrorsAtPath(keyErr, subPath);
-            error = error ? _objectSpread2(_objectSpread2({}, error), keyErr) : keyErr;
           }
+          error = _this2.mergeValidationErrors(error, keyErr);
           var entryErr = _this2.validateMediaEntry(subPath, elem);
           if (entryErr) {
             _this2.markKeyErrorsAtPath(entryErr, subPath);
-            error = error ? _objectSpread2(_objectSpread2({}, error), entryErr) : entryErr;
           }
+          error = _this2.mergeValidationErrors(error, entryErr);
         } else {
           var subError = _this2.item["executeValidate"](subPath, elem);
-          if (subError && error) {
-            error = _objectSpread2(_objectSpread2({}, subError), error);
-          } else if (subError) {
-            error = subError;
-          }
+          error = _this2.mergeValidationErrors(error, subError);
         }
       });
       return error;
@@ -4907,10 +4912,11 @@ var datetime = function datetime(options) {
   return new DateTimeSchema(options);
 };
 
-function router(router, item) {
-  var keySchema = string();
-  var recordSchema = new RecordSchema(item, false, [], router, keySchema);
-  return recordSchema;
+function router(router, keyOrItem, maybeItem) {
+  if (maybeItem) {
+    return new RecordSchema(maybeItem, false, [], router, keyOrItem);
+  }
+  return new RecordSchema(keyOrItem, false, [], router, string());
 }
 
 /**

package/dist/{index-6aa8e224.esm.js → index-802570f7.esm.js}

@@ -220,6 +220,34 @@ var Schema = /*#__PURE__*/function () {
         }]);
       }
     }
+
+    /**
+     * Merges two sets of validation errors path-wise: errors on the same path are
+     * concatenated, not overwritten. Object spread cannot be used for this, since
+     * it replaces the array of the colliding path. A record, for example, validates
+     * the key and the item on the same path, so both sets must survive.
+     *
+     * MUTATES! since internal and perf sensitive
+     */
+  }, {
+    key: "mergeValidationErrors",
+    value: function mergeValidationErrors(current, incoming) {
+      if (!incoming) {
+        return current;
+      }
+      if (!current) {
+        return incoming;
+      }
+      for (var pathS in incoming) {
+        var _path = pathS;
+        if (current[_path]) {
+          current[_path] = current[_path].concat(incoming[_path]);
+        } else {
+          current[_path] = incoming[_path];
+        }
+      }
+      return current;
+    }
   }]);
 }();
 
@@ -1005,11 +1033,7 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
           src);
         } else {
           var subError = schema["executeValidate"](subPath, src[_key]);
-          if (subError && error) {
-            error = _objectSpread2(_objectSpread2({}, subError), error);
-          } else if (subError) {
-            error = subError;
-          }
+          error = this.mergeValidationErrors(error, subError);
         }
       }
       return error;
@@ -1183,7 +1207,7 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
       if (assertRes.data === null) {
         return false;
       }
-      var error = {};
+      var error = false;
       for (var _i = 0, _Object$entries = Object.entries(assertRes.data); _i < _Object$entries.length; _i++) {
         var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
           idx = _Object$entries$_i[0],
@@ -1191,12 +1215,7 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
         var subPath = unsafeCreateSourcePath(path, Number(idx));
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         var subError = this.item["executeValidate"](subPath, i);
-        if (subError) {
-          error = _objectSpread2(_objectSpread2({}, subError), error);
-        }
-      }
-      if (Object.keys(error).length === 0) {
-        return false;
+        error = this.mergeValidationErrors(error, subError);
       }
       return error;
     }
@@ -2979,9 +2998,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
         }]));
       }
       var routerValidations = this.getRouterValidations(path, src);
-      if (routerValidations) {
-        return routerValidations;
-      }
+      error = this.mergeValidationErrors(error, routerValidations);
       var _iterator = _createForOfIteratorHelper(customValidationErrors),
         _step;
       try {
@@ -3045,15 +3062,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
                 keyError: true
               });
             });
-            if (error) {
-              if (error[keyPath]) {
-                error[keyPath] = [].concat(_toConsumableArray(error[keyPath]), _toConsumableArray(keyError[keyPath]));
-              } else {
-                error[keyPath] = keyError[keyPath];
-              }
-            } else {
-              error = keyError;
-            }
+            error = _this2.mergeValidationErrors(error, keyError);
           }
         }
         var subPath = createValPathOfItem(path, key);
@@ -3068,20 +3077,16 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           var keyErr = _this2.validateMediaKey(subPath, key);
           if (keyErr) {
             _this2.markKeyErrorsAtPath(keyErr, subPath);
-            error = error ? _objectSpread2(_objectSpread2({}, error), keyErr) : keyErr;
           }
+          error = _this2.mergeValidationErrors(error, keyErr);
           var entryErr = _this2.validateMediaEntry(subPath, elem);
           if (entryErr) {
             _this2.markKeyErrorsAtPath(entryErr, subPath);
-            error = error ? _objectSpread2(_objectSpread2({}, error), entryErr) : entryErr;
           }
+          error = _this2.mergeValidationErrors(error, entryErr);
         } else {
           var subError = _this2.item["executeValidate"](subPath, elem);
-          if (subError && error) {
-            error = _objectSpread2(_objectSpread2({}, subError), error);
-          } else if (subError) {
-            error = subError;
-          }
+          error = _this2.mergeValidationErrors(error, subError);
         }
       });
       return error;
@@ -4905,10 +4910,11 @@ var datetime = function datetime(options) {
   return new DateTimeSchema(options);
 };
 
-function router(router, item) {
-  var keySchema = string();
-  var recordSchema = new RecordSchema(item, false, [], router, keySchema);
-  return recordSchema;
+function router(router, keyOrItem, maybeItem) {
+  if (maybeItem) {
+    return new RecordSchema(maybeItem, false, [], router, keyOrItem);
+  }
+  return new RecordSchema(keyOrItem, false, [], router, string());
 }
 
 /**

package/dist/valbuild-core.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('./index-a169d6a7.cjs.dev.js');
+var dist_valbuildCore = require('./index-24fcc47f.cjs.dev.js');
 require('./result-bb1f436e.cjs.dev.js');
 
 

package/dist/valbuild-core.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('./index-30ac56b6.cjs.prod.js');
+var dist_valbuildCore = require('./index-139e0a7d.cjs.prod.js');
 require('./result-787e35f6.cjs.prod.js');
 
 

package/dist/valbuild-core.esm.js

@@ -1,2 +1,2 @@
-export { A as ArraySchema, B as BooleanSchema, e as DEFAULT_APP_HOST, D as DEFAULT_CONTENT_HOST, g as DEFAULT_VAL_REMOTE_HOST, p as DateSchema, q as DateTimeSchema, F as FATAL_ERROR_TYPES, h as FILE_REF_PROP, j as FILE_REF_SUBTYPE_TAG, o as FileSchema, G as GenericSelector, n as ImageSchema, I as Internal, K as KeyOfSchema, L as LiteralSchema, M as ModuleFilePathSep, N as NumberSchema, O as ObjectSchema, R as RecordSchema, t as RichTextSchema, r as RouteSchema, S as Schema, l as StringSchema, U as UnionSchema, V as VAL_EXTENSION, k as derefPatch, u as deserializeSchema, f as extractValModules, v as getSourcePathFromRoute, i as initVal, m as modules } from './index-6aa8e224.esm.js';
+export { A as ArraySchema, B as BooleanSchema, e as DEFAULT_APP_HOST, D as DEFAULT_CONTENT_HOST, g as DEFAULT_VAL_REMOTE_HOST, p as DateSchema, q as DateTimeSchema, F as FATAL_ERROR_TYPES, h as FILE_REF_PROP, j as FILE_REF_SUBTYPE_TAG, o as FileSchema, G as GenericSelector, n as ImageSchema, I as Internal, K as KeyOfSchema, L as LiteralSchema, M as ModuleFilePathSep, N as NumberSchema, O as ObjectSchema, R as RecordSchema, t as RichTextSchema, r as RouteSchema, S as Schema, l as StringSchema, U as UnionSchema, V as VAL_EXTENSION, k as derefPatch, u as deserializeSchema, f as extractValModules, v as getSourcePathFromRoute, i as initVal, m as modules } from './index-802570f7.esm.js';
 import './result-4bd63123.esm.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.97.4",
+  "version": "0.97.7",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "repository": {

package/patch/dist/valbuild-core-patch.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('../../dist/index-a169d6a7.cjs.dev.js');
+var dist_valbuildCore = require('../../dist/index-24fcc47f.cjs.dev.js');
 var result = require('../../dist/result-bb1f436e.cjs.dev.js');
 var util = require('../../dist/util-b213092b.cjs.dev.js');
 

package/patch/dist/valbuild-core-patch.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('../../dist/index-30ac56b6.cjs.prod.js');
+var dist_valbuildCore = require('../../dist/index-139e0a7d.cjs.prod.js');
 var result = require('../../dist/result-787e35f6.cjs.prod.js');
 var util = require('../../dist/util-030d8a1f.cjs.prod.js');
 

package/patch/dist/valbuild-core-patch.esm.js

@@ -1,5 +1,5 @@
-import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-6aa8e224.esm.js';
-export { P as PatchError } from '../../dist/index-6aa8e224.esm.js';
+import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-802570f7.esm.js';
+export { P as PatchError } from '../../dist/index-802570f7.esm.js';
 import { f as isNonEmpty, e as err, o as ok, m as map, g as flatMap, i as isErr, h as flatMapReduce, j as filterOrElse, k as mapErr, l as map$1, n as all, p as flatten, q as allT } from '../../dist/result-4bd63123.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';