@valbuild/core 0.17.0 → 0.19.0

package/dist/{ops-23a5abb2.esm.js → ops-7ef32b0a.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, n as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, f as convertFileSource, d as _defineProperty, m 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, k as _slicedToArray, j as _objectSpread2, u as _toConsumableArray, I as ImageSchema } from './index-bccf1907.esm.js';
 import { _ as _createForOfIteratorHelper } from './result-b96df128.esm.js';
 
 function hasOwn(obj, prop) {
@@ -380,75 +380,132 @@ var union = function union(key) {
 var RichTextSchema = /*#__PURE__*/function (_Schema) {
   _inherits(RichTextSchema, _Schema);
   var _super = _createSuper(RichTextSchema);
-  function RichTextSchema() {
+  function RichTextSchema(options) {
     var _this;
-    var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     _classCallCheck(this, RichTextSchema);
     _this = _super.call(this);
+    _this.options = options;
     _this.opt = opt;
     return _this;
   }
   _createClass(RichTextSchema, [{
     key: "validate",
     value: function validate(path, src) {
+      return false; //TODO
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      return true; // TODO
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new RichTextSchema(this.options, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return {
+        type: "richtext",
+        opt: this.opt
+      };
+    }
+  }]);
+  return RichTextSchema;
+}(Schema);
+var richtext = function richtext(options) {
+  return new RichTextSchema(options);
+};
+
+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 (src === null || src === undefined) {
-        return _defineProperty({}, path, [{
-          message: "Expected non-nullable got '".concat(src, "'")
-        }]);
-      }
-      if (_typeof(src) !== "object" && !Array.isArray(src)) {
-        return _defineProperty({}, path, [{
-          message: "Expected 'object' (that is not of an array) or 'string', got '".concat(_typeof(src), "'"),
-          value: src
-        }]);
-      }
-      if (src[VAL_EXTENSION] !== "richtext") {
-        return _defineProperty({}, path, [{
-          message: "Expected _type key with value 'richtext' got '".concat(src[VAL_EXTENSION], "'"),
-          value: src
-        }]);
-      }
-      if (src.type !== "root") {
+      if (_typeof(src) !== "object") {
         return _defineProperty({}, path, [{
-          message: "Expected type key with value 'root' got '".concat(src.type, "'"),
-          value: src
+          message: "Expected 'object', got '".concat(_typeof(src), "'")
         }]);
       }
-      if (_typeof(src.children) !== "object" && !Array.isArray(src.children)) {
+      if (Array.isArray(src)) {
         return _defineProperty({}, path, [{
-          message: "Expected children to be an array, but got '".concat(src.type, "'"),
-          value: src
+          message: "Expected 'object', got 'array'"
         }]);
       }
-      return false;
+      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) {
-      // TODO:
-      return true;
+      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 RichTextSchema(true);
+      return new RecordSchema(this.item, true);
     }
   }, {
     key: "serialize",
     value: function serialize() {
       return {
-        type: "richtext",
+        type: "record",
+        item: this.item.serialize(),
         opt: this.opt
       };
     }
   }]);
-  return RichTextSchema;
+  return RecordSchema;
 }(Schema);
-var richtext = function richtext() {
-  return new RichTextSchema();
+var record = function record(schema) {
+  return new RecordSchema(schema);
 };
 
 function content(
@@ -475,6 +532,9 @@ function splitModuleIdAndModulePath(path) {
 function isObjectSchema(schema) {
   return schema instanceof ObjectSchema || _typeof(schema) === "object" && "type" in schema && schema.type === "object";
 }
+function isRecordSchema(schema) {
+  return schema instanceof RecordSchema || _typeof(schema) === "object" && "type" in schema && schema.type === "record";
+}
 function isArraySchema(schema) {
   return schema instanceof ArraySchema || _typeof(schema) === "object" && "type" in schema && schema.type === "array";
 }
@@ -533,6 +593,18 @@ function resolvePath(path, valModule, schema) {
       }
       resolvedSource = resolvedSource[part];
       resolvedSchema = resolvedSchema.item;
+    } else if (isRecordSchema(resolvedSchema)) {
+      if (typeof part !== "string") {
+        throw Error("Invalid path: record schema ".concat(resolvedSchema, " must have path: ").concat(part, " as string"));
+      }
+      if (_typeof(resolvedSource) !== "object" && !Array.isArray(resolvedSource)) {
+        throw Error("Schema type error: expected source to be type of record, but got ".concat(_typeof(resolvedSource)));
+      }
+      if (!resolvedSource[part]) {
+        throw Error("Invalid path: record source did not have key ".concat(part, " from path: ").concat(path));
+      }
+      resolvedSource = resolvedSource[part];
+      resolvedSchema = resolvedSchema.item;
     } else if (isObjectSchema(resolvedSchema)) {
       if (_typeof(resolvedSource) !== "object") {
         throw Error("Schema type error: expected source to be type of object, but got ".concat(_typeof(resolvedSource)));
@@ -668,4 +740,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, record as b, content as c, createValPathOfItem as d, resolvePath as e, getSource as g, isSelector as i, newSelectorProxy as n, object as o, richtext as r, splitModuleIdAndModulePath as s, union as u };

package/dist/{ops-0d09f8ee.cjs.prod.js → ops-ae089ab2.cjs.prod.js}

@@ -382,75 +382,132 @@ var union = function union(key) {
 var RichTextSchema = /*#__PURE__*/function (_Schema) {
   index._inherits(RichTextSchema, _Schema);
   var _super = index._createSuper(RichTextSchema);
-  function RichTextSchema() {
+  function RichTextSchema(options) {
     var _this;
-    var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     index._classCallCheck(this, RichTextSchema);
     _this = _super.call(this);
+    _this.options = options;
     _this.opt = opt;
     return _this;
   }
   index._createClass(RichTextSchema, [{
     key: "validate",
     value: function validate(path, src) {
+      return false; //TODO
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      return true; // TODO
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new RichTextSchema(this.options, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return {
+        type: "richtext",
+        opt: this.opt
+      };
+    }
+  }]);
+  return RichTextSchema;
+}(index.Schema);
+var richtext = function richtext(options) {
+  return new RichTextSchema(options);
+};
+
+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 (src === null || src === undefined) {
-        return index._defineProperty({}, path, [{
-          message: "Expected non-nullable got '".concat(src, "'")
-        }]);
-      }
-      if (index._typeof(src) !== "object" && !Array.isArray(src)) {
-        return index._defineProperty({}, path, [{
-          message: "Expected 'object' (that is not of an array) or 'string', got '".concat(index._typeof(src), "'"),
-          value: src
-        }]);
-      }
-      if (src[index.VAL_EXTENSION] !== "richtext") {
-        return index._defineProperty({}, path, [{
-          message: "Expected _type key with value 'richtext' got '".concat(src[index.VAL_EXTENSION], "'"),
-          value: src
-        }]);
-      }
-      if (src.type !== "root") {
+      if (index._typeof(src) !== "object") {
         return index._defineProperty({}, path, [{
-          message: "Expected type key with value 'root' got '".concat(src.type, "'"),
-          value: src
+          message: "Expected 'object', got '".concat(index._typeof(src), "'")
         }]);
       }
-      if (index._typeof(src.children) !== "object" && !Array.isArray(src.children)) {
+      if (Array.isArray(src)) {
         return index._defineProperty({}, path, [{
-          message: "Expected children to be an array, but got '".concat(src.type, "'"),
-          value: src
+          message: "Expected 'object', got 'array'"
         }]);
       }
-      return false;
+      Object.entries(src).forEach(function (_ref3) {
+        var _ref4 = index._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 = index._objectSpread2(index._objectSpread2({}, subError), error);
+          } else if (subError) {
+            error = subError;
+          }
+        }
+      });
+      return error;
     }
   }, {
     key: "assert",
     value: function assert(src) {
-      // TODO:
-      return true;
+      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 RichTextSchema(true);
+      return new RecordSchema(this.item, true);
     }
   }, {
     key: "serialize",
     value: function serialize() {
       return {
-        type: "richtext",
+        type: "record",
+        item: this.item.serialize(),
         opt: this.opt
       };
     }
   }]);
-  return RichTextSchema;
+  return RecordSchema;
 }(index.Schema);
-var richtext = function richtext() {
-  return new RichTextSchema();
+var record = function record(schema) {
+  return new RecordSchema(schema);
 };
 
 function content(
@@ -477,6 +534,9 @@ function splitModuleIdAndModulePath(path) {
 function isObjectSchema(schema) {
   return schema instanceof ObjectSchema || index._typeof(schema) === "object" && "type" in schema && schema.type === "object";
 }
+function isRecordSchema(schema) {
+  return schema instanceof RecordSchema || index._typeof(schema) === "object" && "type" in schema && schema.type === "record";
+}
 function isArraySchema(schema) {
   return schema instanceof ArraySchema || index._typeof(schema) === "object" && "type" in schema && schema.type === "array";
 }
@@ -535,6 +595,18 @@ function resolvePath(path, valModule, schema) {
       }
       resolvedSource = resolvedSource[part];
       resolvedSchema = resolvedSchema.item;
+    } else if (isRecordSchema(resolvedSchema)) {
+      if (typeof part !== "string") {
+        throw Error("Invalid path: record schema ".concat(resolvedSchema, " must have path: ").concat(part, " as string"));
+      }
+      if (index._typeof(resolvedSource) !== "object" && !Array.isArray(resolvedSource)) {
+        throw Error("Schema type error: expected source to be type of record, but got ".concat(index._typeof(resolvedSource)));
+      }
+      if (!resolvedSource[part]) {
+        throw Error("Invalid path: record source did not have key ".concat(part, " from path: ").concat(path));
+      }
+      resolvedSource = resolvedSource[part];
+      resolvedSchema = resolvedSchema.item;
     } else if (isObjectSchema(resolvedSchema)) {
       if (index._typeof(resolvedSource) !== "object") {
         throw Error("Schema type error: expected source to be type of object, but got ".concat(index._typeof(resolvedSource)));
@@ -678,6 +750,7 @@ exports.getSource = getSource;
 exports.isSelector = isSelector;
 exports.newSelectorProxy = newSelectorProxy;
 exports.object = object;
+exports.record = record;
 exports.resolvePath = resolvePath;
 exports.richtext = richtext;
 exports.splitModuleIdAndModulePath = splitModuleIdAndModulePath;