@valbuild/core 0.17.0 → 0.18.0

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

@@ -7,6 +7,8 @@ import { union } from "./schema/union.js";
 import { richtext } from "./schema/richtext.js";
 import { image } from "./schema/image.js";
 import { literal } from "./schema/literal.js";
+import { keyOf } from "./schema/keyOf.js";
+import { record } from "./schema/record.js";
 export type InitSchema = {
     readonly string: typeof string;
     readonly boolean: typeof boolean;
@@ -17,6 +19,8 @@ export type InitSchema = {
     readonly richtext: typeof richtext;
     readonly image: typeof image;
     readonly literal: typeof literal;
+    readonly keyOf: typeof keyOf;
+    readonly record: typeof record;
 };
 export declare function initSchema(): {
     string: <T extends string>(options?: {
@@ -46,4 +50,6 @@ export declare function initSchema(): {
     richtext: () => import("./schema/index.js").Schema<import("./index.js").RichTextSource>;
     image: (options?: import("./schema/image.js").ImageOptions | undefined) => import("./schema/index.js").Schema<import("./index.js").FileSource<import("./schema/image.js").ImageMetadata>>;
     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").SchemaTypeOf<S_3>>>;
 };

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

@@ -1,7 +1,7 @@
-import { Schema, SerializedSchema, SourceObject } from "../index.js";
+import { Schema, SerializedSchema } from "./index.js";
 import { ValModuleBrand } from "../module.js";
 import { GenericSelector } from "../selector/index.js";
-import { SourceArray } from "../source/index.js";
+import { SourceArray, SourceObject } from "../source/index.js";
 import { SourcePath } from "../val/index.js";
 import { ValidationErrors } from "./validation/ValidationError.js";
 export type SerializedKeyOfSchema = {

package/dist/{index-3e3e839e.esm.js → index-4abf3a1f.esm.js}

@@ -1,4 +1,4 @@
-import { f as _objectSpread2, j as _slicedToArray, c as _createClass, b as _classCallCheck, q as Sym, C as Call, r as StringLiteral, s as StringTemplate, e as _typeof, l as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, m as convertFileSource, d as _defineProperty, S as Schema, E as Expr, t as _toConsumableArray, N as NilSym } from './index-369caccf.esm.js';
+import { h as _objectSpread2, f as _slicedToArray, c as _createClass, b as _classCallCheck, r as Sym, C as Call, s as StringLiteral, t as StringTemplate, e as _typeof, m as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, n as convertFileSource, d as _defineProperty, S as Schema, E as Expr, u as _toConsumableArray, N as NilSym } from './index-a9235737.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", " "];

package/dist/{index-369caccf.esm.js → index-a9235737.esm.js}

@@ -547,4 +547,4 @@ function getValPath(valOrSelector) {
   return valOrSelector[Path];
 }
 
-export { Call as C, Expr as E, FILE_REF_PROP as F, GetSource as G, ImageSchema as I, NilSym as N, Path as P, Schema as S, VAL_EXTENSION as V, _inherits as _, _createSuper as a, _classCallCheck as b, _createClass as c, _defineProperty as d, _typeof as e, _objectSpread2 as f, getValPath as g, file as h, image as i, _slicedToArray as j, isFile as k, isSerializedVal as l, convertFileSource as m, getSchema as n, isVal as o, GenericSelector as p, Sym as q, StringLiteral as r, StringTemplate as s, _toConsumableArray as t, GetSchema as u };
+export { Call as C, Expr as E, FILE_REF_PROP as F, GetSchema as G, ImageSchema as I, NilSym as N, Path as P, Schema as S, VAL_EXTENSION as V, _inherits as _, _createSuper as a, _classCallCheck as b, _createClass as c, _defineProperty as d, _typeof as e, _slicedToArray as f, getValPath as g, _objectSpread2 as h, image as i, file as j, isFile as k, GetSource as l, isSerializedVal as m, convertFileSource as n, getSchema as o, isVal as p, GenericSelector as q, Sym as r, StringLiteral as s, StringTemplate as t, _toConsumableArray as u };

package/dist/{ops-23a5abb2.esm.js → ops-a2a295f8.esm.js}

@@ -1,4 +1,4 @@
-import { e as _typeof, l as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, m as convertFileSource, d as _defineProperty, G as GetSource, P as Path, u as GetSchema, S as Schema, E as Expr, _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, j as _slicedToArray, f as _objectSpread2, t as _toConsumableArray, I as ImageSchema } from './index-369caccf.esm.js';
+import { e as _typeof, m as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, n as convertFileSource, d as _defineProperty, l as GetSource, P as Path, G as GetSchema, S as Schema, E as Expr, _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, f as _slicedToArray, h as _objectSpread2, u as _toConsumableArray, I as ImageSchema } from './index-a9235737.esm.js';
 import { _ as _createForOfIteratorHelper } from './result-b96df128.esm.js';
 
 function hasOwn(obj, prop) {
@@ -668,4 +668,4 @@ var PatchError = /*#__PURE__*/_createClass(function PatchError(message) {
  * NOTE: MAY mutate the input document.
  */
 
-export { PatchError as P, array as a, createValPathOfItem as b, content as c, resolvePath as d, getSource as g, isSelector as i, newSelectorProxy as n, object as o, richtext as r, splitModuleIdAndModulePath as s, union as u };
+export { PatchError as P, array as a, content as b, createValPathOfItem as c, resolvePath as d, getSource as g, isSelector as i, newSelectorProxy as n, object as o, richtext as r, splitModuleIdAndModulePath as s, union as u };

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

@@ -231,6 +231,204 @@ var literal = function literal(value) {
   return new LiteralSchema(value);
 };
 
+var KeyOfSchema = /*#__PURE__*/function (_Schema) {
+  index._inherits(KeyOfSchema, _Schema);
+  var _super = index._createSuper(KeyOfSchema);
+  function KeyOfSchema(selector) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    index._classCallCheck(this, KeyOfSchema);
+    _this = _super.call(this);
+    _this.selector = selector;
+    _this.opt = opt;
+    return _this;
+  }
+  index._createClass(KeyOfSchema, [{
+    key: "validate",
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      var schema = this.selector[index.GetSchema];
+      if (!schema) {
+        return index._defineProperty({}, path, [{
+          message: "Schema not found for module. keyOf must be used with a Val Module"
+        }]);
+      }
+      var serializedSchema = schema.serialize();
+      if (!(serializedSchema.type === "array" || serializedSchema.type === "object" || serializedSchema.type === "record")) {
+        return index._defineProperty({}, path, [{
+          message: "Schema in keyOf must be an 'array', 'object' or 'record'. Found '".concat(serializedSchema.type, "'")
+        }]);
+      }
+      if (serializedSchema.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (serializedSchema.type === "array" && typeof src !== "number") {
+        return index._defineProperty({}, path, [{
+          message: "Type of value in keyof (array) must be 'number'"
+        }]);
+      }
+      if (serializedSchema.type === "record" && typeof src !== "string") {
+        return index._defineProperty({}, path, [{
+          message: "Type of value in keyof (record) must be 'string'"
+        }]);
+      }
+      if (serializedSchema.type === "object") {
+        var keys = Object.keys(serializedSchema.items);
+        if (!keys.includes(src)) {
+          return index._defineProperty({}, path, [{
+            message: "Value of keyOf (object) must be: ".concat(keys.join(", "), ". Found: ").concat(src)
+          }]);
+        }
+      }
+      return false;
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      var schema = this.selector[index.GetSchema];
+      if (!schema) {
+        return false;
+      }
+      var serializedSchema = schema.serialize();
+      if (!(serializedSchema.type === "array" || serializedSchema.type === "object" || serializedSchema.type === "record")) {
+        return false;
+      }
+      if (serializedSchema.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      if (serializedSchema.type === "array" && typeof src !== "number") {
+        return false;
+      }
+      if (serializedSchema.type === "record" && typeof src !== "string") {
+        return false;
+      }
+      if (serializedSchema.type === "object") {
+        var keys = Object.keys(serializedSchema.items);
+        if (!keys.includes(src)) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new KeyOfSchema(this.selector, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      var path = index.getValPath(this.selector);
+      if (!path) {
+        throw new Error("Cannot serialize oneOf schema with empty selector. keyOf must be used with a Val Module.");
+      }
+      return {
+        type: "keyOf",
+        selector: path,
+        opt: this.opt
+      };
+    }
+  }]);
+  return KeyOfSchema;
+}(index.Schema);
+var keyOf = function keyOf(valModule) {
+  return new KeyOfSchema(valModule);
+};
+
+var RecordSchema = /*#__PURE__*/function (_Schema) {
+  index._inherits(RecordSchema, _Schema);
+  var _super = index._createSuper(RecordSchema);
+  function RecordSchema(item) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    index._classCallCheck(this, RecordSchema);
+    _this = _super.call(this);
+    _this.item = item;
+    _this.opt = opt;
+    return _this;
+  }
+  index._createClass(RecordSchema, [{
+    key: "validate",
+    value: function validate(path, src) {
+      var _this2 = this;
+      var error = false;
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (index._typeof(src) !== "object") {
+        return index._defineProperty({}, path, [{
+          message: "Expected 'object', got '".concat(index._typeof(src), "'")
+        }]);
+      }
+      if (Array.isArray(src)) {
+        return index._defineProperty({}, path, [{
+          message: "Expected 'object', got 'array'"
+        }]);
+      }
+      Object.entries(src).forEach(function (_ref3) {
+        var _ref4 = index._slicedToArray(_ref3, 2),
+          key = _ref4[0],
+          elem = _ref4[1];
+        var subPath = ops.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),
+          // Should! never happen
+          src);
+        } else {
+          var subError = _this2.item.validate(subPath, elem);
+          if (subError && error) {
+            error = index._objectSpread2(index._objectSpread2({}, subError), error);
+          } else if (subError) {
+            error = subError;
+          }
+        }
+      });
+      return error;
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      if (!src) {
+        return false;
+      }
+      for (var _i = 0, _Object$entries = Object.entries(src); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = index._slicedToArray(_Object$entries[_i], 2),
+          _item = _Object$entries$_i[1];
+        if (!this.item.assert(_item)) {
+          return false;
+        }
+      }
+      return index._typeof(src) === "object" && !Array.isArray(src);
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new RecordSchema(this.item, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return {
+        type: "record",
+        item: this.item.serialize(),
+        opt: this.opt
+      };
+    }
+  }]);
+  return RecordSchema;
+}(index.Schema);
+var record = function record(schema) {
+  return new RecordSchema(schema);
+};
+
 // import type { F } from "ts-toolbelt";
 // import { i18n, I18n } from "./schema/future/i18n";
 // import { oneOf } from "./schema/future/oneOf";
@@ -249,7 +447,9 @@ function initSchema() {
     // oneOf,
     richtext: ops.richtext,
     image: index.image,
-    literal: literal
+    literal: literal,
+    keyOf: keyOf,
+    record: record
     // i18n: i18n(locales),
   };
 }

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

@@ -231,6 +231,204 @@ var literal = function literal(value) {
   return new LiteralSchema(value);
 };
 
+var KeyOfSchema = /*#__PURE__*/function (_Schema) {
+  index._inherits(KeyOfSchema, _Schema);
+  var _super = index._createSuper(KeyOfSchema);
+  function KeyOfSchema(selector) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    index._classCallCheck(this, KeyOfSchema);
+    _this = _super.call(this);
+    _this.selector = selector;
+    _this.opt = opt;
+    return _this;
+  }
+  index._createClass(KeyOfSchema, [{
+    key: "validate",
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      var schema = this.selector[index.GetSchema];
+      if (!schema) {
+        return index._defineProperty({}, path, [{
+          message: "Schema not found for module. keyOf must be used with a Val Module"
+        }]);
+      }
+      var serializedSchema = schema.serialize();
+      if (!(serializedSchema.type === "array" || serializedSchema.type === "object" || serializedSchema.type === "record")) {
+        return index._defineProperty({}, path, [{
+          message: "Schema in keyOf must be an 'array', 'object' or 'record'. Found '".concat(serializedSchema.type, "'")
+        }]);
+      }
+      if (serializedSchema.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (serializedSchema.type === "array" && typeof src !== "number") {
+        return index._defineProperty({}, path, [{
+          message: "Type of value in keyof (array) must be 'number'"
+        }]);
+      }
+      if (serializedSchema.type === "record" && typeof src !== "string") {
+        return index._defineProperty({}, path, [{
+          message: "Type of value in keyof (record) must be 'string'"
+        }]);
+      }
+      if (serializedSchema.type === "object") {
+        var keys = Object.keys(serializedSchema.items);
+        if (!keys.includes(src)) {
+          return index._defineProperty({}, path, [{
+            message: "Value of keyOf (object) must be: ".concat(keys.join(", "), ". Found: ").concat(src)
+          }]);
+        }
+      }
+      return false;
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      var schema = this.selector[index.GetSchema];
+      if (!schema) {
+        return false;
+      }
+      var serializedSchema = schema.serialize();
+      if (!(serializedSchema.type === "array" || serializedSchema.type === "object" || serializedSchema.type === "record")) {
+        return false;
+      }
+      if (serializedSchema.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      if (serializedSchema.type === "array" && typeof src !== "number") {
+        return false;
+      }
+      if (serializedSchema.type === "record" && typeof src !== "string") {
+        return false;
+      }
+      if (serializedSchema.type === "object") {
+        var keys = Object.keys(serializedSchema.items);
+        if (!keys.includes(src)) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new KeyOfSchema(this.selector, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      var path = index.getValPath(this.selector);
+      if (!path) {
+        throw new Error("Cannot serialize oneOf schema with empty selector. keyOf must be used with a Val Module.");
+      }
+      return {
+        type: "keyOf",
+        selector: path,
+        opt: this.opt
+      };
+    }
+  }]);
+  return KeyOfSchema;
+}(index.Schema);
+var keyOf = function keyOf(valModule) {
+  return new KeyOfSchema(valModule);
+};
+
+var RecordSchema = /*#__PURE__*/function (_Schema) {
+  index._inherits(RecordSchema, _Schema);
+  var _super = index._createSuper(RecordSchema);
+  function RecordSchema(item) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    index._classCallCheck(this, RecordSchema);
+    _this = _super.call(this);
+    _this.item = item;
+    _this.opt = opt;
+    return _this;
+  }
+  index._createClass(RecordSchema, [{
+    key: "validate",
+    value: function validate(path, src) {
+      var _this2 = this;
+      var error = false;
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (index._typeof(src) !== "object") {
+        return index._defineProperty({}, path, [{
+          message: "Expected 'object', got '".concat(index._typeof(src), "'")
+        }]);
+      }
+      if (Array.isArray(src)) {
+        return index._defineProperty({}, path, [{
+          message: "Expected 'object', got 'array'"
+        }]);
+      }
+      Object.entries(src).forEach(function (_ref3) {
+        var _ref4 = index._slicedToArray(_ref3, 2),
+          key = _ref4[0],
+          elem = _ref4[1];
+        var subPath = ops.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),
+          // Should! never happen
+          src);
+        } else {
+          var subError = _this2.item.validate(subPath, elem);
+          if (subError && error) {
+            error = index._objectSpread2(index._objectSpread2({}, subError), error);
+          } else if (subError) {
+            error = subError;
+          }
+        }
+      });
+      return error;
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      if (!src) {
+        return false;
+      }
+      for (var _i = 0, _Object$entries = Object.entries(src); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = index._slicedToArray(_Object$entries[_i], 2),
+          _item = _Object$entries$_i[1];
+        if (!this.item.assert(_item)) {
+          return false;
+        }
+      }
+      return index._typeof(src) === "object" && !Array.isArray(src);
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new RecordSchema(this.item, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return {
+        type: "record",
+        item: this.item.serialize(),
+        opt: this.opt
+      };
+    }
+  }]);
+  return RecordSchema;
+}(index.Schema);
+var record = function record(schema) {
+  return new RecordSchema(schema);
+};
+
 // import type { F } from "ts-toolbelt";
 // import { i18n, I18n } from "./schema/future/i18n";
 // import { oneOf } from "./schema/future/oneOf";
@@ -249,7 +447,9 @@ function initSchema() {
     // oneOf,
     richtext: ops.richtext,
     image: index.image,
-    literal: literal
+    literal: literal,
+    keyOf: keyOf,
+    record: record
     // i18n: i18n(locales),
   };
 }

package/dist/valbuild-core.esm.js

@@ -1,7 +1,7 @@
-import { _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, d as _defineProperty, e as _typeof, S as Schema, i as image, V as VAL_EXTENSION, f as _objectSpread2, g as getValPath, h as file, j as _slicedToArray, k as isFile, F as FILE_REF_PROP, P as Path, G as GetSource, l as isSerializedVal, m as convertFileSource, n as getSchema, o as isVal } from './index-369caccf.esm.js';
-export { F as FILE_REF_PROP, p as GenericSelector, S as Schema, V as VAL_EXTENSION } from './index-369caccf.esm.js';
-import { a as array, o as object, u as union, r as richtext$1, c as content, P as PatchError, n as newSelectorProxy, b as createValPathOfItem, i as isSelector, g as getSource, d as resolvePath, s as splitModuleIdAndModulePath } from './ops-23a5abb2.esm.js';
-export { i as expr } from './index-3e3e839e.esm.js';
+import { _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, d as _defineProperty, e as _typeof, S as Schema, G as GetSchema, g as getValPath, f as _slicedToArray, h as _objectSpread2, i as image, V as VAL_EXTENSION, j as file, k as isFile, F as FILE_REF_PROP, P as Path, l as GetSource, m as isSerializedVal, n as convertFileSource, o as getSchema, p as isVal } from './index-a9235737.esm.js';
+export { F as FILE_REF_PROP, q as GenericSelector, S as Schema, V as VAL_EXTENSION } from './index-a9235737.esm.js';
+import { c as createValPathOfItem, a as array, o as object, u as union, r as richtext$1, b as content, P as PatchError, n as newSelectorProxy, i as isSelector, g as getSource, d as resolvePath, s as splitModuleIdAndModulePath } from './ops-a2a295f8.esm.js';
+export { i as expr } from './index-4abf3a1f.esm.js';
 import { _ as _createForOfIteratorHelper, i as isErr, a as isOk, e as err, o as ok, r as result } from './result-b96df128.esm.js';
 
 var NumberSchema = /*#__PURE__*/function (_Schema) {
@@ -228,6 +228,204 @@ var literal = function literal(value) {
   return new LiteralSchema(value);
 };
 
+var KeyOfSchema = /*#__PURE__*/function (_Schema) {
+  _inherits(KeyOfSchema, _Schema);
+  var _super = _createSuper(KeyOfSchema);
+  function KeyOfSchema(selector) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    _classCallCheck(this, KeyOfSchema);
+    _this = _super.call(this);
+    _this.selector = selector;
+    _this.opt = opt;
+    return _this;
+  }
+  _createClass(KeyOfSchema, [{
+    key: "validate",
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      var schema = this.selector[GetSchema];
+      if (!schema) {
+        return _defineProperty({}, path, [{
+          message: "Schema not found for module. keyOf must be used with a Val Module"
+        }]);
+      }
+      var serializedSchema = schema.serialize();
+      if (!(serializedSchema.type === "array" || serializedSchema.type === "object" || serializedSchema.type === "record")) {
+        return _defineProperty({}, path, [{
+          message: "Schema in keyOf must be an 'array', 'object' or 'record'. Found '".concat(serializedSchema.type, "'")
+        }]);
+      }
+      if (serializedSchema.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (serializedSchema.type === "array" && typeof src !== "number") {
+        return _defineProperty({}, path, [{
+          message: "Type of value in keyof (array) must be 'number'"
+        }]);
+      }
+      if (serializedSchema.type === "record" && typeof src !== "string") {
+        return _defineProperty({}, path, [{
+          message: "Type of value in keyof (record) must be 'string'"
+        }]);
+      }
+      if (serializedSchema.type === "object") {
+        var keys = Object.keys(serializedSchema.items);
+        if (!keys.includes(src)) {
+          return _defineProperty({}, path, [{
+            message: "Value of keyOf (object) must be: ".concat(keys.join(", "), ". Found: ").concat(src)
+          }]);
+        }
+      }
+      return false;
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      var schema = this.selector[GetSchema];
+      if (!schema) {
+        return false;
+      }
+      var serializedSchema = schema.serialize();
+      if (!(serializedSchema.type === "array" || serializedSchema.type === "object" || serializedSchema.type === "record")) {
+        return false;
+      }
+      if (serializedSchema.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      if (serializedSchema.type === "array" && typeof src !== "number") {
+        return false;
+      }
+      if (serializedSchema.type === "record" && typeof src !== "string") {
+        return false;
+      }
+      if (serializedSchema.type === "object") {
+        var keys = Object.keys(serializedSchema.items);
+        if (!keys.includes(src)) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new KeyOfSchema(this.selector, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      var path = getValPath(this.selector);
+      if (!path) {
+        throw new Error("Cannot serialize oneOf schema with empty selector. keyOf must be used with a Val Module.");
+      }
+      return {
+        type: "keyOf",
+        selector: path,
+        opt: this.opt
+      };
+    }
+  }]);
+  return KeyOfSchema;
+}(Schema);
+var keyOf = function keyOf(valModule) {
+  return new KeyOfSchema(valModule);
+};
+
+var RecordSchema = /*#__PURE__*/function (_Schema) {
+  _inherits(RecordSchema, _Schema);
+  var _super = _createSuper(RecordSchema);
+  function RecordSchema(item) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    _classCallCheck(this, RecordSchema);
+    _this = _super.call(this);
+    _this.item = item;
+    _this.opt = opt;
+    return _this;
+  }
+  _createClass(RecordSchema, [{
+    key: "validate",
+    value: function validate(path, src) {
+      var _this2 = this;
+      var error = false;
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (_typeof(src) !== "object") {
+        return _defineProperty({}, path, [{
+          message: "Expected 'object', got '".concat(_typeof(src), "'")
+        }]);
+      }
+      if (Array.isArray(src)) {
+        return _defineProperty({}, path, [{
+          message: "Expected 'object', got 'array'"
+        }]);
+      }
+      Object.entries(src).forEach(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          key = _ref4[0],
+          elem = _ref4[1];
+        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),
+          // Should! never happen
+          src);
+        } else {
+          var subError = _this2.item.validate(subPath, elem);
+          if (subError && error) {
+            error = _objectSpread2(_objectSpread2({}, subError), error);
+          } else if (subError) {
+            error = subError;
+          }
+        }
+      });
+      return error;
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      if (!src) {
+        return false;
+      }
+      for (var _i = 0, _Object$entries = Object.entries(src); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+          _item = _Object$entries$_i[1];
+        if (!this.item.assert(_item)) {
+          return false;
+        }
+      }
+      return _typeof(src) === "object" && !Array.isArray(src);
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new RecordSchema(this.item, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return {
+        type: "record",
+        item: this.item.serialize(),
+        opt: this.opt
+      };
+    }
+  }]);
+  return RecordSchema;
+}(Schema);
+var record = function record(schema) {
+  return new RecordSchema(schema);
+};
+
 // import type { F } from "ts-toolbelt";
 // import { i18n, I18n } from "./schema/future/i18n";
 // import { oneOf } from "./schema/future/oneOf";
@@ -246,7 +444,9 @@ function initSchema() {
     // oneOf,
     richtext: richtext$1,
     image: image,
-    literal: literal
+    literal: literal,
+    keyOf: keyOf,
+    record: record
     // i18n: i18n(locales),
   };
 }

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

@@ -1,3 +1,3 @@
-export { e as evaluate, p as parse } from '../../dist/index-3e3e839e.esm.js';
-export { C as Call, E as Expr, N as NilSym, r as StringLiteral, s as StringTemplate, q as Sym } from '../../dist/index-369caccf.esm.js';
+export { e as evaluate, p as parse } from '../../dist/index-4abf3a1f.esm.js';
+export { C as Call, E as Expr, N as NilSym, s as StringLiteral, t as StringTemplate, r as Sym } from '../../dist/index-a9235737.esm.js';
 import '../../dist/result-b96df128.esm.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "scripts": {

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

@@ -1,8 +1,8 @@
-import { e as _typeof, j as _slicedToArray, c as _createClass, b as _classCallCheck, t as _toConsumableArray } from '../../dist/index-369caccf.esm.js';
+import { e as _typeof, f as _slicedToArray, c as _createClass, b as _classCallCheck, u as _toConsumableArray } from '../../dist/index-a9235737.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-b96df128.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';
-import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-23a5abb2.esm.js';
-export { P as PatchError } from '../../dist/ops-23a5abb2.esm.js';
+import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-a2a295f8.esm.js';
+export { P as PatchError } from '../../dist/ops-a2a295f8.esm.js';
 
 function isNotRoot(path) {
   return isNonEmpty(path);

package/src/initSchema.ts

@@ -8,6 +8,8 @@ import { union } from "./schema/union";
 import { richtext } from "./schema/richtext";
 import { image } from "./schema/image";
 import { literal } from "./schema/literal";
+import { keyOf } from "./schema/keyOf";
+import { record } from "./schema/record";
 // import { i18n, I18n } from "./schema/future/i18n";
 // import { oneOf } from "./schema/future/oneOf";
 
@@ -22,6 +24,8 @@ export type InitSchema = {
   readonly richtext: typeof richtext;
   readonly image: typeof image;
   readonly literal: typeof literal;
+  readonly keyOf: typeof keyOf;
+  readonly record: typeof record;
 };
 // export type InitSchemaLocalized<Locales extends readonly string[]> = {
 //   readonly i18n: I18n<Locales>;
@@ -39,6 +43,8 @@ export function initSchema() {
     richtext,
     image,
     literal,
+    keyOf,
+    record,
     // i18n: i18n(locales),
   };
 }

package/src/schema/keyOf.ts

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { Schema, SerializedSchema, SourceObject } from "..";
+import { Schema, SerializedSchema } from "../schema";
 import { ValModuleBrand } from "../module";
 import { GenericSelector, GetSchema } from "../selector";
-import { SourceArray } from "../source";
+import { SourceArray, SourceObject } from "../source";
 import { SourcePath, getValPath } from "../val";
 import { ValidationErrors } from "./validation/ValidationError";