@valbuild/core 0.16.0 → 0.17.0

package/dist/{SelectorProxy-2af1b2b8.cjs.prod.js → index-8706c87e.cjs.prod.js}

@@ -220,21 +220,26 @@ function _createSuper(Derived) {
   };
 }
 
+// import { RemoteCompatibleSource, RemoteSource } from "../source/remote";
+
+// import { SerializedI18nSchema } from "./future/i18n";
+// import { SerializedOneOfSchema } from "./future/oneOf";
 var Schema = /*#__PURE__*/function () {
   function Schema() {
     _classCallCheck(this, Schema);
   }
   _createClass(Schema, [{
-    key: "remote",
-    value: function remote() {
-      // TODO: Schema<never, "Cannot create remote schema from non-remote source.">
-      throw new Error("You need Val Ultra to use .remote()");
-    }
+    key: "appendValidationError",
+    value:
+    // remote(): Src extends RemoteCompatibleSource
+    //   ? Schema<RemoteSource<Src>>
+    //   : never {
+    //   // TODO: Schema<never, "Cannot create remote schema from non-remote source.">
+    //   throw new Error("You need Val Ultra to use .remote()");
+    // }
 
     /** MUTATES! since internal and perf sensitive */
-  }, {
-    key: "appendValidationError",
-    value: function appendValidationError(current, path, message, value) {
+    function appendValidationError(current, path, message, value) {
       if (current) {
         if (current[path]) {
           current[path].push({
@@ -261,30 +266,6 @@ var Schema = /*#__PURE__*/function () {
 
 // TODO: SourceError<"Could not determine type of Schema">
 
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-/**
- * Selectors can be used to select parts of a Val module.
- * Unlike queries, joins, aggregates etc is and will not be supported.
- *
- * They are designed to be be used as if they were "normal" JSON data,
- * though some concessions had to be made because of TypeScript limitations.
- *
- * Selectors works equally on source content, defined in code, and remote content.
- *
- * @example
- * // Select the title of a document
- * const titles = useVal(docsVal.map((doc) => doc.title));
- *
- * @example
- * // Match on a union type
- * const titles = useVal(docsVal.map((doc) => doc.fold("type")({
- *   newsletter: (newsletter) => newsletter.title,
- *   email: (email) => email.subject,
- * }));
- *
- */
-
 /**
  * @internal
  */
@@ -297,27 +278,18 @@ var Path = Symbol("Path");
 /**
  * @internal
  */
-var SourceOrExpr = Symbol("SourceOrExpr");
+var GetSource = Symbol("GetSource");
 /**
  * @internal
  */
 var ValError = Symbol("ValError");
-var GenericSelector = /*#__PURE__*/function () {
-  function GenericSelector(valOrExpr, path, schema, error) {
-    _classCallCheck(this, GenericSelector);
-    this[Path] = path;
-    this[SourceOrExpr] = valOrExpr;
-    this[ValError] = error;
-    this[GetSchema] = schema;
-  }
-  _createClass(GenericSelector, [{
-    key: "assert",
-    value: function assert(schema, other) {
-      throw new Error("Not implemented");
-    }
-  }]);
-  return GenericSelector;
-}();
+var GenericSelector = /*#__PURE__*/_createClass(function GenericSelector(valOrExpr, path, schema, error) {
+  _classCallCheck(this, GenericSelector);
+  this[Path] = path;
+  this[GetSource] = valOrExpr;
+  this[ValError] = error;
+  this[GetSchema] = schema;
+});
 
 /**
  * Use this type to convert types that accepts both Source and Selectors
@@ -536,7 +508,7 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
 var image = function image(options) {
   return new ImageSchema(options);
 };
-var convertImageSource = function convertImageSource(src) {
+var convertFileSource = function convertFileSource(src) {
   var _src$metadata;
   // TODO: /public should be configurable
   return {
@@ -577,159 +549,16 @@ function getValPath(valOrSelector) {
   return valOrSelector[Path];
 }
 
-function hasOwn(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-function _andThen(f, source, path) {
-  if (source) {
-    return newSelectorProxy(f(newSelectorProxy(source, path)));
-  }
-  return newSelectorProxy(source, path);
-}
-function isSelector(source) {
-  return _typeof(source) === "object" && source !== null && (SourceOrExpr in source || Path in source);
-}
-function newSelectorProxy(source, path, moduleSchema) {
-  var _ref;
-  if (_typeof(source) === "object") {
-    if (isSelector(source)) {
-      return source;
-    } else if (isSerializedVal(source)) {
-      return newSelectorProxy(source.val, source.valPath);
-    }
-  }
-  if (source && source[FILE_REF_PROP] && source[VAL_EXTENSION] === "file") {
-    var fileRef = source[FILE_REF_PROP];
-    if (typeof fileRef !== "string") {
-      throw Error("Invalid file ref: " + fileRef);
-    }
-    return newSelectorProxy(convertImageSource(source), path, moduleSchema);
-  }
-  switch (_typeof(source)) {
-    case "function":
-    case "symbol":
-      throw Error("Invalid selector type: ".concat(_typeof(source), ": ").concat(source));
-    case "object":
-      // Handles both objects and arrays!
-      if (source !== null) {
-        return new Proxy(source, {
-          // TODO: see proxy docs if we want more traps
-          has: function has(target, prop) {
-            if (prop === SourceOrExpr) {
-              return true;
-            }
-            if (prop === Path) {
-              return true;
-            }
-            if (prop === "andThen") {
-              return true;
-            }
-            if (prop === GetSchema) {
-              return true;
-            }
-            return prop in target;
-          },
-          get: function get(target, prop) {
-            if (prop === SourceOrExpr) {
-              return source;
-            }
-            if (prop === Path) {
-              return path;
-            }
-            if (prop === GetSchema) {
-              return moduleSchema;
-            }
-            if (prop === "andThen") {
-              return function (f) {
-                return _andThen(f, source, path);
-              };
-            }
-            if (Array.isArray(target)) {
-              if (prop === "filter") {
-                return function (f) {
-                  var filtered = target.map(function (a, i) {
-                    return newSelectorProxy(a, createValPathOfItem(path, i), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item);
-                  }).filter(function (a) {
-                    if (f && f instanceof Schema) {
-                      return f.assert(unValify(a));
-                    } else {
-                      return unValify(f(a));
-                    }
-                  });
-                  return newSelectorProxy(filtered, path, moduleSchema);
-                };
-              } else if (prop === "map") {
-                return function (f) {
-                  var filtered = target.map(function (a, i) {
-                    var valueOrSelector = f(newSelectorProxy(a, createValPathOfItem(path, i), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item), newSelectorProxy(i));
-                    if (isSelector(valueOrSelector)) {
-                      return valueOrSelector;
-                    }
-                    return newSelectorProxy(valueOrSelector);
-                  });
-                  return newSelectorProxy(filtered, path, moduleSchema);
-                };
-              }
-            }
-            if (Array.isArray(target) && prop === "length") {
-              return newSelectorProxy(target.length);
-            }
-            var reflectedValue = Reflect.get(target, prop);
-            if (hasOwn(source, prop)) {
-              if (!Number.isNaN(Number(prop))) {
-                return newSelectorProxy(reflectedValue, createValPathOfItem(path, Number(prop)), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item);
-              }
-              return newSelectorProxy(reflectedValue, createValPathOfItem(path, prop), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.items[prop]);
-            }
-            return reflectedValue;
-          }
-        });
-      }
-    // intentional fallthrough
-    // eslint-disable-next-line no-fallthrough
-    default:
-      return _ref = {
-        eq: function eq(other) {
-          var otherValue = other;
-          if (isSelector(other)) {
-            otherValue = other[SourceOrExpr];
-            if (otherValue instanceof Expr) {
-              throw Error("TODO: Cannot evaluate equality with an Expr");
-            }
-          }
-          return newSelectorProxy(source === otherValue, undefined);
-        },
-        andThen: function andThen(f) {
-          return _andThen(f, source === undefined ? null : source, path);
-        }
-      }, _defineProperty(_ref, SourceOrExpr, source === undefined ? null : source), _defineProperty(_ref, Path, path), _defineProperty(_ref, GetSchema, moduleSchema), _ref;
-  }
-}
-function createValPathOfItem(arrayPath, prop) {
-  if (_typeof(prop) === "symbol") {
-    throw Error("Cannot create val path of array item with symbol prop: ".concat(prop.toString()));
-  }
-  return arrayPath && "".concat(arrayPath, ".").concat(JSON.stringify(prop));
-}
-
-// TODO: could we do .val on the objects instead?
-function unValify(valueOrSelector) {
-  if (_typeof(valueOrSelector) === "object" && (SourceOrExpr in valueOrSelector || Path in valueOrSelector)) {
-    var selectorValue = valueOrSelector[SourceOrExpr];
-    return selectorValue;
-  }
-  return valueOrSelector;
-}
-
 exports.Call = Call;
 exports.Expr = Expr;
 exports.FILE_REF_PROP = FILE_REF_PROP;
 exports.GenericSelector = GenericSelector;
+exports.GetSchema = GetSchema;
+exports.GetSource = GetSource;
 exports.ImageSchema = ImageSchema;
 exports.NilSym = NilSym;
 exports.Path = Path;
 exports.Schema = Schema;
-exports.SourceOrExpr = SourceOrExpr;
 exports.StringLiteral = StringLiteral;
 exports.StringTemplate = StringTemplate;
 exports.Sym = Sym;
@@ -743,14 +572,11 @@ exports._objectSpread2 = _objectSpread2;
 exports._slicedToArray = _slicedToArray;
 exports._toConsumableArray = _toConsumableArray;
 exports._typeof = _typeof;
-exports.convertImageSource = convertImageSource;
-exports.createValPathOfItem = createValPathOfItem;
+exports.convertFileSource = convertFileSource;
 exports.file = file;
 exports.getSchema = getSchema;
 exports.getValPath = getValPath;
 exports.image = image;
 exports.isFile = isFile;
-exports.isSelector = isSelector;
 exports.isSerializedVal = isSerializedVal;
 exports.isVal = isVal;
-exports.newSelectorProxy = newSelectorProxy;

package/dist/{SelectorProxy-873782a5.cjs.dev.js → index-a6e642dd.cjs.dev.js}

@@ -220,21 +220,26 @@ function _createSuper(Derived) {
   };
 }
 
+// import { RemoteCompatibleSource, RemoteSource } from "../source/remote";
+
+// import { SerializedI18nSchema } from "./future/i18n";
+// import { SerializedOneOfSchema } from "./future/oneOf";
 var Schema = /*#__PURE__*/function () {
   function Schema() {
     _classCallCheck(this, Schema);
   }
   _createClass(Schema, [{
-    key: "remote",
-    value: function remote() {
-      // TODO: Schema<never, "Cannot create remote schema from non-remote source.">
-      throw new Error("You need Val Ultra to use .remote()");
-    }
+    key: "appendValidationError",
+    value:
+    // remote(): Src extends RemoteCompatibleSource
+    //   ? Schema<RemoteSource<Src>>
+    //   : never {
+    //   // TODO: Schema<never, "Cannot create remote schema from non-remote source.">
+    //   throw new Error("You need Val Ultra to use .remote()");
+    // }
 
     /** MUTATES! since internal and perf sensitive */
-  }, {
-    key: "appendValidationError",
-    value: function appendValidationError(current, path, message, value) {
+    function appendValidationError(current, path, message, value) {
       if (current) {
         if (current[path]) {
           current[path].push({
@@ -261,30 +266,6 @@ var Schema = /*#__PURE__*/function () {
 
 // TODO: SourceError<"Could not determine type of Schema">
 
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-/**
- * Selectors can be used to select parts of a Val module.
- * Unlike queries, joins, aggregates etc is and will not be supported.
- *
- * They are designed to be be used as if they were "normal" JSON data,
- * though some concessions had to be made because of TypeScript limitations.
- *
- * Selectors works equally on source content, defined in code, and remote content.
- *
- * @example
- * // Select the title of a document
- * const titles = useVal(docsVal.map((doc) => doc.title));
- *
- * @example
- * // Match on a union type
- * const titles = useVal(docsVal.map((doc) => doc.fold("type")({
- *   newsletter: (newsletter) => newsletter.title,
- *   email: (email) => email.subject,
- * }));
- *
- */
-
 /**
  * @internal
  */
@@ -297,27 +278,18 @@ var Path = Symbol("Path");
 /**
  * @internal
  */
-var SourceOrExpr = Symbol("SourceOrExpr");
+var GetSource = Symbol("GetSource");
 /**
  * @internal
  */
 var ValError = Symbol("ValError");
-var GenericSelector = /*#__PURE__*/function () {
-  function GenericSelector(valOrExpr, path, schema, error) {
-    _classCallCheck(this, GenericSelector);
-    this[Path] = path;
-    this[SourceOrExpr] = valOrExpr;
-    this[ValError] = error;
-    this[GetSchema] = schema;
-  }
-  _createClass(GenericSelector, [{
-    key: "assert",
-    value: function assert(schema, other) {
-      throw new Error("Not implemented");
-    }
-  }]);
-  return GenericSelector;
-}();
+var GenericSelector = /*#__PURE__*/_createClass(function GenericSelector(valOrExpr, path, schema, error) {
+  _classCallCheck(this, GenericSelector);
+  this[Path] = path;
+  this[GetSource] = valOrExpr;
+  this[ValError] = error;
+  this[GetSchema] = schema;
+});
 
 /**
  * Use this type to convert types that accepts both Source and Selectors
@@ -536,7 +508,7 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
 var image = function image(options) {
   return new ImageSchema(options);
 };
-var convertImageSource = function convertImageSource(src) {
+var convertFileSource = function convertFileSource(src) {
   var _src$metadata;
   // TODO: /public should be configurable
   return {
@@ -577,159 +549,16 @@ function getValPath(valOrSelector) {
   return valOrSelector[Path];
 }
 
-function hasOwn(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-function _andThen(f, source, path) {
-  if (source) {
-    return newSelectorProxy(f(newSelectorProxy(source, path)));
-  }
-  return newSelectorProxy(source, path);
-}
-function isSelector(source) {
-  return _typeof(source) === "object" && source !== null && (SourceOrExpr in source || Path in source);
-}
-function newSelectorProxy(source, path, moduleSchema) {
-  var _ref;
-  if (_typeof(source) === "object") {
-    if (isSelector(source)) {
-      return source;
-    } else if (isSerializedVal(source)) {
-      return newSelectorProxy(source.val, source.valPath);
-    }
-  }
-  if (source && source[FILE_REF_PROP] && source[VAL_EXTENSION] === "file") {
-    var fileRef = source[FILE_REF_PROP];
-    if (typeof fileRef !== "string") {
-      throw Error("Invalid file ref: " + fileRef);
-    }
-    return newSelectorProxy(convertImageSource(source), path, moduleSchema);
-  }
-  switch (_typeof(source)) {
-    case "function":
-    case "symbol":
-      throw Error("Invalid selector type: ".concat(_typeof(source), ": ").concat(source));
-    case "object":
-      // Handles both objects and arrays!
-      if (source !== null) {
-        return new Proxy(source, {
-          // TODO: see proxy docs if we want more traps
-          has: function has(target, prop) {
-            if (prop === SourceOrExpr) {
-              return true;
-            }
-            if (prop === Path) {
-              return true;
-            }
-            if (prop === "andThen") {
-              return true;
-            }
-            if (prop === GetSchema) {
-              return true;
-            }
-            return prop in target;
-          },
-          get: function get(target, prop) {
-            if (prop === SourceOrExpr) {
-              return source;
-            }
-            if (prop === Path) {
-              return path;
-            }
-            if (prop === GetSchema) {
-              return moduleSchema;
-            }
-            if (prop === "andThen") {
-              return function (f) {
-                return _andThen(f, source, path);
-              };
-            }
-            if (Array.isArray(target)) {
-              if (prop === "filter") {
-                return function (f) {
-                  var filtered = target.map(function (a, i) {
-                    return newSelectorProxy(a, createValPathOfItem(path, i), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item);
-                  }).filter(function (a) {
-                    if (f && f instanceof Schema) {
-                      return f.assert(unValify(a));
-                    } else {
-                      return unValify(f(a));
-                    }
-                  });
-                  return newSelectorProxy(filtered, path, moduleSchema);
-                };
-              } else if (prop === "map") {
-                return function (f) {
-                  var filtered = target.map(function (a, i) {
-                    var valueOrSelector = f(newSelectorProxy(a, createValPathOfItem(path, i), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item), newSelectorProxy(i));
-                    if (isSelector(valueOrSelector)) {
-                      return valueOrSelector;
-                    }
-                    return newSelectorProxy(valueOrSelector);
-                  });
-                  return newSelectorProxy(filtered, path, moduleSchema);
-                };
-              }
-            }
-            if (Array.isArray(target) && prop === "length") {
-              return newSelectorProxy(target.length);
-            }
-            var reflectedValue = Reflect.get(target, prop);
-            if (hasOwn(source, prop)) {
-              if (!Number.isNaN(Number(prop))) {
-                return newSelectorProxy(reflectedValue, createValPathOfItem(path, Number(prop)), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.item);
-              }
-              return newSelectorProxy(reflectedValue, createValPathOfItem(path, prop), moduleSchema === null || moduleSchema === void 0 ? void 0 : moduleSchema.items[prop]);
-            }
-            return reflectedValue;
-          }
-        });
-      }
-    // intentional fallthrough
-    // eslint-disable-next-line no-fallthrough
-    default:
-      return _ref = {
-        eq: function eq(other) {
-          var otherValue = other;
-          if (isSelector(other)) {
-            otherValue = other[SourceOrExpr];
-            if (otherValue instanceof Expr) {
-              throw Error("TODO: Cannot evaluate equality with an Expr");
-            }
-          }
-          return newSelectorProxy(source === otherValue, undefined);
-        },
-        andThen: function andThen(f) {
-          return _andThen(f, source === undefined ? null : source, path);
-        }
-      }, _defineProperty(_ref, SourceOrExpr, source === undefined ? null : source), _defineProperty(_ref, Path, path), _defineProperty(_ref, GetSchema, moduleSchema), _ref;
-  }
-}
-function createValPathOfItem(arrayPath, prop) {
-  if (_typeof(prop) === "symbol") {
-    throw Error("Cannot create val path of array item with symbol prop: ".concat(prop.toString()));
-  }
-  return arrayPath && "".concat(arrayPath, ".").concat(JSON.stringify(prop));
-}
-
-// TODO: could we do .val on the objects instead?
-function unValify(valueOrSelector) {
-  if (_typeof(valueOrSelector) === "object" && (SourceOrExpr in valueOrSelector || Path in valueOrSelector)) {
-    var selectorValue = valueOrSelector[SourceOrExpr];
-    return selectorValue;
-  }
-  return valueOrSelector;
-}
-
 exports.Call = Call;
 exports.Expr = Expr;
 exports.FILE_REF_PROP = FILE_REF_PROP;
 exports.GenericSelector = GenericSelector;
+exports.GetSchema = GetSchema;
+exports.GetSource = GetSource;
 exports.ImageSchema = ImageSchema;
 exports.NilSym = NilSym;
 exports.Path = Path;
 exports.Schema = Schema;
-exports.SourceOrExpr = SourceOrExpr;
 exports.StringLiteral = StringLiteral;
 exports.StringTemplate = StringTemplate;
 exports.Sym = Sym;
@@ -743,14 +572,11 @@ exports._objectSpread2 = _objectSpread2;
 exports._slicedToArray = _slicedToArray;
 exports._toConsumableArray = _toConsumableArray;
 exports._typeof = _typeof;
-exports.convertImageSource = convertImageSource;
-exports.createValPathOfItem = createValPathOfItem;
+exports.convertFileSource = convertFileSource;
 exports.file = file;
 exports.getSchema = getSchema;
 exports.getValPath = getValPath;
 exports.image = image;
 exports.isFile = isFile;
-exports.isSelector = isSelector;
 exports.isSerializedVal = isSerializedVal;
 exports.isVal = isVal;
-exports.newSelectorProxy = newSelectorProxy;