fix: vis output

Author: alanshaw

test/clock.test.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-unused-vars
 import * as API from '../src/clock/api.js'
 import { advance, EventBlock, vis } from '../src/clock/index.js'
-import { Blockstore, randomCID } from './helpers.js'
+import { Blockstore, randomCID, clockVis } from './helpers.js'
 
 async function randomEventData () {
   return {
@@ -19,7 +19,7 @@ describe('clock', () => {
     await blocks.put(event.cid, event.bytes)
     const head = await advance(blocks, [], event.cid)
 
-    for await (const line of vis(blocks, head)) console.log(line)
+    await clockVis(blocks, head)
     assert.equal(head.length, 1)
     assert.equal(head[0].toString(), event.cid.toString())
   })
@@ -37,7 +37,7 @@ describe('clock', () => {
 
     head = await advance(blocks, head, event.cid)
 
-    for await (const line of vis(blocks, head)) console.log(line)
+    await clockVis(blocks, head)
     assert.equal(head.length, 1)
     assert.equal(head[0].toString(), event.cid.toString())
   })
@@ -59,7 +59,7 @@ describe('clock', () => {
     await blocks.put(event1.cid, event1.bytes)
     head = await advance(blocks, head, event1.cid)
 
-    for await (const line of vis(blocks, head)) console.log(line)
+    await clockVis(blocks, head)
     assert.equal(head.length, 2)
     assert.equal(head[0].toString(), event0.cid.toString())
     assert.equal(head[1].toString(), event1.cid.toString())
@@ -94,7 +94,7 @@ describe('clock', () => {
     await blocks.put(event4.cid, event4.bytes)
     head = await advance(blocks, head, event4.cid)
 
-    for await (const line of vis(blocks, head)) console.log(line)
+    await clockVis(blocks, head)
     assert.equal(head.length, 2)
     assert.equal(head[0].toString(), event3.cid.toString())
     assert.equal(head[1].toString(), event4.cid.toString())
@@ -137,7 +137,7 @@ describe('clock', () => {
     await blocks.put(event5.cid, event5.bytes)
     head = await advance(blocks, head, event5.cid)
 
-    for await (const line of vis(blocks, head)) console.log(line)
+    await clockVis(blocks, head)
     assert.equal(head.length, 1)
     assert.equal(head[0].toString(), event5.cid.toString())
   })
@@ -192,7 +192,7 @@ describe('clock', () => {
     head = await advance(blocks, head, event6.cid)
     assert.equal(count - before, 10)
 
-    for await (const line of vis(blocks, head)) console.log(line)
+    await clockVis(blocks, head)
     assert.equal(head.length, 2)
     assert.equal(head[0].toString(), event5.cid.toString())
     assert.equal(head[1].toString(), event6.cid.toString())
@@ -214,7 +214,7 @@ describe('clock', () => {
 
     head = await advance(blocks, head, event1.cid)
 
-    for await (const line of vis(blocks, head)) console.log(line)
+    await clockVis(blocks, head)
     assert.equal(head.length, 1)
     assert.equal(head[0].toString(), event1.cid.toString())
   })

test/crdt.test.js

@@ -4,7 +4,7 @@ import * as API from '../src/crdt/api.js'
 import { advance, vis } from '../src/clock/index.js'
 import { put, get, root, entries } from '../src/crdt/index.js'
 import * as Batch from '../src/crdt/batch/index.js'
-import { Blockstore, randomCID, randomString } from './helpers.js'
+import { Blockstore, clockVis, randomCID, randomString } from './helpers.js'
 
 describe('CRDT', () => {
   it('put a value to a new clock', async () => {
@@ -315,9 +315,7 @@ class TestPail {
         : ''})`
     /** @type {(e: API.EventBlockView<API.Operation>) => string} */
     const renderNodeLabel = event => `${shortLink(event.cid)}\\n${renderOp(event.value.data)}`
-    for await (const line of vis(this.blocks, this.head, { renderNodeLabel })) {
-      console.log(line)
-    }
+    await clockVis(this.blocks, this.head, { renderNodeLabel })
   }
 
   /** @param {string} key */

test/helpers.js

@@ -5,9 +5,12 @@ import clc from 'cli-color'
 import archy from 'archy'
 // eslint-disable-next-line no-unused-vars
 import * as API from '../src/api.js'
+// eslint-disable-next-line no-unused-vars
+import * as ClockAPI from '../src/clock/api.js'
 import { ShardFetcher, decodeBlock } from '../src/shard.js'
 import { MemoryBlockstore } from '../src/block.js'
 import { entries, get, put } from '../src/index.js'
+import * as Clock from '../src/clock/index.js'
 
 /**
  * @param {number} min
@@ -156,3 +159,18 @@ export async function randomBytes (size) {
   myCrypto.getRandomValues(bytes)
   return bytes
 }
+
+/**
+ * @template T
+ * @param {API.BlockFetcher} blocks Block storage.
+ * @param {ClockAPI.EventLink<T>[]} head
+ * @param {object} [options]
+ * @param {(b: ClockAPI.EventBlockView<T>) => string} [options.renderNodeLabel]
+ */
+export const clockVis = async (blocks, head, options) => {
+  const lines = []
+  for await (const line of Clock.vis(blocks, head, options)) {
+    lines.push(line)
+  }
+  console.log(lines.join('\n'))
+}