@valbuild/shared 0.64.0 → 0.65.2

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

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { result } from '@valbuild/core/fp';
 import { fromZodError } from 'zod-validation-error';
 
-function toPrimitive(t, r) {
+function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
   if (void 0 !== e) {
@@ -14,24 +14,18 @@ function toPrimitive(t, r) {
   return ("string" === r ? String : Number)(t);
 }
 
-function toPropertyKey(t) {
-  var i = toPrimitive(t, "string");
-  return "symbol" == typeof i ? i : String(i);
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : i + "";
 }
 
-function _defineProperty(obj, key, value) {
-  key = toPropertyKey(key);
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
+function _defineProperty(e, r, t) {
+  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[r] = t, e;
 }
 
 function ownKeys(e, r) {
@@ -56,68 +50,64 @@ function _objectSpread2(e) {
   return e;
 }
 
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
 }
 
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+  }
 }
 
-function _createForOfIteratorHelper(o, allowArrayLike) {
-  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-  if (!it) {
-    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-      if (it) o = it;
-      var i = 0;
-      var F = function () {};
+function _createForOfIteratorHelper(r, e) {
+  var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (!t) {
+    if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) {
+      t && (r = t);
+      var n = 0,
+        F = function () {};
       return {
         s: F,
         n: function () {
-          if (i >= o.length) return {
-            done: true
-          };
-          return {
-            done: false,
-            value: o[i++]
+          return n >= r.length ? {
+            done: !0
+          } : {
+            done: !1,
+            value: r[n++]
           };
         },
-        e: function (e) {
-          throw e;
+        e: function (r) {
+          throw r;
         },
         f: F
       };
     }
     throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
-  var normalCompletion = true,
-    didErr = false,
-    err;
+  var o,
+    a = !0,
+    u = !1;
   return {
     s: function () {
-      it = it.call(o);
+      t = t.call(r);
     },
     n: function () {
-      var step = it.next();
-      normalCompletion = step.done;
-      return step;
+      var r = t.next();
+      return a = r.done, r;
     },
-    e: function (e) {
-      didErr = true;
-      err = e;
+    e: function (r) {
+      u = !0, o = r;
     },
     f: function () {
       try {
-        if (!normalCompletion && it.return != null) it.return();
+        a || null == t.return || t.return();
       } finally {
-        if (didErr) throw err;
+        if (u) throw o;
       }
     }
   };
@@ -127,7 +117,7 @@ function remirrorToRichTextSource(node) {
   var files = {};
   var blocks = [];
   var i = 0;
-  var _iterator = _createForOfIteratorHelper(node.content),
+  var _iterator = _createForOfIteratorHelper((node === null || node === void 0 ? void 0 : node.content) || []),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -308,9 +298,12 @@ function convertImageNode(path, node, files) {
     if (mimeType === undefined) {
       throw new Error("Could not detect Mime Type for image: ".concat(node.attrs.src));
     }
-    var fileExt = Internal.mimeTypeToFileExt(mimeType);
-    var fileName = node.attrs.fileName || "".concat(sha256, ".").concat(fileExt);
-    var filePath = "/public/".concat(fileName);
+    var fileName = Internal.createFilename(node.attrs.src, node.attrs.fileName || "", {
+      width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
+      height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
+      mimeType: mimeType
+    }, sha256);
+    var filePath = "/public/val/".concat(fileName);
     var existingFilesEntry = files[filePath];
     var thisPath = path
     // file is added as src (see below):
@@ -328,21 +321,32 @@ function convertImageNode(path, node, files) {
       src: _defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, filePath), "metadata", {
         width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
         height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
-        sha256: sha256 || "",
         mimeType: mimeType
       })
     };
   } else if (node.attrs) {
-    var _sha = getParam("sha256", node.attrs.src);
-    var patchId = getParam("patch_id", node.attrs.src);
-    var noParamsSrc = node.attrs.src.split("?")[0];
+    var url = node.attrs.src;
+    var patchId = getParam("patch_id", url);
+    var noParamsUrl = url.split("?")[0];
+    if (patchId) {
+      if (noParamsUrl.startsWith("/api/val/files/public")) {
+        noParamsUrl = noParamsUrl.slice("/api/val/files".length);
+      } else {
+        console.error("Patched image URL does not start with /api/val/files: " + url);
+      }
+    } else {
+      if (!noParamsUrl.startsWith("/public")) {
+        noParamsUrl = "/public".concat(noParamsUrl);
+      } else {
+        console.error("Unpatched image URL starts with /public: " + url);
+      }
+    }
     var tag = {
       tag: "img",
-      src: _objectSpread2(_defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, "/public".concat(node.attrs.src.split("?")[0])), "metadata", {
+      src: _objectSpread2(_defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, noParamsUrl), "metadata", {
         width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
         height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
-        sha256: _sha || "",
-        mimeType: noParamsSrc && Internal.filenameToMimeType(noParamsSrc) || ""
+        mimeType: noParamsUrl && Internal.filenameToMimeType(noParamsUrl) || ""
       }), patchId ? {
         patch_id: patchId
       } : {})
@@ -447,20 +451,20 @@ var RemirrorJSON = z.object({
   content: z.array(z.union([RemirrorParagraph, RemirrorHeading, RemirrorBulletList, RemirrorOrderedList]))
 });
 
-function _arrayWithoutHoles(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+function _arrayWithoutHoles(r) {
+  if (Array.isArray(r)) return _arrayLikeToArray(r);
 }
 
-function _iterableToArray(iter) {
-  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+function _iterableToArray(r) {
+  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
 }
 
 function _nonIterableSpread() {
   throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-function _toConsumableArray(arr) {
-  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+function _toConsumableArray(r) {
+  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
 }
 
 function richTextToRemirror(richtext) {
@@ -712,8 +716,8 @@ 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(arr) {
-  if (Array.isArray(arr)) return arr;
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
 }
 
 function _iterableToArrayLimit(r, l) {
@@ -748,8 +752,8 @@ 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(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+function _slicedToArray(r, e) {
+  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
 }
 
 function _regeneratorRuntime() {
@@ -860,7 +864,7 @@ function _regeneratorRuntime() {
   function makeInvokeMethod(e, r, n) {
     var o = h;
     return function (i, a) {
-      if (o === f) throw new Error("Generator is already running");
+      if (o === f) throw Error("Generator is already running");
       if (o === s) {
         if ("throw" === i) throw a;
         return {
@@ -1002,7 +1006,7 @@ function _regeneratorRuntime() {
           } else if (c) {
             if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
           } else {
-            if (!u) throw new Error("try statement without catch or finally");
+            if (!u) throw Error("try statement without catch or finally");
             if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
           }
         }
@@ -1042,7 +1046,7 @@ function _regeneratorRuntime() {
           return o;
         }
       }
-      throw new Error("illegal catch attempt");
+      throw Error("illegal catch attempt");
     },
     delegateYield: function (e, r, n) {
       return this.delegate = {
@@ -1054,59 +1058,46 @@ function _regeneratorRuntime() {
   }, e;
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
+    var i = n[a](c),
+      u = i.value;
+  } catch (n) {
+    return void e(n);
   }
+  i.done ? t(u) : Promise.resolve(u).then(r, o);
 }
-function _asyncToGenerator(fn) {
+function _asyncToGenerator(n) {
   return function () {
-    var self = this,
-      args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+    var t = this,
+      e = arguments;
+    return new Promise(function (r, o) {
+      var a = n.apply(t, e);
+      function _next(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
       }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      function _throw(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
       }
-      _next(undefined);
+      _next(void 0);
     });
   };
 }
 
-function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
+function _classCallCheck(a, n) {
+  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
 }
 
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, toPropertyKey(descriptor.key), descriptor);
+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(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
+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 () {
@@ -1116,10 +1107,10 @@ var ValCache = /*#__PURE__*/function () {
     this.drafts = {};
     this.schema = {};
   }
-  _createClass(ValCache, [{
+  return _createClass(ValCache, [{
     key: "reloadPaths",
     value: function () {
-      var _reloadPaths = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(paths) {
+      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) {
@@ -1145,14 +1136,13 @@ var ValCache = /*#__PURE__*/function () {
               patches = patchesResponse.json;
               filteredPatches = Object.keys(patches);
               _context.next = 10;
-              return this.client("/tree/~", "PUT", {
+              return this.client("/sources", "PUT", {
                 query: {
                   validate_sources: true,
                   validate_all: false,
                   validate_binary_files: false
                 },
                 path: undefined,
-                // TODO: reload only the paths the requested paths
                 body: {
                   patchIds: filteredPatches
                 }
@@ -1187,7 +1177,7 @@ var ValCache = /*#__PURE__*/function () {
   }, {
     key: "reset",
     value: function () {
-      var _reset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      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) {
@@ -1215,7 +1205,7 @@ var ValCache = /*#__PURE__*/function () {
             case 6:
               allPatches = Object.keys(patchesRes.json.patches);
               _context2.next = 9;
-              return this.client("/tree/~", "PUT", {
+              return this.client("/sources", "PUT", {
                 path: undefined,
                 query: {
                   validate_sources: false,
@@ -1294,7 +1284,7 @@ var ValCache = /*#__PURE__*/function () {
   }, {
     key: "getModule",
     value: function () {
-      var _getModule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(path) {
+      var _getModule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(path) {
         var refetch,
           treeRes,
           _treeRes$json2,
@@ -1316,7 +1306,7 @@ var ValCache = /*#__PURE__*/function () {
               }));
             case 3:
               _context3.next = 5;
-              return this.client("/tree/~", "PUT", {
+              return this.client("/sources", "PUT", {
                 path: path,
                 body: {},
                 query: {
@@ -1406,7 +1396,7 @@ var ValCache = /*#__PURE__*/function () {
   }, {
     key: "deletePatches",
     value: function () {
-      var _deletePatches = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(patchIds) {
+      var _deletePatches = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(patchIds) {
         var patchesRes;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -1443,13 +1433,13 @@ var ValCache = /*#__PURE__*/function () {
   }, {
     key: "applyPatch",
     value: function () {
-      var _applyPatch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(path, patchIds, patch) {
-        var treeRes, _treeRes$json4, newPatchId, fetchedSource, _treeRes$json5;
+      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("/tree/~", "PUT", {
+              return this.client("/sources", "PUT", {
                 path: path,
                 query: {
                   validate_sources: false,
@@ -1458,20 +1448,20 @@ var ValCache = /*#__PURE__*/function () {
                 },
                 body: {
                   patchIds: patchIds,
-                  addPatch: {
+                  addPatches: [{
                     path: path,
                     patch: patch
-                  }
+                  }]
                 }
               });
             case 2:
               treeRes = _context5.sent;
               if (!(treeRes.status === 200)) {
-                _context5.next = 19;
+                _context5.next = 20;
                 break;
               }
-              newPatchId = treeRes.json.newPatchId;
-              if (newPatchId) {
+              newPatchIds = treeRes.json.newPatchIds;
+              if (newPatchIds) {
                 _context5.next = 8;
                 break;
               }
@@ -1481,9 +1471,10 @@ var ValCache = /*#__PURE__*/function () {
                 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 = 15;
+                _context5.next = 16;
                 break;
               }
               this.drafts[path] = fetchedSource;
@@ -1494,18 +1485,18 @@ var ValCache = /*#__PURE__*/function () {
                   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 15:
+            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 17:
-              _context5.next = 25;
+            case 18:
+              _context5.next = 26;
               break;
-            case 19:
+            case 20:
               if (!(treeRes.status === 400 && "type" in treeRes.json)) {
-                _context5.next = 23;
+                _context5.next = 24;
                 break;
               }
               return _context5.abrupt("return", result.err({
@@ -1524,13 +1515,13 @@ var ValCache = /*#__PURE__*/function () {
                   });
                 })
               }));
-            case 23:
+            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 25:
+            case 26:
             case "end":
               return _context5.stop();
           }
@@ -1556,7 +1547,7 @@ var ValCache = /*#__PURE__*/function () {
   }, {
     key: "initialize",
     value: function () {
-      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      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) {
@@ -1604,7 +1595,6 @@ var ValCache = /*#__PURE__*/function () {
       return initialize;
     }()
   }]);
-  return ValCache;
 }();
 
 var JSONValueT = z.lazy(function () {
@@ -1693,12 +1683,17 @@ var SerializedArraySchema = z.lazy(function () {
   });
 });
 var SerializedUnionSchema = z.lazy(function () {
-  return z.object({
+  return z.union([z.object({
     type: z.literal("union"),
-    key: z.union([z.string(), SerializedSchema]),
-    items: z.array(SerializedSchema),
+    key: SerializedLiteralSchema,
+    items: z.array(SerializedLiteralSchema),
     opt: z["boolean"]()
-  });
+  }), z.object({
+    type: z.literal("union"),
+    key: z.string(),
+    items: z.array(SerializedObjectSchema),
+    opt: z["boolean"]()
+  })]);
 });
 var RichTextOptions = z.object({
   style: z.object({
@@ -1738,11 +1733,13 @@ var SerializedKeyOfSchema = z.lazy(function () {
     type: z.literal("keyOf"),
     path: SourcePath,
     schema: SerializedSchema,
-    values: z.union([z.literal("string"), z.literal("number"), z.array(z.string())]),
+    values: z.union([z.literal("string"), z.array(z.string())]),
     opt: z["boolean"]()
   });
 });
-var FileOptions = z.record(z.never());
+var FileOptions = z.object({
+  accept: z.string().optional()
+});
 var SerializedFileSchema = z.object({
   type: z.literal("file"),
   options: FileOptions.optional(),
@@ -1755,7 +1752,8 @@ var SerializedDateSchema = z.object({
 var ImageOptions = z.object({
   ext: z.union([z.tuple([z.literal("jpg")]), z.tuple([z.literal("webp")])]).optional(),
   directory: z.string().optional(),
-  prefix: z.string().optional()
+  prefix: z.string().optional(),
+  accept: z.string().optional()
 });
 var SerializedImageSchema = z.object({
   type: z.literal("image"),
@@ -1772,6 +1770,15 @@ var ModuleFilePath = z.string().refine(function (_path) {
   return true;
 } // TODO:
 );
+var ValConfig = z.object({
+  project: z.string().optional(),
+  root: z.string().optional(),
+  files: z.object({
+    directory: z.string() // TODO: validate that it is prefixed by /public/
+  }).optional(),
+  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 ValidationError = z.object({
   message: z.string(),
@@ -1801,14 +1808,89 @@ var enableCookieValue = z.object({
   })
 });
 var Api = {
+  "/draft/enable": {
+    GET: {
+      req: {
+        query: {
+          redirect_to: z.string().optional()
+        },
+        cookies: _defineProperty({}, VAL_SESSION_COOKIE, z.string().optional())
+      },
+      res: z.union([z.object({
+        status: z.literal(401),
+        json: GenericError
+      }), z.object({
+        status: z.literal(302),
+        redirectTo: z.string()
+      }), z.object({
+        status: z.literal(400),
+        json: z.object({
+          message: z.string()
+        })
+      })])
+    }
+  },
+  "/draft/disable": {
+    GET: {
+      req: {
+        query: {
+          redirect_to: z.string().optional()
+        },
+        cookies: _defineProperty({}, VAL_SESSION_COOKIE, z.string().optional())
+      },
+      res: z.union([z.object({
+        status: z.literal(401),
+        json: GenericError
+      }), z.object({
+        status: z.literal(302),
+        redirectTo: z.string()
+      }), z.object({
+        status: z.literal(400),
+        json: z.object({
+          message: z.string()
+        })
+      })])
+    }
+  },
+  "/draft/stat": {
+    GET: {
+      req: {
+        cookies: _defineProperty({}, VAL_SESSION_COOKIE, z.string().optional())
+      },
+      res: z.union([z.object({
+        status: z.literal(401),
+        json: GenericError
+      }), z.object({
+        status: z.literal(200),
+        json: z.object({
+          draftMode: z["boolean"]()
+        })
+      })])
+    }
+  },
   "/enable": {
     GET: {
       req: {
         query: {
           redirect_to: z.string().optional()
-        }
+        },
+        cookies: _defineProperty({}, VAL_SESSION_COOKIE, z.string().optional())
       },
       res: z.union([z.object({
+        status: z.literal(401),
+        json: GenericError
+      }), z.object({
+        status: z.literal(302),
+        redirectTo: z.string(),
+        cookies: z.object(_defineProperty(_defineProperty({}, VAL_ENABLE_COOKIE_NAME, enableCookieValue), VAL_STATE_COOKIE, z.object({
+          value: z.string(),
+          options: z.object({
+            httpOnly: z.literal(true),
+            sameSite: z.literal("lax"),
+            expires: z["instanceof"](Date)
+          })
+        })))
+      }), z.object({
         status: z.literal(302),
         redirectTo: z.string(),
         cookies: z.object(_defineProperty({}, VAL_ENABLE_COOKIE_NAME, enableCookieValue))
@@ -1825,9 +1907,13 @@ var Api = {
       req: {
         query: {
           redirect_to: z.string().optional()
-        }
+        },
+        cookies: _defineProperty({}, VAL_SESSION_COOKIE, z.string().optional())
       },
       res: z.union([z.object({
+        status: z.literal(401),
+        json: GenericError
+      }), z.object({
         status: z.literal(302),
         redirectTo: z.string(),
         cookies: z.object(_defineProperty({}, VAL_ENABLE_COOKIE_NAME, z.object({
@@ -1950,6 +2036,45 @@ var Api = {
       })
     }
   },
+  "/stat": {
+    POST: {
+      req: {
+        body: z.object({
+          schemaSha: z.string(),
+          baseSha: z.string(),
+          patches: z.array(z.string()).optional()
+        }).nullable(),
+        cookies: {
+          val_session: z.string().optional()
+        }
+      },
+      res: z.union([z.object({
+        status: z.literal(401),
+        json: GenericError
+      }), z.object({
+        status: z.literal(500),
+        json: GenericError
+      }), z.object({
+        status: z.literal(200),
+        json: z.union([z.object({
+          type: z.union([z.literal("request-again"), z.literal("no-change"), z.literal("did-change")]),
+          baseSha: z.string(),
+          schemaSha: z.string(),
+          patches: z.array(PatchId),
+          config: ValConfig
+        }), z.object({
+          type: z.literal("use-websocket"),
+          url: z.string(),
+          nonce: z.string(),
+          baseSha: z.string(),
+          schemaSha: z.string(),
+          commitSha: z.string(),
+          patches: z.array(PatchId),
+          config: ValConfig
+        })])
+      })])
+    }
+  },
   "/patches/~": {
     DELETE: {
       req: {
@@ -2024,6 +2149,12 @@ var Api = {
           message: z.string(),
           details: z.array(ModulesError)
         })
+      }), z.object({
+        status: z.literal(500),
+        json: z.object({
+          message: z.string(),
+          details: z.array(GenericError)
+        })
       }), z.object({
         status: z.literal(200),
         json: z.object({
@@ -2033,16 +2164,16 @@ var Api = {
       })])
     }
   },
-  "/tree/~": {
+  "/sources": {
     PUT: {
       req: {
         path: z.string().optional(),
         body: z.object({
           patchIds: z.array(PatchId).optional(),
-          addPatch: z.object({
+          addPatches: z.array(z.object({
             path: ModuleFilePath,
             patch: Patch
-          }).optional()
+          })).optional()
         }).optional(),
         query: {
           validate_all: z["boolean"]().optional(),
@@ -2056,6 +2187,10 @@ 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({
@@ -2073,6 +2208,17 @@ var Api = {
         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"](),
@@ -2093,7 +2239,7 @@ var Api = {
             }).optional(),
             validationErrors: z.record(SourcePath, z.array(ValidationError)).optional()
           })),
-          newPatchId: PatchId.optional()
+          newPatchIds: z.array(PatchId).optional()
         })
       })])
     }
@@ -2111,6 +2257,12 @@ var Api = {
       res: z.union([notFoundResponse, z.object({
         status: z.literal(200),
         json: z.object({}) // TODO:
+      }), z.object({
+        status: z.literal(409),
+        json: z.object({
+          message: z.string(),
+          isNotFastForward: z.literal(true)
+        })
       }), z.object({
         status: z.literal(400),
         json: z.object({
@@ -2174,7 +2326,7 @@ var createValClient = function createValClient(host) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   var anyApi = Api;
   return /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(path, method, req) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(path, method, req) {
       var _anyApi$path, _apiEndpoint$req$body;
       var anyReq, fullPath, params, _i, _Object$keys, _anyReq$query, key, _anyReq$query2, _iterator, _step, value, _anyReq$query3, apiEndpoint, reqBodyResult, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -2256,9 +2408,9 @@ var createValClient = function createValClient(host) {
               headers: {
                 "Content-Type": "application/json"
               },
-              body: anyReq.body ? JSON.stringify(anyReq.body) : undefined
-            }).then( /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+              body: anyReq.body !== undefined ? JSON.stringify(anyReq.body) : undefined
+            }).then(/*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
                 var _apiEndpoint$res;
                 var contentTypeHeaders, json, valClientResult, responseResult;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -2273,7 +2425,7 @@ var createValClient = function createValClient(host) {
                         status: null,
                         json: {
                           type: "client_side_validation_error",
-                          message: "Invalid content type. This could be a result of mismatched Val versions.",
+                          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."),
                           details: {
                             validationError: "Invalid content type",
                             data: {
@@ -2292,15 +2444,28 @@ var createValClient = function createValClient(host) {
                         status: res.status,
                         json: json
                       };
+                      if (!(res.status === 500)) {
+                        _context.next = 10;
+                        break;
+                      }
+                      console.log("Server responded with an error", json);
+                      return _context.abrupt("return", {
+                        status: 500,
+                        json: {
+                          message: json.message,
+                          type: "unknown"
+                        }
+                      });
+                    case 10:
                       responseResult = (_apiEndpoint$res = apiEndpoint.res) === null || _apiEndpoint$res === void 0 ? void 0 : _apiEndpoint$res.safeParse(valClientResult);
                       if (!(responseResult && !responseResult.success)) {
-                        _context.next = 10;
+                        _context.next = 13;
                         break;
                       }
                       return _context.abrupt("return", {
                         status: null,
                         json: {
-                          message: "Response could not be validated. This could be a result of mismatched Val versions.",
+                          message: "Response could not be validated. This could also be a result of mismatched Val versions.",
                           type: "client_side_validation_error",
                           details: {
                             validationError: fromZodError(responseResult.error).toString(),
@@ -2308,12 +2473,12 @@ var createValClient = function createValClient(host) {
                           }
                         }
                       });
-                    case 10:
+                    case 13:
                       return _context.abrupt("return", {
                         status: res.status,
                         json: json
                       });
-                    case 11:
+                    case 14:
                     case "end":
                       return _context.stop();
                   }
@@ -2332,8 +2497,9 @@ var createValClient = function createValClient(host) {
             return _context2.abrupt("return", {
               status: null,
               json: {
-                message: "Failed to fetch data. This is likely a network error.",
+                message: "Failed to fetch data",
                 type: "network_error",
+                retryable: isRetryable(_context2.t0),
                 details: _context2.t0 instanceof Error ? _context2.t0.message : JSON.stringify(_context2.t0)
               }
             });
@@ -2348,6 +2514,20 @@ var createValClient = function createValClient(host) {
     };
   }();
 };
+function isRetryable(error) {
+  if (error instanceof TypeError) {
+    // TypeError is usually thrown by fetch when the network request fails.
+    return true;
+  }
+  if (error instanceof Error && "code" in error) {
+    var errorCode = error.code;
+
+    // Network-specific errors (Node.js specific)
+    var retryableErrorCodes = ["ECONNRESET", "ETIMEDOUT", "ENOTFOUND", "EAI_AGAIN"];
+    return retryableErrorCodes.includes(errorCode);
+  }
+  return false;
+}
 
 var urlOf = function urlOf() {
   var route = arguments.length <= 0 ? undefined : arguments[0];