@valbuild/core 0.14.0 → 0.16.0

package/dist/valbuild-core.esm.js

@@ -1,213 +1,8 @@
-import { _ as _inherits, a as _createSuper, S as Schema, g as getValPath, n as newSelectorProxy, b as SourceOrExpr, E as Expr, I as ImageSchema, c as _objectSpread2, d as _defineProperty, V as VAL_EXTENSION, i as image, f as file, e as isFile, F as FILE_REF_PROP, P as Path, h as createValPathOfItem, j as isSelector, k as isSerializedVal, l as convertImageSource, m as getSchema, o as isVal } from './index-06df0a5b.esm.js';
-export { F as FILE_REF_PROP, G as GenericSelector, S as Schema, V as VAL_EXTENSION, p as expr } from './index-06df0a5b.esm.js';
-import { _ as _classCallCheck, a as _createClass, b as _typeof, c as _slicedToArray, d as _toConsumableArray } from './createClass-012eebbf.esm.js';
+import { _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, g as getValPath, S as Schema, d as _objectSpread2, e as _defineProperty, V as VAL_EXTENSION, f as _typeof, i as image, h as file, j as _slicedToArray, k as isFile, F as FILE_REF_PROP, n as newSelectorProxy, P as Path, l as createValPathOfItem, m as SourceOrExpr, o as isSelector, p as isSerializedVal, q as convertImageSource, r as getSchema, s as isVal } from './SelectorProxy-63c2d0e2.esm.js';
+export { F as FILE_REF_PROP, G as GenericSelector, S as Schema, V as VAL_EXTENSION } from './SelectorProxy-63c2d0e2.esm.js';
+import { a as array, o as object, u as union, r as richtext$1, i as i18n$1, c as content, P as PatchError, g as getRawSource, b as resolvePath, s as splitModuleIdAndModulePath } from './ops-74661336.esm.js';
+export { i as expr } from './index-af761363.esm.js';
 import { _ as _createForOfIteratorHelper, i as isErr, a as isOk, e as err, o as ok } from './result-b96df128.esm.js';
-import { P as PatchError } from './ops-6fae92a1.esm.js';
-
-var ObjectSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(ObjectSchema, _Schema);
-  var _super = _createSuper(ObjectSchema);
-  function ObjectSchema(items) {
-    var _this;
-    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    _classCallCheck(this, ObjectSchema);
-    _this = _super.call(this);
-    _this.items = items;
-    _this.opt = opt;
-    return _this;
-  }
-  _createClass(ObjectSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      if (this.opt && (src === null || src === undefined)) {
-        return true;
-      }
-      if (!src) {
-        return false;
-      }
-
-      // TODO: checks all props
-
-      return _typeof(src) === "object" && !Array.isArray(src);
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new ObjectSchema(this.items, true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "object",
-        items: Object.fromEntries(Object.entries(this.items).map(function (_ref) {
-          var _ref2 = _slicedToArray(_ref, 2),
-            key = _ref2[0],
-            schema = _ref2[1];
-          return [key, schema.serialize()];
-        })),
-        opt: this.opt
-      };
-    }
-  }]);
-  return ObjectSchema;
-}(Schema);
-var object = function object(schema) {
-  return new ObjectSchema(schema);
-};
-
-var ArraySchema = /*#__PURE__*/function (_Schema) {
-  _inherits(ArraySchema, _Schema);
-  var _super = _createSuper(ArraySchema);
-  function ArraySchema(item) {
-    var _this;
-    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    _classCallCheck(this, ArraySchema);
-    _this = _super.call(this);
-    _this.item = item;
-    _this.opt = opt;
-    return _this;
-  }
-  _createClass(ArraySchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      if (this.opt && (src === null || src === undefined)) {
-        return true;
-      }
-      if (!src) {
-        return false;
-      }
-
-      // TODO: checks all items
-      return _typeof(src) === "object" && Array.isArray(src);
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new ArraySchema(this.item, true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "array",
-        item: this.item.serialize(),
-        opt: this.opt
-      };
-    }
-  }]);
-  return ArraySchema;
-}(Schema);
-var array = function array(schema) {
-  return new ArraySchema(schema);
-};
-
-var I18nSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(I18nSchema, _Schema);
-  var _super = _createSuper(I18nSchema);
-  function I18nSchema(locales, item) {
-    var _this;
-    var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    _classCallCheck(this, I18nSchema);
-    _this = _super.call(this);
-    _this.locales = locales;
-    _this.item = item;
-    _this.opt = opt;
-    return _this;
-  }
-  _createClass(I18nSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new I18nSchema(this.locales, this.item, true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "i18n",
-        item: this.item.serialize(),
-        locales: this.locales,
-        opt: this.opt
-      };
-    }
-  }]);
-  return I18nSchema;
-}(Schema);
-var i18n$1 = function i18n(locales) {
-  return function (schema) {
-    return new I18nSchema(locales, schema);
-  };
-};
-
-var UnionSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(UnionSchema, _Schema);
-  var _super = _createSuper(UnionSchema);
-  function UnionSchema(key, items) {
-    var _this;
-    var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    _classCallCheck(this, UnionSchema);
-    _this = _super.call(this);
-    _this.key = key;
-    _this.items = items;
-    _this.opt = opt;
-    return _this;
-  }
-  _createClass(UnionSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "union",
-        key: this.key,
-        items: this.items.map(function (o) {
-          return o.serialize();
-        }),
-        opt: this.opt
-      };
-    }
-  }]);
-  return UnionSchema;
-}(Schema);
-var union = function union(key) {
-  for (var _len = arguments.length, objects = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    objects[_key - 1] = arguments[_key];
-  }
-  return new UnionSchema(key, objects);
-};
 
 var OneOfSchema = /*#__PURE__*/function (_Schema) {
   _inherits(OneOfSchema, _Schema);
@@ -223,12 +18,12 @@ var OneOfSchema = /*#__PURE__*/function (_Schema) {
   }
   _createClass(OneOfSchema, [{
     key: "validate",
-    value: function validate(src) {
+    value: function validate(path, src) {
       throw new Error("Method not implemented.");
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       throw new Error("Method not implemented.");
     }
   }, {
@@ -256,223 +51,6 @@ var oneOf = function oneOf(valModule) {
   return new OneOfSchema(valModule);
 };
 
-var RichTextSchema = /*#__PURE__*/function (_Schema) {
-  _inherits(RichTextSchema, _Schema);
-  var _super = _createSuper(RichTextSchema);
-  function RichTextSchema() {
-    var _this;
-    var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    _classCallCheck(this, RichTextSchema);
-    _this = _super.call(this);
-    _this.opt = opt;
-    return _this;
-  }
-  _createClass(RichTextSchema, [{
-    key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
-    }
-  }, {
-    key: "match",
-    value: function match(src) {
-      // TODO:
-      return true;
-    }
-  }, {
-    key: "optional",
-    value: function optional() {
-      return new RichTextSchema(true);
-    }
-  }, {
-    key: "serialize",
-    value: function serialize() {
-      return {
-        type: "richtext",
-        opt: this.opt
-      };
-    }
-  }]);
-  return RichTextSchema;
-}(Schema);
-var richtext$1 = function richtext() {
-  return new RichTextSchema();
-};
-
-function content(
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-id,
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-schema,
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-source) {
-  return newSelectorProxy(source, id, schema);
-}
-function getRawSource(valModule) {
-  var sourceOrExpr = valModule[SourceOrExpr];
-  if (sourceOrExpr instanceof Expr) {
-    throw Error("Cannot get raw source of an Expr");
-  }
-  var source = sourceOrExpr;
-  return source;
-}
-function splitModuleIdAndModulePath(path) {
-  return [path.slice(0, path.indexOf(".")), path.slice(path.indexOf(".") + 1)];
-}
-function isObjectSchema(schema) {
-  return schema instanceof ObjectSchema || _typeof(schema) === "object" && "type" in schema && schema.type === "object";
-}
-function isArraySchema(schema) {
-  return schema instanceof ArraySchema || _typeof(schema) === "object" && "type" in schema && schema.type === "array";
-}
-function isI18nSchema(schema) {
-  return schema instanceof I18nSchema || _typeof(schema) === "object" && "type" in schema && schema.type === "i18n";
-}
-function isUnionSchema(schema) {
-  return schema instanceof UnionSchema || _typeof(schema) === "object" && "type" in schema && schema.type === "union";
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function isRichTextSchema(schema) {
-  return schema instanceof RichTextSchema || _typeof(schema) === "object" && "type" in schema && schema.type === "richtext";
-}
-function isImageSchema(schema) {
-  return schema instanceof ImageSchema || _typeof(schema) === "object" && "type" in schema && schema.type === "image";
-}
-function resolvePath(path, valModule, schema) {
-  var parts = parsePath(path);
-  var origParts = _toConsumableArray(parts);
-  var resolvedSchema = schema;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  var resolvedSource = valModule;
-  var _loop = function _loop() {
-    var part = parts.shift();
-    if (part === undefined) {
-      throw Error("Unexpected undefined part");
-    }
-    if (isArraySchema(resolvedSchema)) {
-      if (Number.isNaN(Number(part))) {
-        throw Error("Invalid path: array schema ".concat(resolvedSchema, " must have ").concat(part, " a number as path"));
-      }
-      if (_typeof(resolvedSource) !== "object" && !Array.isArray(resolvedSource)) {
-        throw Error("Schema type error: expected source to be type of array, but got ".concat(_typeof(resolvedSource)));
-      }
-      if (!resolvedSource[part]) {
-        var _resolvedSource;
-        throw Error("Invalid path: array source (length: ".concat((_resolvedSource = resolvedSource) === null || _resolvedSource === void 0 ? void 0 : _resolvedSource.length, ") did not have index ").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)));
-      }
-      if (!resolvedSource[part]) {
-        throw Error("Invalid path: object source did not have key ".concat(part, " from path: ").concat(path));
-      }
-      resolvedSource = resolvedSource[part];
-      resolvedSchema = resolvedSchema.items[part];
-    } else if (isI18nSchema(resolvedSchema)) {
-      if (!resolvedSchema.locales.includes(part)) {
-        throw Error("Invalid path: i18n schema ".concat(resolvedSchema, " supports locales ").concat(resolvedSchema.locales.join(", "), ", but found: ").concat(part));
-      }
-      if (!Object.keys(resolvedSource).includes(part)) {
-        throw Error("Schema type error: expected source to be type of i18n with locale ".concat(part, ", but got ").concat(JSON.stringify(Object.keys(resolvedSource))));
-      }
-      resolvedSource = resolvedSource[part];
-      resolvedSchema = resolvedSchema.item;
-    } else if (isImageSchema(resolvedSchema)) {
-      return {
-        v: {
-          path: origParts.slice(0, origParts.length - parts.length - 1).map(function (p) {
-            return JSON.stringify(p);
-          }).join("."),
-          // TODO: create a function generate path from parts (not sure if this always works)
-          schema: resolvedSchema,
-          source: resolvedSource
-        }
-      };
-    } else if (isUnionSchema(resolvedSchema)) {
-      var _key = resolvedSchema.key;
-      var keyValue = resolvedSource[_key];
-      if (!keyValue) {
-        throw Error("Invalid path: union source ".concat(resolvedSchema, " did not have required key ").concat(_key, " in path: ").concat(path));
-      }
-      var schemaOfUnionKey = resolvedSchema.items.find(
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      function (child) {
-        var _child$items, _child$items$_key;
-        return (child === null || child === void 0 ? void 0 : (_child$items = child.items) === null || _child$items === void 0 ? void 0 : (_child$items$_key = _child$items[_key]) === null || _child$items$_key === void 0 ? void 0 : _child$items$_key.value) === keyValue;
-      });
-      if (!schemaOfUnionKey) {
-        throw Error("Invalid path: union schema ".concat(resolvedSchema, " did not have a child object with ").concat(_key, " of value ").concat(keyValue, " in path: ").concat(path));
-      }
-      resolvedSchema = schemaOfUnionKey.items[part];
-      resolvedSource = resolvedSource[part];
-    } else if (isRichTextSchema(resolvedSchema)) {
-      return {
-        v: {
-          path: origParts.slice(0, origParts.length - parts.length - 1).map(function (p) {
-            return JSON.stringify(p);
-          }).join("."),
-          // TODO: create a function generate path from parts (not sure if this always works)
-          schema: resolvedSchema,
-          source: resolvedSource
-        }
-      };
-    } else {
-      throw Error("Invalid path: ".concat(part, " resolved to an unexpected schema ").concat(JSON.stringify(resolvedSchema)));
-    }
-  };
-  while (parts.length > 0) {
-    var _ret = _loop();
-    if (_typeof(_ret) === "object") return _ret.v;
-  }
-  if (parts.length > 0) {
-    throw Error("Invalid path: ".concat(parts.join("."), " is not a valid path"));
-  }
-  return {
-    path: path,
-    schema: resolvedSchema,
-    source: resolvedSource
-  };
-}
-function parsePath(input) {
-  var result = [];
-  var i = 0;
-  while (i < input.length) {
-    var part = "";
-    if (input[i] === '"') {
-      // Parse a quoted string
-      i++;
-      while (i < input.length && input[i] !== '"') {
-        if (input[i] === "\\" && input[i + 1] === '"') {
-          // Handle escaped double quotes
-          part += '"';
-          i++;
-        } else {
-          part += input[i];
-        }
-        i++;
-      }
-      if (input[i] !== '"') {
-        var _input$i;
-        throw new Error("Invalid input (".concat(JSON.stringify(input), "): Missing closing double quote: ").concat((_input$i = input[i]) !== null && _input$i !== void 0 ? _input$i : "at end of string", " (char: ").concat(i, "; length: ").concat(input.length, ")"));
-      }
-    } else {
-      // Parse a regular string
-      while (i < input.length && input[i] !== ".") {
-        part += input[i];
-        i++;
-      }
-    }
-    if (part !== "") {
-      result.push(part);
-    }
-    i++;
-  }
-  return result;
-}
-
 /**
  * I18n sources cannot have nested remote sources.
  */
@@ -506,12 +84,21 @@ var NumberSchema = /*#__PURE__*/function (_Schema) {
   }
   _createClass(NumberSchema, [{
     key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (typeof src !== "number") {
+        return _defineProperty({}, path, [{
+          message: "Expected 'number', got '".concat(_typeof(src), "'"),
+          value: src
+        }]);
+      }
+      return false;
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       if (this.opt && (src === null || src === undefined)) {
         return true;
       }
@@ -552,12 +139,21 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
   }
   _createClass(StringSchema, [{
     key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (typeof src !== "string") {
+        return _defineProperty({}, path, [{
+          message: "Expected 'string', got '".concat(_typeof(src), "'"),
+          value: src
+        }]);
+      }
+      return false;
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       if (this.opt && (src === null || src === undefined)) {
         return true;
       }
@@ -597,12 +193,21 @@ var BooleanSchema = /*#__PURE__*/function (_Schema) {
   }
   _createClass(BooleanSchema, [{
     key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (typeof src !== "boolean") {
+        return _defineProperty({}, path, [{
+          message: "Expected 'boolean', got '".concat(_typeof(src), "'"),
+          value: src
+        }]);
+      }
+      return false;
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       if (this.opt && (src === null || src === undefined)) {
         return true;
       }
@@ -642,12 +247,27 @@ var LiteralSchema = /*#__PURE__*/function (_Schema) {
   }
   _createClass(LiteralSchema, [{
     key: "validate",
-    value: function validate(src) {
-      throw new Error("Method not implemented.");
+    value: function validate(path, src) {
+      if (this.opt && (src === null || src === undefined)) {
+        return false;
+      }
+      if (typeof src !== "string") {
+        return _defineProperty({}, path, [{
+          message: "Expected 'string', got '".concat(_typeof(src), "'"),
+          value: src
+        }]);
+      }
+      if (src !== this.value) {
+        return _defineProperty({}, path, [{
+          message: "Expected literal '".concat(this.value, "', got '").concat(src, "'"),
+          value: src
+        }]);
+      }
+      return false;
     }
   }, {
-    key: "match",
-    value: function match(src) {
+    key: "assert",
+    value: function assert(src) {
       if (this.opt && (src === null || src === undefined)) {
         return true;
       }

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

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-9663f28a.cjs.dev.js');
-require('../../dist/createClass-a436dbfe.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-2fff5ca8.cjs.dev.js');
+var SelectorProxy = require('../../dist/SelectorProxy-873782a5.cjs.dev.js');
 require('../../dist/result-48320acd.cjs.dev.js');
 
 
 
-exports.Call = expr_dist_valbuildCoreExpr.Call;
-exports.Expr = expr_dist_valbuildCoreExpr.Expr;
-exports.NilSym = expr_dist_valbuildCoreExpr.NilSym;
-exports.StringLiteral = expr_dist_valbuildCoreExpr.StringLiteral;
-exports.StringTemplate = expr_dist_valbuildCoreExpr.StringTemplate;
-exports.Sym = expr_dist_valbuildCoreExpr.Sym;
 exports.evaluate = expr_dist_valbuildCoreExpr.evaluate;
 exports.parse = expr_dist_valbuildCoreExpr.parse;
+exports.Call = SelectorProxy.Call;
+exports.Expr = SelectorProxy.Expr;
+exports.NilSym = SelectorProxy.NilSym;
+exports.StringLiteral = SelectorProxy.StringLiteral;
+exports.StringTemplate = SelectorProxy.StringTemplate;
+exports.Sym = SelectorProxy.Sym;

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

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-b2270f8f.cjs.prod.js');
-require('../../dist/createClass-de7426aa.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-cac9ecbd.cjs.prod.js');
+var SelectorProxy = require('../../dist/SelectorProxy-2af1b2b8.cjs.prod.js');
 require('../../dist/result-26f67b40.cjs.prod.js');
 
 
 
-exports.Call = expr_dist_valbuildCoreExpr.Call;
-exports.Expr = expr_dist_valbuildCoreExpr.Expr;
-exports.NilSym = expr_dist_valbuildCoreExpr.NilSym;
-exports.StringLiteral = expr_dist_valbuildCoreExpr.StringLiteral;
-exports.StringTemplate = expr_dist_valbuildCoreExpr.StringTemplate;
-exports.Sym = expr_dist_valbuildCoreExpr.Sym;
 exports.evaluate = expr_dist_valbuildCoreExpr.evaluate;
 exports.parse = expr_dist_valbuildCoreExpr.parse;
+exports.Call = SelectorProxy.Call;
+exports.Expr = SelectorProxy.Expr;
+exports.NilSym = SelectorProxy.NilSym;
+exports.StringLiteral = SelectorProxy.StringLiteral;
+exports.StringTemplate = SelectorProxy.StringTemplate;
+exports.Sym = SelectorProxy.Sym;

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

@@ -1,3 +1,3 @@
-export { C as Call, E as Expr, N as NilSym, r as StringLiteral, s as StringTemplate, t as Sym, u as evaluate, q as parse } from '../../dist/index-06df0a5b.esm.js';
-import '../../dist/createClass-012eebbf.esm.js';
+export { e as evaluate, p as parse } from '../../dist/index-af761363.esm.js';
+export { C as Call, E as Expr, N as NilSym, u as StringLiteral, v as StringTemplate, t as Sym } from '../../dist/SelectorProxy-63c2d0e2.esm.js';
 import '../../dist/result-b96df128.esm.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "scripts": {
@@ -40,6 +40,7 @@
     "exports": true
   },
   "dependencies": {
+    "image-size": "^1.0.2",
     "ts-toolbelt": "^9.6.0"
   }
 }