@valbuild/shared 0.61.0 → 0.62.0

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

@@ -2,7 +2,6 @@ import { VAL_EXTENSION, Internal, FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, RT_IMAGE_
 import * as marked from 'marked';
 import { z } from 'zod';
 import { result } from '@valbuild/core/fp';
-import { JSONOps, applyPatch } from '@valbuild/core/patch';
 
 function toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
@@ -1975,16 +1974,15 @@ function _createClass(Constructor, protoProps, staticProps) {
   return Constructor;
 }
 
-var ops = new JSONOps();
 var ValStore = /*#__PURE__*/function () {
   // uncertain whether this is the optimal way of returning
 
   function ValStore(api) {
     var _this = this;
     _classCallCheck(this, ValStore);
-    _defineProperty(this, "subscribe", function (moduleIds) {
+    _defineProperty(this, "subscribe", function (paths) {
       return function (listener) {
-        var subscriberId = createSubscriberId(moduleIds);
+        var subscriberId = createSubscriberId(paths);
         if (!_this.listeners[subscriberId]) {
           _this.listeners[subscriberId] = [];
           _this.subscribers.set(subscriberId, {});
@@ -1995,18 +1993,18 @@ var ValStore = /*#__PURE__*/function () {
         };
       };
     });
-    _defineProperty(this, "getSnapshot", function (moduleIds) {
+    _defineProperty(this, "getSnapshot", function (paths) {
       return function () {
-        return _this.get(moduleIds);
+        return _this.get(paths);
       };
     });
-    _defineProperty(this, "getServerSnapshot", function (moduleIds) {
+    _defineProperty(this, "getServerSnapshot", function (paths) {
       return function () {
-        return _this.get(moduleIds);
+        return _this.get(paths);
       };
     });
-    _defineProperty(this, "get", function (moduleIds) {
-      var subscriberId = createSubscriberId(moduleIds);
+    _defineProperty(this, "get", function (paths) {
+      var subscriberId = createSubscriberId(paths);
       return _this.subscribers.get(subscriberId);
     });
     this.api = api;
@@ -2016,92 +2014,164 @@ var ValStore = /*#__PURE__*/function () {
     this.schema = {};
   }
   _createClass(ValStore, [{
+    key: "reset",
+    value: function () {
+      var _reset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var patches, allPatches, data, _i, _Object$keys, pathS, path, _i2, _Array$from, _Array$from$_i, subscriberId, subscriberModules;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return this.api.getPatches();
+            case 2:
+              patches = _context.sent;
+              if (!result.isErr(patches)) {
+                _context.next = 6;
+                break;
+              }
+              console.error("Val: failed to get patches", patches.error);
+              return _context.abrupt("return");
+            case 6:
+              allPatches = Object.values(patches.value).flatMap(function (mp) {
+                return mp.map(function (p) {
+                  return p.patch_id;
+                });
+              });
+              _context.next = 9;
+              return this.api.putTree({
+                patchIds: allPatches
+              });
+            case 9:
+              data = _context.sent;
+              _context.next = 12;
+              return this.initialize();
+            case 12:
+              if (result.isOk(data)) {
+                for (_i = 0, _Object$keys = Object.keys(data.value.modules); _i < _Object$keys.length; _i++) {
+                  pathS = _Object$keys[_i];
+                  path = pathS;
+                  this.drafts[path] = data.value.modules[path].source;
+                  this.emitEvent(path, this.drafts[path]);
+                  for (_i2 = 0, _Array$from = Array.from(this.subscribers.entries()); _i2 < _Array$from.length; _i2++) {
+                    _Array$from$_i = _slicedToArray(_Array$from[_i2], 2), subscriberId = _Array$from$_i[0], subscriberModules = _Array$from$_i[1];
+                    if (subscriberModules[path]) {
+                      this.subscribers.set(subscriberId, _objectSpread2(_objectSpread2({}, subscriberModules), {}, _defineProperty({}, path, this.drafts[path])));
+                      this.emitChange(subscriberId);
+                    }
+                  }
+                }
+              } else {
+                console.error("Val: failed to reset", data.error);
+              }
+            case 13:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function reset() {
+        return _reset.apply(this, arguments);
+      }
+      return reset;
+    }()
+  }, {
     key: "getModule",
     value: function () {
-      var _getModule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(moduleId) {
+      var _getModule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(path) {
         var refetch,
           data,
           fetchedSource,
-          fetchedSchema,
-          _args = arguments;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+          schema,
+          _args2 = arguments;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              refetch = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
-              if (!(!refetch && this.drafts[moduleId] && this.schema[moduleId])) {
-                _context.next = 3;
+              refetch = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : false;
+              if (!(!refetch && this.drafts[path] && this.schema[path])) {
+                _context2.next = 3;
                 break;
               }
-              return _context.abrupt("return", result.ok({
-                source: this.drafts[moduleId],
-                schema: this.schema[moduleId]
+              return _context2.abrupt("return", result.ok({
+                source: this.drafts[path],
+                schema: this.schema[path]
               }));
             case 3:
-              _context.next = 5;
-              return this.api.getTree({
-                patch: true,
-                treePath: moduleId,
-                includeSource: true,
-                includeSchema: true
+              _context2.next = 5;
+              return this.api.putTree({
+                treePath: path
               });
             case 5:
-              data = _context.sent;
+              data = _context2.sent;
               if (!result.isOk(data)) {
-                _context.next = 22;
+                _context2.next = 26;
                 break;
               }
-              if (data.value.modules[moduleId]) {
-                _context.next = 10;
+              if (data.value.modules[path]) {
+                _context2.next = 10;
                 break;
               }
               console.error("Val: could not find the module", {
                 moduleIds: Object.keys(data.value.modules),
-                moduleId: moduleId,
+                moduleId: path,
                 data: data
               });
-              return _context.abrupt("return", result.err({
-                message: "Could not fetch data.\nCould not find the module:\n" + moduleId + "\n\nVerify that the val.modules file includes this module."
+              return _context2.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 = data.value.modules[moduleId].source;
-              fetchedSchema = data.value.modules[moduleId].schema;
-              if (!(fetchedSource !== undefined && fetchedSchema !== undefined)) {
-                _context.next = 18;
+              fetchedSource = data.value.modules[path].source;
+              schema = this.schema[path];
+              if (this.schema[path]) {
+                _context2.next = 17;
+                break;
+              }
+              _context2.next = 15;
+              return this.initialize();
+            case 15:
+              if (this.schema[path]) {
+                _context2.next = 17;
                 break;
               }
-              this.drafts[moduleId] = fetchedSource;
-              this.schema[moduleId] = fetchedSchema;
-              return _context.abrupt("return", result.ok({
+              return _context2.abrupt("return", result.err({
+                message: "Path not found in schema. Verify that the module exists."
+              }));
+            case 17:
+              if (!(fetchedSource !== undefined)) {
+                _context2.next = 22;
+                break;
+              }
+              this.drafts[path] = fetchedSource;
+              return _context2.abrupt("return", result.ok({
                 source: fetchedSource,
-                schema: fetchedSchema
+                schema: schema
               }));
-            case 18:
+            case 22:
               console.error("Val: could not find the module source");
-              return _context.abrupt("return", result.err({
+              return _context2.abrupt("return", result.err({
                 message: "Could not fetch data. Verify that the module exists."
               }));
-            case 20:
-              _context.next = 29;
+            case 24:
+              _context2.next = 33;
               break;
-            case 22:
+            case 26:
               if (!(data.error.statusCode === 504)) {
-                _context.next = 27;
+                _context2.next = 31;
                 break;
               }
               console.error("Val: timeout", data.error);
-              return _context.abrupt("return", result.err({
+              return _context2.abrupt("return", result.err({
                 message: "Timed out while fetching data. Try again later."
               }));
-            case 27:
+            case 31:
               console.error("Val: failed to get module", data.error);
-              return _context.abrupt("return", result.err({
+              return _context2.abrupt("return", result.err({
                 message: "Could not fetch data. Verify that Val is correctly configured."
               }));
-            case 29:
+            case 33:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function getModule(_x) {
         return _getModule.apply(this, arguments);
@@ -2111,180 +2181,105 @@ var ValStore = /*#__PURE__*/function () {
   }, {
     key: "applyPatch",
     value: function () {
-      var _applyPatch2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(moduleId, patch) {
-        var currentSource, currentSchema, data, fetchedSource, fetchedSchema, res, patchRes, _i, _Array$from, _Array$from$_i, subscriberId, subscriberModules;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _applyPatch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(path, patchIds, patch) {
+        var data, fetchedSource, _data$value$modules$p, _i3, _Array$from2, _Array$from2$_i, subscriberId, subscriberModules;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              currentSource = this.drafts[moduleId];
-              currentSchema = this.schema[moduleId];
-              if (!(!currentSource || !currentSchema)) {
-                _context2.next = 21;
-                break;
-              }
-              _context2.next = 5;
-              return this.api.getTree({
-                patch: true,
-                treePath: moduleId,
-                includeSource: true,
-                includeSchema: true
+              _context3.next = 2;
+              return this.api.putTree({
+                treePath: path,
+                patchIds: patchIds,
+                addPatch: {
+                  path: path,
+                  patch: patch
+                }
               });
-            case 5:
-              data = _context2.sent;
+            case 2:
+              data = _context3.sent;
               if (!result.isOk(data)) {
-                _context2.next = 19;
+                _context3.next = 16;
                 break;
               }
-              fetchedSource = data.value.modules[moduleId].source;
-              fetchedSchema = data.value.modules[moduleId].schema;
-              if (!(fetchedSource !== undefined && fetchedSchema !== undefined)) {
-                _context2.next = 15;
+              fetchedSource = data.value.modules[path].source;
+              if (!(fetchedSource !== undefined)) {
+                _context3.next = 12;
                 break;
               }
-              currentSource = fetchedSource;
-              this.drafts[moduleId] = fetchedSource;
-              this.schema[moduleId] = fetchedSchema;
-              _context2.next = 17;
-              break;
-            case 15:
-              console.error("Val: could not find the module source");
-              return _context2.abrupt("return", result.err({
+              this.drafts[path] = fetchedSource;
+              this.emitEvent(path, fetchedSource);
+              for (_i3 = 0, _Array$from2 = Array.from(this.subscribers.entries()); _i3 < _Array$from2.length; _i3++) {
+                _Array$from2$_i = _slicedToArray(_Array$from2[_i3], 2), subscriberId = _Array$from2$_i[0], subscriberModules = _Array$from2$_i[1];
+                if (subscriberModules[path]) {
+                  this.subscribers.set(subscriberId, _objectSpread2(_objectSpread2({}, subscriberModules), {}, _defineProperty({}, path, this.drafts[path])));
+                  this.emitChange(subscriberId);
+                }
+              }
+              return _context3.abrupt("return", result.ok(_defineProperty({}, path, {
+                patchIds: ((_data$value$modules$p = data.value.modules[path].patches) === null || _data$value$modules$p === void 0 ? void 0 : _data$value$modules$p.applied) || []
+              })));
+            case 12:
+              console.error("Val: could not patch");
+              return _context3.abrupt("return", result.err({
                 message: "Val: could not fetch data. Verify that the module exists."
               }));
-            case 17:
-              _context2.next = 21;
+            case 14:
+              _context3.next = 18;
               break;
-            case 19:
+            case 16:
               console.error("Val: failed to get module", data.error);
-              return _context2.abrupt("return", result.err({
+              return _context3.abrupt("return", result.err({
                 message: "Val: could not fetch data. Verify that Val is correctly configured."
               }));
-            case 21:
-              _context2.next = 23;
-              return this.api.postPatches(moduleId, patch);
-            case 23:
-              res = _context2.sent;
-              if (!result.isErr(res)) {
-                _context2.next = 27;
-                break;
-              }
-              console.error("Val: failed to post patch", res.error);
-              return _context2.abrupt("return", res);
-            case 27:
-              patchRes = applyPatch(currentSource, ops, patch.filter(Internal.notFileOp) // we cannot apply file ops here
-              );
-              if (!result.isOk(patchRes)) {
-                _context2.next = 35;
-                break;
-              }
-              this.drafts[moduleId] = patchRes.value;
-              this.emitEvent(moduleId, patchRes.value);
-              for (_i = 0, _Array$from = Array.from(this.subscribers.entries()); _i < _Array$from.length; _i++) {
-                _Array$from$_i = _slicedToArray(_Array$from[_i], 2), subscriberId = _Array$from$_i[0], subscriberModules = _Array$from$_i[1];
-                if (subscriberModules[moduleId]) {
-                  this.subscribers.set(subscriberId, _objectSpread2(_objectSpread2({}, subscriberModules), {}, _defineProperty({}, moduleId, this.drafts[moduleId])));
-                  this.emitChange(subscriberId);
-                }
-              }
-              return _context2.abrupt("return", res);
-            case 35:
-              console.error("Val: failed to apply patch", patchRes.error);
-              return _context2.abrupt("return", patchRes);
-            case 37:
+            case 18:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-      function applyPatch$1(_x2, _x3) {
-        return _applyPatch2.apply(this, arguments);
+      function applyPatch(_x2, _x3, _x4) {
+        return _applyPatch.apply(this, arguments);
       }
-      return applyPatch$1;
+      return applyPatch;
     }()
   }, {
     key: "emitEvent",
-    value: function emitEvent(moduleId, source) {
+    value: function emitEvent(path, source) {
       var event = new CustomEvent("val-event", {
         detail: {
           type: "module-update",
-          moduleId: moduleId,
+          path: path,
           source: source
         }
       });
       window.dispatchEvent(event);
     }
   }, {
-    key: "update",
-    value: function () {
-      var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(moduleIds) {
-        var _this2 = this;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return Promise.all(moduleIds.map(function (moduleId) {
-                return _this2.updateTree(moduleId);
-              }));
-            case 2:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      function update(_x4) {
-        return _update.apply(this, arguments);
-      }
-      return update;
-    }()
-  }, {
-    key: "reset",
+    key: "initialize",
     value: function () {
-      var _reset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var data, paths, _i4, _arr, moduleId, schema, msg;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              return _context4.abrupt("return", this.updateTree());
-            case 1:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function reset() {
-        return _reset.apply(this, arguments);
-      }
-      return reset;
-    }()
-  }, {
-    key: "initialize",
-    value: function () {
-      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var data, moduleIds, _i2, _arr, moduleId, schema, msg;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              _context5.next = 2;
-              return this.api.getTree({
-                patch: false,
-                includeSource: false,
-                includeSchema: true
-              });
+              _context4.next = 2;
+              return this.api.getSchema({});
             case 2:
-              data = _context5.sent;
+              data = _context4.sent;
               if (!result.isOk(data)) {
-                _context5.next = 9;
+                _context4.next = 9;
                 break;
               }
-              moduleIds = [];
-              for (_i2 = 0, _arr = Object.keys(data.value.modules); _i2 < _arr.length; _i2++) {
-                moduleId = _arr[_i2];
-                schema = data.value.modules[moduleId].schema;
+              paths = [];
+              for (_i4 = 0, _arr = Object.keys(data.value.schemas); _i4 < _arr.length; _i4++) {
+                moduleId = _arr[_i4];
+                schema = data.value.schemas[moduleId];
                 if (schema) {
-                  moduleIds.push(moduleId);
+                  paths.push(moduleId);
                   this.schema[moduleId] = schema;
                 }
               }
-              return _context5.abrupt("return", result.ok(moduleIds));
+              return _context4.abrupt("return", result.ok(paths));
             case 9:
               msg = "Failed to fetch content. ";
               if (data.error.statusCode === 401) {
@@ -2292,7 +2287,7 @@ var ValStore = /*#__PURE__*/function () {
               } else {
                 msg += "Get a developer to verify that Val is correctly setup.";
               }
-              return _context5.abrupt("return", result.err({
+              return _context4.abrupt("return", result.err({
                 message: msg,
                 details: {
                   fetchError: data.error
@@ -2300,114 +2295,15 @@ var ValStore = /*#__PURE__*/function () {
               }));
             case 12:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
       function initialize() {
         return _initialize.apply(this, arguments);
       }
       return initialize;
     }()
-  }, {
-    key: "updateTree",
-    value: function () {
-      var _updateTree = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(treePath) {
-        var _this3 = this;
-        var data, moduleIds, updatedSubscriberIds, subscriberIds, _loop, _i3, _arr2, _i4, _Array$from2, _Array$from2$_i, updatedSubscriberId, _moduleIds, subscriberModules, msg;
-        return _regeneratorRuntime().wrap(function _callee6$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
-            case 0:
-              _context7.next = 2;
-              return this.api.getTree({
-                patch: true,
-                treePath: treePath,
-                includeSource: true,
-                includeSchema: true
-              });
-            case 2:
-              data = _context7.sent;
-              moduleIds = [];
-              if (!result.isOk(data)) {
-                _context7.next = 18;
-                break;
-              }
-              updatedSubscriberIds = new Map();
-              subscriberIds = Array.from(this.subscribers.keys()); // Figure out which modules have been updated and map to updated subscribed id
-              _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-                var moduleId, source, updatedSubscriberId;
-                return _regeneratorRuntime().wrap(function _loop$(_context6) {
-                  while (1) switch (_context6.prev = _context6.next) {
-                    case 0:
-                      moduleId = _arr2[_i3];
-                      source = data.value.modules[moduleId].source;
-                      if (typeof source !== "undefined") {
-                        moduleIds.push(moduleId);
-                        _this3.emitEvent(moduleId, source);
-                        updatedSubscriberId = subscriberIds.find(function (subscriberId) {
-                          return subscriberId.includes(moduleId);
-                        } // NOTE: dependent on
-                        );
-                        if (updatedSubscriberId) {
-                          updatedSubscriberIds.set(updatedSubscriberId, (updatedSubscriberIds.get(updatedSubscriberId) || []).concat(moduleId));
-                        }
-                      }
-                    case 3:
-                    case "end":
-                      return _context6.stop();
-                  }
-                }, _loop);
-              });
-              _i3 = 0, _arr2 = Object.keys(data.value.modules);
-            case 9:
-              if (!(_i3 < _arr2.length)) {
-                _context7.next = 14;
-                break;
-              }
-              return _context7.delegateYield(_loop(), "t0", 11);
-            case 11:
-              _i3++;
-              _context7.next = 9;
-              break;
-            case 14:
-              // For all updated subscribers: set new module data and emit change
-              for (_i4 = 0, _Array$from2 = Array.from(updatedSubscriberIds.entries()); _i4 < _Array$from2.length; _i4++) {
-                _Array$from2$_i = _slicedToArray(_Array$from2[_i4], 2), updatedSubscriberId = _Array$from2$_i[0], _moduleIds = _Array$from2$_i[1];
-                subscriberModules = Object.fromEntries(_moduleIds.flatMap(function (moduleId) {
-                  var source = data.value.modules[moduleId].source;
-                  if (!source) {
-                    return [];
-                  }
-                  return [[moduleId, source]];
-                }));
-                this.subscribers.set(updatedSubscriberId, subscriberModules);
-                this.emitChange(updatedSubscriberId);
-              }
-              return _context7.abrupt("return", result.ok(moduleIds));
-            case 18:
-              msg = "Failed to fetch content. ";
-              if (data.error.statusCode === 401) {
-                msg += "Authorization failed - check that you are logged in.";
-              } else {
-                msg += "Get a developer to verify that Val is correctly setup.";
-              }
-              return _context7.abrupt("return", result.err({
-                message: msg,
-                details: {
-                  fetchError: data.error
-                }
-              }));
-            case 21:
-            case "end":
-              return _context7.stop();
-          }
-        }, _callee6, this);
-      }));
-      function updateTree(_x5) {
-        return _updateTree.apply(this, arguments);
-      }
-      return updateTree;
-    }()
   }, {
     key: "emitChange",
     value: function emitChange(subscriberId) {
@@ -2427,8 +2323,8 @@ var ValStore = /*#__PURE__*/function () {
   }]);
   return ValStore;
 }();
-function createSubscriberId(moduleIds) {
-  return moduleIds.slice().sort().join("&");
+function createSubscriberId(paths) {
+  return paths.slice().sort().join("&");
 }
 
 export { EXT_TO_MIME_TYPES, MIME_TYPES_TO_EXT, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValStore, filenameToMimeType, getMimeType, mimeTypeToFileExt, parseRichTextSource, remirrorToRichTextSource, richTextToRemirror };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.61.0",
+  "version": "0.62.0",
   "private": false,
   "description": "Val shared types and utilities",
   "scripts": {
@@ -29,7 +29,7 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.61.0",
+    "@valbuild/core": "~0.62.0",
     "marked": "^9.0.3",
     "zod": "^3.22.4"
   },