Changeset: Move changeset logic to a new Changeset class

ether · Nov 22, 2021 · 410d02e · 410d02e
1 parent a5ba53f
commit 410d02e
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 125 deletions.
diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
@@ -582,11 +582,10 @@ const handleUserChanges = async (socket, message) => {
     const wireApool = (new AttributePool()).fromJsonable(apool);
     const pad = await padManager.getPad(thisSession.padId);
 
-    // Verify that the changeset has valid syntax and is in canonical form
-    Changeset.checkRep(changeset);
+    const cs = Changeset.unpack(changeset).validate();
 
     // Validate all added 'author' attribs to be the same value as the current user
-    for (const op of Changeset.deserializeOps(Changeset.unpack(changeset).ops)) {
+    for (const op of Changeset.deserializeOps(cs.ops)) {
       // + can add text with attribs
       // = can change or add attribs
       // - can have attribs, but they are discarded and don't show up in the attribs -

diff --git a/src/node/utils/padDiff.js b/src/node/utils/padDiff.js
@@ -438,7 +438,7 @@ PadDiff.prototype._createDeletionChangeset = function (cs, startAText, apool) {
     }
   }
 
-  return Changeset.checkRep(builder.toString());
+  return builder.build().validate().toString();
 };
 
 // export the constructor
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       }
-      return Changeset.checkRep(builder.toString());
+      return builder.build().validate().toString();
     };
     // export the constructor
@@ Expand Down @@