From 7ee2141fe65187b6ee98e7ed2739b674dafc124a Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 1 Dec 2021 16:39:01 -0500
Subject: [PATCH] Pad: Simplify `getInternalRevisionAText`

---
 src/node/db/Pad.js | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index 6feaf34af..e4ce6b0ba 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -7,6 +7,7 @@ const AttributeMap = require('../../static/js/AttributeMap');
 const Changeset = require('../../static/js/Changeset');
 const ChatMessage = require('../../static/js/ChatMessage');
 const AttributePool = require('../../static/js/AttributePool');
+const Stream = require('../utils/Stream');
 const assert = require('assert').strict;
 const db = require('./DB');
 const settings = require('../utils/Settings');
@@ -163,36 +164,14 @@ class Pad {
 
   async getInternalRevisionAText(targetRev) {
     const keyRev = this.getKeyRevisionNumber(targetRev);
-
-    // find out which changesets are needed
-    const neededChangesets = [];
-    for (let curRev = keyRev; curRev < targetRev;) {
-      neededChangesets.push(++curRev);
-    }
-
-    // get all needed data out of the database
-
-    // start to get the atext of the key revision
-    const atextp = this.db.getSub(`pad:${this.id}:revs:${keyRev}`, ['meta', 'atext']);
-
-    // get all needed changesets
-    const changesets = [];
-    await Promise.all(
-        neededChangesets.map((item) => this.getRevisionChangeset(item).then((changeset) => {
-          changesets[item] = changeset;
-        })));
-
-    // we should have the atext by now
-    let atext = await atextp;
-    atext = Changeset.cloneAText(atext);
-
-    // apply all changesets to the key changeset
+    const [keyAText, changesets] = await Promise.all([
+      this.db.getSub(`pad:${this.id}:revs:${keyRev}`, ['meta', 'atext']),
+      Promise.all(
+          Stream.range(keyRev + 1, targetRev + 1).map(this.getRevisionChangeset.bind(this))),
+    ]);
     const apool = this.apool();
-    for (let curRev = keyRev; curRev < targetRev;) {
-      const cs = changesets[++curRev];
-      atext = Changeset.applyToAText(cs, atext, apool);
-    }
-
+    let atext = keyAText;
+    for (const cs of changesets) atext = Changeset.applyToAText(cs, atext, apool);
     return atext;
   }