reslop 0.2.3 → 0.2.5

package/lib/session/npm.js

@@ -1,10 +1,14 @@
 'use strict';
 
 const commands = require('../npm-commands.js');
-const { logViewRows } = require('../render/npm.js');
+const npm = require('../render/npm.js');
+const { logViewRows } = npm;
 
-const { listCommands, reduceOutput, writeLog, parseScriptLine } = commands;
-const { scriptLine, saveScript, removeScript, reorderScript } = commands;
+const { listCommands, reduceOutput, writeLog } = commands;
+const { staleLogFiles, removeStaleLogs, formatSize } = commands;
+const { saveScript, removeScript, reorderScript } = commands;
+
+const NAME_RE = /^[\w:.-]+$/;
 const { startNpm } = commands;
 
 const selected = (api) => {
@@ -30,14 +34,27 @@ const canEdit = (ui) => {
   return true;
 };
 
+const refreshLogs = (api) => {
+  try {
+    const found = staleLogFiles(api.ui.top);
+    api.state.logBytes = found.bytes;
+  } catch (error) {
+    api.state.logBytes = 0;
+    api.ui.status = error.message;
+  }
+};
+
 const open = (api) => {
   if (api.ui.mode === 'compose') return;
   refresh(api);
+  refreshLogs(api);
   api.state.viewing = false;
   api.state.output = '';
-  api.ui.nav.pane = 'npm';
+  const nav = api.ui.nav;
+  nav.pane = 'npm';
+  nav.resetListScroll('npm');
   api.ui.status = '';
-  api.ui.nav.clearSelection();
+  nav.clearSelection();
 };
 
 const scrollLog = (api, delta) => {
@@ -67,13 +84,22 @@ const move = (api, delta) => {
 const stopRun = (api) => {
   api.state.running = false;
   api.state.child = null;
-  if (api.ui.progress) api.ui.progress.stop('npm');
+  api.ui.progress.stop('npm');
+};
+
+const shownOutput = (api, raw, status) => {
+  if (!api.state.verbose) return reduceOutput(raw, api.ui.top, status);
+  const text = `${raw ?? ''}`;
+  if (!text) return '';
+  if (text.endsWith('\n')) return text;
+  return `${text}\n`;
 };
 
 const showOutput = (api, text) => {
   if (!api.state.viewing || !api.state.running) return;
   if (api.state.stopping) return;
-  api.state.output = text;
+  api.state.raw = text;
+  api.state.output = shownOutput(api, text, '');
   api.ui.paint();
 };
 
@@ -87,10 +113,13 @@ const withNotice = (text, notice) => {
 
 const finishRun = (api, entry, result) => {
   const stopped = api.state.stopping === true;
+  const raw = stopped ? withNotice(api.state.raw, 'terminated') : result.text;
   const reduced = stopped
-    ? withNotice(api.state.output, 'terminated')
+    ? withNotice(reduceOutput(api.state.raw, api.ui.top, ''), 'terminated')
     : reduceOutput(result.text, api.ui.top, result.status);
-  api.state.output = reduced;
+  api.state.raw = raw;
+  api.state.exitStatus = stopped ? '' : result.status;
+  api.state.output = api.state.verbose ? shownOutput(api, raw, '') : reduced;
   api.state.stopping = false;
   stopRun(api);
   try {
@@ -106,21 +135,24 @@ const finishRun = (api, entry, result) => {
 
 const startRun = (api, entry) => {
   api.state.output = '';
+  api.state.raw = '';
+  api.state.exitStatus = '';
   api.state.viewing = true;
   api.state.followEnd = true;
   api.state.logScroll = 0;
   api.state.running = true;
   api.state.stopping = false;
   api.ui.status = '';
-  if (api.ui.progress) api.ui.progress.start('npm');
+  api.ui.progress.start('npm');
   const runner = api.ui.repo && api.ui.repo.runNpmCommand;
   const start = typeof runner === 'function' ? runner : startNpm;
-  api.state.child = start(
+  const child = start(
     api.ui.top,
     entry,
-    (text) => showOutput(api, reduceOutput(text, api.ui.top, '')),
+    (text) => showOutput(api, text),
     (result) => finishRun(api, entry, result),
   );
+  if (api.state.running) api.state.child = child;
   api.ui.paint();
 };
 
@@ -128,6 +160,7 @@ const runSelected = (api) => {
   if (api.state.viewing || api.state.child) return;
   const entry = selected(api);
   if (!entry) return;
+  api.state.verbose = false;
   startRun(api, entry);
 };
 
@@ -143,50 +176,106 @@ const closeView = (api) => {
     api.state.stopping = true;
     if (api.state.child) api.state.child.kill();
     if (!api.state.running) return;
-    api.state.output = withNotice(api.state.output, 'terminated');
+    api.state.raw = withNotice(api.state.raw, 'terminated');
+    api.state.output = api.state.verbose
+      ? shownOutput(api, api.state.raw, '')
+      : withNotice(api.state.output, 'terminated');
     stopRun(api);
     api.ui.status = 'terminated';
     api.ui.paint();
     return;
   }
   api.state.viewing = false;
+  api.state.verbose = false;
   api.ui.status = '';
   api.ui.paint();
 };
 
-const editSelected = (api) => {
-  if (api.state.viewing) return;
-  if (!canEdit(api.ui)) {
-    api.ui.status = 'read only';
-    return;
-  }
+const toggleVerbose = (api) => {
+  if (!api.state.viewing) return;
+  api.state.verbose = !api.state.verbose;
+  const status = api.state.running ? '' : api.state.exitStatus;
+  api.state.output = shownOutput(api, api.state.raw, status);
+  api.ui.status = api.state.verbose ? 'verbose' : 'filtered';
+  api.ui.paint();
+};
+
+const editable = (api) => {
+  if (api.state.viewing) return false;
+  if (canEdit(api.ui)) return true;
+  api.ui.status = 'read only';
+  return false;
+};
+
+const selectedScript = (api) => {
+  if (!editable(api)) return null;
   const entry = selected(api);
-  if (!entry || entry.kind !== 'script') {
-    api.ui.status = 'not a script';
-    return;
-  }
+  if (entry && entry.kind === 'script') return entry;
+  api.ui.status = 'not a script';
+  return null;
+};
+
+const focusScript = (api, name) => {
+  const at = api.state.commands.findIndex((entry) => entry.name === name);
+  if (at >= 0) api.ui.nav.npmCursor = at;
+};
+
+const editSelected = (api) => {
+  const entry = selectedScript(api);
+  if (!entry) return;
   api.state.editName = entry.name;
-  api.ui.composer.openCompose('npm', scriptLine(entry));
+  api.state.editField = 'name';
+  api.state.draftName = entry.name;
+  api.state.draftCommand = entry.command ?? '';
+  api.ui.composer.openCompose('npm', entry.name);
 };
 
 const newCommand = (api) => {
-  if (api.state.viewing) return;
-  if (!canEdit(api.ui)) {
-    api.ui.status = 'read only';
-    return;
-  }
+  if (!editable(api)) return;
   api.state.editName = '';
+  api.state.editField = 'name';
+  api.state.draftName = '';
+  api.state.draftCommand = '';
   api.ui.composer.openCompose('npm', '');
 };
 
+const switchField = (api, editor, field, text) => {
+  api.state.editField = field;
+  editor.replace(text);
+  api.ui.status = '';
+};
+
+const finishName = (api, editor) => {
+  const name = editor.text.trim();
+  if (!name || !NAME_RE.test(name)) {
+    api.ui.status = 'name';
+    return false;
+  }
+  api.state.draftName = name;
+  switchField(api, editor, 'command', api.state.draftCommand);
+  return true;
+};
+
+const focusField = (api, field) => {
+  const editor = api.ui.editor;
+  if (!editor) return false;
+  if (field === api.state.editField) return true;
+  if (field === 'command') return finishName(api, editor);
+  api.state.draftCommand = editor.text;
+  switchField(api, editor, 'name', api.state.draftName ?? '');
+  return true;
+};
+
 const finishEdit = (api) => {
   const editor = api.ui.composer.state.editor;
-  const text = editor ? editor.text : '';
-  const parsed = parseScriptLine(text);
-  if (!parsed) {
-    api.ui.status = 'name: command';
+  if (!editor) return;
+  if (api.state.editField !== 'command') return void finishName(api, editor);
+  const command = editor.text.trim();
+  if (!command) {
+    api.ui.status = 'command';
     return;
   }
+  const parsed = { name: api.state.draftName, command };
   try {
     api.ui.ignoreWatch();
     saveScript(api.ui.top, api.state.editName, parsed);
@@ -194,35 +283,51 @@ const finishEdit = (api) => {
     api.ui.status = error.message;
     return;
   }
+  api.state.editField = '';
   api.ui.composer.closeCompose();
   refresh(api);
-  const at = api.state.commands.findIndex(
-    (entry) => entry.name === parsed.name,
-  );
-  if (at >= 0) api.ui.nav.npmCursor = at;
+  focusScript(api, parsed.name);
   api.ui.status = 'saved';
 };
 
 const askDrop = (api) => {
-  if (api.state.viewing) return;
-  if (!canEdit(api.ui)) {
-    api.ui.status = 'read only';
-    return;
-  }
-  const entry = selected(api);
-  if (!entry || entry.kind !== 'script') {
-    api.ui.status = 'not a script';
-    return;
-  }
+  const entry = selectedScript(api);
+  if (!entry) return;
+  api.state.dropKind = 'script';
   api.state.dropName = entry.name;
   api.ui.mode = 'confirmDrop';
   api.ui.status = '';
 };
 
+const askLogs = (api) => {
+  if (!editable(api)) return;
+  refreshLogs(api);
+  if (!api.state.logBytes) return;
+  api.state.dropKind = 'logs';
+  const size = formatSize(api.state.logBytes);
+  api.state.dropName = `logs older than 5 days (${size})`;
+  api.ui.mode = 'confirmDrop';
+  api.ui.status = '';
+};
+
 const confirmDrop = (api) => {
+  const kind = api.state.dropKind;
   const name = api.state.dropName;
   api.state.dropName = '';
+  api.state.dropKind = '';
   api.ui.mode = 'review';
+  if (kind === 'logs') {
+    try {
+      removeStaleLogs(api.ui.top);
+    } catch (error) {
+      api.ui.status = error.message;
+      refreshLogs(api);
+      return;
+    }
+    refreshLogs(api);
+    api.ui.status = 'dropped logs';
+    return;
+  }
   if (!name) return;
   try {
     api.ui.ignoreWatch();
@@ -237,21 +342,14 @@ const confirmDrop = (api) => {
 
 const cancelDrop = (api) => {
   api.state.dropName = '';
+  api.state.dropKind = '';
   api.ui.mode = 'review';
   api.ui.status = '';
 };
 
 const reorder = (api, delta) => {
-  if (api.state.viewing) return;
-  if (!canEdit(api.ui)) {
-    api.ui.status = 'read only';
-    return;
-  }
-  const entry = selected(api);
-  if (!entry || entry.kind !== 'script') {
-    api.ui.status = 'not a script';
-    return;
-  }
+  const entry = selectedScript(api);
+  if (!entry) return;
   try {
     api.ui.ignoreWatch();
     if (!reorderScript(api.ui.top, entry.name, delta)) return;
@@ -260,24 +358,33 @@ const reorder = (api, delta) => {
     return;
   }
   refresh(api);
-  const at = api.state.commands.findIndex((item) => item.name === entry.name);
-  if (at >= 0) api.ui.nav.npmCursor = at;
+  focusScript(api, entry.name);
   api.ui.status = '';
 };
 
+const npmState = () => ({
+  commands: [],
+  viewing: false,
+  output: '',
+  followEnd: true,
+  logScroll: 0,
+  editName: '',
+  editField: '',
+  draftName: '',
+  draftCommand: '',
+  verbose: false,
+  raw: '',
+  exitStatus: '',
+  dropName: '',
+  dropKind: '',
+  logBytes: 0,
+  running: false,
+  stopping: false,
+  child: null,
+});
+
 const createNpmController = (ui) => {
-  const state = {
-    commands: [],
-    viewing: false,
-    output: '',
-    followEnd: true,
-    logScroll: 0,
-    editName: '',
-    dropName: '',
-    running: false,
-    stopping: false,
-    child: null,
-  };
+  const state = npmState();
   const api = { ui, state };
   return {
     state,
@@ -293,6 +400,10 @@ const createNpmController = (ui) => {
     get dropName() {
       return state.dropName;
     },
+    get logLabel() {
+      if (!state.logBytes) return '';
+      return `old logs ${formatSize(state.logBytes)}`;
+    },
     get followEnd() {
       return state.followEnd;
     },
@@ -302,6 +413,18 @@ const createNpmController = (ui) => {
     get editName() {
       return state.editName;
     },
+    get editField() {
+      return state.editField;
+    },
+    get draftName() {
+      return state.draftName;
+    },
+    get draftCommand() {
+      return state.draftCommand;
+    },
+    get verbose() {
+      return state.verbose;
+    },
     get running() {
       return state.running;
     },
@@ -314,7 +437,15 @@ const createNpmController = (ui) => {
       state.followEnd = true;
       state.logScroll = 0;
       state.editName = '';
+      state.editField = '';
+      state.draftName = '';
+      state.draftCommand = '';
+      state.verbose = false;
+      state.raw = '';
+      state.exitStatus = '';
       state.dropName = '';
+      state.dropKind = '';
+      state.logBytes = 0;
       state.stopping = false;
     },
     open: () => open(api),
@@ -322,10 +453,13 @@ const createNpmController = (ui) => {
     run: () => runSelected(api),
     rerun: () => rerun(api),
     closeView: () => closeView(api),
+    toggleVerbose: () => toggleVerbose(api),
     edit: () => editSelected(api),
     create: () => newCommand(api),
     finishEdit: () => finishEdit(api),
+    focusField: (field) => focusField(api, field),
     askDrop: () => askDrop(api),
+    askLogs: () => askLogs(api),
     confirmDrop: () => confirmDrop(api),
     cancelDrop: () => cancelDrop(api),
     reorder: (delta) => reorder(api, delta),