reslop 0.2.4 → 0.2.5

package/lib/render/primitives.js

@@ -5,10 +5,11 @@ const actions = require('../session/actions.js');
 const { LIST_PANES } = actions;
 
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL, RESET } = ansi;
+const { graphemes, graphemeWidth } = ansi;
 
 const GUTTER_W = 2;
 const FILE_MARK = '▶';
-const FILE_LIST_PAD = 1;
+const LIST_PAD = 1;
 const CHECK_DONE = 'xX';
 const CHECK_TOKEN = /\[([ xX])\]/;
 const CHECK_LEAD = /^\[[ xX]\] /;
@@ -122,61 +123,107 @@ const extraIdx = (extraRow, cursor, count) => {
 const paneResult = (fields = {}) => ({
   body: fields.body ?? [],
   fileHits: fields.fileHits ?? [],
-  todoOwners: fields.todoOwners ?? [],
-  todoChecks: fields.todoChecks ?? [],
+  taskOwners: fields.taskOwners ?? [],
+  taskChecks: fields.taskChecks ?? [],
   cursor: fields.cursor ?? null,
   splitBody: fields.splitBody === true,
   listScroll: fields.listScroll ?? 0,
+  editHits: fields.editHits ?? [],
 });
 
-const paintCursorList = (
-  items,
-  cursor,
-  width,
-  color,
-  bodyH,
-  headerLines,
-  paintRow,
-  extraRow,
-  offset = 0,
-) => {
-  const pad = bodyH >= FILE_LIST_PAD * 2 + 1 ? FILE_LIST_PAD : 0;
+const NO_EDITS = [];
+
+const listLine = (row, index, cursor = null, edits = NO_EDITS) => {
+  const hit = index >= 0;
+  return { row, index, hit, cursor, edits };
+};
+
+const rowCursor = (cursor, row) => {
+  const out = { x: cursor.x, row };
+  if (typeof cursor.scroll === 'number') out.scroll = cursor.scroll;
+  return out;
+};
+
+const paintListWindow = (count, focus, pane, lineAt) => {
+  const { width, color, bodyH, headerLines, offset } = pane;
+  const pad = bodyH >= LIST_PAD * 2 + 1 ? LIST_PAD : 0;
   const listH = bodyH - pad * 2;
-  const inserting = extraRow && extraRow.at === 'start';
-  const extra = extraRow && extraRow.at !== 'replace' ? 1 : 0;
-  const count = items.length + extra;
-  const extraAt = extraIdx(extraRow, cursor, items.length);
-  const focus = extraRow ? extraAt : cursor;
   const start = listWindowStart(focus, offset, listH, count);
   const blank = paintBodyFill(width, color, 'files');
   const body = [];
   const fileHits = [];
-  let textCursor = null;
+  const editHits = [];
+  let cursor = null;
   if (pad) body.push(blank);
   for (let i = 0; i < listH; i++) {
-    const idx = start + i;
-    if (extraRow && idx === extraAt) {
-      body.push(extraRow.row);
-      if (extraRow.cursor) {
-        textCursor = { x: extraRow.cursor.x, row: body.length - 1 };
-      }
-      continue;
+    const line = lineAt(start + i);
+    if (!line) break;
+    const row = body.push(line.row) - 1;
+    if (line.cursor) cursor = rowCursor(line.cursor, row);
+    for (const edit of line.edits) editHits.push({ ...edit, row });
+    if (line.hit) {
+      fileHits.push({ y: headerLines + pad + i + 1, cursor: line.index });
     }
-    const itemIdx = inserting ? idx - 1 : idx;
-    const entry = items[itemIdx];
-    if (!entry) break;
-    const selected = extraRow ? false : itemIdx === cursor;
-    body.push(paintRow(entry, width, color, selected));
-    const y = headerLines + pad + i + 1;
-    fileHits.push({ y, cursor: itemIdx });
   }
   if (pad) body.push(blank);
-  return paneResult({
-    body,
-    fileHits,
-    cursor: textCursor,
-    listScroll: start,
-  });
+  return paneResult({ body, fileHits, editHits, cursor, listScroll: start });
+};
+
+const editLine = (extraRow) => {
+  const { row, cursor, edit, edits = [] } = extraRow;
+  return listLine(row, -1, cursor, edit ? [...edits, edit] : edits);
+};
+
+const paintCursorList = (items, cursor, pane, paintRow, extraRow = null) => {
+  const edit = extraRow ? editLine(extraRow) : null;
+  const inserting = edit !== null && extraRow.at === 'start';
+  const extra = edit && extraRow.at !== 'replace' ? 1 : 0;
+  const extraAt = extraIdx(extraRow, cursor, items.length);
+  const lineAt = (idx) => {
+    if (edit && idx === extraAt) return edit;
+    const index = inserting ? idx - 1 : idx;
+    const entry = items[index];
+    if (!entry) return null;
+    return listLine(paintRow(entry, !edit && index === cursor), index);
+  };
+  const focus = edit ? extraAt : cursor;
+  return paintListWindow(items.length + extra, focus, pane, lineAt);
+};
+
+const sliceVisible = (text, skip, width) => {
+  if (width <= 0) return '';
+  const parts = graphemes(`${text ?? ''}`);
+  let used = 0;
+  let i = 0;
+  const drop = Math.max(0, skip);
+  while (i < parts.length) {
+    const w = graphemeWidth(parts[i], used);
+    if (used + w > drop) break;
+    used += w;
+    i += 1;
+  }
+  let out = '';
+  let taken = 0;
+  for (; i < parts.length; i++) {
+    const w = graphemeWidth(parts[i], drop + taken);
+    if (taken + w > width) break;
+    out += parts[i];
+    taken += w;
+  }
+  return out;
+};
+
+const fieldWindow = (text, cursor, scroll, width) => {
+  const raw = `${text ?? ''}`;
+  if (width <= 0) return { text: '', col: 0, scroll: 0 };
+  const at = Math.max(0, Math.min(cursor ?? 0, raw.length));
+  const col = visibleWidth(raw.slice(0, at));
+  let next = scroll ?? 0;
+  if (next < 0) next = 0;
+  if (col < next) next = col;
+  if (col >= next + width) next = col - width + 1;
+  const shown = sliceVisible(raw, next, width);
+  return { text: shown, col: col - next, scroll: next };
 };
 
 const branchLabel = (name) => `${name ?? ''}`.trim();
@@ -187,7 +234,8 @@ const paintListEdit = (compose, width, color, edgeW = 0) => {
   const prefixW = visibleWidth(prefix);
   const rest = Math.max(1, inner - prefixW);
   const text = `${compose.text ?? ''}`.replaceAll('\n', ' ');
-  const clipped = truncateVisible(text, rest);
+  const win = fieldWindow(text, compose.cursor, compose.scrollCol, rest);
+  const clipped = win.text;
   const pad = Math.max(0, rest - visibleWidth(clipped));
   const left = `${prefix}${clipped}${' '.repeat(pad)}`;
   const fgRgb = THEME.chromeFg;
@@ -202,8 +250,21 @@ const paintListEdit = (compose, width, color, edgeW = 0) => {
     row += paint(gap, fgRgb, bgRgb, color);
     row += edge;
   }
-  const col = Math.min(compose.cursor ?? 0, visibleWidth(clipped));
-  return { row, cursor: { x: prefixW + col + 1 } };
+  const flat = text;
+  return {
+    row,
+    cursor: { x: prefixW + win.col + 1, scroll: win.scroll },
+    edit: {
+      x0: 1,
+      textX: prefixW + 1,
+      x1: prefixW + 1 + rest,
+      start: 0,
+      text: flat,
+      limit: flat.length,
+      scroll: win.scroll,
+      live: true,
+    },
+  };
 };
 
 const measureColumns = (entries, rowFields, align) => {
@@ -264,9 +325,11 @@ module.exports = {
   paintSplitRule,
   paintBodyFill,
   windowRows,
-  listWindowStart,
+  listLine,
+  paintListWindow,
   paintCursorList,
   paintListEdit,
+  fieldWindow,
   branchLabel,
   paneResult,
 };

package/lib/render/unit.js

@@ -6,7 +6,8 @@ const primitives = require('./primitives.js');
 const diff = require('./diff.js');
 
 const { paneResult } = primitives;
-const { paintDiffLine, codeCursorInRows, expandSoftRows } = diff;
+const { paintDiffLine, codeCursorInRows, codeEditHits } = diff;
+const { expandSoftRows } = diff;
 const diffLib = require('../diff/diff.js');
 const { sameHunk } = diffLib;
 
@@ -35,9 +36,11 @@ const paintBodyUnit = (view, width, color) => {
   }
   const edit = overlay ? overlay.cursor : null;
   const cursor = codeCursorInRows(source, false, width, edit, scrollCol);
+  const editHits = editing ? codeEditHits(source, false, width, scrollCol) : [];
   return paneResult({
     body,
     cursor,
+    editHits,
   });
 };
 

package/lib/report-parse.js

@@ -84,6 +84,5 @@ const buildDocument = (stdout, stderr, root, exit, hint) => {
 
 module.exports = {
   toolHint,
-  parseReports,
   buildDocument,
 };

package/lib/report-run.js

@@ -160,7 +160,6 @@ const runCapture = async (proc, deps = {}) => {
 };
 
 module.exports = {
-  outputMode,
   winCommand,
   runCapture,
 };

package/lib/report-test.js

@@ -3,6 +3,8 @@
 const model = require('./report-model.js');
 const npmCommands = require('./npm-commands.js');
 const { isPassingTest } = npmCommands;
+const utilities = require('./utilities.js');
+const { unquote } = utilities;
 
 const { summary, problem, report, userTrace } = model;
 
@@ -69,17 +71,6 @@ const problemFromFields = (name, fields, root) => {
   });
 };
 
-const yamlValue = (raw) => {
-  const text = `${raw ?? ''}`.trim();
-  if (text.length < 2) return text;
-  const open = text[0];
-  const close = text[text.length - 1];
-  const code = open.charCodeAt(0);
-  const quoted = open === close && (code === 34 || code === 39);
-  if (quoted) return text.slice(1, -1);
-  return text;
-};
-
 const yamlFields = (lines) => {
   const fields = [];
   let index = 0;
@@ -93,7 +84,7 @@ const yamlFields = (lines) => {
     const value = match[3].trim().replace(/,$/, '');
     const block = value === '|-' || value === '|' || value === '>';
     if (!block) {
-      fields.push([key, yamlValue(value)]);
+      fields.push([key, unquote(value)]);
       index += 1;
       continue;
     }
@@ -124,16 +115,23 @@ const tapName = (line) => {
   return match[1].trim();
 };
 
+const STAT_FIELD = {
+  tests: 'tests',
+  pass: 'passed',
+  fail: 'failed',
+  skipped: 'skipped',
+  skip: 'skipped',
+};
+
+const applyStat = (stats, key, value) => {
+  if (key === 'duration_ms') stats.duration = value;
+  const field = Object.hasOwn(STAT_FIELD, key) ? STAT_FIELD[key] : '';
+  if (field) stats[field] = Number(value);
+};
+
 const applyTapComment = (stats, line) => {
   const match = /^#\s+(\w+)\s+(.+)$/.exec(line.trim());
-  if (!match) return;
-  const key = match[1];
-  const value = match[2].trim();
-  if (key === 'tests') stats.tests = Number(value);
-  if (key === 'pass') stats.passed = Number(value);
-  if (key === 'fail') stats.failed = Number(value);
-  if (key === 'skipped' || key === 'skip') stats.skipped = Number(value);
-  if (key === 'duration_ms') stats.duration = value;
+  if (match) applyStat(stats, match[1], match[2].trim());
 };
 
 const isTapLine = (line) => {
@@ -259,6 +257,8 @@ const jestTrace = (text, file, root) => {
   return userTrace(file, root);
 };
 
+const durationText = (value) => (value === undefined ? '' : `${value}`);
+
 const jestProblem = (item, file, root) => {
   const messages = item.failureMessages || [];
   const text = messages.join('\n');
@@ -270,7 +270,7 @@ const jestProblem = (item, file, root) => {
     trace: jestTrace(text, file, root),
     expected: expected ? expected[1] : '',
     actual: received ? received[1] : '',
-    duration: item.duration === undefined ? '' : `${item.duration}`,
+    duration: durationText(item.duration),
   });
 };
 
@@ -298,29 +298,27 @@ const parseJest = (data, root) => {
   return report('test', { summary: stats, problems });
 };
 
+const PLAYWRIGHT_FAILED = ['failed', 'timedOut'];
+
+const playwrightProblem = (spec, result, root) => {
+  const error = result.error || {};
+  return problem({
+    name: spec.title || '',
+    message: error.message || result.status,
+    trace: userTrace(error.stack || '', root),
+    duration: durationText(result.duration),
+  });
+};
+
 const walkPlaywright = (suite, problems, root) => {
-  const specs = suite.specs || [];
-  for (const spec of specs) {
-    const tests = spec.tests || [];
-    for (const item of tests) {
-      const results = item.results || [];
-      for (const result of results) {
-        const status = result.status;
-        if (status !== 'failed' && status !== 'timedOut') continue;
-        const error = result.error || {};
-        problems.push(
-          problem({
-            name: spec.title || '',
-            message: error.message || status,
-            trace: userTrace(error.stack || '', root),
-            duration: result.duration === undefined ? '' : `${result.duration}`,
-          }),
-        );
-      }
+  for (const spec of suite.specs || []) {
+    const results = (spec.tests || []).flatMap((item) => item.results || []);
+    for (const result of results) {
+      if (!PLAYWRIGHT_FAILED.includes(result.status)) continue;
+      problems.push(playwrightProblem(spec, result, root));
     }
   }
-  const children = suite.suites || [];
-  for (const child of children) walkPlaywright(child, problems, root);
+  for (const child of suite.suites || []) walkPlaywright(child, problems, root);
 };
 
 const parsePlaywright = (data, root) => {
@@ -349,12 +347,7 @@ const specStats = (stats, line) => {
   const match = /^[ℹi]\s+(\w+)\s+(.+)$/.exec(line.trim());
   if (!match) return false;
   const key = match[1];
-  const value = match[2].trim();
-  if (key === 'tests') stats.tests = Number(value);
-  if (key === 'pass') stats.passed = Number(value);
-  if (key === 'fail') stats.failed = Number(value);
-  if (key === 'skipped') stats.skipped = Number(value);
-  if (key === 'duration_ms') stats.duration = value;
+  applyStat(stats, key, match[2].trim());
   return key === 'tests' || key === 'pass' || key === 'fail';
 };
 

package/lib/report-tools.js

@@ -325,13 +325,6 @@ const parseToolText = (text, root) => {
 };
 
 module.exports = {
-  parseEslintJson,
-  parseEslintStylish,
-  parseTsc,
-  parsePrettier,
-  parseAudit,
-  parseOutdated,
-  parseLs,
   parseToolJson,
   parseToolText,
 };

package/lib/review-merge.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const files = require('./files.js');
-const { TODO_FILE } = files;
+const { TASKS_FILE } = files;
 
 const flatText = (text) => `${text ?? ''}`.trim().replace(/\n/g, ' ');
 
@@ -30,7 +30,7 @@ const copyMap = (map) => {
 
 const snapshotSide = (store) => ({
   status: store.status,
-  todos: snapList(store.todos),
+  tasks: snapList(store.tasks),
   feedback: copyMap(store.feedback),
   code: copyMap(store.code),
 });
@@ -68,83 +68,12 @@ const snapText = (snap) => snap.text;
 const flags = (n) => new Array(n).fill(false);
 
 const adoptTodo = (store, snap) => {
-  const id = store.nextTodoId;
-  store.nextTodoId += 1;
-  const file = snap.file || TODO_FILE;
+  const id = store.nextTaskId;
+  store.nextTaskId += 1;
+  const file = snap.file || TASKS_FILE;
   return { id, file, text: snap.text, done: snap.done };
 };
 
-const findMerged = (merged, alias, text) => {
-  const linked = alias.get(text);
-  if (linked) {
-    const at = merged.indexOf(linked);
-    if (at >= 0) return at;
-  }
-  for (let i = 0; i < merged.length; i++) {
-    if (liveText(merged[i]) === text) return i;
-  }
-  return -1;
-};
-
-const insertTheir = (store, merged, theirs, theirKeep, alias) => {
-  for (let i = 0; i < theirs.length; i++) {
-    if (!theirKeep[i]) continue;
-    let at = merged.length;
-    let placed = false;
-    for (let j = i - 1; j >= 0 && !placed; j--) {
-      const prev = findMerged(merged, alias, theirs[j].text);
-      if (prev < 0) continue;
-      at = prev + 1;
-      placed = true;
-    }
-    for (let j = i + 1; j < theirs.length && !placed; j++) {
-      const next = findMerged(merged, alias, theirs[j].text);
-      if (next < 0) continue;
-      at = next;
-      placed = true;
-    }
-    const item = adoptTodo(store, theirs[i]);
-    merged.splice(at, 0, item);
-    alias.set(theirs[i].text, item);
-  }
-  return merged;
-};
-
-const keepOurs = (ours, kept, alias, index, text) => {
-  kept[index] = true;
-  alias.set(text, ours[index]);
-};
-
-const mergeBaseTodo = (
-  base,
-  ours,
-  theirs,
-  used,
-  kept,
-  dropped,
-  theirKeep,
-  alias,
-) => {
-  const text = base.text;
-  const oi = claim(ours, used.ours, text, liveText);
-  const ti = claim(theirs, used.theirs, text, snapText);
-  if (oi >= 0 && ti >= 0) {
-    const done = pickDone(base.done, ours[oi].done === true, theirs[ti].done);
-    ours[oi] = withDone(ours[oi], done);
-    keepOurs(ours, kept, alias, oi, text);
-    return;
-  }
-  if (oi >= 0) {
-    if (ours[oi].done === base.done) {
-      dropped[oi] = true;
-      return;
-    }
-    keepOurs(ours, kept, alias, oi, text);
-    return;
-  }
-  if (ti >= 0 && theirs[ti].done !== base.done) theirKeep[ti] = true;
-};
-
 const replaceTodo = (todo, snap) => ({
   id: todo.id,
   file: todo.file,
@@ -152,68 +81,109 @@ const replaceTodo = (todo, snap) => ({
   done: snap.done,
 });
 
-const fillGaps = (merged, gaps, theirs, theirKeep, alias) => {
-  let filled = 0;
-  for (let i = 0; i < theirs.length && filled < gaps.length; i++) {
-    if (!theirKeep[i]) continue;
-    const gap = gaps[filled];
-    const item = replaceTodo(gap.todo, theirs[i]);
-    merged.splice(gap.at, 0, item);
-    alias.set(theirs[i].text, item);
-    theirKeep[i] = false;
-    filled += 1;
+class TodoMerge {
+  constructor(store, theirs) {
+    this.store = store;
+    this.ours = store.tasks.filter((todo) => liveText(todo));
+    this.theirs = theirs;
+    this.usedOurs = flags(this.ours.length);
+    this.usedTheirs = flags(theirs.length);
+    this.kept = flags(this.ours.length);
+    this.dropped = flags(this.ours.length);
+    this.theirKeep = flags(theirs.length);
+    this.alias = new Map();
+  }
+
+  keepOurs(index, text) {
+    this.kept[index] = true;
+    this.alias.set(text, this.ours[index]);
+  }
+
+  mergeBase(base) {
+    const { ours, theirs } = this;
+    const text = base.text;
+    const oi = claim(ours, this.usedOurs, text, liveText);
+    const ti = claim(theirs, this.usedTheirs, text, snapText);
+    if (oi >= 0 && ti >= 0) {
+      const done = pickDone(base.done, ours[oi].done === true, theirs[ti].done);
+      ours[oi] = withDone(ours[oi], done);
+      this.keepOurs(oi, text);
+    } else if (oi >= 0) {
+      if (ours[oi].done === base.done) this.dropped[oi] = true;
+      else this.keepOurs(oi, text);
+    } else if (ti >= 0 && theirs[ti].done !== base.done) {
+      this.theirKeep[ti] = true;
+    }
   }
-};
 
-const mergeFreshTodo = (ours, theirs, used, kept, alias, index) => {
-  const text = liveText(ours[index]);
-  const ti = claim(theirs, used.theirs, text, snapText);
-  if (ti < 0) {
-    kept[index] = true;
-    return;
+  mergeFresh(index) {
+    const { ours, theirs } = this;
+    const text = liveText(ours[index]);
+    const ti = claim(theirs, this.usedTheirs, text, snapText);
+    if (ti < 0) {
+      this.kept[index] = true;
+      return;
+    }
+    const done = ours[index].done === true || theirs[ti].done === true;
+    ours[index] = withDone(ours[index], done);
+    this.keepOurs(index, text);
   }
-  const done = ours[index].done === true || theirs[ti].done === true;
-  ours[index] = withDone(ours[index], done);
-  keepOurs(ours, kept, alias, index, text);
-};
 
-const mergeTodos = (store, base, theirs) => {
-  const ours = [];
-  for (const todo of store.todos) {
-    if (!liveText(todo)) continue;
-    ours.push(todo);
-  }
-  const used = { ours: flags(ours.length), theirs: flags(theirs.length) };
-  const kept = flags(ours.length);
-  const dropped = flags(ours.length);
-  const theirKeep = flags(theirs.length);
-  const alias = new Map();
-  for (const item of base) {
-    mergeBaseTodo(item, ours, theirs, used, kept, dropped, theirKeep, alias);
+  findMerged(merged, text) {
+    const linked = this.alias.get(text);
+    const at = linked ? merged.indexOf(linked) : -1;
+    if (at >= 0) return at;
+    return merged.findIndex((todo) => liveText(todo) === text);
   }
-  for (let i = 0; i < ours.length; i++) {
-    if (used.ours[i]) continue;
-    mergeFreshTodo(ours, theirs, used, kept, alias, i);
+
+  theirPlace(merged, index) {
+    const { theirs } = this;
+    for (let j = index - 1; j >= 0; j--) {
+      const prev = this.findMerged(merged, theirs[j].text);
+      if (prev >= 0) return prev + 1;
+    }
+    for (let j = index + 1; j < theirs.length; j++) {
+      const next = this.findMerged(merged, theirs[j].text);
+      if (next >= 0) return next;
+    }
+    return merged.length;
   }
-  for (let i = 0; i < theirs.length; i++) {
-    if (!used.theirs[i]) theirKeep[i] = true;
+
+  place(merged, at, index, item) {
+    merged.splice(at, 0, item);
+    this.alias.set(this.theirs[index].text, item);
+    this.theirKeep[index] = false;
   }
-  const merged = [];
-  const gaps = [];
-  let cursor = 0;
-  for (let i = 0; i < ours.length; i++) {
-    if (kept[i]) {
-      merged.push(ours[i]);
-      cursor += 1;
-      continue;
+
+  merge(base) {
+    const { ours, theirs } = this;
+    for (const item of base) this.mergeBase(item);
+    for (let i = 0; i < ours.length; i++) {
+      if (!this.usedOurs[i]) this.mergeFresh(i);
+    }
+    for (let i = 0; i < theirs.length; i++) {
+      if (!this.usedTheirs[i]) this.theirKeep[i] = true;
     }
-    if (!dropped[i]) continue;
-    gaps.push({ at: cursor, todo: ours[i] });
-    cursor += 1;
+    const merged = [];
+    const gaps = [];
+    for (let i = 0; i < ours.length; i++) {
+      const at = merged.length + gaps.length;
+      if (this.kept[i]) merged.push(ours[i]);
+      else if (this.dropped[i]) gaps.push({ at, task: ours[i] });
+    }
+    for (let i = 0; i < theirs.length && gaps.length; i++) {
+      if (!this.theirKeep[i]) continue;
+      const gap = gaps.shift();
+      this.place(merged, gap.at, i, replaceTodo(gap.task, theirs[i]));
+    }
+    for (let i = 0; i < theirs.length; i++) {
+      if (!this.theirKeep[i]) continue;
+      const at = this.theirPlace(merged, i);
+      this.place(merged, at, i, adoptTodo(this.store, theirs[i]));
+    }
+    return merged;
   }
-  fillGaps(merged, gaps, theirs, theirKeep, alias);
-  store.todos = insertTheir(store, merged, theirs, theirKeep, alias);
-};
+}
 
 const sameNote = (left, right) =>
   left.text === right.text && !!left.done === !!right.done;
@@ -257,9 +227,9 @@ const mergeMap = (ours, base, theirs) => {
 
 const mergeReview = (store, disk) => {
   const base = store.baseline;
-  const baseTodos = base ? base.todos : [];
+  const baseTodos = base?.tasks ?? base?.todos ?? [];
   const baseStatus = base ? base.status : store.status;
-  mergeTodos(store, baseTodos, snapList(disk.todos));
+  store.tasks = new TodoMerge(store, snapList(disk.tasks)).merge(baseTodos);
   const feedback = base ? base.feedback : new Map();
   const code = base ? base.code : new Map();
   mergeMap(store.feedback, feedback, disk.feedback);