@valbuild/shared 0.67.0 → 0.68.0

package/internal/dist/valbuild-shared-internal.esm.js

@@ -1,6 +1,5 @@
 import { Internal, VAL_EXTENSION, FILE_REF_PROP, FILE_REF_SUBTYPE_TAG } from '@valbuild/core';
 import { z } from 'zod';
-import { result } from '@valbuild/core/fp';
 import { fromZodError } from 'zod-validation-error';
 
 function _toPrimitive(t, r) {
@@ -717,46 +716,6 @@ var VAL_SESSION_COOKIE = Internal.VAL_SESSION_COOKIE;
 var VAL_STATE_COOKIE = Internal.VAL_STATE_COOKIE;
 var VAL_ENABLE_COOKIE_NAME = Internal.VAL_ENABLE_COOKIE_NAME;
 
-function _arrayWithHoles(r) {
-  if (Array.isArray(r)) return r;
-}
-
-function _iterableToArrayLimit(r, l) {
-  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (null != t) {
-    var e,
-      n,
-      i,
-      u,
-      a = [],
-      f = !0,
-      o = !1;
-    try {
-      if (i = (t = t.call(r)).next, 0 === l) {
-        if (Object(t) !== t) return;
-        f = !1;
-      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
-    } catch (r) {
-      o = !0, n = r;
-    } finally {
-      try {
-        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
-      } finally {
-        if (o) throw n;
-      }
-    }
-    return a;
-  }
-}
-
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-function _slicedToArray(r, e) {
-  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
-}
-
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
     return e;
@@ -1085,522 +1044,52 @@ function _asyncToGenerator(n) {
   };
 }
 
-function _classCallCheck(a, n) {
-  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
-}
-
-function _defineProperties(e, r) {
-  for (var t = 0; t < r.length; t++) {
-    var o = r[t];
-    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
-  }
-}
-function _createClass(e, r, t) {
-  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
-    writable: !1
-  }), e;
-}
-
-var ValCache = /*#__PURE__*/function () {
-  function ValCache(client) {
-    _classCallCheck(this, ValCache);
-    this.client = client;
-    this.drafts = {};
-    this.schema = {};
-  }
-  return _createClass(ValCache, [{
-    key: "reloadPaths",
-    value: function () {
-      var _reloadPaths = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(paths) {
-        var patchesResponse, patches, filteredPatches, treeRes, data, _i, _Object$keys, _data$modules, pathS, path;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return this.client("/patches/~", "GET", {
-                query: {
-                  omit_patch: true,
-                  author: [],
-                  patch_id: [],
-                  module_file_path: paths
-                }
-              });
-            case 2:
-              patchesResponse = _context.sent;
-              if (!(patchesResponse.status !== 200)) {
-                _context.next = 6;
-                break;
-              }
-              console.error("Val: failed to get patches", patchesResponse.json.message, patchesResponse.json);
-              return _context.abrupt("return");
-            case 6:
-              patches = patchesResponse.json;
-              filteredPatches = Object.keys(patches);
-              _context.next = 10;
-              return this.client("/sources", "PUT", {
-                query: {
-                  validate_sources: true,
-                  validate_all: false,
-                  validate_binary_files: false
-                },
-                path: undefined,
-                body: {
-                  patchIds: filteredPatches
-                }
-              });
-            case 10:
-              treeRes = _context.sent;
-              _context.next = 13;
-              return this.initialize();
-            case 13:
-              if (treeRes.status === 200) {
-                data = treeRes.json;
-                for (_i = 0, _Object$keys = Object.keys(data.modules); _i < _Object$keys.length; _i++) {
-                  pathS = _Object$keys[_i];
-                  path = pathS;
-                  this.drafts[path] = data === null || data === void 0 || (_data$modules = data.modules) === null || _data$modules === void 0 || (_data$modules = _data$modules[path]) === null || _data$modules === void 0 ? void 0 : _data$modules.source;
-                  this.emitEvent(path, this.drafts[path]);
-                }
-              } else {
-                console.error("Val: failed to reload paths", paths, treeRes.json);
-              }
-            case 14:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function reloadPaths(_x) {
-        return _reloadPaths.apply(this, arguments);
-      }
-      return reloadPaths;
-    }()
-  }, {
-    key: "reset",
-    value: function () {
-      var _reset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var patchesRes, allPatches, treeRes, initRes, _i2, _Object$keys2, _treeRes$json, pathS, path;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this.client("/patches/~", "GET", {
-                query: {
-                  omit_patch: true,
-                  author: [],
-                  patch_id: [],
-                  module_file_path: []
-                }
-              });
-            case 2:
-              patchesRes = _context2.sent;
-              if (!(patchesRes.status !== 200)) {
-                _context2.next = 6;
-                break;
-              }
-              console.error("Val: failed to get patches", patchesRes.json);
-              return _context2.abrupt("return", result.err({
-                errorType: "other",
-                message: "Failed to get patches"
-              }));
-            case 6:
-              allPatches = Object.keys(patchesRes.json.patches);
-              _context2.next = 9;
-              return this.client("/sources", "PUT", {
-                path: undefined,
-                query: {
-                  validate_sources: false,
-                  validate_all: false,
-                  validate_binary_files: false
-                },
-                body: {
-                  patchIds: allPatches
-                }
-              });
-            case 9:
-              treeRes = _context2.sent;
-              _context2.next = 12;
-              return this.initialize();
-            case 12:
-              initRes = _context2.sent;
-              if (!result.isErr(initRes)) {
-                _context2.next = 16;
-                break;
-              }
-              console.error("Failed to initialize inside reset", initRes.error);
-              return _context2.abrupt("return", result.err({
-                errorType: "other",
-                message: initRes.error.message
-              }));
-            case 16:
-              if (!(treeRes.status === 200)) {
-                _context2.next = 21;
-                break;
-              }
-              for (_i2 = 0, _Object$keys2 = Object.keys(treeRes.json.modules); _i2 < _Object$keys2.length; _i2++) {
-                pathS = _Object$keys2[_i2];
-                path = pathS;
-                this.drafts[path] = (_treeRes$json = treeRes.json) === null || _treeRes$json === void 0 || (_treeRes$json = _treeRes$json.modules) === null || _treeRes$json === void 0 || (_treeRes$json = _treeRes$json[path]) === null || _treeRes$json === void 0 ? void 0 : _treeRes$json.source;
-                this.emitEvent(path, this.drafts[path]);
-              }
-              return _context2.abrupt("return", result.ok(undefined));
-            case 21:
-              if (!(treeRes.status === 400 && "type" in treeRes.json)) {
-                _context2.next = 25;
-                break;
-              }
-              return _context2.abrupt("return", result.err({
-                errorType: "patch-error",
-                errors: Object.entries(treeRes.json.errors).flatMap(function (_ref) {
-                  var _ref2 = _slicedToArray(_ref, 2),
-                    moduleFilePath = _ref2[0],
-                    value = _ref2[1];
-                  return (value !== null && value !== void 0 ? value : []).map(function (item) {
-                    return {
-                      moduleFilePath: moduleFilePath,
-                      patchError: item.error.message,
-                      patchId: item.patchId,
-                      skipped: item.skipped
-                    };
-                  });
-                })
-              }));
-            case 25:
-              console.error("Val: failed to reset", treeRes.json);
-              return _context2.abrupt("return", result.err({
-                errorType: "other",
-                message: "Failed to reset " + JSON.stringify(treeRes.json)
-              }));
-            case 27:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function reset() {
-        return _reset.apply(this, arguments);
-      }
-      return reset;
-    }()
-  }, {
-    key: "getModule",
-    value: function () {
-      var _getModule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(path) {
-        var refetch,
-          treeRes,
-          _treeRes$json2,
-          _treeRes$json3,
-          fetchedSource,
-          schema,
-          _args3 = arguments;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              refetch = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : false;
-              if (!(!refetch && this.drafts[path] && this.schema[path])) {
-                _context3.next = 3;
-                break;
-              }
-              return _context3.abrupt("return", result.ok({
-                source: this.drafts[path],
-                schema: this.schema[path]
-              }));
-            case 3:
-              _context3.next = 5;
-              return this.client("/sources", "PUT", {
-                path: path,
-                body: {},
-                query: {
-                  validate_sources: false,
-                  validate_all: false,
-                  validate_binary_files: false
-                }
-              });
-            case 5:
-              treeRes = _context3.sent;
-              if (!(treeRes.status === 200)) {
-                _context3.next = 26;
-                break;
-              }
-              if ((_treeRes$json2 = treeRes.json) !== null && _treeRes$json2 !== void 0 && (_treeRes$json2 = _treeRes$json2.modules) !== null && _treeRes$json2 !== void 0 && _treeRes$json2[path]) {
-                _context3.next = 10;
-                break;
-              }
-              console.error("Val: could not find the module", {
-                moduleIds: Object.keys(treeRes.json.modules),
-                moduleId: path,
-                data: treeRes
-              });
-              return _context3.abrupt("return", result.err({
-                message: "Could not fetch data.\nCould not find the module:\n" + path + "\n\nVerify that the val.modules file includes this module."
-              }));
-            case 10:
-              fetchedSource = (_treeRes$json3 = treeRes.json) === null || _treeRes$json3 === void 0 || (_treeRes$json3 = _treeRes$json3.modules) === null || _treeRes$json3 === void 0 || (_treeRes$json3 = _treeRes$json3[path]) === null || _treeRes$json3 === void 0 ? void 0 : _treeRes$json3.source;
-              schema = this.schema[path];
-              if (this.schema[path]) {
-                _context3.next = 17;
-                break;
-              }
-              _context3.next = 15;
-              return this.initialize();
-            case 15:
-              if (this.schema[path]) {
-                _context3.next = 17;
-                break;
-              }
-              return _context3.abrupt("return", result.err({
-                message: "Path not found in schema. Verify that the module exists."
-              }));
-            case 17:
-              if (!(fetchedSource !== undefined)) {
-                _context3.next = 22;
-                break;
-              }
-              this.drafts[path] = fetchedSource;
-              return _context3.abrupt("return", result.ok({
-                source: fetchedSource,
-                schema: schema
-              }));
-            case 22:
-              console.error("Val: could not find the module source");
-              return _context3.abrupt("return", result.err({
-                message: "Could not fetch data. Verify that the module exists."
-              }));
-            case 24:
-              _context3.next = 33;
-              break;
-            case 26:
-              if (!(treeRes.status === 504)) {
-                _context3.next = 31;
-                break;
-              }
-              console.error("Val: timeout", treeRes.json);
-              return _context3.abrupt("return", result.err({
-                message: "Timed out while fetching data. Try again later."
-              }));
-            case 31:
-              console.error("Val: failed to get module", treeRes.json);
-              return _context3.abrupt("return", result.err({
-                message: "Could not fetch data. Verify that  is correctly configured."
-              }));
-            case 33:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function getModule(_x2) {
-        return _getModule.apply(this, arguments);
-      }
-      return getModule;
-    }()
-  }, {
-    key: "deletePatches",
-    value: function () {
-      var _deletePatches = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(patchIds) {
-        var patchesRes;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 2;
-              return this.client("/patches/~", "DELETE", {
-                query: {
-                  id: patchIds
-                }
-              });
-            case 2:
-              patchesRes = _context4.sent;
-              if (!(patchesRes.status === 200)) {
-                _context4.next = 7;
-                break;
-              }
-              return _context4.abrupt("return", result.ok(patchesRes.json));
-            case 7:
-              console.error("Val: failed to delete patches", patchesRes.json);
-              return _context4.abrupt("return", result.err({
-                message: patchesRes.json.message
-              }));
-            case 9:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function deletePatches(_x3) {
-        return _deletePatches.apply(this, arguments);
-      }
-      return deletePatches;
-    }()
-  }, {
-    key: "applyPatch",
-    value: function () {
-      var _applyPatch = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(path, patchIds, patch) {
-        var treeRes, _treeRes$json4, newPatchIds, newPatchId, fetchedSource, _treeRes$json5;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              _context5.next = 2;
-              return this.client("/sources", "PUT", {
-                path: path,
-                query: {
-                  validate_sources: false,
-                  validate_all: false,
-                  validate_binary_files: false
-                },
-                body: {
-                  patchIds: patchIds,
-                  addPatches: [{
-                    path: path,
-                    patch: patch
-                  }]
-                }
-              });
-            case 2:
-              treeRes = _context5.sent;
-              if (!(treeRes.status === 200)) {
-                _context5.next = 20;
-                break;
-              }
-              newPatchIds = treeRes.json.newPatchIds;
-              if (newPatchIds) {
-                _context5.next = 8;
-                break;
-              }
-              console.error("Val: could create patch", treeRes);
-              return _context5.abrupt("return", result.err({
-                errorType: "other",
-                message: "Val: could not create patch"
-              }));
-            case 8:
-              newPatchId = newPatchIds[0];
-              fetchedSource = (_treeRes$json4 = treeRes.json) === null || _treeRes$json4 === void 0 || (_treeRes$json4 = _treeRes$json4.modules) === null || _treeRes$json4 === void 0 || (_treeRes$json4 = _treeRes$json4[path]) === null || _treeRes$json4 === void 0 ? void 0 : _treeRes$json4.source;
-              if (!(fetchedSource !== undefined)) {
-                _context5.next = 16;
-                break;
-              }
-              this.drafts[path] = fetchedSource;
-              this.emitEvent(path, fetchedSource);
-              return _context5.abrupt("return", result.ok({
-                newPatchId: newPatchId,
-                modules: _defineProperty({}, path, {
-                  patchIds: ((_treeRes$json5 = treeRes.json) === null || _treeRes$json5 === void 0 || (_treeRes$json5 = _treeRes$json5.modules) === null || _treeRes$json5 === void 0 || (_treeRes$json5 = _treeRes$json5[path]) === null || _treeRes$json5 === void 0 || (_treeRes$json5 = _treeRes$json5.patches) === null || _treeRes$json5 === void 0 ? void 0 : _treeRes$json5.applied) || []
-                })
-              }));
-            case 16:
-              console.error("Val: could not patch");
-              return _context5.abrupt("return", result.err({
-                errorType: "other",
-                message: "Val: could not fetch data. Verify that the module exists."
-              }));
-            case 18:
-              _context5.next = 26;
-              break;
-            case 20:
-              if (!(treeRes.status === 400 && "type" in treeRes.json)) {
-                _context5.next = 24;
-                break;
-              }
-              return _context5.abrupt("return", result.err({
-                errorType: "patch-error",
-                errors: Object.entries(treeRes.json.errors).flatMap(function (_ref3) {
-                  var _ref4 = _slicedToArray(_ref3, 2),
-                    moduleFilePath = _ref4[0],
-                    value = _ref4[1];
-                  return (value !== null && value !== void 0 ? value : []).map(function (item) {
-                    return {
-                      moduleFilePath: moduleFilePath,
-                      patchError: item.error.message,
-                      patchId: item.patchId,
-                      skipped: item.skipped
-                    };
-                  });
-                })
-              }));
-            case 24:
-              console.error("Val: failed to get module", treeRes.json);
-              return _context5.abrupt("return", result.err({
-                errorType: "other",
-                message: "Val: could not fetch data. Verify that  is correctly configured."
-              }));
-            case 26:
-            case "end":
-              return _context5.stop();
-          }
-        }, _callee5, this);
-      }));
-      function applyPatch(_x4, _x5, _x6) {
-        return _applyPatch.apply(this, arguments);
-      }
-      return applyPatch;
-    }()
-  }, {
-    key: "emitEvent",
-    value: function emitEvent(path, source) {
-      var event = new CustomEvent("val-event", {
-        detail: {
-          type: "module-update",
-          path: path,
-          source: source
-        }
-      });
-      window.dispatchEvent(event);
-    }
-  }, {
-    key: "initialize",
-    value: function () {
-      var _initialize = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var schemaRes, paths, _i3, _arr, moduleId, schema, msg;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              _context6.next = 2;
-              return this.client("/schema", "GET", {});
-            case 2:
-              schemaRes = _context6.sent;
-              if (!(schemaRes.status === 200)) {
-                _context6.next = 9;
-                break;
-              }
-              paths = [];
-              for (_i3 = 0, _arr = Object.keys(schemaRes.json.schemas); _i3 < _arr.length; _i3++) {
-                moduleId = _arr[_i3];
-                schema = schemaRes.json.schemas[moduleId];
-                if (schema) {
-                  paths.push(moduleId);
-                  this.schema[moduleId] = schema;
-                }
-              }
-              return _context6.abrupt("return", result.ok(paths));
-            case 9:
-              msg = "Failed to fetch content. ";
-              if (schemaRes.status === 401) {
-                msg += "Authorization failed - check that you are logged in.";
-              } else {
-                msg += "Get a developer to verify that  is correctly setup.";
-              }
-              return _context6.abrupt("return", result.err({
-                message: msg,
-                details: {
-                  fetchError: schemaRes.json
-                }
-              }));
-            case 12:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6, this);
-      }));
-      function initialize() {
-        return _initialize.apply(this, arguments);
-      }
-      return initialize;
-    }()
-  }]);
-}();
-
 var JSONValueT = z.lazy(function () {
   return z.union([z.string(), z.number(), z["boolean"](), z["null"](), z.array(JSONValueT), z.record(JSONValueT)]);
 });
+
+/**
+ * Raw JSON patch operation.
+ */
+var OperationJSONT = z.discriminatedUnion("op", [z.object({
+  op: z.literal("add"),
+  path: z.string(),
+  value: JSONValueT
+}).strict(), z.object({
+  op: z.literal("remove"),
+  /**
+   * Must be non-root
+   */
+  path: z.string()
+}).strict(), z.object({
+  op: z.literal("replace"),
+  path: z.string(),
+  value: JSONValueT
+}).strict(), z.object({
+  op: z.literal("move"),
+  /**
+   * Must be non-root and not a proper prefix of "path".
+   */
+  from: z.string(),
+  path: z.string()
+}).strict(), z.object({
+  op: z.literal("copy"),
+  from: z.string(),
+  path: z.string()
+}).strict(), z.object({
+  op: z.literal("test"),
+  path: z.string(),
+  value: JSONValueT
+}).strict(), z.object({
+  op: z.literal("file"),
+  path: z.string(),
+  filePath: z.string(),
+  value: z.string()
+}).strict()]);
+var PatchJSON = z.array(OperationJSONT);
+/**
+ * Raw JSON patch operation.
+ */
 var OperationT = z.discriminatedUnion("op", [z.object({
   op: z.literal("add"),
   path: z.array(z.string()),
@@ -1629,11 +1118,24 @@ var OperationT = z.discriminatedUnion("op", [z.object({
   path: z.array(z.string()),
   filePath: z.string(),
   nestedFilePath: z.array(z.string()).optional(),
-  value: z.union([z.string(), z.object({
-    sha256: z.string()
-  })])
+  value: z.string()
 }).strict()]);
 var Patch = z.array(OperationT);
+var PatchId = z.string().refine(function (_id) {
+  return true;
+} // TODO: validation
+);
+var ParentRef$1 = z.union([z.object({
+  type: z.literal("head"),
+  headBaseSha: z.string()
+}), z.object({
+  type: z.literal("patch"),
+  patchId: PatchId
+})]);
+var PatchBlock = z.object({
+  patch: Patch,
+  parentRef: ParentRef$1
+});
 
 var SourcePath = z.string().transform(function (path) {
   return path;
@@ -1763,14 +1265,17 @@ var SerializedImageSchema = z.object({
 });
 var SerializedSchema = z.union([SerializedStringSchema, SerializedLiteralSchema, SerializedBooleanSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedArraySchema, SerializedUnionSchema, SerializedRichTextSchema, SerializedRecordSchema, SerializedKeyOfSchema, SerializedFileSchema, SerializedDateSchema, SerializedImageSchema]);
 
-var PatchId = z.string().refine(function (_id) {
-  return true;
-} // TODO:
-);
 var ModuleFilePath = z.string().refine(function (_path) {
   return true;
-} // TODO:
+} // TODO: validation
 );
+var ParentRef = z.union([z.object({
+  type: z.literal("head"),
+  headBaseSha: z.string()
+}), z.object({
+  type: z.literal("patch"),
+  patchId: PatchId
+})]);
 var ValConfig = z.object({
   project: z.string().optional(),
   root: z.string().optional(),
@@ -1780,7 +1285,7 @@ var ValConfig = z.object({
   gitCommit: z.string().optional(),
   gitBranch: z.string().optional()
 });
-var ValidationFixZ = z.union([z.literal("image:add-metadata"), z.literal("image:replace-metadata"), z.literal("file:add-metadata"), z.literal("file:check-metadata"), z.literal("fix:deprecated-richtext")]);
+var ValidationFixZ = z.union([z.literal("image:change-extension"), z.literal("image:add-metadata"), z.literal("image:check-metadata"), z.literal("file:change-extension"), z.literal("file:add-metadata"), z.literal("file:check-metadata")]);
 var ValidationError = z.object({
   message: z.string(),
   value: z.unknown().optional(),
@@ -1796,6 +1301,13 @@ var notFoundResponse = z.object({
 var GenericError = z.object({
   message: z.string()
 });
+var GenericPatchError = z.union([z.object({
+  patchId: PatchId,
+  message: z.string()
+}), z.object({
+  parentPatchId: z.string(),
+  message: z.string()
+})]);
 var ModulesError = z.object({
   message: z.string(),
   path: ModuleFilePath.optional()
@@ -2076,7 +1588,7 @@ var Api = {
       })])
     }
   },
-  "/patches/~": {
+  "/patches": {
     DELETE: {
       req: {
         query: {
@@ -2090,13 +1602,50 @@ var Api = {
         status: z.literal(500),
         json: z.object({
           message: z.string(),
-          details: z.record(PatchId, GenericError)
+          errors: z.array(GenericPatchError)
         })
       }), z.object({
         status: z.literal(200),
         json: z.array(PatchId)
       })])
     },
+    PUT: {
+      req: {
+        body: z.object({
+          parentRef: ParentRef,
+          patches: z.array(z.object({
+            path: ModuleFilePath,
+            patch: Patch
+          }))
+        }),
+        cookies: {
+          val_session: z.string().optional()
+        }
+      },
+      res: z.union([notFoundResponse, z.object({
+        status: z.literal(409),
+        // conflict: i.e. not a head of patches
+        json: z.object({
+          type: z.literal("patch-head-conflict"),
+          message: z.string()
+        })
+      }), z.object({
+        status: z.literal(400),
+        json: z.object({
+          type: z.literal("patch-error"),
+          message: z.string(),
+          errors: z.record(ModuleFilePath, z.array(z.object({
+            error: GenericError
+          })))
+        })
+      }), z.object({
+        status: z.literal(200),
+        json: z.object({
+          newPatchIds: z.array(PatchId),
+          parentRef: ParentRef
+        })
+      })])
+    },
     GET: {
       req: {
         query: {
@@ -2113,14 +1662,21 @@ var Api = {
         status: z.literal(500),
         json: z.object({
           message: z.string(),
-          details: z.record(PatchId, GenericError)
+          patchErrors: z.array(GenericPatchError)
+        })
+      }), z.object({
+        status: z.literal(500),
+        json: z.object({
+          message: z.string(),
+          error: GenericError
         })
       }), z.object({
         status: z.literal(200),
         json: z.object({
-          patches: z.record(PatchId, z.object({
+          patches: z.array(z.object({
             path: ModuleFilePath,
             patch: Patch.optional(),
+            patchId: PatchId,
             createdAt: z.string(),
             authorId: z.string().nullable(),
             appliedAt: z.object({
@@ -2131,6 +1687,7 @@ var Api = {
               timestamp: z.string()
             }).nullable()
           })),
+          baseSha: z.string(),
           error: GenericError.optional(),
           errors: z.record(PatchId, GenericError).optional()
         })
@@ -2165,16 +1722,12 @@ var Api = {
       })])
     }
   },
-  "/sources": {
+  "/sources/~": {
     PUT: {
       req: {
         path: z.string().optional(),
         body: z.object({
-          patchIds: z.array(PatchId).optional(),
-          addPatches: z.array(z.object({
-            path: ModuleFilePath,
-            patch: Patch
-          })).optional()
+          patchIds: z.array(PatchId).optional()
         }).optional(),
         query: {
           validate_all: z["boolean"]().optional(),
@@ -2188,10 +1741,6 @@ var Api = {
       res: z.union([notFoundResponse, z.object({
         status: z.literal(401),
         json: GenericError
-      }), z.object({
-        status: z.literal(409),
-        // conflict: i.e. not a head of patches
-        json: GenericError
       }), z.object({
         status: z.literal(500),
         json: z.object({
@@ -2199,32 +1748,15 @@ var Api = {
           details: z.union([z.array(ModulesError), GenericError])
         })
       }), z.object({
-        status: z.literal(400),
+        status: z.literal(409),
         json: z.object({
-          message: z.string(),
-          details: z.array(ModulesError)
+          message: z.string()
         })
       }), z.object({
         status: z.literal(400),
         json: z.object({
-          type: z.literal("patch-error"),
           message: z.string(),
-          schemaSha: z.string(),
-          modules: z.record(ModuleFilePath, z.object({
-            source: z.any(),
-            //.optional(), // TODO: Json zod type
-            patches: z.object({
-              applied: z.array(PatchId),
-              skipped: z.array(PatchId).optional(),
-              errors: z.record(PatchId, GenericError).optional()
-            }).optional(),
-            validationErrors: z.record(SourcePath, z.array(ValidationError)).optional()
-          })),
-          errors: z.record(ModuleFilePath, z.array(z.object({
-            patchId: PatchId,
-            skipped: z["boolean"](),
-            error: GenericError
-          })))
+          details: z.array(ModulesError)
         })
       }), z.object({
         status: z.literal(200),
@@ -2239,8 +1771,7 @@ var Api = {
               errors: z.record(PatchId, GenericError).optional()
             }).optional(),
             validationErrors: z.record(SourcePath, z.array(ValidationError)).optional()
-          })),
-          newPatchIds: z.array(PatchId).optional()
+          }))
         })
       })])
     }
@@ -2387,9 +1918,13 @@ var createValClient = function createValClient(host) {
           case 7:
             reqBodyResult = (_apiEndpoint$req$body = apiEndpoint.req.body) === null || _apiEndpoint$req$body === void 0 ? void 0 : _apiEndpoint$req$body.safeParse(anyReq.body);
             if (!(reqBodyResult && !reqBodyResult.success)) {
-              _context2.next = 10;
+              _context2.next = 11;
               break;
             }
+            console.error("Invalid request body", {
+              body: anyReq.body,
+              error: reqBodyResult.error
+            });
             return _context2.abrupt("return", {
               status: null,
               json: {
@@ -2401,9 +1936,9 @@ var createValClient = function createValClient(host) {
                 }
               }
             });
-          case 10:
-            _context2.prev = 10;
-            _context2.next = 13;
+          case 11:
+            _context2.prev = 11;
+            _context2.next = 14;
             return fetch("".concat(host).concat(fullPath), {
               method: method,
               headers: {
@@ -2426,7 +1961,7 @@ var createValClient = function createValClient(host) {
                         status: null,
                         json: {
                           type: "client_side_validation_error",
-                          message: "Invalid content type header in response. Could not find application/json in ".concat(Array.from(res.headers.entries()), ". This could be a result of mismatched Val versions."),
+                          message: "Invalid response (expected JSON, but got something else). This could be a result of mismatched Val versions or a transient error.",
                           details: {
                             validationError: "Invalid content type",
                             data: {
@@ -2489,12 +2024,12 @@ var createValClient = function createValClient(host) {
                 return _ref2.apply(this, arguments);
               };
             }());
-          case 13:
+          case 14:
             res = _context2.sent;
             return _context2.abrupt("return", res);
-          case 17:
-            _context2.prev = 17;
-            _context2.t0 = _context2["catch"](10);
+          case 18:
+            _context2.prev = 18;
+            _context2.t0 = _context2["catch"](11);
             return _context2.abrupt("return", {
               status: null,
               json: {
@@ -2504,11 +2039,11 @@ var createValClient = function createValClient(host) {
                 details: _context2.t0 instanceof Error ? _context2.t0.message : JSON.stringify(_context2.t0)
               }
             });
-          case 20:
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[10, 17]]);
+      }, _callee2, null, [[11, 18]]);
     }));
     return function (_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -2530,6 +2065,46 @@ function isRetryable(error) {
   return false;
 }
 
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+
+function _iterableToArrayLimit(r, l) {
+  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
+    try {
+      if (i = (t = t.call(r)).next, 0 === l) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      o = !0, n = r;
+    } finally {
+      try {
+        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
+      } finally {
+        if (o) throw n;
+      }
+    }
+    return a;
+  }
+}
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _slicedToArray(r, e) {
+  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+}
+
 var urlOf = function urlOf() {
   var route = arguments.length <= 0 ? undefined : arguments[0];
   var query = arguments.length <= 1 ? undefined : arguments[1];
@@ -2549,4 +2124,4 @@ var urlOf = function urlOf() {
   return "".concat(route);
 };
 
-export { Api, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValCache, createValClient, remirrorToRichTextSource, richTextToRemirror, urlOf };
+export { Api, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchId, PatchJSON, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, createValClient, remirrorToRichTextSource, richTextToRemirror, urlOf };