reslop 0.2.3 → 0.2.5

package/lib/gitlab.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { isPathInScope } = require('./files.js');
+const files = require('./files.js');
+const { isPathInScope } = files;
 const remote = require('./remote.js');
 const { isRecord } = remote;
 const { createClient, listUrl, parseNextPage } = remote;
@@ -160,7 +161,7 @@ const noteToImported = (note, items, paths) => {
 
 const discussionToNotes = (discussions, items, paths = []) => {
   const feedback = [];
-  const todos = [];
+  const tasks = [];
   const threads = discussions ?? [];
   for (const discussion of threads) {
     if (!isRecord(discussion)) continue;
@@ -169,10 +170,10 @@ const discussionToNotes = (discussions, items, paths = []) => {
       const mapped = noteToImported(note, items, paths);
       if (!mapped) continue;
       if (mapped.kind === 'feedback') feedback.push(mapped);
-      else todos.push(mapped);
+      else tasks.push(mapped);
     }
   }
-  return { feedback, todos };
+  return { feedback, tasks };
 };
 
 const loadDiscussion = async (mr, options) => {

package/lib/highlight/bash.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { SQUOTE, emit, wordStyle, readUntilNl } = require('./core.js');
+const core = require('./core.js');
+const { SQUOTE, emit, wordStyle, readUntilNl } = core;
 
 const BASH_QUOTE = `${SQUOTE}\``;
 

package/lib/highlight/core.js

@@ -41,6 +41,16 @@ const emit = (out, style, text) => {
   out.push({ text, style: style || 'plain' });
 };
 
+const highlightLines = (highlightLine) => (source) => {
+  const lines = source.split('\n');
+  const out = [];
+  for (let i = 0; i < lines.length; i += 1) {
+    if (i) emit(out, 'plain', '\n');
+    for (const t of highlightLine(lines[i])) out.push(t);
+  }
+  return out;
+};
+
 const tokensText = (out) => {
   let s = '';
   for (const t of out) s += t.text;
@@ -177,6 +187,7 @@ module.exports = {
   ANY_QUOTE,
   EXPECT_STYLE,
   emit,
+  highlightLines,
   tokensText,
   wordStyle,
   peekIdent,

package/lib/highlight/css.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { QUOTES, emit, readBlockComment, readString } = require('./core.js');
+const core = require('./core.js');
+const { QUOTES, emit, readBlockComment, readString } = core;
 
 const CSS_NEXT_STYLE = {
   ':': 'property',

package/lib/highlight/csv.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { emit } = require('./core.js');
+const core = require('./core.js');
+const { emit } = core;
 
 const splitCsv = (line) => {
   const cells = [];

package/lib/highlight/dot.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { emit } = require('./core.js');
+const core = require('./core.js');
+const { emit, highlightLines } = core;
 
 const highlightDotLine = (line) => {
   if (!line) return [];
@@ -29,16 +30,6 @@ const highlightDotLine = (line) => {
   return out;
 };
 
-const highlight = (source) => {
-  const lines = source.split('\n');
-  const out = [];
-  for (let i = 0; i < lines.length; i += 1) {
-    if (i) emit(out, 'plain', '\n');
-    for (const t of highlightDotLine(lines[i])) out.push(t);
-  }
-  return out;
-};
-
 module.exports = {
   langs: ['dot'],
   aliases: {
@@ -50,5 +41,5 @@ module.exports = {
     yml: 'dot',
     toml: 'dot',
   },
-  highlight,
+  highlight: highlightLines(highlightDotLine),
 };

package/lib/highlight/html.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { SQUOTE, emit, skipQuoted } = require('./core.js');
+const core = require('./core.js');
+const { SQUOTE, emit, skipQuoted } = core;
 
 const colorHtmlTag = (tag) => {
   const out = [];

package/lib/highlight/json.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { emit, readString } = require('./core.js');
+const core = require('./core.js');
+const { emit, readString } = core;
 
 const JSON_LITERAL = {
   true: 'literal',

package/lib/highlight/log.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { emit } = require('./core.js');
+const core = require('./core.js');
+const { emit, highlightLines } = core;
 
 const LOG_DATETIME_RE = new RegExp(
   '^(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}' +
@@ -45,14 +46,7 @@ const highlightLogLine = (line) => {
   return out;
 };
 
-const highlight = (source) => {
-  const lines = source.split('\n');
-  const out = [];
-  for (let i = 0; i < lines.length; i += 1) {
-    if (i) emit(out, 'plain', '\n');
-    for (const t of highlightLogLine(lines[i])) out.push(t);
-  }
-  return out;
+module.exports = {
+  langs: ['log'],
+  highlight: highlightLines(highlightLogLine),
 };
-
-module.exports = { langs: ['log'], highlight };

package/lib/highlight/txt.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { emit } = require('./core.js');
+const core = require('./core.js');
+const { emit, highlightLines } = core;
 
 const highlightTxtLine = (line) => {
   if (!line) return [];
@@ -19,18 +20,8 @@ const highlightTxtLine = (line) => {
   return out;
 };
 
-const highlight = (source) => {
-  const lines = source.split('\n');
-  const out = [];
-  for (let i = 0; i < lines.length; i += 1) {
-    if (i) emit(out, 'plain', '\n');
-    for (const t of highlightTxtLine(lines[i])) out.push(t);
-  }
-  return out;
-};
-
 module.exports = {
   langs: ['txt', 'py', 'md'],
   aliases: { text: 'txt', plain: 'txt', markdown: 'md', python: 'py' },
-  highlight,
+  highlight: highlightLines(highlightTxtLine),
 };

package/lib/highlight.js

@@ -3,7 +3,8 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const { tokensText } = require('./highlight/core.js');
+const core = require('./highlight/core.js');
+const { tokensText } = core;
 
 const PLUGIN_DIR = path.join(__dirname, 'highlight');
 const SKIP = ['core.js'];

package/lib/keys.js

@@ -4,8 +4,8 @@ const actions = require('./session/actions.js');
 
 const { ACTIONS, ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS } = actions;
 const { DIFF_DISABLED, FILES_DISABLED, FILES_GIT_DISABLED } = actions;
-const { FILES_HIDDEN, FILES_TODO_DISABLED, TODO_DISABLED, BRANCHES_DISABLED } =
-  actions;
+const { FILES_HIDDEN, FILES_TASKS_DISABLED } = actions;
+const { TASKS_DISABLED, BRANCHES_DISABLED } = actions;
 const { COMMITS_DISABLED, UNIT_DISABLED, NPM_DISABLED } = actions;
 const { disabledActions, diffGitDisabled, branchGitDisabled } = actions;
 const { commitGitDisabled } = actions;
@@ -65,21 +65,31 @@ const parseCsiSeq = (rest) => {
   return { params: body.slice(0, i), final: body[i], eat: 2 + i + 1 };
 };
 
-const ctrlHeld = (modText) => {
+const modifierBits = (modText) => {
   const mod = parseInt(modText, 10);
-  return Number.isFinite(mod) && ((mod - 1) & 4) !== 0;
+  if (!Number.isFinite(mod)) return 0;
+  return mod - 1;
+};
+
+const modifiedKey = (base, bits) => {
+  const arrow =
+    base === 'left' || base === 'right' || base === 'up' || base === 'down';
+  const end = base === 'home' || base === 'end';
+  if (!arrow && !end) return base;
+  const ctrl = (bits & 4) !== 0;
+  const shift = (bits & 1) !== 0;
+  if (ctrl && shift && arrow) return `ctrl-shift-${base}`;
+  if (ctrl && arrow) return `ctrl-${base}`;
+  if (shift) return `shift-${base}`;
+  return base;
 };
 
 const keyFromCsi = (paramsText, final) => {
   const params = paramsText ? paramsText.split(';') : [];
-  if (final === '~') return CSI_TILDE[params[0]] ?? null;
-  const base = CSI_KEYS[final];
+  const base = final === '~' ? CSI_TILDE[params[0]] : CSI_KEYS[final];
   if (!base) return null;
   if (params.length < 2) return base;
-  const arrow =
-    base === 'left' || base === 'right' || base === 'up' || base === 'down';
-  if (ctrlHeld(params[1]) && arrow) return `ctrl-${base}`;
-  return base;
+  return modifiedKey(base, modifierBits(params[1]));
 };
 
 const mouseKindFromButton = (button, press) => {
@@ -194,8 +204,8 @@ module.exports = {
   FILES_DISABLED,
   FILES_HIDDEN,
   FILES_GIT_DISABLED,
-  FILES_TODO_DISABLED,
-  TODO_DISABLED,
+  FILES_TASKS_DISABLED,
+  TASKS_DISABLED,
   BRANCHES_DISABLED,
   COMMITS_DISABLED,
   NPM_DISABLED,

package/lib/manifest.js

@@ -1,8 +1,10 @@
 'use strict';
 
 const path = require('node:path');
-const { isHashObject, jsonParse } = require('metautil');
-const { parseVersion, cmpVersion } = require('./utilities.js');
+const metautil = require('metautil');
+const { isHashObject, jsonParse } = metautil;
+const utilities = require('./utilities.js');
+const { parseVersion, cmpVersion } = utilities;
 
 const MANIFEST = 'package.json';
 const LOCKFILE = 'package-lock.json';
@@ -308,9 +310,7 @@ const proposedWanted = (out, vul) => {
 module.exports = {
   MANIFEST,
   LOCKFILE,
-  DEP_KIND,
   SECTION_KEYS,
-  posixRel,
   depFileMeta,
   relOf,
   listFilePath,
@@ -319,8 +319,6 @@ module.exports = {
   lockRootSections,
   lockEntries,
   lockPackageCount,
-  cloneJson,
-  stringifyJson,
   mergeDepFile,
   applyWantedRange,
   findDeclared,

package/lib/npm-commands.js

@@ -2,10 +2,14 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
-const { spawn } = require('node:child_process');
-const { jsonParse } = require('metautil');
-const { stripAnsi, visibleWidth } = require('./ansi.js');
-const { npmBin, npmOpts, spawnBase } = require('./utilities.js');
+const childProcess = require('node:child_process');
+const { spawn } = childProcess;
+const metautil = require('metautil');
+const { jsonParse } = metautil;
+const ansi = require('./ansi.js');
+const { stripAnsi, visibleWidth } = ansi;
+const utilities = require('./utilities.js');
+const { npmBin, npmOpts, spawnBase, unquote, dateStamp } = utilities;
 
 const MANIFEST = 'package.json';
 const SECTIONS = ['dependencies', 'devDependencies', 'optionalDependencies'];
@@ -124,17 +128,6 @@ const withoutNodeFrame = (line) => {
   return null;
 };
 
-const unquote = (value) => {
-  const text = `${value ?? ''}`;
-  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;
-  return text.slice(1, -1);
-};
-
 const objectEnd = (lines, start) => {
   if (stripAnsi(lines[start]).trim() !== '{') return -1;
   for (let i = start + 1; i < lines.length; i++) {
@@ -280,14 +273,79 @@ const logFileName = (command, date, index) => {
   return `${date}-${safe}-${n}.log`;
 };
 
-const dateStamp = (now) => {
-  const y = now.getFullYear();
-  const m = `${now.getMonth() + 1}`.padStart(2, '0');
-  const d = `${now.getDate()}`.padStart(2, '0');
-  return `${y}-${m}-${d}`;
+const LOG_DIR = '.log';
+const LOG_STALE_DAYS = 5;
+const DAY_MS = 24 * 60 * 60 * 1000;
+const LOG_DATE = /^(\d{4})-(\d{2})-(\d{2})-/;
+
+const logDay = (name) => {
+  const match = LOG_DATE.exec(name);
+  if (!match) return null;
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  if (month < 1 || month > 12 || day < 1 || day > 31) return null;
+  return Date.UTC(year, month - 1, day) / DAY_MS;
 };
 
-const LOG_DIR = '.log';
+const todayIndex = (now) =>
+  Date.UTC(now.getFullYear(), now.getMonth(), now.getDate()) / DAY_MS;
+
+const isStaleLog = (name, now) => {
+  const day = logDay(name);
+  if (day === null) return false;
+  return todayIndex(now) - day > LOG_STALE_DAYS;
+};
+
+const readLogNames = (dir) => {
+  try {
+    return fs.readdirSync(dir);
+  } catch (error) {
+    if (error.code === 'ENOENT') return [];
+    throw error;
+  }
+};
+
+const staleLogFiles = (root, now = new Date()) => {
+  const dir = path.join(root, LOG_DIR);
+  const names = readLogNames(dir);
+  const files = [];
+  let bytes = 0;
+  for (const name of names) {
+    if (!name.endsWith('.log') || !isStaleLog(name, now)) continue;
+    const full = path.join(dir, name);
+    let stat;
+    try {
+      stat = fs.statSync(full);
+    } catch (error) {
+      if (error.code === 'ENOENT') continue;
+      throw error;
+    }
+    if (!stat.isFile()) continue;
+    bytes += stat.size;
+    files.push(full);
+  }
+  return { bytes, files };
+};
+
+const removeStaleLogs = (root, now = new Date()) => {
+  const found = staleLogFiles(root, now);
+  for (const full of found.files) fs.rmSync(full, { force: true });
+  return found.bytes;
+};
+
+const scaled = (value) => {
+  if (value >= 10) return `${Math.round(value)}`;
+  return `${Math.round(value * 10) / 10}`;
+};
+
+const formatSize = (bytes) => {
+  const size = bytes > 0 ? bytes : 0;
+  if (size < 1024) return `${size}b`;
+  const kb = size / 1024;
+  if (kb < 1024) return `${scaled(kb)}k`;
+  return `${scaled(kb / 1024)}m`;
+};
 
 const nextLogFile = (root, command, now = new Date()) => {
   const date = dateStamp(now);
@@ -327,8 +385,6 @@ const parseScriptLine = (text) => {
   return { name, command };
 };
 
-const scriptLine = (entry) => `${entry.name}: ${entry.command}`;
-
 const orderedScripts = (pkg) => {
   const scripts = pkg.scripts;
   if (!scripts || typeof scripts !== 'object' || Array.isArray(scripts)) {
@@ -497,8 +553,10 @@ module.exports = {
   reduceOutput,
   logFileName,
   writeLog,
+  staleLogFiles,
+  removeStaleLogs,
+  formatSize,
   parseScriptLine,
-  scriptLine,
   saveScript,
   removeScript,
   reorderScript,

package/lib/remote.js

@@ -1,10 +1,15 @@
 'use strict';
 
-const { delay, jsonParse, isHashObject } = require('metautil');
-const { oneLine } = require('./utilities.js');
-const { itemPath, isPathInScope } = require('./files.js');
-const { parseDiff, itemsFromFiles, isCtxType } = require('./diff/diff.js');
-const { foldDepItems } = require('./deps.js');
+const metautil = require('metautil');
+const { delay, jsonParse, isHashObject } = metautil;
+const utilities = require('./utilities.js');
+const { oneLine } = utilities;
+const files = require('./files.js');
+const { itemPath, isPathInScope } = files;
+const diff = require('./diff/diff.js');
+const { parseDiff, itemsFromFiles, isCtxType } = diff;
+const deps = require('./deps.js');
+const { foldDepItems } = deps;
 
 const RETRY_ATTEMPTS = 3;
 const RETRY_DELAY_MS = 200;
@@ -323,13 +328,15 @@ const changeFiles = (items) => {
 
 const loadChange = async (ref, options, source) => {
   const { client, url, diffUrl = url, diffAccept } = source;
-  const paths = options.paths ?? [];
-  const request = {
-    fetch: options.fetch ?? globalThis.fetch,
-    token: options.token ?? '',
-    retry: options.retry ?? {},
-    signal: options.signal,
-  };
+  const {
+    cwd,
+    paths = [],
+    fetch = globalThis.fetch,
+    token = '',
+    retry = {},
+    signal,
+  } = options;
+  const request = { fetch, token, retry, signal };
   const jsonPage = await client.request(url, request);
   const data = client.parseJson(jsonPage.body, `${client.subject} payload`);
   const diffPage = await client.request(diffUrl, {
@@ -340,7 +347,7 @@ const loadChange = async (ref, options, source) => {
   const items = foldDepItems(itemsFromFiles(files, 'pr'));
   const change = source.toChange(ref, data, items);
   const sourceLabel = `${source.prefix}${change.number}`;
-  let imported = { feedback: [], todos: [] };
+  let imported = { feedback: [], tasks: [] };
   try {
     const discussion = await source.loadDiscussion(ref, request);
     imported = source.discussionToNotes(discussion, items, paths);
@@ -348,26 +355,20 @@ const loadChange = async (ref, options, source) => {
     if (isAbortError(error, request.signal)) throw error;
     // Discussion import is optional.
   }
-  return { top: options.cwd, items, sourceLabel, change, imported };
+  return { top: cwd, items, sourceLabel, change, imported };
 };
 
 module.exports = {
-  RETRY_ATTEMPTS,
-  RETRY_DELAY_MS,
-  TRANSIENT_STATUS,
   isRecord,
   isAbortError,
   createTransport,
-  headerValue,
   parseLinkNext,
   parseNextPage,
   createClient,
   listUrl,
-  findItemForLine,
   importedText,
   importedTodo,
   noteFromLocation,
-  changePath,
   filterChangeFiles,
   changeFiles,
   loadChange,

package/lib/render/branches.js

@@ -1,11 +1,13 @@
 'use strict';
 
 const ansi = require('../ansi.js');
+const files = require('../files.js');
 const primitives = require('./primitives.js');
+const { shortAge } = files;
 const { measureColumns, padColumns, joinColumns, paintColumns } = primitives;
 
 const { THEME, paint, visibleWidth, truncateVisible, seq, EL } = ansi;
-const { FILE_MARK, paneResult } = primitives;
+const { FILE_MARK } = primitives;
 const { paintCursorList, paintListEdit } = primitives;
 const { branchLabel } = primitives;
 
@@ -61,7 +63,7 @@ const branchRowFg = (entry, selected) => {
 
 const branchRowFields = (entry) => {
   const sha = entry.sha ?? '';
-  const date = entry.date ?? '';
+  const date = shortAge(entry.date ?? '');
   const gone = entry.gone ? 'gone' : '';
   const ahead = entry.ahead ? `⇡${entry.ahead}` : '';
   const behind = entry.behind ? `⇣${entry.behind}` : '';
@@ -110,9 +112,6 @@ const paintBranchRow = (entry, width, color, selected, cols) => {
   return out;
 };
 
-const paintBranchEdit = (compose, width, color) =>
-  paintListEdit(compose, width, color);
-
 const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
   const branches = view.branches ?? [];
   const cols = measureColumns(branches, branchRowFields, BRANCH_COL_ALIGN);
@@ -124,28 +123,11 @@ const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
   const cursor = view.branchCursor ?? 0;
   const compose = view.compose;
   const editing = compose && compose.kind === 'branch';
-  const tail = editing ? paintBranchEdit(compose, width, color) : null;
-  const paintRow = (entry, rowWidth, rowColor, selected) =>
-    paintBranchRow(entry, rowWidth, rowColor, selected, cols);
-  const painted = paintCursorList(
-    branches,
-    cursor,
-    width,
-    color,
-    bodyH,
-    headerLines,
-    paintRow,
-    tail,
-    view.listScroll,
-  );
-  return paneResult({
-    body: painted.body,
-    fileHits: painted.fileHits,
-    todoOwners: [],
-    cursor: painted.cursor,
-    splitBody: false,
-    listScroll: painted.offset,
-  });
+  const tail = editing ? paintListEdit(compose, width, color) : null;
+  const pane = { width, color, bodyH, headerLines, offset: view.listScroll };
+  const paintRow = (entry, selected) =>
+    paintBranchRow(entry, width, color, selected, cols);
+  return paintCursorList(branches, cursor, pane, paintRow, tail);
 };
 
 module.exports = { paintBodyBranches };