reslop 0.2.3 → 0.2.5

package/lib/session/dispatch.js

@@ -1,15 +1,17 @@
 'use strict';
 
 const compose = require('./compose.js');
-const { listedCommits } = require('./commit.js');
+const commit = require('./commit.js');
+const { hasStagedChanges, listedCommits } = commit;
 const { COMPOSE_LEAVE } = compose;
 const actions = require('./actions.js');
-const { CONFIRM_MODE, disabledActions, actionFromKey, applyConfirm } = actions;
-
-const targetHasStaged = (session) => {
-  if (session.repo.hasStaged) return session.repo.hasStaged(session.top);
-  return session.items.some((item) => item.origin === 'staged');
-};
+const {
+  LIST_PANES,
+  CONFIRM_MODE,
+  disabledActions,
+  actionFromKey,
+  applyConfirm,
+} = actions;
 
 const currentTarget = (ui) => {
   if (ui.pane === 'files') return ui.fileCursorEntry();
@@ -18,9 +20,9 @@ const currentTarget = (ui) => {
   }
   if (ui.pane === 'commits') {
     const entry = listedCommits(ui.commits.commits)[ui.commitCursor];
-    const staged = targetHasStaged(ui);
-    if (!entry) return { canCommit: staged };
-    return { ...entry, canCommit: staged };
+    const staged = hasStagedChanges(ui);
+    const unstagedCurrent = !ui.rev && !ui.revShort;
+    return { ...entry, canCommit: staged, unstagedCurrent };
   }
   return ui.current();
 };
@@ -30,13 +32,14 @@ const createDispatcher = (ui) => {
     add: ui.changeActions.onAdd,
     unstage: ui.changeActions.onUnstage,
     revert: ui.changeActions.onRevert,
+    ignore: ui.changeActions.onIgnore,
     next: ui.filesPane.onNext,
     prev: ui.filesPane.onPrev,
     layout: ui.filesPane.onLayout,
     theme: ui.filesPane.onTheme,
     files: ui.filesPane.onFiles,
     feedback: ui.composer.onFeedback,
-    todo: ui.composer.onTodo,
+    tasks: ui.composer.onTasks,
     code: ui.composer.onCode,
     reload: ui.lifecycle.onReload,
     commit: ui.commits.onCommit,
@@ -62,12 +65,16 @@ const createDispatcher = (ui) => {
     npm: ui.npm.open,
     npmEdit: ui.npm.edit,
     npmNew: ui.npm.create,
+    npmDrop: () => ui.npm.askDrop(),
+    npmLogs: () => ui.npm.askLogs(),
     npmStop: () => ui.npm.closeView(),
+    back: () => ui.filesPane.onEscape(),
+    npmVerbose: () => ui.npm.toggleVerbose(),
     npmRerun: () => ui.npm.rerun(),
-    check: () => ui.composer.toggleFocusedTodo(),
-    removeTodo: () => {
+    check: () => ui.composer.toggleFocusedTask(),
+    removeTask: () => {
       if (ui.pane === 'npm') return void ui.npm.askDrop();
-      ui.composer.removeFocusedTodo();
+      ui.composer.removeFocusedTask();
     },
     quit: () => ui.onQuit(),
     scrollUp: () => ui.filesPane.onScroll(-1),
@@ -88,21 +95,9 @@ const createDispatcher = (ui) => {
       if (result && result.kind === 'error') return;
     }
     const pane = ui.pane;
-    if (pane === 'files') {
-      if (action === 'next') return void ui.filesPane.onFileMove(1);
-      if (action === 'prev') return void ui.filesPane.onFileMove(-1);
-    }
-    if (pane === 'branches') {
-      if (action === 'next') return void ui.gitBranches.onBranchMove(1);
-      if (action === 'prev') return void ui.gitBranches.onBranchMove(-1);
-    }
-    if (pane === 'commits') {
-      if (action === 'next') return void ui.commits.onCommitMove(1);
-      if (action === 'prev') return void ui.commits.onCommitMove(-1);
-    }
-    if (pane === 'npm') {
-      if (action === 'next') return void ui.npm.move(1);
-      if (action === 'prev') return void ui.npm.move(-1);
+    if (LIST_PANES.includes(pane) && (action === 'next' || action === 'prev')) {
+      ui.filesPane.onScroll(action === 'next' ? 1 : -1);
+      return;
     }
     const hidden = disabledActions(pane, currentTarget(ui));
     if (hidden.includes(action)) return;
@@ -122,8 +117,8 @@ const createInput = (ui) => {
       cancel: () => ui.cancelQuit(),
     },
     confirmUpdate: {
-      accept: ui.updater.accept,
-      decline: ui.updater.decline,
+      accept: () => ui.updater.accept(),
+      decline: () => ui.updater.decline(),
     },
     confirmDrop: {
       confirm: () => {
@@ -153,30 +148,42 @@ const createInput = (ui) => {
     applyConfirm(mode, key, confirmations[mode]);
   };
 
+  const npmViewKeys = {
+    escape: () => ui.npm.closeView(),
+    r: () => ui.npm.rerun(),
+    v: () => ui.npm.toggleVerbose(),
+    e: () => {},
+    n: () => {},
+  };
+
+  const npmListKeys = {
+    'ctrl-up': () => ui.npm.reorder(-1),
+    'ctrl-down': () => ui.npm.reorder(1),
+    up: () => ui.npm.move(-1),
+    down: () => ui.npm.move(1),
+  };
+
+  const npmKey = (key) => {
+    if (ui.pane !== 'npm') return null;
+    if (ui.npm.viewing && Object.hasOwn(npmViewKeys, key)) {
+      return npmViewKeys[key];
+    }
+    return Object.hasOwn(npmListKeys, key) ? npmListKeys[key] : null;
+  };
+
   const handleKey = (key) => {
     const mode = ui.mode;
     if (CONFIRM_MODE.includes(mode)) return void confirmChoice(key);
     if (mode === 'compose') {
-      if (key === 'ctrl-c') return void ui.onQuit();
       const command = ui.composer.handleKey(key);
       return void ui.runComposeCommand(command);
     }
-    if (ui.pane === 'npm' && ui.npm.viewing) {
-      if (key === 'escape') return void ui.npm.closeView();
-      if (key === 'r') return void ui.npm.rerun();
-      if (key === 'e' || key === 'n') return;
-    }
-    if (ui.pane === 'npm' && key === 'ctrl-up') return void ui.npm.reorder(-1);
-    if (ui.pane === 'npm' && key === 'ctrl-down') {
-      return void ui.npm.reorder(1);
-    }
-    if (ui.pane === 'npm' && (key === 'up' || key === 'down')) {
-      return void ui.npm.move(key === 'up' ? -1 : 1);
-    }
+    const onNpmKey = npmKey(key);
+    if (onNpmKey) return void onNpmKey();
     if (key === 'escape') return void ui.filesPane.onEscape();
     const toggle = key === 'x' || key === ' ';
-    if (toggle && ui.composer.toggleFocusedTodo()) return;
-    if (ui.composer.typeIntoTodo(key)) return;
+    if (toggle && ui.composer.toggleFocusedTask()) return;
+    if (ui.composer.typeIntoTask(key)) return;
     const action = actionFromKey(key, ui.pane, ui.fileScope);
     if (action) ui.dispatch(action);
   };

package/lib/session/edit-click.js

@@ -0,0 +1,57 @@
+'use strict';
+
+const wrap = require('../wrap.js');
+const diff = require('../render/diff.js');
+
+const { indexAtRow } = wrap;
+const { codeInnerWidth } = diff;
+
+const hitAt = (hits, cell) => {
+  for (const hit of hits) {
+    if (hit.y !== cell.y) continue;
+    const x0 = hit.x0 ?? hit.textX;
+    if (cell.x < x0) continue;
+    if (hit.x1 !== undefined && cell.x >= hit.x1) continue;
+    return hit;
+  }
+  return null;
+};
+
+const offsetOf = (hit, cellX) => {
+  const shown = cellX - hit.textX;
+  const col = Math.max(0, shown) + (hit.scroll || 0);
+  const at = indexAtRow(hit.start || 0, hit.text, col);
+  if (hit.limit !== undefined && at > hit.limit) return hit.limit;
+  return at;
+};
+
+const revealCode = (ui) => {
+  const kind = ui.composeKind;
+  if (kind !== 'code' && kind !== 'file') return;
+  const size = ui.lastSize ?? ui.getSize();
+  ui.editor.reveal(codeInnerWidth(size.width, ui.layout));
+};
+
+const focusField = (ui, hit) => {
+  if (!hit.field || !ui.npm) return true;
+  if (hit.field === ui.npm.editField) return true;
+  return ui.npm.focusField(hit.field);
+};
+
+const placeClick = (ui, cell) => {
+  if (ui.mode !== 'compose' || !ui.editor) return false;
+  const hits = ui.lastFrame && ui.lastFrame.editHits;
+  if (!hits || !hits.length) return false;
+  const hit = hitAt(hits, cell);
+  if (!hit) return false;
+  if (!focusField(ui, hit)) {
+    ui.paint();
+    return true;
+  }
+  ui.editor.place(offsetOf(hit, cell.x));
+  revealCode(ui);
+  ui.paint();
+  return true;
+};
+
+module.exports = { placeClick };

package/lib/session/files-pane.js

@@ -3,14 +3,17 @@
 const ansi = require('../ansi.js');
 const files = require('../files.js');
 const { THEME_NAMES, setTheme, themeName } = ansi;
-const { isTodosEntry, TODO_FILE } = files;
-const { logViewRows } = require('../render/npm.js');
+const { isTasksEntry, TASKS_FILE } = files;
+const npm = require('../render/npm.js');
+const { logViewRows } = npm;
 const unit = require('./unit.js');
+const actions = require('./actions.js');
+const { LIST_PANES } = actions;
 const { setFileScope, openUnitFile, moveUnitBlock } = unit;
 
 const LAYOUTS = ['unified', 'mixed', 'side'];
 
-const current = (ui) => ui.nav.current(ui.items, ui.todoItem);
+const current = (ui) => ui.nav.current(ui.items, ui.tasksItem);
 
 const clampIndex = (ui) => ui.nav.clampIndex(ui.items.length);
 
@@ -29,25 +32,19 @@ const syncFileCursor = (ui) => {
 const showFiles = (ui) => {
   const nav = ui.nav;
   const held =
-    nav.todoOpen === true ||
+    nav.tasksOpen === true ||
     nav.pane === 'branches' ||
     nav.pane === 'commits' ||
     nav.pane === 'npm';
   nav.pane = 'files';
+  nav.resetListScroll('files');
   nav.clearSelection();
   followReviewPath(ui);
-  nav.todoOpen = false;
+  nav.tasksOpen = false;
   if (held) ui.lifecycle.catchUpWatch();
 };
 
 const onEscape = (ui) => {
-  if (
-    ui.nav.pane === 'branches' ||
-    ui.nav.pane === 'commits' ||
-    ui.nav.pane === 'npm'
-  ) {
-    return void showFiles(ui);
-  }
   if (ui.nav.pane === 'files') return void ui.onQuit();
   showFiles(ui);
 };
@@ -58,12 +55,12 @@ const onFiles = (ui) => {
     if (ui.nav.fileScope === 'file') {
       const list = ui.fileList();
       const entry = list[ui.nav.fileCursor];
-      if (entry && !isTodosEntry(entry)) openUnitFile(ui, entry);
+      if (entry && !isTasksEntry(entry)) openUnitFile(ui, entry);
       return;
     }
     ui.nav.pane = 'diff';
     ui.nav.clearSelection();
-    if (ui.nav.reviewPath === TODO_FILE) ui.composer.openTodoPage();
+    if (ui.nav.reviewPath === TASKS_FILE) ui.composer.openTasksPage();
     return;
   }
   showFiles(ui);
@@ -76,18 +73,18 @@ const onOpenFile = (ui) => {
   if (ui.nav.pane === 'commits') return void ui.commits.onShowDiff();
   if (ui.nav.pane === 'npm') return void ui.npm.run();
   if (ui.nav.pane !== 'files') {
-    if (ui.nav.todoOpen) ui.composer.editFocusedTodo();
+    if (ui.nav.tasksOpen) ui.composer.editFocusedTask();
     return;
   }
   const list = ui.fileList();
   const entry = list[ui.nav.fileCursor];
   if (!entry) return;
-  if (isTodosEntry(entry)) {
-    ui.composer.openTodoPage();
+  if (isTasksEntry(entry)) {
+    ui.composer.openTasksPage();
     ui.status = '';
     return;
   }
-  ui.nav.todoOpen = false;
+  ui.nav.tasksOpen = false;
   ui.nav.index = entry.openIndex ?? entry.firstIndex;
   if (ui.nav.fileScope === 'file') {
     return void openUnitFile(ui, entry);
@@ -111,8 +108,8 @@ const onFileMove = (ui, delta) => {
   if (next === ui.nav.fileCursor) return;
   ui.nav.fileCursor = next;
   const entry = list[next];
-  if (isTodosEntry(entry)) {
-    ui.nav.reviewPath = TODO_FILE;
+  if (isTasksEntry(entry)) {
+    ui.nav.reviewPath = TASKS_FILE;
   } else {
     ui.nav.reviewPath = entry.path;
     ui.nav.index = entry.firstIndex;
@@ -137,8 +134,8 @@ const moveRemaining = (ui, step) => {
 
 const onNext = (ui) => {
   if (ui.nav.pane === 'unit') return void moveUnitBlock(ui, 1);
-  if (ui.nav.todoOpen) {
-    ui.composer.closeTodoPage();
+  if (ui.nav.tasksOpen) {
+    ui.composer.closeTasksPage();
     if (ui.items.length) ui.nav.index = 0;
     ui.nav.scroll = 0;
     syncReviewPath(ui);
@@ -150,8 +147,8 @@ const onNext = (ui) => {
 
 const onPrev = (ui) => {
   if (ui.nav.pane === 'unit') return void moveUnitBlock(ui, -1);
-  if (ui.nav.todoOpen) return;
-  if (ui.nav.index <= 0) return void ui.composer.openTodoPage();
+  if (ui.nav.tasksOpen) return;
+  if (ui.nav.index <= 0) return void ui.composer.openTasksPage();
   moveRemaining(ui, -1);
 };
 
@@ -179,8 +176,8 @@ const onScroll = (ui, delta) => {
     return void ui.commits.onCommitMove(delta);
   }
   if (ui.nav.pane === 'npm') return void ui.npm.move(delta);
-  if (ui.nav.todoOpen && ui.composer.todoRowCount() > 1) {
-    return void ui.composer.moveTodoFocus(delta);
+  if (ui.nav.tasksOpen && ui.composer.taskRowCount() > 1) {
+    return void ui.composer.moveTaskFocus(delta);
   }
   const frame = ui.lastFrame;
   const max = frame ? frame.scrollMax : null;
@@ -193,32 +190,15 @@ const onScroll = (ui, delta) => {
 };
 
 const onJump = (ui, toEnd) => {
-  if (ui.nav.pane === 'files') {
-    const list = ui.fileList();
-    if (!list.length) {
-      ui.status = 'nothing to review';
-      return;
-    }
-    const target = toEnd ? list.length - 1 : 0;
-    return void onFileMove(ui, target - ui.nav.fileCursor);
-  }
-  if (ui.nav.pane === 'branches') {
-    const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    return void ui.gitBranches.onBranchMove(delta);
-  }
-  if (ui.nav.pane === 'commits') {
-    const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    return void ui.commits.onCommitMove(delta);
-  }
-  if (ui.nav.pane === 'npm') {
+  if (LIST_PANES.includes(ui.nav.pane)) {
     const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
-    return void ui.npm.move(delta);
+    return void onScroll(ui, delta);
   }
-  if (ui.nav.todoOpen && ui.composer.todoRowCount() > 0) {
-    const last = ui.composer.todoRowCount() - 1;
+  if (ui.nav.tasksOpen && ui.composer.taskRowCount() > 0) {
+    const last = ui.composer.taskRowCount() - 1;
     const target = toEnd ? last : 0;
-    const at = ui.composer.clampedTodoFocus();
-    return void ui.composer.moveTodoFocus(target - at);
+    const at = ui.composer.clampedTaskFocus();
+    return void ui.composer.moveTaskFocus(target - at);
   }
   const frame = ui.lastFrame;
   const max = frame ? frame.scrollMax : 0;
@@ -251,7 +231,6 @@ const createFilesPane = (ui) => ({
   onEscape: () => onEscape(ui),
   onFiles: () => onFiles(ui),
   onOpenFile: () => onOpenFile(ui),
-  onFileMove: (delta) => onFileMove(ui, delta),
   onNext: () => onNext(ui),
   onPrev: () => onPrev(ui),
   scrollStep: (fraction) => scrollStep(ui, fraction),
@@ -264,4 +243,4 @@ const createFilesPane = (ui) => ({
   onDiffScope: () => setFileScope(ui, 'diff'),
 });
 
-module.exports = { LAYOUTS, createFilesPane };
+module.exports = { createFilesPane };

package/lib/session/items.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const { stateView } = require('./accessors.js');
-
 const files = require('../files.js');
-const { itemPath, TODO_FILE, isTodoItem } = files;
-const { feedbackKey } = require('../review.js');
-const { refreshIndexPatches } = require('../diff/diff.js');
+const { itemPath, TASKS_FILE, isTaskItem } = files;
+const review = require('../review.js');
+const { feedbackKey } = review;
+const diff = require('../diff/diff.js');
+const { refreshIndexPatches } = diff;
 
 const depChangeKey = (item) => {
   const change = item.dep && item.dep.change;
@@ -26,7 +26,7 @@ const npmBusyKind = (item) => {
 const blockKey = (item) => {
   if (!item || !item.file) return '';
   const rel = itemPath(item);
-  if (isTodoItem(item)) return `todo:${TODO_FILE}`;
+  if (isTaskItem(item)) return `todo:${TASKS_FILE}`;
   const depId = depChangeKey(item);
   if (depId) return `${rel}:dep:${depId}`;
   if (!item.hunk) {
@@ -41,13 +41,13 @@ const blockKey = (item) => {
 
 const itemKey = (item) => {
   const key = blockKey(item);
-  if (!key || isTodoItem(item)) return key;
+  if (!key || isTaskItem(item)) return key;
   const origin = item.origin ?? '';
   return `${origin}:${key}`;
 };
 
 const blockLinesKey = (item) => {
-  if (!item || !item.file || isTodoItem(item)) return '';
+  if (!item || !item.file || isTaskItem(item)) return '';
   if (!item.hunk) return '';
   const parts = [itemPath(item)];
   for (const line of item.hunk.lines) {
@@ -129,27 +129,25 @@ const alignLoadedItems = (prev, next) => {
   return ordered;
 };
 
-const restoredIndex = (items, item) => {
-  if (!item || !item.file) return -1;
-  const origin = item.origin ?? '';
+const originOf = (item) => item.origin ?? '';
+
+const hunkStart = (item) => (item.hunk ? item.hunk.newStart : 0);
+
+const sameLinesIndex = (items, item) => {
   const lines = blockLinesKey(item);
-  if (lines) {
-    let any = -1;
-    for (let i = 0; i < items.length; i++) {
-      if (blockLinesKey(items[i]) !== lines) continue;
-      if (any < 0) any = i;
-      if ((items[i].origin ?? '') === origin) return i;
-    }
-    if (any >= 0) return any;
-  }
-  const key = itemKey(item);
-  if (key) {
-    const exact = items.findIndex((entry) => itemKey(entry) === key);
-    if (exact >= 0) return exact;
+  if (!lines) return -1;
+  let fallback = -1;
+  for (let i = 0; i < items.length; i++) {
+    if (blockLinesKey(items[i]) !== lines) continue;
+    if (originOf(items[i]) === originOf(item)) return i;
+    if (fallback < 0) fallback = i;
   }
+  return fallback;
+};
+
+const nearestHunkIndex = (items, item) => {
   const rel = itemPath(item);
   if (!rel) return -1;
-  const start = item.hunk ? item.hunk.newStart : 0;
   let fileMatch = -1;
   let best = -1;
   let bestDist = Infinity;
@@ -157,19 +155,27 @@ const restoredIndex = (items, item) => {
     const entry = items[i];
     if (itemPath(entry) !== rel) continue;
     if (fileMatch < 0) fileMatch = i;
-    if ((entry.origin ?? '') !== origin) continue;
-    const at = entry.hunk ? entry.hunk.newStart : 0;
-    const dist = Math.abs(at - start);
+    if (originOf(entry) !== originOf(item)) continue;
+    const dist = Math.abs(hunkStart(entry) - hunkStart(item));
     if (dist >= bestDist) continue;
     bestDist = dist;
     best = i;
   }
-  if (best >= 0) return best;
-  return fileMatch;
+  return best >= 0 ? best : fileMatch;
+};
+
+const restoredIndex = (items, item) => {
+  if (!item || !item.file) return -1;
+  const byLines = sameLinesIndex(items, item);
+  if (byLines >= 0) return byLines;
+  const key = itemKey(item);
+  const exact = key ? items.findIndex((entry) => itemKey(entry) === key) : -1;
+  if (exact >= 0) return exact;
+  return nearestHunkIndex(items, item);
 };
 
 const itemFeedKey = (item) => {
-  if (!item || !item.file || isTodoItem(item)) return '';
+  if (!item || !item.file || isTaskItem(item)) return '';
   const hunk = item.hunk;
   const depId = depChangeKey(item);
   const file = depId ? `${itemPath(item)}#${depId}` : itemPath(item);
@@ -187,88 +193,65 @@ const sameBlock = (left, right) => {
 };
 
 const canEditCode = (item) => {
-  if (!item || isTodoItem(item)) return false;
+  if (!item || isTaskItem(item)) return false;
   if (!item.hunk || !item.file) return false;
   if (item.file.isBinary) return false;
   return true;
 };
 
-const createItemCollection = () => {
-  const state = {
-    items: [],
-    dismissed: new Set(),
-  };
+class ItemCollection {
+  constructor() {
+    this.items = [];
+    this.dismissed = new Set();
+  }
 
-  const reset = () => {
-    state.items = [];
-    state.dismissed = new Set();
-  };
+  reset() {
+    this.items = [];
+    this.dismissed = new Set();
+  }
 
-  const isDismissed = (item) => state.dismissed.has(itemKey(item));
+  isDismissed(item) {
+    return this.dismissed.has(itemKey(item));
+  }
 
-  const replace = (items) => {
-    const aligned = alignLoadedItems(state.items, items);
-    const next = [];
-    for (const item of aligned) {
-      if (isDismissed(item)) continue;
-      next.push(item);
-    }
-    state.items = next;
-    return next;
-  };
+  replace(items) {
+    const aligned = alignLoadedItems(this.items, items);
+    this.items = aligned.filter((item) => !this.isDismissed(item));
+    return this.items;
+  }
 
-  const dismiss = (item) => {
-    state.dismissed.add(itemKey(item));
-  };
+  dismiss(item) {
+    this.dismissed.add(itemKey(item));
+  }
 
-  const clearDismissed = () => {
-    state.dismissed.clear();
-  };
+  clearDismissed() {
+    this.dismissed.clear();
+  }
 
-  const findRestoredIndex = (item) => restoredIndex(state.items, item);
+  findRestoredIndex(item) {
+    return restoredIndex(this.items, item);
+  }
 
-  const keepOrigin = (item, origin) => {
+  keepOrigin(item, origin) {
     const next = { ...item, origin };
-    const { length } = state.items;
-    const replaced = new Array(length);
-    for (let i = 0; i < length; i++) {
-      const entry = state.items[i];
-      replaced[i] = sameBlock(entry, item) ? next : entry;
-    }
+    const replaced = this.items.map((entry) =>
+      sameBlock(entry, item) ? next : entry,
+    );
     if (next.dep) {
-      state.items = replaced;
+      this.items = replaced;
       return;
     }
-    state.items = refreshIndexPatches(replaced, next);
-  };
-
-  return stateView(
-    state,
-    {
-      reset,
-      replace,
-      dismiss,
-      clearDismissed,
-      isDismissed,
-      findRestoredIndex,
-      keepOrigin,
-    },
-    ['items'],
-    ['dismissed'],
-  );
-};
+    this.items = refreshIndexPatches(replaced, next);
+  }
+}
 
 module.exports = {
-  depChangeKey,
   needsReload,
   npmBusyKind,
-  blockKey,
-  itemKey,
   itemFeedKey,
-  blockLinesKey,
   alignLoadedItems,
   restoredIndex,
   sameBlock,
   canEditCode,
-  createItemCollection,
+  ItemCollection,
 };