@valbuild/core 0.87.2 → 0.87.4

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

@@ -98,7 +98,7 @@ export declare function initSchema(): {
     image: (options?: import("./schema/image.js").ImageOptions | undefined) => import("./schema/image.js").ImageSchema<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/keyOf.js").KeyOfSchema<Src, 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>;
-    record: <S_3 extends import("./schema/index.js").Schema<import("./selector/index.js").SelectorSource>>(schema: S_3) => import("./schema/record.js").RecordSchema<S_3, Record<string, import("./schema/index.js").SelectorOfSchema<S_3>>>;
+    record: typeof record;
     file: (options?: import("./schema/file.js").FileOptions | undefined) => import("./schema/file.js").FileSchema<import("./index.js").FileSource<import("./schema/file.js").FileMetadata>>;
     date: (options?: Record<string, never> | undefined) => import("./schema/date.js").DateSchema<import("./schema/string.js").RawString>;
 };

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

@@ -10,21 +10,23 @@ import { ValidationErrors } from "./validation/ValidationError.js";
 export type SerializedRecordSchema = {
     type: "record";
     item: SerializedSchema;
+    key?: SerializedSchema;
     opt: boolean;
     router?: string;
     customValidate?: boolean;
 };
-export declare class RecordSchema<T extends Schema<SelectorSource>, Src extends Record<string, SelectorOfSchema<T>> | null> extends Schema<Src> {
+export declare class RecordSchema<T extends Schema<SelectorSource>, K extends Schema<string>, Src extends Record<SelectorOfSchema<K>, SelectorOfSchema<T>> | null> extends Schema<Src> {
     private readonly item;
     private readonly opt;
     private readonly customValidateFunctions;
     private readonly currentRouter;
-    constructor(item: T, opt?: boolean, customValidateFunctions?: CustomValidateFunction<Src>[], currentRouter?: ValRouter | null);
-    validate(validationFunction: (src: Src) => false | string): RecordSchema<T, Src>;
+    private readonly keySchema;
+    constructor(item: T, opt?: boolean, customValidateFunctions?: CustomValidateFunction<Src>[], currentRouter?: ValRouter | null, keySchema?: Schema<string> | null);
+    validate(validationFunction: (src: Src) => false | string): RecordSchema<T, K, Src>;
     protected executeValidate(path: SourcePath, src: Src): ValidationErrors;
     protected executeAssert(path: SourcePath, src: unknown): SchemaAssertResult<Src>;
-    nullable(): RecordSchema<T, Src | null>;
-    router(router: ValRouter): RecordSchema<T, Src>;
+    nullable(): RecordSchema<T, K, Src | null>;
+    router(router: ValRouter): RecordSchema<T, K, Src>;
     private getRouterValidations;
     protected executeSerialize(): SerializedRecordSchema;
     private renderInput;
@@ -41,4 +43,5 @@ export declare class RecordSchema<T extends Schema<SelectorSource>, Src extends
         };
     }): this;
 }
-export declare const record: <S extends Schema<SelectorSource>>(schema: S) => RecordSchema<S, Record<string, SelectorOfSchema<S>>>;
+export declare function record<K extends Schema<string>, S extends Schema<SelectorSource>>(key: K, schema: S): RecordSchema<S, K, Record<SelectorOfSchema<K>, SelectorOfSchema<S>>>;
+export declare function record<S extends Schema<SelectorSource>>(schema: S): RecordSchema<S, Schema<string>, Record<string, SelectorOfSchema<S>>>;

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

@@ -6,6 +6,7 @@ export type ValidationError = {
     typeError?: boolean;
     schemaError?: boolean;
     fixes?: ValidationFix[];
+    keyError?: boolean;
 };
 /**
  * Equals `false` if no validation errors were found.

package/dist/{index-e0c4e804.esm.js → index-2b6db652.esm.js}

@@ -1516,10 +1516,10 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
         };
       }
       if (this.key instanceof LiteralSchema) {
-        var _ref25;
+        var _ref23;
         var success = false;
         var errors = {};
-        var _iterator2 = _createForOfIteratorHelper((_ref25 = [this.key]).concat.apply(_ref25, _toConsumableArray(this.items))),
+        var _iterator2 = _createForOfIteratorHelper((_ref23 = [this.key]).concat.apply(_ref23, _toConsumableArray(this.items))),
           _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -2010,7 +2010,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
           _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;
+            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$block0, _this2$options$inline;
             var node = _step.value;
             var path = unsafeCreateSourcePath(rootPath, nodes.indexOf(node));
             if (typeof node === "string") {
@@ -2065,7 +2065,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
             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)) {
+            if (node.tag === "li" && !((_this2$options$block9 = _this2.options.block) !== null && _this2$options$block9 !== void 0 && _this2$options$block9.ul) && !((_this2$options$block0 = _this2.options.block) !== null && _this2$options$block0 !== void 0 && _this2$options$block0.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)) {
@@ -2392,6 +2392,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     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;
     _classCallCheck(this, RecordSchema);
     _this = _callSuper(this, RecordSchema);
     _defineProperty(_this, "renderInput", null);
@@ -2399,13 +2400,14 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     _this.customValidateFunctions = customValidateFunctions;
     _this.currentRouter = currentRouter;
+    _this.keySchema = keySchema;
     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]));
+      return new RecordSchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.currentRouter, this.keySchema);
     }
   }, {
     key: "executeValidate",
@@ -2453,6 +2455,30 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
         var _ref6 = _slicedToArray(_ref5, 2),
           key = _ref6[0],
           elem = _ref6[1];
+        if (_this2.keySchema) {
+          var keyPath = createValPathOfItem(path, key);
+          if (!keyPath) {
+            throw new Error("Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " for key validation")) // Should! never happen
+            ;
+          }
+          var keyError = _this2.keySchema["executeValidate"](keyPath, key);
+          if (keyError) {
+            keyError[keyPath] = keyError[keyPath].map(function (err) {
+              return _objectSpread2(_objectSpread2({}, err), {}, {
+                keyError: true
+              });
+            });
+            if (error) {
+              if (error[keyPath]) {
+                error[keyPath] = [].concat(_toConsumableArray(error[keyPath]), _toConsumableArray(keyError[keyPath]));
+              } else {
+                error[keyPath] = keyError[keyPath];
+              }
+            } else {
+              error = keyError;
+            }
+          }
+        }
         var subPath = createValPathOfItem(path, key);
         if (!subPath) {
           error = _this2.appendValidationError(error, path, "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(elem),
@@ -2504,12 +2530,12 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "nullable",
     value: function nullable() {
-      return new RecordSchema(this.item, true);
+      return new RecordSchema(this.item, true, this.customValidateFunctions, this.currentRouter, this.keySchema);
     }
   }, {
     key: "router",
     value: function router(_router) {
-      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router);
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router, this.keySchema);
     }
   }, {
     key: "getRouterValidations",
@@ -2530,9 +2556,9 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           schemaError: true
         }]);
       }
-      var routerValidations = this.currentRouter.validate(moduleFilePath, Object.keys(src));
-      if (routerValidations.length > 0) {
-        return Object.fromEntries(routerValidations.map(function (validation) {
+      var routerValidationErrors = this.currentRouter.validate(moduleFilePath, Object.keys(src));
+      if (routerValidationErrors.length > 0) {
+        return Object.fromEntries(routerValidationErrors.map(function (validation) {
           if (!validation.error.urlPath) {
             return [path, [{
               message: "Router validation error: ".concat(validation.error.message, " has no url path"),
@@ -2541,13 +2567,13 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           }
           var subPath = createValPathOfItem(path, validation.error.urlPath);
           if (!subPath) {
-            return [path, [{
-              message: "Could not create path for router validation error",
-              schemaError: true
-            }]];
+            throw new Error("Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " for router validation")) // Should! never happen
+            ;
           }
           return [subPath, [{
-            message: validation.error.message
+            message: validation.error.message,
+            value: validation.error.urlPath,
+            keyError: true
           }]];
         }));
       }
@@ -2556,10 +2582,11 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeSerialize",
     value: function executeSerialize() {
-      var _this$currentRouter, _this$customValidateF;
+      var _this$keySchema, _this$currentRouter, _this$customValidateF;
       return {
         type: "record",
         item: this.item["executeSerialize"](),
+        key: (_this$keySchema = this.keySchema) === null || _this$keySchema === void 0 ? void 0 : _this$keySchema["executeSerialize"](),
         opt: this.opt,
         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
@@ -2572,16 +2599,16 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
       if (src === null) {
         return res;
       }
-      for (var key in src) {
-        var itemSrc = src[key];
+      for (var _key in src) {
+        var itemSrc = src[_key];
         if (itemSrc === null || itemSrc === undefined) {
           continue;
         }
-        var subPath = unsafeCreateSourcePath(sourcePath, key);
+        var subPath = unsafeCreateSourcePath(sourcePath, _key);
         var itemResult = this.item["executeRender"](subPath, itemSrc);
         for (var keyS in itemResult) {
-          var _key = keyS;
-          res[_key] = itemResult[_key];
+          var _key2 = keyS;
+          res[_key2] = itemResult[_key2];
         }
       }
       if (this.renderInput) {
@@ -2640,9 +2667,21 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
 }(Schema);
-var record = function record(schema) {
-  return new RecordSchema(schema);
-};
+
+// Overload: with key schema
+
+// Overload: without key schema
+
+// Implementation
+function record(keyOrSchema, schema) {
+  if (schema) {
+    // Two-argument call: first is key schema, second is value schema
+    return new RecordSchema(schema, false, [], null, keyOrSchema);
+  } else {
+    // One-argument call: only value schema
+    return new RecordSchema(keyOrSchema, false, [], null, null);
+  }
+}
 
 function define(
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -4092,6 +4131,7 @@ var N = /*#__PURE__*/function (N) {
   N[N["inputWords"] = 16] = "inputWords";
   N[N["highIndex"] = 14] = "highIndex";
   N[N["lowIndex"] = 15] = "lowIndex";
+  // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
   N[N["workWords"] = 64] = "workWords";
   N[N["allocBytes"] = 80] = "allocBytes";
   N[N["allocWords"] = 20] = "allocWords";
@@ -5185,7 +5225,7 @@ function deserializeSchema(serialized) {
         return new RichTextSchema(deserializedOptions, serialized.opt);
       }
     case "record":
-      return new RecordSchema(deserializeSchema(serialized.item), serialized.opt);
+      return new RecordSchema(deserializeSchema(serialized.item), serialized.opt, [], null, serialized.key ? deserializeSchema(serialized.key) : null);
     case "keyOf":
       return new KeyOfSchema(serialized.schema, serialized.path, serialized.opt);
     case "file":

package/dist/{index-af1d2d7a.cjs.prod.js → index-b20e3bab.cjs.prod.js}

@@ -1518,10 +1518,10 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
         };
       }
       if (this.key instanceof LiteralSchema) {
-        var _ref25;
+        var _ref23;
         var success = false;
         var errors = {};
-        var _iterator2 = result._createForOfIteratorHelper((_ref25 = [this.key]).concat.apply(_ref25, _toConsumableArray(this.items))),
+        var _iterator2 = result._createForOfIteratorHelper((_ref23 = [this.key]).concat.apply(_ref23, _toConsumableArray(this.items))),
           _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -2012,7 +2012,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
           _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;
+            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$block0, _this2$options$inline;
             var node = _step.value;
             var path = unsafeCreateSourcePath(rootPath, nodes.indexOf(node));
             if (typeof node === "string") {
@@ -2067,7 +2067,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
             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)) {
+            if (node.tag === "li" && !((_this2$options$block9 = _this2.options.block) !== null && _this2$options$block9 !== void 0 && _this2$options$block9.ul) && !((_this2$options$block0 = _this2.options.block) !== null && _this2$options$block0 !== void 0 && _this2$options$block0.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)) {
@@ -2394,6 +2394,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     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;
     _classCallCheck(this, RecordSchema);
     _this = _callSuper(this, RecordSchema);
     _defineProperty(_this, "renderInput", null);
@@ -2401,13 +2402,14 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     _this.customValidateFunctions = customValidateFunctions;
     _this.currentRouter = currentRouter;
+    _this.keySchema = keySchema;
     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]));
+      return new RecordSchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.currentRouter, this.keySchema);
     }
   }, {
     key: "executeValidate",
@@ -2455,6 +2457,30 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
         var _ref6 = _slicedToArray(_ref5, 2),
           key = _ref6[0],
           elem = _ref6[1];
+        if (_this2.keySchema) {
+          var keyPath = createValPathOfItem(path, key);
+          if (!keyPath) {
+            throw new Error("Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " for key validation")) // Should! never happen
+            ;
+          }
+          var keyError = _this2.keySchema["executeValidate"](keyPath, key);
+          if (keyError) {
+            keyError[keyPath] = keyError[keyPath].map(function (err) {
+              return _objectSpread2(_objectSpread2({}, err), {}, {
+                keyError: true
+              });
+            });
+            if (error) {
+              if (error[keyPath]) {
+                error[keyPath] = [].concat(_toConsumableArray(error[keyPath]), _toConsumableArray(keyError[keyPath]));
+              } else {
+                error[keyPath] = keyError[keyPath];
+              }
+            } else {
+              error = keyError;
+            }
+          }
+        }
         var subPath = createValPathOfItem(path, key);
         if (!subPath) {
           error = _this2.appendValidationError(error, path, "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(elem),
@@ -2506,12 +2532,12 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "nullable",
     value: function nullable() {
-      return new RecordSchema(this.item, true);
+      return new RecordSchema(this.item, true, this.customValidateFunctions, this.currentRouter, this.keySchema);
     }
   }, {
     key: "router",
     value: function router(_router) {
-      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router);
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router, this.keySchema);
     }
   }, {
     key: "getRouterValidations",
@@ -2532,9 +2558,9 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           schemaError: true
         }]);
       }
-      var routerValidations = this.currentRouter.validate(moduleFilePath, Object.keys(src));
-      if (routerValidations.length > 0) {
-        return Object.fromEntries(routerValidations.map(function (validation) {
+      var routerValidationErrors = this.currentRouter.validate(moduleFilePath, Object.keys(src));
+      if (routerValidationErrors.length > 0) {
+        return Object.fromEntries(routerValidationErrors.map(function (validation) {
           if (!validation.error.urlPath) {
             return [path, [{
               message: "Router validation error: ".concat(validation.error.message, " has no url path"),
@@ -2543,13 +2569,13 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           }
           var subPath = createValPathOfItem(path, validation.error.urlPath);
           if (!subPath) {
-            return [path, [{
-              message: "Could not create path for router validation error",
-              schemaError: true
-            }]];
+            throw new Error("Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " for router validation")) // Should! never happen
+            ;
           }
           return [subPath, [{
-            message: validation.error.message
+            message: validation.error.message,
+            value: validation.error.urlPath,
+            keyError: true
           }]];
         }));
       }
@@ -2558,10 +2584,11 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeSerialize",
     value: function executeSerialize() {
-      var _this$currentRouter, _this$customValidateF;
+      var _this$keySchema, _this$currentRouter, _this$customValidateF;
       return {
         type: "record",
         item: this.item["executeSerialize"](),
+        key: (_this$keySchema = this.keySchema) === null || _this$keySchema === void 0 ? void 0 : _this$keySchema["executeSerialize"](),
         opt: this.opt,
         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
@@ -2574,16 +2601,16 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
       if (src === null) {
         return res;
       }
-      for (var key in src) {
-        var itemSrc = src[key];
+      for (var _key in src) {
+        var itemSrc = src[_key];
         if (itemSrc === null || itemSrc === undefined) {
           continue;
         }
-        var subPath = unsafeCreateSourcePath(sourcePath, key);
+        var subPath = unsafeCreateSourcePath(sourcePath, _key);
         var itemResult = this.item["executeRender"](subPath, itemSrc);
         for (var keyS in itemResult) {
-          var _key = keyS;
-          res[_key] = itemResult[_key];
+          var _key2 = keyS;
+          res[_key2] = itemResult[_key2];
         }
       }
       if (this.renderInput) {
@@ -2642,9 +2669,21 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
 }(Schema);
-var record = function record(schema) {
-  return new RecordSchema(schema);
-};
+
+// Overload: with key schema
+
+// Overload: without key schema
+
+// Implementation
+function record(keyOrSchema, schema) {
+  if (schema) {
+    // Two-argument call: first is key schema, second is value schema
+    return new RecordSchema(schema, false, [], null, keyOrSchema);
+  } else {
+    // One-argument call: only value schema
+    return new RecordSchema(keyOrSchema, false, [], null, null);
+  }
+}
 
 function define(
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -4094,6 +4133,7 @@ var N = /*#__PURE__*/function (N) {
   N[N["inputWords"] = 16] = "inputWords";
   N[N["highIndex"] = 14] = "highIndex";
   N[N["lowIndex"] = 15] = "lowIndex";
+  // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
   N[N["workWords"] = 64] = "workWords";
   N[N["allocBytes"] = 80] = "allocBytes";
   N[N["allocWords"] = 20] = "allocWords";
@@ -5187,7 +5227,7 @@ function deserializeSchema(serialized) {
         return new RichTextSchema(deserializedOptions, serialized.opt);
       }
     case "record":
-      return new RecordSchema(deserializeSchema(serialized.item), serialized.opt);
+      return new RecordSchema(deserializeSchema(serialized.item), serialized.opt, [], null, serialized.key ? deserializeSchema(serialized.key) : null);
     case "keyOf":
       return new KeyOfSchema(serialized.schema, serialized.path, serialized.opt);
     case "file":

package/dist/{index-c05b59eb.cjs.dev.js → index-e3cd5eca.cjs.dev.js}

@@ -1518,10 +1518,10 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
         };
       }
       if (this.key instanceof LiteralSchema) {
-        var _ref25;
+        var _ref23;
         var success = false;
         var errors = {};
-        var _iterator2 = result._createForOfIteratorHelper((_ref25 = [this.key]).concat.apply(_ref25, _toConsumableArray(this.items))),
+        var _iterator2 = result._createForOfIteratorHelper((_ref23 = [this.key]).concat.apply(_ref23, _toConsumableArray(this.items))),
           _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -2012,7 +2012,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
           _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;
+            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$block0, _this2$options$inline;
             var node = _step.value;
             var path = unsafeCreateSourcePath(rootPath, nodes.indexOf(node));
             if (typeof node === "string") {
@@ -2067,7 +2067,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
             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)) {
+            if (node.tag === "li" && !((_this2$options$block9 = _this2.options.block) !== null && _this2$options$block9 !== void 0 && _this2$options$block9.ul) && !((_this2$options$block0 = _this2.options.block) !== null && _this2$options$block0 !== void 0 && _this2$options$block0.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)) {
@@ -2394,6 +2394,7 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     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;
     _classCallCheck(this, RecordSchema);
     _this = _callSuper(this, RecordSchema);
     _defineProperty(_this, "renderInput", null);
@@ -2401,13 +2402,14 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     _this.opt = opt;
     _this.customValidateFunctions = customValidateFunctions;
     _this.currentRouter = currentRouter;
+    _this.keySchema = keySchema;
     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]));
+      return new RecordSchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.currentRouter, this.keySchema);
     }
   }, {
     key: "executeValidate",
@@ -2455,6 +2457,30 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
         var _ref6 = _slicedToArray(_ref5, 2),
           key = _ref6[0],
           elem = _ref6[1];
+        if (_this2.keySchema) {
+          var keyPath = createValPathOfItem(path, key);
+          if (!keyPath) {
+            throw new Error("Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " for key validation")) // Should! never happen
+            ;
+          }
+          var keyError = _this2.keySchema["executeValidate"](keyPath, key);
+          if (keyError) {
+            keyError[keyPath] = keyError[keyPath].map(function (err) {
+              return _objectSpread2(_objectSpread2({}, err), {}, {
+                keyError: true
+              });
+            });
+            if (error) {
+              if (error[keyPath]) {
+                error[keyPath] = [].concat(_toConsumableArray(error[keyPath]), _toConsumableArray(keyError[keyPath]));
+              } else {
+                error[keyPath] = keyError[keyPath];
+              }
+            } else {
+              error = keyError;
+            }
+          }
+        }
         var subPath = createValPathOfItem(path, key);
         if (!subPath) {
           error = _this2.appendValidationError(error, path, "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(elem),
@@ -2506,12 +2532,12 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "nullable",
     value: function nullable() {
-      return new RecordSchema(this.item, true);
+      return new RecordSchema(this.item, true, this.customValidateFunctions, this.currentRouter, this.keySchema);
     }
   }, {
     key: "router",
     value: function router(_router) {
-      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router);
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router, this.keySchema);
     }
   }, {
     key: "getRouterValidations",
@@ -2532,9 +2558,9 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           schemaError: true
         }]);
       }
-      var routerValidations = this.currentRouter.validate(moduleFilePath, Object.keys(src));
-      if (routerValidations.length > 0) {
-        return Object.fromEntries(routerValidations.map(function (validation) {
+      var routerValidationErrors = this.currentRouter.validate(moduleFilePath, Object.keys(src));
+      if (routerValidationErrors.length > 0) {
+        return Object.fromEntries(routerValidationErrors.map(function (validation) {
           if (!validation.error.urlPath) {
             return [path, [{
               message: "Router validation error: ".concat(validation.error.message, " has no url path"),
@@ -2543,13 +2569,13 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           }
           var subPath = createValPathOfItem(path, validation.error.urlPath);
           if (!subPath) {
-            return [path, [{
-              message: "Could not create path for router validation error",
-              schemaError: true
-            }]];
+            throw new Error("Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " for router validation")) // Should! never happen
+            ;
           }
           return [subPath, [{
-            message: validation.error.message
+            message: validation.error.message,
+            value: validation.error.urlPath,
+            keyError: true
           }]];
         }));
       }
@@ -2558,10 +2584,11 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeSerialize",
     value: function executeSerialize() {
-      var _this$currentRouter, _this$customValidateF;
+      var _this$keySchema, _this$currentRouter, _this$customValidateF;
       return {
         type: "record",
         item: this.item["executeSerialize"](),
+        key: (_this$keySchema = this.keySchema) === null || _this$keySchema === void 0 ? void 0 : _this$keySchema["executeSerialize"](),
         opt: this.opt,
         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
@@ -2574,16 +2601,16 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
       if (src === null) {
         return res;
       }
-      for (var key in src) {
-        var itemSrc = src[key];
+      for (var _key in src) {
+        var itemSrc = src[_key];
         if (itemSrc === null || itemSrc === undefined) {
           continue;
         }
-        var subPath = unsafeCreateSourcePath(sourcePath, key);
+        var subPath = unsafeCreateSourcePath(sourcePath, _key);
         var itemResult = this.item["executeRender"](subPath, itemSrc);
         for (var keyS in itemResult) {
-          var _key = keyS;
-          res[_key] = itemResult[_key];
+          var _key2 = keyS;
+          res[_key2] = itemResult[_key2];
         }
       }
       if (this.renderInput) {
@@ -2642,9 +2669,21 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     }
   }]);
 }(Schema);
-var record = function record(schema) {
-  return new RecordSchema(schema);
-};
+
+// Overload: with key schema
+
+// Overload: without key schema
+
+// Implementation
+function record(keyOrSchema, schema) {
+  if (schema) {
+    // Two-argument call: first is key schema, second is value schema
+    return new RecordSchema(schema, false, [], null, keyOrSchema);
+  } else {
+    // One-argument call: only value schema
+    return new RecordSchema(keyOrSchema, false, [], null, null);
+  }
+}
 
 function define(
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -4094,6 +4133,7 @@ var N = /*#__PURE__*/function (N) {
   N[N["inputWords"] = 16] = "inputWords";
   N[N["highIndex"] = 14] = "highIndex";
   N[N["lowIndex"] = 15] = "lowIndex";
+  // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
   N[N["workWords"] = 64] = "workWords";
   N[N["allocBytes"] = 80] = "allocBytes";
   N[N["allocWords"] = 20] = "allocWords";
@@ -5187,7 +5227,7 @@ function deserializeSchema(serialized) {
         return new RichTextSchema(deserializedOptions, serialized.opt);
       }
     case "record":
-      return new RecordSchema(deserializeSchema(serialized.item), serialized.opt);
+      return new RecordSchema(deserializeSchema(serialized.item), serialized.opt, [], null, serialized.key ? deserializeSchema(serialized.key) : null);
     case "keyOf":
       return new KeyOfSchema(serialized.schema, serialized.path, serialized.opt);
     case "file":

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dist_valbuildCore = require('./index-c05b59eb.cjs.dev.js');
+var dist_valbuildCore = require('./index-e3cd5eca.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-af1d2d7a.cjs.prod.js');
+var dist_valbuildCore = require('./index-b20e3bab.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, f as DEFAULT_VAL_REMOTE_HOST, o as DateSchema, F as FATAL_ERROR_TYPES, g as FILE_REF_PROP, h as FILE_REF_SUBTYPE_TAG, n as FileSchema, G as GenericSelector, l as ImageSchema, I as Internal, K as KeyOfSchema, L as LiteralSchema, M as ModuleFilePathSep, N as NumberSchema, O as ObjectSchema, R as RecordSchema, p as RichTextSchema, S as Schema, k as StringSchema, U as UnionSchema, V as VAL_EXTENSION, j as derefPatch, q as deserializeSchema, i as initVal, m as modules } from './index-e0c4e804.esm.js';
+export { A as ArraySchema, B as BooleanSchema, e as DEFAULT_APP_HOST, D as DEFAULT_CONTENT_HOST, f as DEFAULT_VAL_REMOTE_HOST, o as DateSchema, F as FATAL_ERROR_TYPES, g as FILE_REF_PROP, h as FILE_REF_SUBTYPE_TAG, n as FileSchema, G as GenericSelector, l as ImageSchema, I as Internal, K as KeyOfSchema, L as LiteralSchema, M as ModuleFilePathSep, N as NumberSchema, O as ObjectSchema, R as RecordSchema, p as RichTextSchema, S as Schema, k as StringSchema, U as UnionSchema, V as VAL_EXTENSION, j as derefPatch, q as deserializeSchema, i as initVal, m as modules } from './index-2b6db652.esm.js';
 import './result-daff1cae.esm.js';

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@valbuild/core",
-  "version": "0.87.2",
+  "version": "0.87.4",
   "private": false,
   "description": "Val - supercharged hard-coded content",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/valbuild/val.git"
+  },
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",

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-c05b59eb.cjs.dev.js');
+var dist_valbuildCore = require('../../dist/index-e3cd5eca.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-af1d2d7a.cjs.prod.js');
+var dist_valbuildCore = require('../../dist/index-b20e3bab.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-e0c4e804.esm.js';
-export { P as PatchError } from '../../dist/index-e0c4e804.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-2b6db652.esm.js';
+export { P as PatchError } from '../../dist/index-2b6db652.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-daff1cae.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';