reslop 0.2.3 → 0.2.4

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 } = core;
 
 const LOG_DATETIME_RE = new RegExp(
   '^(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}' +

package/lib/highlight/txt.js

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

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_TODO_DISABLED } = actions;
+const { TODO_DISABLED, BRANCHES_DISABLED } = actions;
 const { COMMITS_DISABLED, UNIT_DISABLED, NPM_DISABLED } = actions;
 const { disabledActions, diffGitDisabled, branchGitDisabled } = actions;
 const { commitGitDisabled } = actions;

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';

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 } = utilities;
 
 const MANIFEST = 'package.json';
 const SECTIONS = ['dependencies', 'devDependencies', 'optionalDependencies'];
@@ -288,6 +292,78 @@ const dateStamp = (now) => {
 };
 
 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 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);
@@ -497,6 +573,9 @@ module.exports = {
   reduceOutput,
   logFileName,
   writeLog,
+  staleLogFiles,
+  removeStaleLogs,
+  formatSize,
   parseScriptLine,
   scriptLine,
   saveScript,

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, {
@@ -348,7 +355,7 @@ 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 = {

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,10 +123,10 @@ 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 tail = editing ? paintListEdit(compose, width, color) : null;
   const paintRow = (entry, rowWidth, rowColor, selected) =>
     paintBranchRow(entry, rowWidth, rowColor, selected, cols);
-  const painted = paintCursorList(
+  return paintCursorList(
     branches,
     cursor,
     width,
@@ -138,14 +137,6 @@ const paintBodyBranches = (view, width, color, bodyH, headerLines) => {
     tail,
     view.listScroll,
   );
-  return paneResult({
-    body: painted.body,
-    fileHits: painted.fileHits,
-    todoOwners: [],
-    cursor: painted.cursor,
-    splitBody: false,
-    listScroll: painted.offset,
-  });
 };
 
 module.exports = { paintBodyBranches };

package/lib/render/chrome.js

@@ -5,7 +5,7 @@ const keys = require('../keys.js');
 const files = require('../files.js');
 const primitives = require('./primitives.js');
 
-const { itemPath, TODO_FILE, isTodosEntry, fileTotals } = files;
+const { itemPath, REPO_TODOS_LABEL, isTodosEntry, fileTotals } = files;
 const { ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS, actionLetter } = keys;
 const { buttonWord } = keys;
 const { FILES_HIDDEN, FILES_GIT_DISABLED, BRANCHES_DISABLED } = keys;
@@ -152,10 +152,10 @@ const headerScreen = (view) => {
   if (pane === 'files') {
     const files = view.files ?? [];
     const entry = files[view.fileCursor ?? 0];
-    if (isTodosEntry(entry)) return TODO_FILE;
+    if (isTodosEntry(entry)) return REPO_TODOS_LABEL;
     return '';
   }
-  if (view.item && view.item.origin === 'todo') return TODO_FILE;
+  if (view.item && view.item.origin === 'todo') return REPO_TODOS_LABEL;
   return '';
 };
 
@@ -397,7 +397,9 @@ const statusStats = (view) => {
   const fallbackN = counts.staged ?? 0;
   const n = hasGit ? total.staged : fallbackN;
   const m = hasGit ? total.remaining : counted;
-  return joinStatus([statusDelta(total), `${n}/${m}`]);
+  const git = joinStatus([statusDelta(total), `${n}/${m}`]);
+  if (!view.npmLogs) return git;
+  return joinStatus([view.npmLogs, git]);
 };
 
 const statusLayout = (view, status, width) => {
@@ -454,6 +456,7 @@ const paintChoicePrompt = (choices, width, color, prefix = '') => {
 };
 
 const STATUS_MARK = /(\+[0-9]+(?:\/[0-9]+)?|-[0-9]+(?:\/[0-9]+)?)/g;
+const OLD_LOGS = /old logs \S+/;
 
 const paintStatusMark = (token, color) => {
   const bgRgb = THEME.chromeBg;
@@ -467,6 +470,18 @@ const paintStatusLeft = (text, color) => {
   const bgRgb = THEME.chromeBg;
   const muted = THEME.mutedFg;
   if (!color) return text;
+  const found = text.match(OLD_LOGS);
+  if (found) {
+    const at = found.index;
+    const token = found[0];
+    const before = text.slice(0, at);
+    const after = text.slice(at + token.length);
+    return (
+      paintStatusLeft(before, color) +
+      paint(token, THEME.shaFg, bgRgb, color) +
+      paintStatusLeft(after, color)
+    );
+  }
   let out = '';
   let last = 0;
   for (const match of text.matchAll(STATUS_MARK)) {
@@ -621,13 +636,18 @@ const dimFooterActions = (view) => {
   if (pane === 'commits') {
     const entry = selectedCommit(view);
     const staged = (view.counts?.staged ?? 0) > 0;
-    if (!entry) return commitGitDisabled({ canCommit: staged });
-    return commitGitDisabled({ ...entry, canCommit: staged });
+    const unstagedCurrent = !view.rev && !view.revShort;
+    return commitGitDisabled({
+      ...entry,
+      canCommit: staged,
+      unstagedCurrent,
+    });
   }
   if (pane === 'npm' && view.npmView) {
     if (view.npmRunning) return ['npmRerun'];
     return [];
   }
+  if (pane === 'npm' && !view.npmLogs) return ['npmLogs'];
   return [];
 };
 
@@ -641,7 +661,7 @@ const extraFooterActions = (view) => {
   if (pane === 'commits') return Object.keys(COMMIT_ACTIONS);
   if (pane === 'npm') {
     if (view.npmView) return ['npmStop', 'npmRerun'];
-    return ['npmEdit', 'npmNew'];
+    return ['npmEdit', 'npmNew', 'npmDrop', 'npmLogs'];
   }
   return [];
 };