reslop 0.2.1 → 0.2.4

package/lib/deps.js

@@ -2,8 +2,10 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
-const { jsonParse, isHashObject } = require('metautil');
-const { itemPath } = require('./files.js');
+const metautil = require('metautil');
+const { jsonParse, isHashObject } = metautil;
+const files = require('./files.js');
+const { itemPath } = files;
 const manifest = require('./manifest.js');
 const { MANIFEST, LOCKFILE, SECTION_KEYS, depFileMeta, relOf } = manifest;
 const { listFilePath, readSections, lockEntries, lockPackageCount } = manifest;
@@ -73,6 +75,39 @@ const pkgHasExportEntry = (pkg) => {
   return Object.keys(exported).length > 0;
 };
 
+const isRuntimeFile = (value) => {
+  if (typeof value !== 'string' || !value) return false;
+  return !value.endsWith('.d.ts');
+};
+
+const hasRuntimeExport = (value) => {
+  if (isRuntimeFile(value)) return true;
+  if (Array.isArray(value)) return value.some(hasRuntimeExport);
+  if (!value || typeof value !== 'object') return false;
+  const keys = Object.keys(value);
+  for (const key of keys) {
+    if (key === 'types' || key === 'typings') continue;
+    if (hasRuntimeExport(value[key])) return true;
+  }
+  return false;
+};
+
+const pkgHasBin = (pkg) => {
+  if (!pkg || typeof pkg !== 'object') return false;
+  const bin = pkg.bin;
+  if (typeof bin === 'string') return !!bin;
+  if (!bin || typeof bin !== 'object' || Array.isArray(bin)) return false;
+  return Object.keys(bin).length > 0;
+};
+
+const pkgExportsLibrary = (pkg) => {
+  if (!pkg || typeof pkg !== 'object') return false;
+  if (pkgHasBin(pkg)) return false;
+  if (isRuntimeFile(pkg.main)) return true;
+  if (isRuntimeFile(pkg.module)) return true;
+  return hasRuntimeExport(pkg.exports);
+};
+
 const SKIP_WALK = ['node_modules', '.git', '.review', 'coverage', 'dist'];
 
 const collectUsedFromManifest = (used, rel) => {
@@ -156,8 +191,8 @@ const readDepPkg = (root, pkgDir, name) => {
 
 const depHasExportEntry = (root, pkgDir, name) => {
   const pkg = readDepPkg(root, pkgDir, name);
-  if (!pkg) return true;
-  return pkgHasExportEntry(pkg);
+  if (!pkg) return false;
+  return pkgExportsLibrary(pkg);
 };
 
 const collectExportEntries = (root, pkgDir, names) => {
@@ -180,14 +215,7 @@ const declaredDepNames = (root, pkgDir) => {
     return [];
   }
   const maps = readSections(jsonParse(text));
-  let size = 0;
-  for (const key of SECTION_KEYS) size += maps[key].size;
-  const names = new Array(size);
-  let i = 0;
-  for (const key of SECTION_KEYS) {
-    for (const name of maps[key].keys()) names[i++] = name;
-  }
-  return names;
+  return SECTION_KEYS.flatMap((key) => [...maps[key].keys()]);
 };
 
 const collectExportMeta = (root, extra = {}) => {
@@ -342,16 +370,7 @@ const markChanges = (changes, report, kind) => {
   });
 };
 
-const markAuditChanges = (changes, audit) =>
-  markChanges(changes, audit, 'audit');
-
-const markOutdatedChanges = (changes, outdated) =>
-  markChanges(changes, outdated, 'outdated');
-
-const depExports = (exportEntries, name) => {
-  if (!exportEntries || !exportEntries.has(name)) return true;
-  return exportEntries.get(name) === true;
-};
+const depExports = (exportEntries, name) => exportEntries?.get(name) === true;
 
 const isAddedDep = (change) => {
   if (change.action !== 'added') return false;
@@ -389,23 +408,12 @@ const unusedDeclaredNames = (pkg, used) => {
 };
 
 const markUnusedChanges = (changes, used, pkg, exportEntries) => {
-  if (!pkgHasExportEntry(pkg)) return changes;
-  if (!used || !used.size) return changes;
-  const { length } = changes;
-  const marked = new Array(length);
-  for (let i = 0; i < length; i++) {
-    const change = changes[i];
-    if (!isAddedDep(change) || used.has(change.name)) {
-      marked[i] = change;
-      continue;
-    }
-    if (!depExports(exportEntries, change.name)) {
-      marked[i] = change;
-      continue;
-    }
-    marked[i] = { ...change, unused: true, propose: true };
-  }
-  return marked;
+  if (!pkgHasExportEntry(pkg) || !used?.size) return changes;
+  return changes.map((change) => {
+    if (!isAddedDep(change) || used.has(change.name)) return change;
+    if (!depExports(exportEntries, change.name)) return change;
+    return { ...change, unused: true, propose: true };
+  });
 };
 
 const unusedDeclaredChanges = (pkg, used, exportEntries) => {
@@ -511,18 +519,16 @@ const loadExportEntries = (names, extra = {}, pkgDir) => {
   if (!missing.length) return supplied ?? new Map();
   const found = collectExportEntries(extra.root, dir, missing);
   if (!supplied) return found;
-  const merged = new Map(supplied);
-  for (const name of found.keys()) merged.set(name, found.get(name));
-  return merged;
+  return new Map([...supplied, ...found]);
 };
 
 const groupedSynthetics = (synthetic) => {
   const byPath = new Map();
-  for (const key of synthetic.keys()) {
+  for (const [key, items] of synthetic) {
     const dir = key.slice(key.indexOf('\0') + 1);
     const rel = relOf(dir, MANIFEST);
     const list = byPath.get(rel) ?? [];
-    for (const item of synthetic.get(key)) list.push(item);
+    for (const item of items) list.push(item);
     byPath.set(rel, list);
   }
   return byPath;
@@ -530,12 +536,10 @@ const groupedSynthetics = (synthetic) => {
 
 const spliceAtSlots = (out, synthetic, slot) => {
   const byPath = groupedSynthetics(synthetic);
-  const inserts = new Array(byPath.size);
-  let i = 0;
-  for (const rel of byPath.keys()) {
-    const at = slot.has(rel) ? slot.get(rel) : out.length;
-    inserts[i++] = { at, items: byPath.get(rel) };
-  }
+  const inserts = [...byPath].map(([rel, items]) => ({
+    at: slot.get(rel) ?? out.length,
+    items,
+  }));
   inserts.sort((left, right) => right.at - left.at);
   for (const insert of inserts) {
     out.splice(insert.at, 0, ...insert.items);
@@ -570,8 +574,7 @@ const foldDepItems = (
   const folded = new Set();
   const synthetic = new Map();
   const leftoverNames = new Map();
-  for (const key of groups.keys()) {
-    const group = groups.get(key);
+  for (const [key, group] of groups) {
     const summary = summarizeGroup(group, readSides);
     const unusedNames = unusedChangeNames(summary.changes, usedNames);
     const exportEntries = loadExportEntries(unusedNames, extra, group.dir);
@@ -581,8 +584,8 @@ const foldDepItems = (
       summary.pkg,
       exportEntries,
     );
-    const audited = markAuditChanges(unused, audit);
-    const changes = markOutdatedChanges(audited, outdated);
+    const audited = markChanges(unused, audit, 'audit');
+    const changes = markChanges(audited, outdated, 'outdated');
     const next = { ...summary, changes };
     leftoverNames.set(key, foldedDepNames(next.changes));
     const taken = takeManifestItems(next);

package/lib/detect.js

@@ -1,9 +1,11 @@
 'use strict';
 
 const path = require('node:path');
-const { fileExt } = require('metautil');
+const metautil = require('metautil');
+const { fileExt } = metautil;
 
-const { mapLang } = require('./highlight.js');
+const highlight = require('./highlight.js');
+const { mapLang } = highlight;
 
 const PROSE_BASENAMES = [
   'license',

package/lib/diff/align.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { diffChars, tokenSimilarity } = require('./inline.js');
+const inline = require('./inline.js');
+const { diffChars, tokenSimilarity } = inline;
 
 const PAIR_MIN_SIM = 0.3;
 const PAIR_HEAD_WEIGHT = 0.4;

package/lib/diff/diff.js

@@ -1,8 +1,11 @@
 'use strict';
 
-const { diffChars } = require('./inline.js');
-const { isCtxType, pairIndices, attachInline } = require('./align.js');
-const { parseDiff } = require('./parse.js');
+const inline = require('./inline.js');
+const { diffChars } = inline;
+const align = require('./align.js');
+const { isCtxType, pairIndices, attachInline } = align;
+const parse = require('./parse.js');
+const { parseDiff } = parse;
 const patch = require('./patch.js');
 const { splitHunk, flattenBlock, countSides, formatPatch } = patch;
 const display = require('./display.js');

package/lib/diff/display.js

@@ -2,7 +2,8 @@
 
 const align = require('./align.js');
 const { isCtxType, attachInline, LAYOUT_ALIGN } = align;
-const { flattenBlock } = require('./patch.js');
+const patch = require('./patch.js');
+const { flattenBlock } = patch;
 
 const DISPLAY_CONTEXT = 3;
 

package/lib/diff/inline.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { graphemes } = require('../ansi.js');
+const ansi = require('../ansi.js');
+const { graphemes } = ansi;
 
 const LCS_CELL_LIMIT = 250000;
 const NOISY_TINY_SPANS = 6;

package/lib/diff/patch.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { isCtxType } = require('./align.js');
+const align = require('./align.js');
+const { isCtxType } = align;
 
 const LINE_MARK = {
   add: '+',

package/lib/diff/unit.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { attachInline } = require('./align.js');
-const { listPath } = require('../files.js');
+const align = require('./align.js');
+const { attachInline } = align;
+const files = require('../files.js');
+const { listPath } = files;
 
 const splitEditor = (text) => {
   const lines = `${text}`.split('\n');

package/lib/editor.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { graphemes } = require('./ansi.js');
-const { wrapMove } = require('./wrap.js');
+const ansi = require('./ansi.js');
+const { graphemes, visibleWidth } = ansi;
+const wrap = require('./wrap.js');
+const { wrapMove } = wrap;
 
 const UNDO_CAP = 100;
 
@@ -59,6 +61,7 @@ class Editor {
     this.undo = [];
     this.redo = [];
     this.wantCol = null;
+    this.scrollCol = 0;
   }
 
   snapshot() {
@@ -132,6 +135,19 @@ class Editor {
     return { line, col };
   }
 
+  visibleLineCol() {
+    const { col, line } = this.linePos();
+    const row = this.text.split('\n')[line] ?? '';
+    return visibleWidth(row.slice(0, col));
+  }
+
+  reveal(width) {
+    const col = this.visibleLineCol();
+    const room = Math.max(1, width);
+    if (col < this.scrollCol) this.scrollCol = col;
+    if (col >= this.scrollCol + room) this.scrollCol = col - room + 1;
+  }
+
   moveLine(delta, width) {
     if (width !== undefined) {
       const col = this.wantCol;
@@ -142,8 +158,10 @@ class Editor {
     }
     const rows = this.text.split('\n');
     const { line, col } = this.linePos();
-    const next = line + delta;
-    if (next < 0 || next >= rows.length) return;
+    let next = line + delta;
+    if (next < 0) next = 0;
+    if (next >= rows.length) next = rows.length - 1;
+    if (next === line) return;
     const row = rows[next];
     const c = Math.min(col, row.length);
     let cursor = 0;

package/lib/files.js

@@ -1,11 +1,12 @@
 'use strict';
 
-const { listFilePath } = require('./manifest.js');
+const manifest = require('./manifest.js');
+const { listFilePath } = manifest;
 
 const REVIEW_DIR = '.review';
 const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
 const TODO_FILE = 'TODOs';
-const REPO_TODOS_LABEL = 'Repository TODOs and Issues';
+const REPO_TODOS_LABEL = 'Project Backlog and Issues';
 const TOTAL_LABEL = 'total';
 
 const isPathInScope = (rel, paths) => {
@@ -73,23 +74,47 @@ const lineDelta = ({ hunk, blockId }) => {
   return delta;
 };
 
-const countAgo = (n, unit) => {
-  const label = n === 1 ? unit : `${unit}s`;
-  return `${n} ${label} ago`;
+const AGE_UNIT = {
+  second: 's',
+  minute: 'm',
+  hour: 'h',
+  day: 'd',
+  week: 'w',
+  month: 'mo',
+  year: 'y',
+};
+
+const AGE_AGO = /^(\d+)\s+(second|minute|hour|day|week|month|year)s?\s+ago$/i;
+const AGE_SHORT = /^(\d+)(mo|[smhdwy])(?: ago)?$/i;
+
+const shortUnit = (n, unit) => `${n}${AGE_UNIT[unit]} ago`;
+
+const shortAge = (text) => {
+  const raw = `${text ?? ''}`.trim();
+  if (!raw) return '';
+  if (/^yesterday$/i.test(raw)) return '1d ago';
+  const match = AGE_AGO.exec(raw);
+  if (match) {
+    const unit = AGE_UNIT[match[2].toLowerCase()];
+    if (unit) return `${match[1]}${unit} ago`;
+  }
+  const brief = AGE_SHORT.exec(raw);
+  if (brief) return `${brief[1]}${brief[2].toLowerCase()} ago`;
+  return raw;
 };
 
 const relativeAge = (thenMs, nowMs = Date.now()) => {
   const diff = Math.max(0, Math.round((nowMs - thenMs) / 1000));
-  if (diff < 90) return countAgo(diff, 'second');
+  if (diff < 90) return shortUnit(diff, 'second');
   const minutes = Math.round(diff / 60);
-  if (minutes < 90) return countAgo(minutes, 'minute');
+  if (minutes < 90) return shortUnit(minutes, 'minute');
   const hours = Math.round(minutes / 60);
-  if (hours < 36) return countAgo(hours, 'hour');
+  if (hours < 36) return shortUnit(hours, 'hour');
   const days = Math.round(hours / 24);
-  if (days < 14) return countAgo(days, 'day');
-  if (days < 70) return countAgo(Math.round(days / 7), 'week');
-  if (days < 365) return countAgo(Math.round(days / 30), 'month');
-  return countAgo(Math.round(days / 365), 'year');
+  if (days < 14) return shortUnit(days, 'day');
+  if (days < 70) return shortUnit(Math.round(days / 7), 'week');
+  if (days < 365) return shortUnit(Math.round(days / 30), 'month');
+  return shortUnit(Math.round(days / 365), 'year');
 };
 
 const addLineDelta = (group, origin, delta) => {
@@ -231,4 +256,5 @@ module.exports = {
   fileEntries,
   fileTotals,
   relativeAge,
+  shortAge,
 };