Changeset: Move stringAssembler() logic to a new class

Author: rhansen

src/static/js/Changeset.js

@@ -717,23 +717,20 @@ exports.stringIterator = (str) => {
 
 /**
  * A custom made StringBuffer
- *
- * @typedef {object} StringAssembler
- * @property {Function} append -
- * @property {Function} toString -
  */
+class StringAssembler {
+  constructor() { this._str = ''; }
+  /**
+   * @param {string} x -
+   */
+  append(x) { this._str += String(x); }
+  toString() { return this._str; }
+}
 
 /**
  * @returns {StringAssembler}
  */
-exports.stringAssembler = () => ({
-  _str: '',
-  /**
-   * @param {string} x -
-   */
-  append(x) { this._str += String(x); },
-  toString() { return this._str; },
-});
+exports.stringAssembler = () => new StringAssembler();
 
 /**
  * Class to iterate and modify texts which have several lines. It is used for applying Changesets on
@@ -1145,7 +1142,7 @@ exports.applyToText = (cs, str) => {
   assert(str.length === unpacked.oldLen, 'mismatched apply: ', str.length, ' / ', unpacked.oldLen);
   const bankIter = exports.stringIterator(unpacked.charBank);
   const strIter = exports.stringIterator(str);
-  const assem = exports.stringAssembler();
+  const assem = new StringAssembler();
   for (const op of new exports.OpIter(unpacked.ops)) {
     switch (op.opcode) {
       case '+':
@@ -1250,7 +1247,7 @@ exports.composeAttributes = (att1, att2, resultIsMutation, pool) => {
     }
     return '';
   });
-  const buf = exports.stringAssembler();
+  const buf = new StringAssembler();
   for (const att of [...atts].sort((a, b) => (a[0] > b[0]) - (a[0] < b[0]))) {
     buf.append('*');
     buf.append(exports.numToString(pool.putAttrib(att)));
@@ -1471,7 +1468,7 @@ exports.compose = (cs1, cs2, pool) => {
   const len3 = unpacked2.newLen;
   const bankIter1 = exports.stringIterator(unpacked1.charBank);
   const bankIter2 = exports.stringIterator(unpacked2.charBank);
-  const bankAssem = exports.stringAssembler();
+  const bankAssem = new StringAssembler();
 
   const newOps = applyZip(unpacked1.ops, unpacked2.ops, (op1, op2) => {
     const op1code = op1.opcode;
@@ -1905,7 +1902,7 @@ exports.Builder = class {
   constructor(oldLen) {
     this._oldLen = oldLen;
     this._ops = [];
-    this._charBank = exports.stringAssembler();
+    this._charBank = new StringAssembler();
   }
 
   /**
@@ -2106,7 +2103,7 @@ exports.inverse = (cs, lines, alines, pool) => {
 
   const nextText = (numChars) => {
     let len = 0;
-    const assem = exports.stringAssembler();
+    const assem = new StringAssembler();
     const firstString = linesGet(curLine).substring(curChar);
     len += firstString.length;
     assem.append(firstString);
@@ -2332,7 +2329,7 @@ const followAttributes = (att1, att2, pool) => {
     return '';
   });
   // we've only removed attributes, so they're already sorted
-  const buf = exports.stringAssembler();
+  const buf = new StringAssembler();
   for (const att of atts) {
     buf.append('*');
     buf.append(exports.numToString(pool.putAttrib(att)));